Thanks for the patch, and sorry for missing before that we could macro it instead.
You should also update ovn-architechture.xml that was modified in patches 4/5 and 5/5 of the original series. Thanks! On Wed, Jun 7, 2023 at 7:02 AM Dumitru Ceara <[email protected]> wrote: > Make it alias OFTABLE_OUTPUT_LARGE_PKT_DETECT in order to avoid always > doing an extra resubmit in slow path. The OFTABLE_OUTPUT_INIT table > didn't have more than the "advance to the next table" default rule. > > Fixes: 740f23c19577 ("Add new egress tables to accommodate for too-big > packets handling") > Signed-off-by: Dumitru Ceara <[email protected]> > --- > controller/lflow.h | 16 ++- > controller/physical.c | 58 ++++---- > tests/ovn-controller.at | 304 +++++++++++++++++++-------------------- > tests/ovn.at | 280 ++++++++++++++++++------------------ > tests/system-ovn-kmod.at | 2 +- > tests/system-ovn.at | 8 +- > 6 files changed, 332 insertions(+), 336 deletions(-) > > diff --git a/controller/lflow.h b/controller/lflow.h > index b804e61e52..2472dec29a 100644 > --- a/controller/lflow.h > +++ b/controller/lflow.h > @@ -67,15 +67,17 @@ struct uuid; > > /* Start of LOG_PIPELINE_LEN tables. */ > #define OFTABLE_LOG_INGRESS_PIPELINE 8 > -#define OFTABLE_OUTPUT_INIT 37 > -#define OFTABLE_OUTPUT_LARGE_PKT_DETECT 38 > -#define OFTABLE_OUTPUT_LARGE_PKT_PROCESS 39 > -#define OFTABLE_REMOTE_OUTPUT 40 > -#define OFTABLE_LOCAL_OUTPUT 41 > -#define OFTABLE_CHECK_LOOPBACK 42 > +#define OFTABLE_OUTPUT_LARGE_PKT_DETECT 37 > +#define OFTABLE_OUTPUT_LARGE_PKT_PROCESS 38 > +#define OFTABLE_REMOTE_OUTPUT 39 > +#define OFTABLE_LOCAL_OUTPUT 40 > +#define OFTABLE_CHECK_LOOPBACK 41 > + > +/* Start of the OUTPUT section of the pipeline. */ > +#define OFTABLE_OUTPUT_INIT OFTABLE_OUTPUT_LARGE_PKT_DETECT > > /* Start of LOG_PIPELINE_LEN tables. */ > -#define OFTABLE_LOG_EGRESS_PIPELINE 43 > +#define OFTABLE_LOG_EGRESS_PIPELINE 42 > #define OFTABLE_SAVE_INPORT 64 > #define OFTABLE_LOG_TO_PHY 65 > #define OFTABLE_MAC_BINDING 66 > diff --git a/controller/physical.c b/controller/physical.c > index d69c0a4022..5b7ac49a55 100644 > --- a/controller/physical.c > +++ b/controller/physical.c > @@ -878,12 +878,12 @@ put_local_common_flows(uint32_t dp_key, > > uint32_t port_key = pb->tunnel_key; > > - /* Table 41, priority 100. > + /* Table 40, priority 100. > * ======================= > * > * Implements output to local hypervisor. Each flow matches a > * logical output port on the local hypervisor, and resubmits to > - * table 42. > + * table 41. > */ > > ofpbuf_clear(ofpacts_p); > @@ -893,13 +893,13 @@ put_local_common_flows(uint32_t dp_key, > > put_zones_ofpacts(zone_ids, ofpacts_p); > > - /* Resubmit to table 42. */ > + /* Resubmit to table 41. */ > put_resubmit(OFTABLE_CHECK_LOOPBACK, ofpacts_p); > ofctrl_add_flow(flow_table, OFTABLE_LOCAL_OUTPUT, 100, > pb->header_.uuid.parts[0], &match, ofpacts_p, > &pb->header_.uuid); > > - /* Table 42, Priority 100. > + /* Table 41, Priority 100. > * ======================= > * > * Drop packets whose logical inport and outport are the same > @@ -1473,12 +1473,12 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > || ha_chassis_group_is_active(binding->ha_chassis_group, > active_tunnels, chassis))) { > > - /* Table 41, priority 100. > + /* Table 40, priority 100. > * ======================= > * > * Implements output to local hypervisor. Each flow matches a > * logical output port on the local hypervisor, and resubmits to > - * table 42. For ports of type "chassisredirect", the logical > + * table 41. For ports of type "chassisredirect", the logical > * output port is changed from the "chassisredirect" port to the > * underlying distributed port. */ > > @@ -1515,7 +1515,7 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > ct_zones); > put_zones_ofpacts(&zone_ids, ofpacts_p); > > - /* Resubmit to table 42. */ > + /* Resubmit to table 41. */ > put_resubmit(OFTABLE_CHECK_LOOPBACK, ofpacts_p); > } > > @@ -1731,7 +1731,7 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > ofport, flow_table); > } > > - /* Table 42, priority 160. > + /* Table 41, priority 160. > * ======================= > * > * Do not forward local traffic from a localport to a localnet > port. > @@ -1801,13 +1801,13 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > } > } > > - /* Table 40, priority 150. > + /* Table 39, priority 150. > * ======================= > * > * Handles packets received from ports of type "localport". These > * ports are present on every hypervisor. Traffic that > originates at > * one should never go over a tunnel to a remote hypervisor, > - * so resubmit them to table 41 for local delivery. */ > + * so resubmit them to table 40 for local delivery. */ > if (!strcmp(binding->type, "localport")) { > ofpbuf_clear(ofpacts_p); > put_resubmit(OFTABLE_LOCAL_OUTPUT, ofpacts_p); > @@ -1821,7 +1821,7 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > } > } else if (access_type == PORT_LOCALNET) { > /* Remote port connected by localnet port */ > - /* Table 41, priority 100. > + /* Table 40, priority 100. > * ======================= > * > * Implements switching to localnet port. Each flow matches a > @@ -1836,7 +1836,7 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > > put_load(localnet_port->tunnel_key, MFF_LOG_OUTPORT, 0, 32, > ofpacts_p); > > - /* Resubmit to table 41. */ > + /* Resubmit to table 40. */ > put_resubmit(OFTABLE_LOCAL_OUTPUT, ofpacts_p); > ofctrl_add_flow(flow_table, OFTABLE_LOCAL_OUTPUT, 100, > binding->header_.uuid.parts[0], > @@ -1855,7 +1855,7 @@ consider_port_binding(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > const char *redirect_type = smap_get(&binding->options, > "redirect-type"); > > - /* Table 41, priority 100. > + /* Table 40, priority 100. > * ======================= > * > * Handles traffic that needs to be sent to a remote hypervisor. Each > @@ -2080,7 +2080,7 @@ consider_mc_group(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > } > } > > - /* Table 41, priority 100. > + /* Table 40, priority 100. > * ======================= > * > * Handle output to the local logical ports in the multicast group, if > @@ -2096,7 +2096,7 @@ consider_mc_group(struct ovsdb_idl_index > *sbrec_port_binding_by_name, > &match, &ofpacts, &mc->header_.uuid); > } > > - /* Table 40, priority 100. > + /* Table 39, priority 100. > * ======================= > * > * Handle output to the remote chassis in the multicast group, if > @@ -2295,7 +2295,7 @@ physical_run(struct physical_ctx *p_ctx, > * encapsulations have metadata about the ingress and egress logical > ports. > * VXLAN encapsulations have metadata about the egress logical port > only. > * We set MFF_LOG_DATAPATH, MFF_LOG_INPORT, and MFF_LOG_OUTPORT from > the > - * tunnel key data where possible, then resubmit to table 41 to handle > + * tunnel key data where possible, then resubmit to table 40 to handle > * packets to the local hypervisor. */ > struct chassis_tunnel *tun; > HMAP_FOR_EACH (tun, hmap_node, p_ctx->chassis_tunnels) { > @@ -2397,18 +2397,12 @@ physical_run(struct physical_ctx *p_ctx, > */ > add_default_drop_flow(p_ctx, OFTABLE_PHY_TO_LOG, flow_table); > > - /* Table 34-36, priority 0. > + /* Table 37-38, priority 0. > * ======================== > * > * Default resubmit actions for OFTABLE_OUTPUT_LARGE_PKT_* tables. > */ > struct match match; > - match_init_catchall(&match); > - ofpbuf_clear(&ofpacts); > - put_resubmit(OFTABLE_OUTPUT_LARGE_PKT_DETECT, &ofpacts); > - ofctrl_add_flow(flow_table, OFTABLE_OUTPUT_INIT, 0, 0, &match, > - &ofpacts, hc_uuid); > - > match_init_catchall(&match); > ofpbuf_clear(&ofpacts); > put_resubmit(OFTABLE_REMOTE_OUTPUT, &ofpacts); > @@ -2429,12 +2423,12 @@ physical_run(struct physical_ctx *p_ctx, > ofctrl_add_flow(flow_table, OFTABLE_OUTPUT_LARGE_PKT_PROCESS, 0, 0, > &match, > &ofpacts, hc_uuid); > > - /* Table 40, priority 150. > + /* Table 39, priority 150. > * ======================= > * > * Handles packets received from a VXLAN tunnel which get resubmitted > to > * OFTABLE_LOG_INGRESS_PIPELINE due to lack of needed metadata in > VXLAN, > - * explicitly skip sending back out any tunnels and resubmit to table > 41 > + * explicitly skip sending back out any tunnels and resubmit to table > 40 > * for local delivery, except packets which have MLF_ALLOW_LOOPBACK > bit > * set. > */ > @@ -2442,13 +2436,13 @@ physical_run(struct physical_ctx *p_ctx, > match_set_reg_masked(&match, MFF_LOG_FLAGS - MFF_REG0, > MLF_RCV_FROM_RAMP, > MLF_RCV_FROM_RAMP | MLF_ALLOW_LOOPBACK); > > - /* Resubmit to table 41. */ > + /* Resubmit to table 40. */ > ofpbuf_clear(&ofpacts); > put_resubmit(OFTABLE_LOCAL_OUTPUT, &ofpacts); > ofctrl_add_flow(flow_table, OFTABLE_REMOTE_OUTPUT, 150, 0, > &match, &ofpacts, hc_uuid); > > - /* Table 40, priority 150. > + /* Table 39, priority 150. > * ======================= > * > * Packets that should not be sent to other hypervisors. > @@ -2456,13 +2450,13 @@ physical_run(struct physical_ctx *p_ctx, > match_init_catchall(&match); > match_set_reg_masked(&match, MFF_LOG_FLAGS - MFF_REG0, > MLF_LOCAL_ONLY, MLF_LOCAL_ONLY); > - /* Resubmit to table 41. */ > + /* Resubmit to table 40. */ > ofpbuf_clear(&ofpacts); > put_resubmit(OFTABLE_LOCAL_OUTPUT, &ofpacts); > ofctrl_add_flow(flow_table, OFTABLE_REMOTE_OUTPUT, 150, 0, > &match, &ofpacts, hc_uuid); > > - /* Table 40, Priority 0. > + /* Table 39, Priority 0. > * ======================= > * > * Resubmit packets that are not directed at tunnels or part of a > @@ -2473,18 +2467,18 @@ physical_run(struct physical_ctx *p_ctx, > ofctrl_add_flow(flow_table, OFTABLE_REMOTE_OUTPUT, 0, 0, &match, > &ofpacts, hc_uuid); > > - /* Table 41, priority 0. > + /* Table 40, priority 0. > * ====================== > * > * Drop packets that do not match previous flows. > */ > add_default_drop_flow(p_ctx, OFTABLE_LOCAL_OUTPUT, flow_table); > > - /* Table 42, Priority 0. > + /* Table 41, Priority 0. > * ======================= > * > * Resubmit packets that don't output to the ingress port (already > checked > - * in table 41) to the logical egress pipeline, clearing the logical > + * in table 40) to the logical egress pipeline, clearing the logical > * registers (for consistent behavior with packets that get > tunneled). */ > match_init_catchall(&match); > ofpbuf_clear(&ofpacts); > diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at > index 7109ff19b2..28c13234ca 100644 > --- a/tests/ovn-controller.at > +++ b/tests/ovn-controller.at > @@ -873,7 +873,7 @@ meta=$(ovn-sbctl get datapath ls1 tunnel_key) > port=$(ovn-sbctl get port_binding ls1-rp tunnel_key) > check ovn-nbctl lrp-add lr0 rp-ls1 00:00:01:01:02:03 192.168.1.254/24 > > -OVS_WAIT_UNTIL([as hv1 ovs-ofctl dump-flows br-int | grep table=41 | grep > -q "reg15=0x${port},metadata=0x${meta}"]) > +OVS_WAIT_UNTIL([as hv1 ovs-ofctl dump-flows br-int | grep table=40 | grep > -q "reg15=0x${port},metadata=0x${meta}"]) > > OVN_CLEANUP([hv1]) > AT_CLEANUP > @@ -917,14 +917,14 @@ for i in $(seq 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x1,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x1,metadata=0x1,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x1,metadata=0x1,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x1,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x1,metadata=0x1,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x1,metadata=0x1,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$i > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$i > ]) > done > > @@ -939,15 +939,15 @@ for i in $(seq 10); do > check ovn-nbctl remove address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 9; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}'], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > if test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((10 - $i)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((10 - $i)) > ]) > fi > done > @@ -965,17 +965,17 @@ for i in $(seq 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i,10.0.1.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i * 2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i * 2)) > ]) > done > > @@ -992,11 +992,11 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.21,10.0.0.22 -- \ > remove address_set as1 addresses 10.0.0.10 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.21], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.21], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.22], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.22], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.10], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.10], [1], > [ignore]) > > reprocess_count_new=$(read_counter consider_logical_flow) > AT_CHECK([echo $(($reprocess_count_new - $reprocess_count_old))], [0], [0 > @@ -1008,9 +1008,9 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl remove address_set as1 addresses 10.0.0.21,10.0.0.22 -- \ > add address_set as1 addresses 10.0.0.10 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.21], [1], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.22], [1], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.10], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.21], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.22], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.10], > [0], [1 > ]) > > reprocess_count_new=$(read_counter consider_logical_flow) > @@ -1023,9 +1023,9 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.21 -- \ > remove address_set as1 addresses 10.0.0.10 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.21], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.21], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.10], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.10], [1], > [ignore]) > > reprocess_count_new=$(read_counter consider_logical_flow) > AT_CHECK([echo $(($reprocess_count_new - $reprocess_count_old))], [0], [0 > @@ -1037,12 +1037,12 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.22,10.0.0.23 -- \ > remove address_set as1 addresses 10.0.0.9,10.0.0.8 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.22], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.22], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.23], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.23], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.8], [1], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.9], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.8], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.9], [1], > [ignore]) > > reprocess_count_new=$(read_counter consider_logical_flow) > AT_CHECK([echo $(($reprocess_count_new - $reprocess_count_old))], [0], [0 > @@ -1090,24 +1090,24 @@ for i in $(seq 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 1; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,tp_dst=111 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,tp_dst=222 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,tp_dst=333 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,tp_dst=111 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,tp_dst=222 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,tp_dst=333 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > # (1 conj_id flow + 3 tp_dst flows) = 4 extra flows > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i + 4)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i + 4)) > ]) > fi > > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], > [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=conjunction,1/2) > @@ -1129,17 +1129,17 @@ for i in $(seq 10); do > check ovn-nbctl remove address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > elif test "$i" = 9; then > # no conjunction left > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,tp_dst=111 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,tp_dst=222 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,tp_dst=333 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,tp_dst=111 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,tp_dst=222 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,tp_dst=333 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((14 - $i)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((14 - $i)) > ]) > fi > done > @@ -1155,11 +1155,11 @@ for i in $(seq 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i,10.0.1.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], > [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=conjunction,1/2) > @@ -1171,7 +1171,7 @@ > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,tp_dst=222 > actions=conjun > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,tp_dst=333 > actions=conjunction,2/2) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i * 2 + 4)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i * 2 + 4)) > ]) > done > > @@ -1187,11 +1187,11 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.21,10.0.0.22 -- \ > remove address_set as1 addresses 10.0.0.10 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.21], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.21], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.22], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.22], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.10], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.10], [1], > [ignore]) > > reprocess_count_new=$(read_counter consider_logical_flow) > AT_CHECK([echo $(($reprocess_count_new - $reprocess_count_old))], [0], [0 > @@ -1203,9 +1203,9 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl remove address_set as1 addresses 10.0.0.21,10.0.0.22 -- \ > add address_set as1 addresses 10.0.0.10 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.21], [1], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.22], [1], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.10], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.21], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.22], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.10], > [0], [1 > ]) > > reprocess_count_new=$(read_counter consider_logical_flow) > @@ -1218,9 +1218,9 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.21 -- \ > remove address_set as1 addresses 10.0.0.10 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.21], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.21], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.10], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.10], [1], > [ignore]) > > reprocess_count_new=$(read_counter consider_logical_flow) > AT_CHECK([echo $(($reprocess_count_new - $reprocess_count_old))], [0], [0 > @@ -1232,12 +1232,12 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.22,10.0.0.23 -- \ > remove address_set as1 addresses 10.0.0.9,10.0.0.8 > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.22], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.22], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c 10\.0\.0\.23], > [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c 10\.0\.0\.23], > [0], [1 > ]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.8], [1], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10\.0\.0\.9], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.8], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10\.0\.0\.9], [1], > [ignore]) > > reprocess_count_new=$(read_counter consider_logical_flow) > AT_CHECK([echo $(($reprocess_count_new - $reprocess_count_old))], [0], [0 > @@ -1287,22 +1287,22 @@ for i in $(seq 10); do > add address_set as2 addresses 10.0.0.$j > check ovn-nbctl --wait=hv sync > if test "$i" = 1; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > # (1 conj_id + nw_src * i + nw_dst * i) = 1 + i*2 flows > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i*2 + 1)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i*2 + 1)) > ]) > fi > > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], > [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.6 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.7 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.8 > actions=conjunction,1/2) > @@ -1326,15 +1326,15 @@ for i in $(seq 10); do > remove address_set as2 addresses 10.0.0.$j > check ovn-nbctl --wait=hv sync > if test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > elif test "$i" = 9; then > # no conjunction left > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.15 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.15 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((21 - $i*2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((21 - $i*2)) > ]) > fi > done > @@ -1355,14 +1355,14 @@ for i in $(seq 2 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$i > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$i > ]) > done > > @@ -1381,16 +1381,16 @@ for i in $(seq 10); do > check ovn-nbctl remove address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 9; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}'], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.7 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.7 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > elif test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > else > # 2 dst + (10 - i) src + 1 conj_id > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((10 - $i + 3)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((10 - $i + 3)) > ]) > fi > done > @@ -1444,27 +1444,27 @@ for i in $(seq 10); do > add address_set as2 addresses 10.0.0.$j > check ovn-nbctl --wait=hv sync > if test "$i" = 1; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i*2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i*2)) > ]) > fi > > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,/conj_id=,/' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.7 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.8 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.7 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.8 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > done > @@ -1482,9 +1482,9 @@ for i in $(seq 10); do > remove address_set as2 addresses 10.0.0.$j > check ovn-nbctl --wait=hv sync > if test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((20 - $i*2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((20 - $i*2)) > ]) > fi > done > @@ -1540,30 +1540,30 @@ for i in $(seq 10); do > add address_set as2 addresses 10.0.0.$j > check ovn-nbctl --wait=hv sync > if test "$i" = 1; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > elif test "$i" -lt 6; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i*2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i*2)) > ]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((5 + $i)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((5 + $i)) > ]) > fi > > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,/conj_id=,/' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.7 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.8 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.6 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.7 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.8 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > done > @@ -1581,12 +1581,12 @@ for i in $(seq 10); do > remove address_set as2 addresses 10.0.0.$j > check ovn-nbctl --wait=hv sync > if test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > elif test "$i" -lt 6; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((15 - $i)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((15 - $i)) > ]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((10 - ($i - 5)*2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((10 - ($i - 5)*2)) > ]) > fi > done > @@ -1638,22 +1638,22 @@ for i in $(seq 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 1; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,nw_dst=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.1,nw_dst=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > # (1 conj_id + nw_src * i + nw_dst * i) = 1 + i*2 flows > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i*2 + 1)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i*2 + 1)) > ]) > fi > > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], > [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.1 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.2 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.3 > actions=conjunction,1/2) > @@ -1675,15 +1675,15 @@ for i in $(seq 10); do > check ovn-nbctl remove address_set as1 addresses 10.0.0.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 10; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > elif test "$i" = 9; then > # no conjunction left > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.10 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.10,nw_dst=10.0.0.10 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((21 - $i*2)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((21 - $i*2)) > ]) > fi > done > @@ -1699,11 +1699,11 @@ for i in $(seq 10); do > check ovn-nbctl add address_set as1 addresses 10.0.0.$i,10.0.1.$i > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], > [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.1 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.2 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.3 > actions=conjunction,1/2) > @@ -1718,7 +1718,7 @@ > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.2 > actions=co > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.1.3 > actions=conjunction,2/2) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$(($i * 4 + 1)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$(($i * 4 + 1)) > ]) > done > > @@ -1739,11 +1739,11 @@ check ovn-nbctl --wait=hv sync > reprocess_count_old=$(read_counter consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.4,10.0.0.5 > check ovn-nbctl --wait=hv sync > -AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47,reg15=0x$port_key > | \ > +AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46,reg15=0x$port_key > | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.1 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.2 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.3 > actions=conjunction,1/2) > @@ -1763,11 +1763,11 @@ AT_CHECK([echo $(($reprocess_count_new - > $reprocess_count_old))], [0], [1 > # Delete 2 IPs > reprocess_count_old=$(read_counter consider_logical_flow) > check ovn-nbctl --wait=hv remove address_set as1 addresses > 10.0.0.4,10.0.0.5 > -AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47,reg15=0x$port_key > | \ > +AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46,reg15=0x$port_key > | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.*,/conjunction,/' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.1 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.2 > actions=conjunction,1/2) > priority=1100,ip,reg15=0x$port_key,metadata=0x$dp_key,nw_dst=10.0.0.3 > actions=conjunction,1/2) > @@ -1821,12 +1821,12 @@ check ovn-nbctl acl-add ls1 to-lport 100 'outport > == "ls1-lp1" && ip4.src == $as > check ovn-nbctl acl-add ls1 to-lport 100 'outport == "ls1-lp1" && ip4.src > == $as2 && tcp && tcp.dst == {201, 202}' drop > > check ovn-nbctl --wait=hv sync > -AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47,reg15=0x$port_key > | \ > +AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46,reg15=0x$port_key > | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.[[0-9]]*,/conjunction,/g' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.11 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.12 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.13 > actions=conjunction,1/2) > @@ -1846,12 +1846,12 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl add address_set as1 addresses 10.0.0.14,10.0.0.33 -- \ > add address_set as2 addresses 10.0.0.24,10.0.0.33 > check ovn-nbctl --wait=hv sync > -AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47,reg15=0x$port_key > | \ > +AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46,reg15=0x$port_key > | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.[[0-9]]*,/conjunction,/g' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.11 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.12 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.13 > actions=conjunction,1/2) > @@ -1877,12 +1877,12 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > check ovn-nbctl remove address_set as1 addresses 10.0.0.14,10.0.0.33 -- \ > remove address_set as2 addresses 10.0.0.24,10.0.0.33 > check ovn-nbctl --wait=hv sync > -AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47,reg15=0x$port_key > | \ > +AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46,reg15=0x$port_key > | \ > grep -v reply | awk '{print $7, $8}' | \ > sed -r 's/conjunction.[[0-9]]*,/conjunction,/g' | \ > sed -r 's/conj_id=.*,metadata/conj_id=,metadata/' | sort], [0], [dnl > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,conj_id=,metadata=0x$dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.11 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.12 > actions=conjunction,1/2) > priority=1100,tcp,reg15=0x$port_key,metadata=0x$dp_key,nw_src=10.0.0.13 > actions=conjunction,1/2) > @@ -1942,14 +1942,14 @@ for i in $(seq 5); do > check ovn-nbctl add address_set as1 addresses > "aa\:aa\:aa\:aa\:aa\:0$i" > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:01 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:02 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:03 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:01 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:02 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:03 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$i > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$i > ]) > done > > @@ -1963,17 +1963,17 @@ reprocess_count_old=$(read_counter > consider_logical_flow) > for i in $(seq 5); do > check ovn-nbctl remove address_set as1 addresses > "aa\:aa\:aa\:aa\:aa\:0$i" > check ovn-nbctl --wait=hv sync > - ovs-ofctl dump-flows br-int table=47 | grep "priority=1100" > + ovs-ofctl dump-flows br-int table=46 | grep "priority=1100" > if test "$i" = 4; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}'], [0], [dnl > -priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:05 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,reg15=0x$port_key,metadata=0x$dp_key,dl_src=aa:aa:aa:aa:aa:05 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > if test "$i" = 5; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((5 - $i)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((5 - $i)) > ]) > fi > done > @@ -2023,14 +2023,14 @@ for i in $(seq 5); do > check ovn-nbctl add address_set as1 addresses "ff\:\:0$i" > check ovn-nbctl --wait=hv sync > if test "$i" = 3; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}' | sort], [0], [dnl > -priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > -priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::1 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::2 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > +priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::3 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$i > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$i > ]) > done > > @@ -2045,15 +2045,15 @@ for i in $(seq 5); do > check ovn-nbctl remove address_set as1 addresses "ff\:\:0$i" > check ovn-nbctl --wait=hv sync > if test "$i" = 4; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=47,reg15=0x$port_key | \ > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int > table=46,reg15=0x$port_key | \ > grep -v reply | awk '{print $7, $8}'], [0], [dnl > -priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::5 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,48) > +priority=1100,ipv6,reg15=0x$port_key,metadata=0x$dp_key,ipv6_src=ff::5 > actions=load:0x1->OXM_OF_PKT_REG4[[49]],resubmit(,47) > ]) > fi > if test "$i" = 5; then > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep > "priority=1100"], [1], [ignore]) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep > "priority=1100"], [1], [ignore]) > else > - AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [$((5 - $i)) > + AT_CHECK_UNQUOTED([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [$((5 - $i)) > ]) > fi > done > @@ -2088,7 +2088,7 @@ ovn-appctl -t ovn-controller vlog/set file:dbg > ovn-nbctl create address_set name=as1 addresses=8.8.8.8 > check ovn-nbctl acl-add ls1 to-lport 100 'outport == "ls1-lp1" && ip4.src > == $as1' drop > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100"], [0], [1 > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100"], [0], [1 > ]) > > # pause ovn-northd > @@ -2104,13 +2104,13 @@ check as northd-backup ovn-appctl -t ovn-northd > pause > # undefined. This test runs the scenario ten times to make sure different > # orders are covered and handled properly. > > -flow_count=$(ovs-ofctl dump-flows br-int table=47 | grep -c > "priority=1100") > +flow_count=$(ovs-ofctl dump-flows br-int table=46 | grep -c > "priority=1100") > for i in $(seq 10); do > # Delete and recreate the SB address set with same name and an extra > IP. > addrs_=$(fetch_column address_set addresses name=as1) > addrs=${addrs_// /,} > AT_CHECK([ovn-sbctl destroy address_set as1 -- create address_set > name=as1 addresses=$addrs,1.1.1.$i], [0], [ignore]) > - OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=47 | > grep -c "priority=1100") = "$(($i + 1))"]) > + OVS_WAIT_UNTIL([test $(as hv1 ovs-ofctl dump-flows br-int table=46 | > grep -c "priority=1100") = "$(($i + 1))"]) > done > > OVN_CLEANUP([hv1]) > diff --git a/tests/ovn.at b/tests/ovn.at > index 5e6a8fefa3..e6fdaa542f 100644 > --- a/tests/ovn.at > +++ b/tests/ovn.at > @@ -1004,10 +1004,10 @@ next(pipeline=ingress, table=11); > > next(pipeline=egress); > formats as next(pipeline=egress, table=11); > - encodes as resubmit(,54) > + encodes as resubmit(,53) > > next(pipeline=egress, table=5); > - encodes as resubmit(,48) > + encodes as resubmit(,47) > > next(table=10); > formats as next(10); > @@ -11233,7 +11233,7 @@ hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns > ofport find Interface name=ov > hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface > name=ovn-gw2-0) > > OVS_WAIT_UNTIL([ > - test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=40 | grep -c > "active_backup,ofport,members:$hv1_gw1_ofport,$hv1_gw2_ofport") > + test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=39 | grep -c > "active_backup,ofport,members:$hv1_gw1_ofport,$hv1_gw2_ofport") > ]) > > test_ip_packet() > @@ -11343,7 +11343,7 @@ AT_CHECK( > ]) > > OVS_WAIT_UNTIL([ > - test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=40 | grep -c > "active_backup,ofport,members:$hv1_gw2_ofport,$hv1_gw1_ofport") > + test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=39 | grep -c > "active_backup,ofport,members:$hv1_gw2_ofport,$hv1_gw1_ofport") > ]) > > test_ip_packet gw2 gw1 0 > @@ -11521,7 +11521,7 @@ hv1_gw1_ofport=$(as hv1 ovs-vsctl --bare --columns > ofport find Interface name=ov > hv1_gw2_ofport=$(as hv1 ovs-vsctl --bare --columns ofport find Interface > name=ovn-gw2-0) > > OVS_WAIT_UNTIL([ > - test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=40 | grep -c > "active_backup,ofport,members:$hv1_gw1_ofport,$hv1_gw2_ofport") > + test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=39 | grep -c > "active_backup,ofport,members:$hv1_gw1_ofport,$hv1_gw2_ofport") > ]) > > test_ip_packet() > @@ -11601,7 +11601,7 @@ AT_CHECK([ovn-nbctl --wait=hv \ > ]) > > OVS_WAIT_UNTIL([ > - test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=40 | grep -c > "active_backup,ofport,members:$hv1_gw2_ofport,$hv1_gw1_ofport") > + test 1 = $(as hv1 ovs-ofctl dump-flows br-int table=39 | grep -c > "active_backup,ofport,members:$hv1_gw2_ofport,$hv1_gw1_ofport") > ]) > > test_ip_packet gw2 gw1 > @@ -11767,12 +11767,12 @@ AT_CAPTURE_FILE([hv2flows]) > > AT_CHECK( > [# Check that redirect mapping is programmed only on hv2 > - grep table=41 hv1flows | grep =0x3,metadata=0x1 | wc -l > - grep table=41 hv2flows | grep =0x3,metadata=0x1 | grep load:0x2- | wc > -l > + grep table=40 hv1flows | grep =0x3,metadata=0x1 | wc -l > + grep table=40 hv2flows | grep =0x3,metadata=0x1 | grep load:0x2- | wc > -l > > # Check that hv1 sends chassisredirect port traffic to hv2 > - grep table=40 hv1flows | grep =0x3,metadata=0x1 | grep output | wc -l > - grep table=40 hv2flows | grep =0x3,metadata=0x1 | wc -l > + grep table=39 hv1flows | grep =0x3,metadata=0x1 | grep output | wc -l > + grep table=39 hv2flows | grep =0x3,metadata=0x1 | wc -l > > # Check that arp reply on distributed gateway port is only programmed > on hv2 > grep arp hv1flows | grep load:0x2- | grep =0x2,metadata=0x1 | wc -l > @@ -12301,7 +12301,7 @@ as hv1 ovs-appctl ofproto/trace br-int > in_port=hv1-vif1 $packet > sleep 2 > > AS_BOX([On hv1, table 40 check that no packet goes via the tunnel port]) > -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=40 \ > +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=39 \ > | grep "NXM_NX_TUN_ID" | grep -v n_packets=0 | wc -l], [0], [[0 > ]]) > > @@ -13276,20 +13276,20 @@ echo $hv2_gw1_ofport > echo $hv2_gw2_ofport > > echo "--- hv1 ---" > -as hv1 ovs-ofctl dump-flows br-int table=40 > +as hv1 ovs-ofctl dump-flows br-int table=39 > > echo "--- hv2 ---" > -as hv2 ovs-ofctl dump-flows br-int table=40 > +as hv2 ovs-ofctl dump-flows br-int table=39 > > gw1_chassis=$(fetch_column Chassis _uuid name=gw1) > gw2_chassis=$(fetch_column Chassis _uuid name=gw2) > > -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv1_gw1_ofport,$hv1_gw2_ofport \ > | wc -l], [0], [1 > ]) > > -OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv2_gw1_ofport,$hv2_gw2_ofport \ > | wc -l], [0], [1 > ]) > @@ -13332,12 +13332,12 @@ wait_for_ports_up > check ovn-nbctl --wait=hv sync > > # we make sure that the hypervisors noticed, and inverted the slave ports > -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv1_gw2_ofport,$hv1_gw1_ofport \ > | wc -l], [0], [1 > ]) > > -OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv2_gw2_ofport,$hv2_gw1_ofport \ > | wc -l], [0], [1 > ]) > @@ -13488,12 +13488,12 @@ ovn-nbctl set Logical_Router_Port outside > ha_chassis_group=$hagrp1_uuid > wait_row_count HA_Chassis_Group 1 > wait_row_count HA_Chassis 2 > > -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv1_gw1_ofport,$hv1_gw2_ofport \ > | wc -l], [0], [0 > ]) > > -OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv2_gw1_ofport,$hv2_gw2_ofport \ > | wc -l], [0], [0 > ]) > @@ -13511,12 +13511,12 @@ done > # Re-add gw2 > as gw2 ovn_attach n1 br-phys 192.168.0.1 > > -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv1_gw1_ofport,$hv1_gw2_ofport \ > | wc -l], [0], [1 > ]) > > -OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv2_gw1_ofport,$hv2_gw2_ofport \ > | wc -l], [0], [1 > ]) > @@ -13544,12 +13544,12 @@ wait_column "$exp_ref_ch_list" HA_Chassis_Group > ref_chassis > # Increase the priority of gw2 > ovn-nbctl --wait=sb ha-chassis-group-add-chassis hagrp1 gw2 40 > > -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv1_gw2_ofport,$hv1_gw1_ofport \ > | wc -l], [0], [1 > ]) > > -OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=40 | \ > +OVS_WAIT_FOR_OUTPUT([as hv2 ovs-ofctl dump-flows br-int table=39 | \ > grep active_backup | grep members:$hv2_gw2_ofport,$hv2_gw1_ofport \ > | wc -l], [0], [1 > ]) > @@ -16734,25 +16734,25 @@ sleep 2 > # Get total number of ipv4 packets that received on ovs > > # sender side > -flow=$(as hv1 ovs-ofctl dump-flows br-int table=47 | grep > priority=2002|grep ip,metadata=0x1) > +flow=$(as hv1 ovs-ofctl dump-flows br-int table=46 | grep > priority=2002|grep ip,metadata=0x1) > n_pkts="$(echo $flow|awk -F',' '{ print $4 }'|awk -F'=' '{ print $2 }')" > check test $n_pkts -eq 1 > > # receiver side > -flow=$(as hv2 ovs-ofctl dump-flows br-int table=47 | grep > priority=2002|grep ip,metadata=0x1) > +flow=$(as hv2 ovs-ofctl dump-flows br-int table=46 | grep > priority=2002|grep ip,metadata=0x1) > n_pkts="$(echo $flow|awk -F',' '{ print $4 }'|awk -F'=' '{ print $2 }')" > check test $n_pkts -eq 1 > > # Get total number of ipv6 packets that received on ovs > > # sender side > -flow=$(as hv1 ovs-ofctl dump-flows br-int table=47 | grep > priority=2002|grep ipv6,metadata=0x1) > +flow=$(as hv1 ovs-ofctl dump-flows br-int table=46 | grep > priority=2002|grep ipv6,metadata=0x1) > n_pkts="$(echo $flow|awk -F',' '{ print $4 }'|awk -F'=' '{ print $2 }')" > check test $n_pkts -eq 1 > > > # receiver side > -flow=$(as hv2 ovs-ofctl dump-flows br-int table=47 | grep > priority=2002|grep ipv6,metadata=0x1) > +flow=$(as hv2 ovs-ofctl dump-flows br-int table=46 | grep > priority=2002|grep ipv6,metadata=0x1) > n_pkts="$(echo $flow|awk -F',' '{ print $4 }'|awk -F'=' '{ print $2 }')" > check test $n_pkts -eq 1 > > @@ -18414,17 +18414,17 @@ check ovn-nbctl acl-add ls1 to-lport 3 > 'ip4.src==10.0.0.1' allow > check ovn-nbctl --wait=hv sync > > # Check OVS flows, the less restrictive flows should have been installed. > -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=47 | ofctl_strip_all | > +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=46 | ofctl_strip_all | > grep "priority=1003" | \ > sed 's/conjunction([[^)]]*)/conjunction()/g' | \ > sed 's/conj_id=[[0-9]]*,/conj_id=xxx,/g' | sort], [0], [dnl > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > ]) > > # Traffic 10.0.0.1, 10.0.0.2 -> 10.0.0.3, 10.0.0.4 should be allowed. > @@ -18459,17 +18459,17 @@ check ovn-nbctl acl-del ls1 to-lport 3 > 'ip4.src==10.0.0.1 || ip4.src==10.0.0.1' > check ovn-nbctl --wait=hv sync > > # Check OVS flows, the second less restrictive allow ACL should have been > installed. > -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=47 | ofctl_strip_all | > \ > +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=46 | ofctl_strip_all | > \ > grep "priority=1003" | \ > sed 's/conjunction([[^)]]*)/conjunction()/g' | \ > sed 's/conj_id=[[0-9]]*,/conj_id=xxx,/g' | sort], [0], [dnl > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > ]) > > # Remove the less restrictive allow ACL. > @@ -18477,17 +18477,17 @@ check ovn-nbctl acl-del ls1 to-lport 3 > 'ip4.src==10.0.0.1' > check ovn-nbctl --wait=hv sync > > # Check OVS flows, the 10.0.0.1 conjunction should have been reinstalled. > -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=47 | ofctl_strip_all | > \ > +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=46 | ofctl_strip_all | > \ > grep "priority=1003" | \ > sed 's/conjunction([[^)]]*)/conjunction()/g' | \ > sed 's/conj_id=[[0-9]]*,/conj_id=xxx,/g' | sort], [0], [dnl > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > ]) > > # Traffic 10.0.0.1, 10.0.0.2 -> 10.0.0.3, 10.0.0.4 should be allowed. > @@ -18517,17 +18517,17 @@ check ovn-nbctl acl-add ls1 to-lport 3 > 'ip4.src==10.0.0.1' allow > check ovn-nbctl --wait=hv sync > > # Check OVS flows, the less restrictive flows should have been installed. > -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=47 | ofctl_strip_all | > \ > +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=46 | ofctl_strip_all | > \ > grep "priority=1003" | \ > sed 's/conjunction([[^)]]*)/conjunction()/g' | \ > sed 's/conj_id=[[0-9]]*,/conj_id=xxx,/g' | sort], [0], [dnl > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > ]) > > # Add another ACL that overlaps with the existing less restrictive ones. > @@ -18538,20 +18538,20 @@ check ovn-nbctl --wait=hv sync > # with an additional conjunction action. > # > # New non-conjunctive flows should be added to match on 'udp'. > -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=47 | ofctl_strip_all | > \ > +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=46 | ofctl_strip_all | > \ > grep "priority=1003" | \ > sed 's/conjunction([[^)]]*)/conjunction()/g' | \ > sed 's/conj_id=[[0-9]]*,/conj_id=xxx,/g' | sort], [0], [dnl > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction(),conjunction() > - table=47, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > - table=47, priority=1003,udp,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > - table=47, priority=1003,udp6,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,conj_id=xxx,ip,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.3 > actions=conjunction(),conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_dst=10.0.0.4 > actions=conjunction(),conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.2 > actions=conjunction(),conjunction() > + table=46, priority=1003,ip,metadata=0x1,nw_src=10.0.0.42 > actions=conjunction() > + table=46, priority=1003,udp,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > + table=46, priority=1003,udp6,metadata=0x1 > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > ]) > > OVN_CLEANUP([hv1]) > @@ -18606,17 +18606,17 @@ check ovn-nbctl acl-add pg1 to-lport 100 > 'outport == @pg1 && ip4.src == $as2' al > > wait_for_ports_up > check ovn-nbctl --wait=hv sync > -ovs-ofctl dump-flows br-int table=47 > -AT_CHECK([test `ovs-ofctl dump-flows br-int table=47 | grep -c conj_id` = > 2]) > +ovs-ofctl dump-flows br-int table=46 > +AT_CHECK([test `ovs-ofctl dump-flows br-int table=46 | grep -c conj_id` = > 2]) > > echo ------- > # Add another address in as1, so that the 1st ACL will now generate 2 > conjunctions. > ovn-nbctl set address_set as1 addresses="10.0.0.1,10.0.0.2" > check ovn-nbctl --wait=hv sync > > -ovs-ofctl dump-flows br-int table=47 > +ovs-ofctl dump-flows br-int table=46 > # There should be 3 conjunctions in total (2 from 1st ACL + 1 from 2nd > ACL) > -AT_CHECK([test `ovs-ofctl dump-flows br-int table=47 | grep -c conj_id` = > 3]) > +AT_CHECK([test `ovs-ofctl dump-flows br-int table=46 | grep -c conj_id` = > 3]) > > OVN_CLEANUP([hv1]) > AT_CLEANUP > @@ -21579,8 +21579,8 @@ check_virtual_offlows_present() { > lr0_dp_key=$(printf "%x" $(fetch_column Datapath_Binding tunnel_key > external_ids:name=lr0)) > lr0_public_dp_key=$(printf "%x" $(fetch_column Port_Binding > tunnel_key logical_port=lr0-public)) > > - AT_CHECK_UNQUOTED([as $hv ovs-ofctl dump-flows br-int table=47,ip | > ofctl_strip_all | grep "priority=2000"], [0], [dnl > - table=47, priority=2000,ip,metadata=0x$sw0_dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,48) > + AT_CHECK_UNQUOTED([as $hv ovs-ofctl dump-flows br-int table=46,ip | > ofctl_strip_all | grep "priority=2000"], [0], [dnl > + table=46, priority=2000,ip,metadata=0x$sw0_dp_key > actions=load:0x1->OXM_OF_PKT_REG4[[48]],resubmit(,47) > ]) > > AT_CHECK_UNQUOTED([as $hv ovs-ofctl dump-flows br-int table=11 | > ofctl_strip_all | \ > @@ -21591,7 +21591,7 @@ check_virtual_offlows_present() { > > check_virtual_offlows_not_present() { > hv=$1 > - AT_CHECK([as $hv ovs-ofctl dump-flows br-int table=47,ip | > ofctl_strip_all | grep "priority=2000"], [1], [dnl > + AT_CHECK([as $hv ovs-ofctl dump-flows br-int table=46,ip | > ofctl_strip_all | grep "priority=2000"], [1], [dnl > ]) > > AT_CHECK([as $hv ovs-ofctl dump-flows br-int table=11 | > ofctl_strip_all | \ > @@ -24148,7 +24148,7 @@ m4_define([DVR_N_S_PING], > OVN_CHECK_PACKETS_REMOVE_BROADCAST([hv4/vif-north-tx.pcap], > [vif-north.expected]) > > # Confirm that packets did not go out via tunnel port. > - AT_CHECK([as hv1 ovs-ofctl dump-flows br-int | grep table=38 | grep > NXM_NX_TUN_METADATA0 | grep n_packets=0 | wc -l], [0], [[0 > + AT_CHECK([as hv1 ovs-ofctl dump-flows br-int | grep table=39 | grep > NXM_NX_TUN_METADATA0 | grep n_packets=0 | wc -l], [0], [[0 > ]]) > > # Confirm that packet went out via localnet port > @@ -28502,22 +28502,22 @@ AT_CHECK([test ! -z $p1_zoneid]) > p2_zoneid=$(as hv1 ovs-vsctl get bridge br-int > external_ids:ct-zone-sw0-p2 | sed 's/"//g') > AT_CHECK([test ! -z $p2_zoneid]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p1_dpkey} | grep REG13 | wc -l) -eq 1]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p1_dpkey} | grep "load:0x${p1_zoneid}->NXM_NX_REG13" | wc -l) > -eq 1]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw1_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw1_dpkey},\ > reg15=0x${p2_dpkey} | grep REG13 | wc -l) -eq 1]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw1_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw1_dpkey},\ > reg15=0x${p2_dpkey} | grep "load:0x${p2_zoneid}->NXM_NX_REG13" | wc -l) > -eq 1]) > > ovs-vsctl set interface hv1-vif1 external_ids:iface-id=foo > OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p1) = xdown]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p1_dpkey} | grep REG13 | wc -l) -eq 0]) > > p1_zoneid=$(as hv1 ovs-vsctl get bridge br-int > external_ids:ct-zone-sw0-p1 | sed 's/"//g') > @@ -28529,16 +28529,16 @@ OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up > sw0-p1) = xup]) > p1_zoneid=$(as hv1 ovs-vsctl get bridge br-int > external_ids:ct-zone-sw0-p1 | sed 's/"//g') > AT_CHECK([test ! -z $p1_zoneid]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p1_dpkey} | grep REG13 | wc -l) -eq 1]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p1_dpkey} | grep "load:0x${p1_zoneid}->NXM_NX_REG13" | wc -l) > -eq 1]) > > ovs-vsctl del-port hv1-vif2 > OVS_WAIT_UNTIL([test x$(ovn-nbctl lsp-get-up sw0-p2) = xdown]) > > -AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p2_dpkey} | grep REG13 | wc -l) -eq 0]) > > p2_zoneid=$(as hv1 ovs-vsctl get bridge br-int > external_ids:ct-zone-sw0-p2 | sed 's/"//g') > @@ -28546,7 +28546,7 @@ AT_CHECK([test -z $p2_zoneid]) > > ovn-nbctl lsp-del sw0-p1 > > -OVS_WAIT_UNTIL([test $(ovs-ofctl dump-flows br-int > table=41,metadata=${sw0_dpkey},\ > +OVS_WAIT_UNTIL([test $(ovs-ofctl dump-flows br-int > table=40,metadata=${sw0_dpkey},\ > reg15=0x${p1_dpkey} | grep REG13 | wc -l) -eq 0]) > > p1_zoneid=$(as hv1 ovs-vsctl get bridge br-int > external_ids:ct-zone-sw0-p1 | sed 's/"//g') > @@ -31005,46 +31005,46 @@ AT_CHECK([kill -0 $(cat hv1/ovn-controller.pid)]) > check ovn-nbctl --wait=hv sync > > # Check OVS flows are installed properly. > -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=47 | ofctl_strip_all | > \ > +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=46 | ofctl_strip_all | > \ > grep "priority=2002" | grep conjunction | \ > sed 's/conjunction([[^)]]*)/conjunction()/g' | \ > sed 's/reg15=0x[[1-9]]/reg15=0xN/g' | sort], [0], [dnl > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x10/0xfff0 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x100/0xff00 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x1000/0xf000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2/0xfffe > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x20/0xffe0 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x200/0xfe00 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2000/0xe000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4/0xfffc > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x40/0xffc0 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x400/0xfc00 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4000/0xc000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8/0xfff8 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x80/0xff80 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x800/0xf800 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8000/0x8000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=1 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x100/0x100,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x10/0xfff0 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x100/0xff00 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x1000/0xf000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2/0xfffe > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x20/0xffe0 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x200/0xfe00 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2000/0xe000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4/0xfffc > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x40/0xffc0 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x400/0xfc00 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4000/0xc000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8/0xfff8 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x80/0xff80 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x800/0xf800 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8000/0x8000 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=1 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > - table=47, > priority=2002,udp,reg0=0x80/0x80,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x10/0xfff0 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x100/0xff00 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x1000/0xf000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2/0xfffe > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x20/0xffe0 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x200/0xfe00 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2000/0xe000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4/0xfffc > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x40/0xffc0 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x400/0xfc00 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4000/0xc000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8/0xfff8 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x80/0xff80 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x800/0xf800 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8000/0x8000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,metadata=0x1,nw_src=192.168.47.4,tp_dst=1 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x100/0x100,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x10/0xfff0 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x100/0xff00 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x1000/0xf000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2/0xfffe > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x20/0xffe0 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x200/0xfe00 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x2000/0xe000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4/0xfffc > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x40/0xffc0 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x400/0xfc00 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x4000/0xc000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8/0xfff8 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x80/0xff80 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x800/0xf800 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=0x8000/0x8000 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,metadata=0x1,nw_src=192.168.47.4,tp_dst=1 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > + table=46, > priority=2002,udp,reg0=0x80/0x80,reg15=0xN,metadata=0x1,nw_src=192.168.47.4 > actions=conjunction() > ]) > > OVN_CLEANUP([hv1]) > @@ -32219,7 +32219,7 @@ ovs-vsctl add-port br-int lsp0-0 -- set interface > lsp0-0 external_ids:iface-id=l > ovs-vsctl add-port br-int lsp0-1 -- set interface lsp0-1 > external_ids:iface-id=lsp0-1 > > check ovn-nbctl --wait=hv sync > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep conjunction > | wc -l) == 22]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep conjunction > | wc -l) == 22]) > > # Save the current lflow_run counter > lflow_run=$(ovn-appctl -t ovn-controller coverage/read-counter lflow_run) > @@ -32229,7 +32229,7 @@ lflow_run=$(ovn-appctl -t ovn-controller > coverage/read-counter lflow_run) > # 1. Remove half of the ports from pg1. The excepted conjunction flows > should be: > # 2 + 10 = 12 > check ovn-nbctl --wait=hv pg-set-ports pg1 $(for i in 0 1 2 3 4; do for j > in 0 1; do echo lsp${i}-${j}; done; done) > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep conjunction > | wc -l) == 12]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep conjunction > | wc -l) == 12]) > > # 2. Unbind lsp0-0. The there shouldn't be any conjunction flows because > the > # port group const set should have only one member (lsp0-1). And the > total > @@ -32237,25 +32237,25 @@ AT_CHECK([test $(ovs-ofctl dump-flows br-int > table=47 | grep conjunction | wc -l > # 10. > ovs-vsctl del-port br-int lsp0-0 > check ovn-nbctl --wait=hv sync > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep conjunction > | wc -l) == 0]) > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep 192.168 | wc > -l) == 10]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep conjunction > | wc -l) == 0]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep 192.168 | wc > -l) == 10]) > > # 3. Rebind lsp0-0. The expected conjunction flows are back to 12. > ovs-vsctl add-port br-int lsp0-0 -- set interface lsp0-0 > external_ids:iface-id=lsp0-0 > check ovn-nbctl --wait=hv sync > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep conjunction > | wc -l) == 12]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep conjunction > | wc -l) == 12]) > > # 4. Bind a lsp (lsp9-0) that doesn't belong to pg1, should not see any > change. > ovs-vsctl add-port br-int lsp9-0 -- set interface lsp9-0 > external_ids:iface-id=lsp9-0 > check ovn-nbctl --wait=hv sync > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep conjunction > | wc -l) == 12]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep conjunction > | wc -l) == 12]) > > # 5. Bind another 2 lsps (lsp1-0 lsp1-1) that belong to pg1 and on a > different > # LS (ls1), should see conjunction flows doubled (12 x 2 = 24) > ovs-vsctl add-port br-int lsp1-0 -- set interface lsp1-0 > external_ids:iface-id=lsp1-0 > ovs-vsctl add-port br-int lsp1-1 -- set interface lsp1-1 > external_ids:iface-id=lsp1-1 > check ovn-nbctl --wait=hv sync > -AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep conjunction > | wc -l) == 24]) > +AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep conjunction > | wc -l) == 24]) > > # 6. Simulate a SB port-group "del and add" notification to > ovn-controller in the > # same IDL iteration. ovn-controller should still program the same > flows. In > @@ -32280,7 +32280,7 @@ for i in $(seq 1 10); do > check ovn-nbctl --wait=hv sync > > # Finally check flow count is the same as before. > - AT_CHECK([test $(ovs-ofctl dump-flows br-int table=47 | grep > conjunction | wc -l) == 24]) > + AT_CHECK([test $(ovs-ofctl dump-flows br-int table=46 | grep > conjunction | wc -l) == 24]) > done > > # Make sure all the above was performed with I-P (no recompute) > @@ -32688,8 +32688,8 @@ check ovn-nbctl acl-add lsw0 to-lport 1002 > 'outport == "lp2" && ip4.src == 10.0. > > # The first ACL should be programmed, but the second one shouldn't. > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.111], [0], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.122], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.111], [0], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.122], [1], > [ignore]) > > # Now create the lport lp2. > check ovn-nbctl lsp-add lsw0 lp2 \ > @@ -32697,12 +32697,12 @@ check ovn-nbctl lsp-add lsw0 lp2 \ > > check ovn-nbctl --wait=hv sync > # Now the second ACL should be programmed. > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.122], [0], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.122], [0], > [ignore]) > > # Remove the lport lp2 again, the OVS flow for the second ACL should be > # removed. > check ovn-nbctl --wait=hv lsp-del lp2 > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.122], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.122], [1], > [ignore]) > > # Test similar scenario but when the referenced lport is not bound > locally. > > @@ -32716,8 +32716,8 @@ check ovn-nbctl acl-add lsw0 to-lport 1002 'inport > == "lp4" && ip4.dst == 10.0.0 > > # The ACL for lp3 should be programmed, but the one for lp4 shouldn't. > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.133], [0], > [ignore]) > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.144], [1], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.133], [0], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.144], [1], > [ignore]) > > # Now create the lport lp4. > check ovn-nbctl lsp-add lsw0 lp4 \ > @@ -32725,7 +32725,7 @@ check ovn-nbctl lsp-add lsw0 lp4 \ > > # Now the ACL for lp4 should be programmed. > check ovn-nbctl --wait=hv sync > -AT_CHECK([ovs-ofctl dump-flows br-int table=47 | grep 10.0.0.144], [0], > [ignore]) > +AT_CHECK([ovs-ofctl dump-flows br-int table=46 | grep 10.0.0.144], [0], > [ignore]) > > OVN_CLEANUP([hv1]) > AT_CLEANUP > @@ -34167,7 +34167,7 @@ check ovn-nbctl --wait=hv sync > # Use constants so that if tables or registers change, this test can > # be updated easily. > DNAT_TABLE=15 > -SNAT_TABLE=46 > +SNAT_TABLE=45 > DNAT_ZONE_REG="NXM_NX_REG11[[0..15]]" > SNAT_ZONE_REG="NXM_NX_REG12[[0..15]]" > > diff --git a/tests/system-ovn-kmod.at b/tests/system-ovn-kmod.at > index ca434602bb..ebfaf26a00 100644 > --- a/tests/system-ovn-kmod.at > +++ b/tests/system-ovn-kmod.at > @@ -176,7 +176,7 @@ ovn-nbctl set load_balancer $uuid vips:'"30.0.0.2:8000 > "'='"192.168.1.2:12345,192 > > ovn-nbctl list load_balancer > ovn-sbctl dump-flows R2 > -OVS_WAIT_UNTIL([ovs-ofctl -O OpenFlow13 dump-flows br-int table=46 | grep > 'nat(src=20.0.0.2)']) > +OVS_WAIT_UNTIL([ovs-ofctl -O OpenFlow13 dump-flows br-int table=45 | grep > 'nat(src=20.0.0.2)']) > > dnl Test load-balancing that includes L4 ports in NAT. > for i in `seq 1 20`; do > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > index 6669c18e75..0fbaefcd25 100644 > --- a/tests/system-ovn.at > +++ b/tests/system-ovn.at > @@ -2243,7 +2243,7 @@ ovn-nbctl set load_balancer $uuid vips:'" > 30.0.0.2:8000"'='"192.168.1.2:80,192.16 > > ovn-nbctl list load_balancer > ovn-sbctl dump-flows R2 > -OVS_WAIT_UNTIL([ovs-ofctl -O OpenFlow13 dump-flows br-int table=46 | \ > +OVS_WAIT_UNTIL([ovs-ofctl -O OpenFlow13 dump-flows br-int table=45 | \ > grep 'nat(src=20.0.0.2)']) > > check ovs-appctl dpctl/flush-conntrack > @@ -2282,7 +2282,7 @@ ovn-nbctl set load_balancer $uuid vips:'" > 30.0.0.2:8000"'='"192.168.1.2:80,192.16 > > ovn-nbctl list load_balancer > ovn-sbctl dump-flows R2 > -OVS_WAIT_UNTIL([ovs-ofctl -O OpenFlow13 dump-flows br-int table=46 | \ > +OVS_WAIT_UNTIL([ovs-ofctl -O OpenFlow13 dump-flows br-int table=45 | \ > grep 'nat(src=20.0.0.2)']) > > rm -f wget*.log > @@ -5081,7 +5081,7 @@ OVS_WAIT_UNTIL([ > ]) > > OVS_WAIT_UNTIL([ > - n_pkt=$(ovs-ofctl dump-flows br-int table=47 | grep -v n_packets=0 | \ > + n_pkt=$(ovs-ofctl dump-flows br-int table=46 | grep -v n_packets=0 | \ > grep controller | grep tp_dst=84 -c) > test $n_pkt -eq 1 > ]) > @@ -5331,7 +5331,7 @@ OVS_WAIT_UNTIL([ > ]) > > OVS_WAIT_UNTIL([ > - n_pkt=$(ovs-ofctl dump-flows br-int table=47 | grep -v n_packets=0 | \ > + n_pkt=$(ovs-ofctl dump-flows br-int table=46 | grep -v n_packets=0 | \ > grep controller | grep tp_dst=84 -c) > test $n_pkt -eq 1 > ]) > -- > 2.31.1 > > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
