From: Russell Bryant <russell@ovn.org>
Date: Tue, 29 Mar 2016 23:47:58 +0000 (-0700)
Subject: ovn: Minor refactoring.
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=1021e19b1d729b1eff9e4ea91d71b5dec5d1261d;p=cascardo%2Fovs.git

ovn: Minor refactoring.

This commit applies a minor restructuring of this code to put the
localnet port specific code in its own block.  This is mostly to make a
future patch easier to read.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/ovn/controller/patch.c b/ovn/controller/patch.c
index be9418c66..943ac999e 100644
--- a/ovn/controller/patch.c
+++ b/ovn/controller/patch.c
@@ -175,32 +175,32 @@ add_bridge_mappings(struct controller_ctx *ctx,
 
     const struct sbrec_port_binding *binding;
     SBREC_PORT_BINDING_FOR_EACH (binding, ctx->ovnsb_idl) {
-        if (strcmp(binding->type, "localnet")) {
+        if (!strcmp(binding->type, "localnet")) {
+            struct local_datapath *ld;
+            ld = CONTAINER_OF(hmap_first_with_hash(local_datapaths,
+                              binding->datapath->tunnel_key),
+                              struct local_datapath, hmap_node);
+            if (!ld) {
+                /* This localnet port is on a datapath with no
+                 * logical ports bound to this chassis, so there's no need
+                 * to create patch ports for it. */
+                continue;
+            }
+            if (ld->localnet_port) {
+                static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1);
+                VLOG_WARN_RL(&rl, "localnet port '%s' already set for datapath "
+                             "'%"PRId64"', skipping the new port '%s'.",
+                             ld->localnet_port->logical_port,
+                             binding->datapath->tunnel_key,
+                             binding->logical_port);
+                continue;
+            }
+            ld->localnet_port = binding;
+        } else {
             /* Not a binding for a localnet port. */
             continue;
         }
 
-        struct local_datapath *ld;
-        ld = CONTAINER_OF(hmap_first_with_hash(local_datapaths,
-                          binding->datapath->tunnel_key),
-                          struct local_datapath, hmap_node);
-        if (!ld) {
-            /* This localnet port is on a datapath with no
-             * logical ports bound to this chassis, so there's no need
-             * to create patch ports for it. */
-            continue;
-        }
-        if (ld->localnet_port) {
-            static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1);
-            VLOG_WARN_RL(&rl, "localnet port '%s' already set for datapath "
-                         "'%"PRId64"', skipping the new port '%s'.",
-                         ld->localnet_port->logical_port,
-                         binding->datapath->tunnel_key,
-                         binding->logical_port);
-            continue;
-        }
-        ld->localnet_port = binding;
-
         const char *network = smap_get(&binding->options, "network_name");
         if (!network) {
             static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1);