ovn-controller: Rename "ovn-patch-port" to "ovn-localnet-port".

An upcoming patch will introduce a different use for patch ports, so
ovn-patch-port would become an ambiguous name.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>

diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml
index e79e665..2fcd145 100644 (file)
--- a/ovn/controller/ovn-controller.8.xml
+++ b/ovn/controller/ovn-controller.8.xml
@@ -159,7 +159,8 @@
       </dd>
 
       <dt>
-        <code>external-ids:ovn-patch-port</code> in the <code>Port</code> table
+        <code>external-ids:ovn-localnet-port</code> in the <code>Port</code>
+        table
       </dt>
       <dd>
         <p>
@@ -174,7 +175,8 @@
         <p>
           Each <code>localnet</code> logical port is implemented as a pair of
           patch ports, one in the integration bridge, one in a different
-          bridge, with the same <code>external-ids:ovn-patch-port</code> value.
+          bridge, with the same <code>external-ids:ovn-localnet-port</code>
+          value.
         </p>
       </dd>
     </dl>

diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c
index 67f72af..8134fa4 100644 (file)
--- a/ovn/controller/patch.c
+++ b/ovn/controller/patch.c
@@ -49,7 +49,7 @@ match_patch_port(const struct ovsrec_port *port, const char *peer)
 
 /* Creates a patch port in bridge 'src' named 'src_name', whose peer is
  * 'dst_name' in bridge 'dst'.  Initializes the patch port's
- * external-ids:ovn-patch-port to 'network'.
+ * external-ids:ovn-localnet-port to 'network'.
  *
  * If such a patch port already exists, removes it from 'existing_ports'. */
 static void
@@ -82,7 +82,7 @@ create_patch_port(struct controller_ctx *ctx,
     port = ovsrec_port_insert(ctx->ovs_idl_txn);
     ovsrec_port_set_name(port, src_name);
     ovsrec_port_set_interfaces(port, &iface, 1);
-    const struct smap ids = SMAP_CONST1(&ids, "ovn-patch-port", network);
+    const struct smap ids = SMAP_CONST1(&ids, "ovn-localnet-port", network);
     ovsrec_port_set_external_ids(port, &ids);
 
     struct ovsrec_port **ports;
@@ -97,7 +97,7 @@ create_patch_port(struct controller_ctx *ctx,
 
 /* Creates a pair of patch ports that connect bridges 'b1' and 'b2', using a
  * port named 'name1' and 'name2' in each respective bridge.
- * external-ids:ovn-patch-port in each port is initialized to 'network'.
+ * external-ids:ovn-localnet-port in each port is initialized to 'network'.
  *
  * If one or both of the ports already exists, leaves it there and removes it
  * from 'existing_ports'. */
@@ -203,7 +203,7 @@ patch_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int)
     struct shash existing_ports = SHASH_INITIALIZER(&existing_ports);
     const struct ovsrec_port *port;
     OVSREC_PORT_FOR_EACH (port, ctx->ovs_idl) {
-        if (smap_get(&port->external_ids, "ovn-patch-port")) {
+        if (smap_get(&port->external_ids, "ovn-localnet-port")) {
             shash_add(&existing_ports, port->name, port);
         }
     }

diff --git a/ovn/controller/physical.c b/ovn/controller/physical.c
index 1f5f716..155d96b 100644 (file)
--- a/ovn/controller/physical.c
+++ b/ovn/controller/physical.c
@@ -157,7 +157,7 @@ physical_run(struct controller_ctx *ctx, enum mf_field_id mff_ovn_geneve,
         }
 
         const char *localnet = smap_get(&port_rec->external_ids,
-                                        "ovn-patch-port");
+                                        "ovn-localnet-port");
 
         for (int j = 0; j < port_rec->n_interfaces; j++) {
             const struct ovsrec_interface *iface_rec = port_rec->interfaces[j];