Implement IPFIX export

[sliver-openvswitch.git] / vswitchd / bridge.c

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 1fcf547..899fd64 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -200,6 +200,7 @@ static void bridge_configure_netflow(struct bridge *);
 static void bridge_configure_forward_bpdu(struct bridge *);
 static void bridge_configure_mac_table(struct bridge *);
 static void bridge_configure_sflow(struct bridge *, int *sflow_bridge_number);
+static void bridge_configure_ipfix(struct bridge *);
 static void bridge_configure_stp(struct bridge *);
 static void bridge_configure_tables(struct bridge *);
 static void bridge_configure_dp_desc(struct bridge *);
@@ -388,8 +389,9 @@ bridge_init(const char *remote)
     ovsdb_idl_omit_alert(idl, &ovsrec_mirror_col_statistics);
 
     ovsdb_idl_omit(idl, &ovsrec_netflow_col_external_ids);
-
     ovsdb_idl_omit(idl, &ovsrec_sflow_col_external_ids);
+    ovsdb_idl_omit(idl, &ovsrec_ipfix_col_external_ids);
+    ovsdb_idl_omit(idl, &ovsrec_flow_sample_collector_set_col_external_ids);
 
     ovsdb_idl_omit(idl, &ovsrec_manager_col_external_ids);
     ovsdb_idl_omit(idl, &ovsrec_manager_col_inactivity_probe);
@@ -612,6 +614,7 @@ bridge_reconfigure_continue(const struct ovsrec_open_vswitch *ovs_cfg)
         bridge_configure_remotes(br, managers, n_managers);
         bridge_configure_netflow(br);
         bridge_configure_sflow(br, &sflow_bridge_number);
+        bridge_configure_ipfix(br);
         bridge_configure_stp(br);
         bridge_configure_tables(br);
         bridge_configure_dp_desc(br);
@@ -944,6 +947,79 @@ bridge_configure_sflow(struct bridge *br, int *sflow_bridge_number)
     sset_destroy(&oso.targets);
 }
 
+/* Set IPFIX configuration on 'br'. */
+static void
+bridge_configure_ipfix(struct bridge *br)
+{
+    const struct ovsrec_ipfix *be_cfg = br->cfg->ipfix;
+    const struct ovsrec_flow_sample_collector_set *fe_cfg;
+    struct ofproto_ipfix_bridge_exporter_options be_opts;
+    struct ofproto_ipfix_flow_exporter_options *fe_opts = NULL;
+    size_t n_fe_opts = 0;
+
+    OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) {
+        if (fe_cfg->bridge == br->cfg) {
+            n_fe_opts++;
+        }
+    }
+
+    if (!be_cfg && n_fe_opts == 0) {
+        ofproto_set_ipfix(br->ofproto, NULL, NULL, 0);
+        return;
+    }
+
+    if (be_cfg) {
+        memset(&be_opts, 0, sizeof be_opts);
+
+        sset_init(&be_opts.targets);
+        sset_add_array(&be_opts.targets, be_cfg->targets, be_cfg->n_targets);
+
+        if (be_cfg->sampling) {
+            be_opts.sampling_rate = *be_cfg->sampling;
+        } else {
+            be_opts.sampling_rate = SFL_DEFAULT_SAMPLING_RATE;
+        }
+        if (be_cfg->obs_domain_id) {
+            be_opts.obs_domain_id = *be_cfg->obs_domain_id;
+        }
+        if (be_cfg->obs_point_id) {
+            be_opts.obs_point_id = *be_cfg->obs_point_id;
+        }
+    }
+
+    if (n_fe_opts > 0) {
+        struct ofproto_ipfix_flow_exporter_options *opts;
+        fe_opts = xcalloc(n_fe_opts, sizeof *fe_opts);
+        opts = fe_opts;
+        OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) {
+            if (fe_cfg->bridge == br->cfg) {
+                opts->collector_set_id = fe_cfg->id;
+                sset_init(&opts->targets);
+                sset_add_array(&opts->targets, fe_cfg->ipfix->targets,
+                               fe_cfg->ipfix->n_targets);
+                opts++;
+            }
+        }
+    }
+
+    ofproto_set_ipfix(br->ofproto, be_cfg ? &be_opts : NULL, fe_opts,
+                      n_fe_opts);
+
+    if (be_cfg) {
+        sset_destroy(&be_opts.targets);
+    }
+
+    if (n_fe_opts > 0) {
+        struct ofproto_ipfix_flow_exporter_options *opts = fe_opts;
+        size_t i;
+        for (i = 0; i < n_fe_opts; i++) {
+            sset_destroy(&opts->targets);
+            opts++;
+        }
+        free(fe_opts);
+    }
+}
+
 static void
 port_configure_stp(const struct ofproto *ofproto, struct port *port,
                    struct ofproto_port_stp_settings *port_s,
@@ -2269,25 +2345,25 @@ bridge_run(void)
     }
 
     if (reconfiguring) {
-        if (cfg) {
-            if (!reconf_txn) {
-                reconf_txn = ovsdb_idl_txn_create(idl);
-            }
-            if (bridge_reconfigure_continue(cfg)) {
+        if (!reconf_txn) {
+            reconf_txn = ovsdb_idl_txn_create(idl);
+        }
+
+        if (bridge_reconfigure_continue(cfg ? cfg : &null_cfg)) {
+            reconfiguring = false;
+
+            if (cfg) {
                 ovsrec_open_vswitch_set_cur_cfg(cfg, cfg->next_cfg);
-                reconfiguring = false;
-
-                /* If we are completing our initial configuration for this run
-                 * of ovs-vswitchd, then keep the transaction around to monitor
-                 * it for completion. */
-                if (!initial_config_done) {
-                    initial_config_done = true;
-                    daemonize_txn = reconf_txn;
-                    reconf_txn = NULL;
-                }
             }
-        } else {
-            bridge_reconfigure_continue(&null_cfg);
+
+            /* If we are completing our initial configuration for this run
+             * of ovs-vswitchd, then keep the transaction around to monitor
+             * it for completion. */
+            if (!initial_config_done) {
+                initial_config_done = true;
+                daemonize_txn = reconf_txn;
+                reconf_txn = NULL;
+            }
         }
     }