diff mbox series

[ovs-dev,05/15] northd: separate code for nb->sb port binding chassis update

Message ID 20220215035737.1820679-6-ihrachys@redhat.com
State Superseded, archived
Headers show
Series Support additional-chassis for ports | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Ihar Hrachyshka Feb. 15, 2022, 3:57 a.m. UTC 
The ovn_port_update_sbrec function became too long, and the next
patches will touch the code to update chassis mapping for ports. This
patch prepares for the next step.

Signed-off-by: Ihar Hrachyshka <ihrachys@redhat.com>
---
 northd/northd.c | 62 ++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 26 deletions(-)
diff mbox series

Patch

diff --git a/northd/northd.c b/northd/northd.c
index 0f694cb2d..0179b2bc9 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -3132,6 +3132,40 @@  chassis_lookup(struct ovsdb_idl_index *sbrec_chassis_by_name,
                     sbrec_chassis_by_hostname, name_or_hostname);
 }
 
+static void
+ovn_port_update_sbrec_chassis(
+        struct ovsdb_idl_index *sbrec_chassis_by_name,
+        struct ovsdb_idl_index *sbrec_chassis_by_hostname,
+        const struct ovn_port *op)
+{
+    const char *requested_chassis; /* May be NULL. */
+    bool reset_requested_chassis = false;
+    requested_chassis = smap_get(&op->nbsp->options,
+                                 "requested-chassis");
+    if (requested_chassis) {
+        const struct sbrec_chassis *chassis = chassis_lookup(
+            sbrec_chassis_by_name, sbrec_chassis_by_hostname,
+            requested_chassis);
+        if (chassis) {
+            sbrec_port_binding_set_requested_chassis(op->sb, chassis);
+        } else {
+            reset_requested_chassis = true;
+            static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(
+                1, 1);
+            VLOG_WARN_RL(
+                &rl,
+                "Unknown chassis '%s' set as "
+                "options:requested-chassis on LSP '%s'.",
+                requested_chassis, op->nbsp->name);
+        }
+    } else if (op->sb->requested_chassis) {
+        reset_requested_chassis = true;
+    }
+    if (reset_requested_chassis) {
+        sbrec_port_binding_set_requested_chassis(op->sb, NULL);
+    }
+}
+
 static void
 ovn_port_update_sbrec(struct northd_input *input_data,
                       struct ovsdb_idl_txn *ovnsb_txn,
@@ -3322,32 +3356,8 @@  ovn_port_update_sbrec(struct northd_input *input_data,
                 sbrec_port_binding_set_ha_chassis_group(op->sb, NULL);
             }
 
-            const char *requested_chassis; /* May be NULL. */
-            bool reset_requested_chassis = false;
-            requested_chassis = smap_get(&op->nbsp->options,
-                                         "requested-chassis");
-            if (requested_chassis) {
-                const struct sbrec_chassis *chassis = chassis_lookup(
-                    sbrec_chassis_by_name, sbrec_chassis_by_hostname,
-                    requested_chassis);
-                if (chassis) {
-                    sbrec_port_binding_set_requested_chassis(op->sb, chassis);
-                } else {
-                    reset_requested_chassis = true;
-                    static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(
-                        1, 1);
-                    VLOG_WARN_RL(
-                        &rl,
-                        "Unknown chassis '%s' set as "
-                        "options:requested-chassis on LSP '%s'.",
-                        requested_chassis, op->nbsp->name);
-                }
-            } else if (op->sb->requested_chassis) {
-                reset_requested_chassis = true;
-            }
-            if (reset_requested_chassis) {
-                sbrec_port_binding_set_requested_chassis(op->sb, NULL);
-            }
+            ovn_port_update_sbrec_chassis(sbrec_chassis_by_name,
+                                          sbrec_chassis_by_hostname, op);
         } else {
             const char *chassis = NULL;
             if (op->peer && op->peer->od && op->peer->od->nbr) {