| Message ID | 20240507215713.902148-1-numans@ovn.org |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [ovs-dev] northd: Add documentation for is_cr_port() and is_l3dgw_port(). | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On Tue, May 7, 2024 at 5:57 PM <numans@ovn.org> wrote: > > From: Numan Siddique <numans@ovn.org> > > Although these util functions are correct in their implementation, > they are confusing to the reader. Add proper documentation > and make the is_l3dgw_port() more clearer by checking if the > gateway chassis or ha chassis group is set or not. > > Signed-off-by: Numan Siddique <numans@ovn.org> This patch is now part of the series here - https://patchwork.ozlabs.org/project/ovn/list/?series=406203&state=* Thanks Numan > --- > northd/northd.c | 22 +++++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > > diff --git a/northd/northd.c b/northd/northd.c > index 0cabda7ea0..d1afc52c4a 100644 > --- a/northd/northd.c > +++ b/northd/northd.c > @@ -1077,12 +1077,32 @@ struct ovn_port_routable_addresses { > > static bool lsp_can_be_inc_processed(const struct nbrec_logical_switch_port *); > > +/* This function returns true if 'op' is a gateway router port. > + * False otherwise. > + * For 'op' to be a gateway router port. > + * 1. op->nbrp->gateway_chassis or op->nbrp->ha_chassis_group should > + * be configured. > + * 2. op->cr_port should not be NULL. If op->nbrp->gateway_chassis or > + * op->nbrp->ha_chassis_group is set by the user, northd WILL create > + * a chassis resident port in the SB port binding. > + * See join_logical_ports(). > + */ > static bool > is_l3dgw_port(const struct ovn_port *op) > { > - return op->cr_port; > + return op->cr_port && op->nbrp && > + (op->nbrp->n_gateway_chassis || op->nbrp->ha_chassis_group); > } > > +/* This function returns true if 'op' is a chassis resident > + * derived port. False otherwise. > + * There are 2 ways to check if 'op' is chassis resident port. > + * 1. op->sb->type is "chassisresident" > + * 2. op->l3dgw_port is not NULL. If op->l3dgw_port is set, > + * it means 'op' is derived from the gateway port (op->l3dgw_port). > + * > + * This function uses the (2) method as it doesn't involve strcmp(). > + */ > static bool > is_cr_port(const struct ovn_port *op) > { > -- > 2.44.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 0cabda7ea0..d1afc52c4a 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -1077,12 +1077,32 @@ struct ovn_port_routable_addresses { static bool lsp_can_be_inc_processed(const struct nbrec_logical_switch_port *); +/* This function returns true if 'op' is a gateway router port. + * False otherwise. + * For 'op' to be a gateway router port. + * 1. op->nbrp->gateway_chassis or op->nbrp->ha_chassis_group should + * be configured. + * 2. op->cr_port should not be NULL. If op->nbrp->gateway_chassis or + * op->nbrp->ha_chassis_group is set by the user, northd WILL create + * a chassis resident port in the SB port binding. + * See join_logical_ports(). + */ static bool is_l3dgw_port(const struct ovn_port *op) { - return op->cr_port; + return op->cr_port && op->nbrp && + (op->nbrp->n_gateway_chassis || op->nbrp->ha_chassis_group); } +/* This function returns true if 'op' is a chassis resident + * derived port. False otherwise. + * There are 2 ways to check if 'op' is chassis resident port. + * 1. op->sb->type is "chassisresident" + * 2. op->l3dgw_port is not NULL. If op->l3dgw_port is set, + * it means 'op' is derived from the gateway port (op->l3dgw_port). + * + * This function uses the (2) method as it doesn't involve strcmp(). + */ static bool is_cr_port(const struct ovn_port *op) {