| Message ID | 41a2a452d6bc79afe4e2ad012d0c1e60b6348657.1730713432.git.felix.huettner@stackit.cloud |
|---|---|
| State | Superseded |
| Headers | show |
| Series | OVN Fabric integration | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
> this makes the later active_active patches clearer as they need this new > order. > For now this has no real effect as these two parts are completely > independent. > > Signed-off-by: Felix Huettner <felix.huettner@stackit.cloud> Acked-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> > --- > northd/northd.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/northd/northd.c b/northd/northd.c > index 8d95650c2..5c48503e3 100644 > --- a/northd/northd.c > +++ b/northd/northd.c > @@ -2365,17 +2365,6 @@ join_logical_ports(const struct sbrec_port_binding_table *sbrec_pb_table, > } > > struct ovn_datapath *od; > - HMAP_FOR_EACH (od, key_node, ls_datapaths) { > - ovs_assert(od->nbs); > - for (size_t i = 0; i < od->nbs->n_ports; i++) { > - const struct nbrec_logical_switch_port *nbsp > - = od->nbs->ports[i]; > - join_logical_ports_lsp(ports, nb_only, both, od, nbsp, > - nbsp->name, queue_id_bitmap, > - tag_alloc_table); > - } > - } > - > struct hmapx dgps = HMAPX_INITIALIZER(&dgps); > HMAP_FOR_EACH (od, key_node, lr_datapaths) { > ovs_assert(od->nbr); > @@ -2396,6 +2385,17 @@ join_logical_ports(const struct sbrec_port_binding_table *sbrec_pb_table, > } > } > > + HMAP_FOR_EACH (od, key_node, ls_datapaths) { > + ovs_assert(od->nbs); > + for (size_t i = 0; i < od->nbs->n_ports; i++) { > + const struct nbrec_logical_switch_port *nbsp > + = od->nbs->ports[i]; > + join_logical_ports_lsp(ports, nb_only, both, od, nbsp, > + nbsp->name, queue_id_bitmap, > + tag_alloc_table); > + } > + } > + > /* Connect logical router ports, and logical switch ports of type "router", > * to their peers. */ > struct ovn_port *op; > -- > 2.47.0 > > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/northd/northd.c b/northd/northd.c index 8d95650c2..5c48503e3 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -2365,17 +2365,6 @@ join_logical_ports(const struct sbrec_port_binding_table *sbrec_pb_table, } struct ovn_datapath *od; - HMAP_FOR_EACH (od, key_node, ls_datapaths) { - ovs_assert(od->nbs); - for (size_t i = 0; i < od->nbs->n_ports; i++) { - const struct nbrec_logical_switch_port *nbsp - = od->nbs->ports[i]; - join_logical_ports_lsp(ports, nb_only, both, od, nbsp, - nbsp->name, queue_id_bitmap, - tag_alloc_table); - } - } - struct hmapx dgps = HMAPX_INITIALIZER(&dgps); HMAP_FOR_EACH (od, key_node, lr_datapaths) { ovs_assert(od->nbr); @@ -2396,6 +2385,17 @@ join_logical_ports(const struct sbrec_port_binding_table *sbrec_pb_table, } } + HMAP_FOR_EACH (od, key_node, ls_datapaths) { + ovs_assert(od->nbs); + for (size_t i = 0; i < od->nbs->n_ports; i++) { + const struct nbrec_logical_switch_port *nbsp + = od->nbs->ports[i]; + join_logical_ports_lsp(ports, nb_only, both, od, nbsp, + nbsp->name, queue_id_bitmap, + tag_alloc_table); + } + } + /* Connect logical router ports, and logical switch ports of type "router", * to their peers. */ struct ovn_port *op;
this makes the later active_active patches clearer as they need this new order. For now this has no real effect as these two parts are completely independent. Signed-off-by: Felix Huettner <felix.huettner@stackit.cloud> --- northd/northd.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)