diff mbox series

[ovs-dev,v3,03/33] northd: Find outports based on ovn_port.

Message ID c16b86ed16def6068517d62168734b2f8b1dff8f.1732630355.git.felix.huettner@stackit.cloud
State Accepted
Headers show
Series OVN Fabric integration | expand

Checks

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

Commit Message

Felix Huettner Nov. 26, 2024, 2:37 p.m. UTC 
Previously we searched for the outport of a route by going through all
LRPs of the LR in the northbound, finding the matching ovn_port and
checking if it matches. However we can also just iterate over all
ovn_port of the LR datapath.

This is simpler and a prerequisite for later patches that use
derived router ports.

Acked-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Huettner <felix.huettner@stackit.cloud>
---
 northd/northd.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Dumitru Ceara Dec. 2, 2024, 10:56 a.m. UTC | #1 
On 11/26/24 3:37 PM, Felix Huettner via dev wrote:
> Previously we searched for the outport of a route by going through all
> LRPs of the LR in the northbound, finding the matching ovn_port and
> checking if it matches. However we can also just iterate over all
> ovn_port of the LR datapath.
> 
> This is simpler and a prerequisite for later patches that use
> derived router ports.
> 
> Acked-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
> Signed-off-by: Felix Huettner <felix.huettner@stackit.cloud>
> ---

Thank you Felix and Lorenzo!  I applied this patch to the main branch.

Regards,
Dumitru

>  northd/northd.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/northd/northd.c b/northd/northd.c
> index fa3a8a882..8ba7b8c33 100644
> --- a/northd/northd.c
> +++ b/northd/northd.c
> @@ -11433,15 +11433,7 @@ find_static_route_outport(struct ovn_datapath *od, const struct hmap *lr_ports,
>      } else {
>          /* output_port is not specified, find the
>           * router port matching the next hop. */
> -        int i;
> -        for (i = 0; i < od->nbr->n_ports; i++) {
> -            struct nbrec_logical_router_port *lrp = od->nbr->ports[i];
> -            out_port = ovn_port_find(lr_ports, lrp->name);
> -            if (!out_port) {
> -                /* This should not happen. */
> -                continue;
> -            }
> -
> +        HMAP_FOR_EACH (out_port, dp_node, &od->ports) {
>              if (route->nexthop[0]) {
>                  lrp_addr_s = find_lrp_member_ip(out_port, route->nexthop);
>              }
diff mbox series

Patch

diff --git a/northd/northd.c b/northd/northd.c
index fa3a8a882..8ba7b8c33 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -11433,15 +11433,7 @@  find_static_route_outport(struct ovn_datapath *od, const struct hmap *lr_ports,
     } else {
         /* output_port is not specified, find the
          * router port matching the next hop. */
-        int i;
-        for (i = 0; i < od->nbr->n_ports; i++) {
-            struct nbrec_logical_router_port *lrp = od->nbr->ports[i];
-            out_port = ovn_port_find(lr_ports, lrp->name);
-            if (!out_port) {
-                /* This should not happen. */
-                continue;
-            }
-
+        HMAP_FOR_EACH (out_port, dp_node, &od->ports) {
             if (route->nexthop[0]) {
                 lrp_addr_s = find_lrp_member_ip(out_port, route->nexthop);
             }