Revert "ipfix: Export user specified virtual observation ID".

This reverts commit 337bebe91c94d9d201e28811c469869d32e978ff, which caused a
crash in test 1048 "ofproto-dpif - Flow IPFIX sanity check" (now test 1051)
with the following backtrace:

 #0 hmap_first_with_hash (hmap=<optimized out>, hmap=<optimized out>,
    hash=<optimized out>) at ../lib/hmap.h:328
 #1 smap_find__ (smap=0x94, key=key@entry=0x817f7ab "virtual_obs_id",
    key_len=14, hash=2537071222) at ../lib/smap.c:366
 #2 0x0812b9d7 in smap_get_node (smap=0x9738a276,
    key=0x817f7ab "virtual_obs_id") at ../lib/smap.c:198
 #3 0x0812ba30 in smap_get (smap=0x94, key=0x817f7ab "virtual_obs_id")
    at ../lib/smap.c:189
 #4 0x08055a60 in bridge_configure_ipfix (br=<optimized out>)
    at ../vswitchd/bridge.c:1237
 #5 bridge_reconfigure (ovs_cfg=0x94) at ../vswitchd/bridge.c:666
 #6 0x080568d3 in bridge_run () at ../vswitchd/bridge.c:2972
 #7 0x0804c9dd in main (argc=10, argv=0xffd8b934)
    at ../vswitchd/ovs-vswitchd.c:112

Signed-off-by: Ben Pfaff <blp@ovn.org>

2 files changed, 0 insertions, 46 deletions

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 19e9f2dde..427355214 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1165,7 +1165,6 @@ bridge_configure_ipfix(struct bridge *br)
     struct ofproto_ipfix_bridge_exporter_options be_opts;
     struct ofproto_ipfix_flow_exporter_options *fe_opts = NULL;
     size_t n_fe_opts = 0;
-    const char *virtual_obs_id;
 
     OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) {
         if (ovsrec_fscs_is_valid(fe_cfg, br)) {
@@ -1210,11 +1209,6 @@ bridge_configure_ipfix(struct bridge *br)
 
         be_opts.enable_output_sampling = !smap_get_bool(&be_cfg->other_config,
                                               "enable-output-sampling", false);
-
-        virtual_obs_id = smap_get(&be_cfg->other_config, "virtual_obs_id");
-        be_opts.virtual_obs_id = (virtual_obs_id
-                                  ? xstrdup(virtual_obs_id)
-                                  : NULL);
     }
 
     if (n_fe_opts > 0) {
@@ -1234,11 +1228,6 @@ bridge_configure_ipfix(struct bridge *br)
                 opts->enable_tunnel_sampling = smap_get_bool(
                                                    &fe_cfg->ipfix->other_config,
                                                   "enable-tunnel-sampling", true);
-                virtual_obs_id = smap_get(&be_cfg->other_config,
-                                          "virtual_obs_id");
-                opts->virtual_obs_id = (virtual_obs_id
-                                        ? xstrdup(virtual_obs_id)
-                                        : NULL);
                 opts++;
             }
         }
@@ -1249,7 +1238,6 @@ bridge_configure_ipfix(struct bridge *br)
 
     if (valid_be_cfg) {
         sset_destroy(&be_opts.targets);
-        free(be_opts.virtual_obs_id);
     }
 
     if (n_fe_opts > 0) {
@@ -1257,7 +1245,6 @@ bridge_configure_ipfix(struct bridge *br)
         size_t i;
         for (i = 0; i < n_fe_opts; i++) {
             sset_destroy(&opts->targets);
-            free(opts->virtual_obs_id);
             opts++;
         }
         free(fe_opts);
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index aad490441..7ae0b5131 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -4747,39 +4747,6 @@
       </p>
     </column>
 
-    <column name="other_config" key="virtual_obs_id"
-            type='{"type": "string"}'>
-      <p>
-        A string that accompanies each IPFIX flow record.  Its intended use is
-        for the ``virtual observation ID,'' an identifier of a virtual
-        observation point that is locally unique in a virtual network.  It
-        describes a location in the virtual network where IP packets can be
-        observed.  The maximum length is 254 bytes.  If not specified, the
-        field is omitted from the IPFIX flow record.
-      </p>
-
-      <p>
-        The following enterprise entity reports the specified virtual
-        observation ID:
-      </p>
-
-      <dl>
-        <dt>virtualObsID:</dt>
-        <dd>
-          <p>ID: 898, and enterprise ID 6876 (VMware).</p>
-          <p>type: variable-length string.</p>
-          <p>data type semantics: identifier.</p>
-          <p>description: A virtual observation domain ID that is locally
-          unique in a virtual network.
-          </p>
-        </dd>
-      </dl>
-
-      <p>
-        This feature was introduced in Open vSwitch 2.5.90.
-      </p>
-    </column>
-
     <group title="Per-Bridge Sampling">
       <p>
         These values affect only per-bridge sampling.  See above for a