From e513bafe5718f42844f41d248ddf1777b71aaa50 Mon Sep 17 00:00:00 2001

Message-Id: <e513bafe5718f42844f41d248ddf1777b71aaa50.1610458802.git.lorenzo.bianconi@redhat.com>

In-Reply-To: <f21c1b7a467a691847b5552d4570af706fcc5bb0.1610458802.git.lorenzo.bianconi@redhat.com>

References: <f21c1b7a467a691847b5552d4570af706fcc5bb0.1610458802.git.lorenzo.bianconi@redhat.com>

From: Anton Ivanov <anton.ivanov@cambridgegreys.com>

Date: Tue, 5 Jan 2021 17:49:29 +0000

Subject: [PATCH 02/16] ovn-northd: Move DHCP Options and Response to a

 function.

Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>

Signed-off-by: Numan Siddique <numans@ovn.org>

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

---

 northd/ovn-northd.c | 100 ++++++++++++++++++++++----------------------

 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c

index d17cc55ac..a5b28584f 100644

--- a/northd/ovn-northd.c

+++ b/northd/ovn-northd.c

@@ -6780,55 +6780,6 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports,

     struct ovn_datapath *od;

     struct ovn_port *op;

-

-    /* Logical switch ingress table 14 and 15: DHCP options and response

-     * priority 100 flows. */

-    HMAP_FOR_EACH (op, key_node, ports) {

-        if (!op->nbsp) {

-           continue;

-        }

-

-        if (!lsp_is_enabled(op->nbsp) || lsp_is_router(op->nbsp)) {

-            /* Don't add the DHCP flows if the port is not enabled or if the

-             * port is a router port. */

-            continue;

-        }

-

-        if (!op->nbsp->dhcpv4_options && !op->nbsp->dhcpv6_options) {

-            /* CMS has disabled both native DHCPv4 and DHCPv6 for this lport.

-             */

-            continue;

-        }

-

-        bool is_external = lsp_is_external(op->nbsp);

-        if (is_external && (!op->od->n_localnet_ports ||

-                            !op->nbsp->ha_chassis_group)) {

-            /* If it's an external port and there are no localnet ports

-             * and if it doesn't belong to an HA chassis group ignore it. */

-            continue;

-        }

-

-        for (size_t i = 0; i < op->n_lsp_addrs; i++) {

-            if (is_external) {

-                for (size_t j = 0; j < op->od->n_localnet_ports; j++) {

-                    build_dhcpv4_options_flows(

-                        op, &op->lsp_addrs[i],

-                        op->od->localnet_ports[j]->json_key, is_external,

-                        lflows);

-                    build_dhcpv6_options_flows(

-                        op, &op->lsp_addrs[i],

-                        op->od->localnet_ports[j]->json_key, is_external,

-                        lflows);

-                }

-            } else {

-                build_dhcpv4_options_flows(op, &op->lsp_addrs[i], op->json_key,

-                                           is_external, lflows);

-                build_dhcpv6_options_flows(op, &op->lsp_addrs[i], op->json_key,

-                                           is_external, lflows);

-            }

-        }

-    }

-

     /* Logical switch ingress table 17 and 18: DNS lookup and response

      * priority 100 flows.

      */

@@ -7484,6 +7435,55 @@ build_lswitch_arp_nd_service_monitor(struct ovn_northd_lb *lb,

 }

+/* Logical switch ingress table 14 and 15: DHCP options and response

+ * priority 100 flows. */

+static void

+build_lswitch_dhcp_options_and_response(struct ovn_port *op,

+                                        struct hmap *lflows)

+{

+    if (op->nbsp) {

+        if (!lsp_is_enabled(op->nbsp) || lsp_is_router(op->nbsp)) {

+            /* Don't add the DHCP flows if the port is not enabled or if the

+             * port is a router port. */

+            return;

+        }

+

+        if (!op->nbsp->dhcpv4_options && !op->nbsp->dhcpv6_options) {

+            /* CMS has disabled both native DHCPv4 and DHCPv6 for this lport.

+             */

+            return;

+        }

+

+        bool is_external = lsp_is_external(op->nbsp);

+        if (is_external && (!op->od->n_localnet_ports ||

+                            !op->nbsp->ha_chassis_group)) {

+            /* If it's an external port and there are no localnet ports

+             * and if it doesn't belong to an HA chassis group ignore it. */

+            return;

+        }

+

+        for (size_t i = 0; i < op->n_lsp_addrs; i++) {

+            if (is_external) {

+                for (size_t j = 0; j < op->od->n_localnet_ports; j++) {

+                    build_dhcpv4_options_flows(

+                        op, &op->lsp_addrs[i],

+                        op->od->localnet_ports[j]->json_key, is_external,

+                        lflows);

+                    build_dhcpv6_options_flows(

+                        op, &op->lsp_addrs[i],

+                        op->od->localnet_ports[j]->json_key, is_external,

+                        lflows);

+                }

+            } else {

+                build_dhcpv4_options_flows(op, &op->lsp_addrs[i], op->json_key,

+                                           is_external, lflows);

+                build_dhcpv6_options_flows(op, &op->lsp_addrs[i], op->json_key,

+                                           is_external, lflows);

+            }

+        }

+    }

+}

+

 /* Returns a string of the IP address of the router port 'op' that

  * overlaps with 'ip_s".  If one is not found, returns NULL.

  *

@@ -11371,6 +11371,8 @@ build_lswitch_and_lrouter_iterate_by_op(struct ovn_port *op,

                                              lsi->ports,

                                              &lsi->actions,

                                              &lsi->match);

+    build_lswitch_dhcp_options_and_response(op,lsi->lflows);

+

     /* Build Logical Router Flows. */

     build_adm_ctrl_flows_for_lrouter_port(op, lsi->lflows, &lsi->match,

                                           &lsi->actions);

-- 

2.29.2