[ovs-dev,v2,06/29] tests: Add macro for OFTABLE_PHY_TO_LOG table number.

Message ID	20240206094043.530335-7-amusil@redhat.com
State	Accepted
Headers	show Return-Path: <ovs-dev-bounces@openvswitch.org> From: Ales Musil <amusil@redhat.com> To: dev@openvswitch.org Date: Tue, 6 Feb 2024 10:40:20 +0100 Message-ID: <20240206094043.530335-7-amusil@redhat.com> In-Reply-To: <20240206094043.530335-1-amusil@redhat.com> References: <20240206094043.530335-1-amusil@redhat.com> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn v2 06/29] tests: Add macro for OFTABLE_PHY_TO_LOG table number. Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" <ovs-dev-bounces@openvswitch.org>
Series	Remove most of the hardcoded table numbers \| expand [ovs-dev,v2,00/29] Remove most of the hardcoded table numbers [ovs-dev,v2,01/29] tests: Add macro to strip table numbers from lflows. [ovs-dev,v2,02/29] tests: Use ovn_strip_lflows instead of single ? for the replace. [ovs-dev,v2,03/29] tests: Use ovn_strip_lflows for cases with sort before sed. [ovs-dev,v2,04/29] tests: Use ovn_strip_lflows for cases without sort. [ovs-dev,v2,05/29] tests: Use ovn_strip_lflows for the rest of lflows. [ovs-dev,v2,06/29] tests: Add macro for OFTABLE_PHY_TO_LOG table number. [ovs-dev,v2,07/29] tests: Add macro for OFTABLE_LOG_INGRESS_PIPELINE table number. [ovs-dev,v2,08/29] tests: Add macro for OFTABLE_OUTPUT_LARGE_PKT_DETECT table number. [ovs-dev,v2,09/29] tests: Add macro for OFTABLE_OUTPUT_LARGE_PKT_PROCESS table number. [ovs-dev,v2,10/29] tests: Add macro for OFTABLE_REMOTE_OUTPUT table number. [ovs-dev,v2,11/29] tests: Add macro for OFTABLE_LOCAL_OUTPUT table number. [ovs-dev,v2,12/29] tests: Add macro for OFTABLE_LOG_TO_PHY table number. [ovs-dev,v2,13/29] tests: Add macro for OFTABLE_MAC_BINDING table number. [ovs-dev,v2,14/29] tests: Add macro for OFTABLE_MAC_LOOKUP table number. [ovs-dev,v2,15/29] tests: Add macro for OFTABLE_CHK_LB_HAIRPIN table number. [ovs-dev,v2,16/29] tests: Add macro for OFTABLE_CHK_LB_HAIRPIN_REPLY table number. [ovs-dev,v2,17/29] tests: Add macro for OFTABLE_CT_SNAT_HAIRPIN table number. [ovs-dev,v2,18/29] tests: Add macro for OFTABLE_GET_FDB table number. [ovs-dev,v2,19/29] tests: Add macro for OFTABLE_LOOKUP_FDB table number. [ovs-dev,v2,20/29] tests: Add macro for OFTABLE_CHK_IN_PORT_SEC table number. [ovs-dev,v2,21/29] tests: Add macro for OFTABLE_CHK_IN_PORT_SEC_ND table number. [ovs-dev,v2,22/29] tests: Add macro for OFTABLE_CHK_OUT_PORT_SEC table number. [ovs-dev,v2,23/29] tests: Add macro for OFTABLE_ECMP_NH_MAC table number. [ovs-dev,v2,24/29] tests: Add macro for OFTABLE_ECMP_NH table number. [ovs-dev,v2,25/29] tests: Add macro for OFTABLE_CHK_LB_AFFINITY table number. [ovs-dev,v2,26/29] tests: Add macro for OFTABLE_MAC_CACHE_USE table number. [ovs-dev,v2,27/29] checkpatch: Add rule to check for hardcoded table numbers. [ovs-dev,v2,28/29] utilities: Add ovn-debug binary tool. [ovs-dev,v2,29/29] tests: Use the ovn-debug binary to determine table numbers.

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

diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index 50f31b22f..083bbdbc5 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -593,11 +593,11 @@ OVN_NB_ADD_VTEP_PORT([lsw0], [lsp-vtep], [vtep1], [lswitch0]) wait_row_count Port_Binding 1 logical_port=lsp-vtep chassis='[[]]' # add vlan binding, ensure port_binding has chassis and OF on hv is installed -OVS_WAIT_WHILE([ovs-ofctl dump-flows br-int table=0 | grep 'priority=110']) +OVS_WAIT_WHILE([ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep 'priority=110']) check as vtep1 vtep-ctl add-ls lswitch0 -- bind-ls vtep1 p0 100 lswitch0 wait_row_count Port_Binding 1 logical_port=lsp-vtep chassis!='[[]]' -OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int table=0 | grep 'priority=110']) -AT_CHECK([ovs-ofctl dump-flows br-int table=0 | grep 'priority=110' | \ +OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep 'priority=110']) +AT_CHECK([ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep 'priority=110' | \ awk '{print $(NF-1), $NF}' | sed -e 's/in_port=[[0-9]]\+/in_port=<>/g' | \ sed -e 's/0x[[0-9a-f]]\+/0x<>/g'], [0], [dnl priority=110,tun_id=0x<>,in_port=<> actions=move:NXM_NX_TUN_ID[[0..23]]->OXM_OF_METADATA[[0..23]],load:0x<>->NXM_NX_REG14[[0..14]],load:0x<>->NXM_NX_REG10[[1]],resubmit(,8) @@ -621,8 +621,8 @@ check as vtep1 vtep-ctl add-ls lswitch0 -- bind-ls vtep1 p0 100 lswitch0 OVN_NB_ADD_VTEP_PORT([lsw0], [lsp-vtep], [vtep1], [lswitch0]) wait_row_count Port_Binding 1 logical_port=lsp-vtep chassis!='[[]]' -OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int table=0 | grep 'priority=110']) -AT_CHECK([ovs-ofctl dump-flows br-int table=0 | grep 'priority=110' | \ +OVS_WAIT_UNTIL([ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep 'priority=110']) +AT_CHECK([ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep 'priority=110' | \ awk '{print $(NF-1), $NF}' | sed -e 's/in_port=[[0-9]]\+/in_port=<>/g' | \ sed -e 's/0x[[0-9a-f]]\+/0x<>/g'], [0], [dnl priority=110,tun_id=0x<>,in_port=<> actions=move:NXM_NX_TUN_ID[[0..23]]->OXM_OF_METADATA[[0..23]],load:0x<>->NXM_NX_REG14[[0..14]],load:0x<>->NXM_NX_REG10[[1]],resubmit(,8) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index b3d536471..33c66e21e 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -2649,7 +2649,7 @@ check ovn-nbctl lsp-set-addresses sw0-p1 "50:54:00:00:00:03 10.0.0.3 1000::3" wait_for_ports_up ovn-nbctl --wait=hv sync -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c in_port=1], [0],[dnl +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c in_port=1], [0],[dnl 1 ]) @@ -2657,10 +2657,10 @@ OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c in_por check as hv1 ovs-vsctl set Interface hv1-vif1 ofport-request=24 OVS_WAIT_UNTIL([test x`as hv1 ovs-vsctl get Interface hv1-vif1 ofport` = x24]) -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c in_port=24], [0],[dnl +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c in_port=24], [0],[dnl 1 ]) -OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c in_port=1], [1],[dnl +OVS_WAIT_FOR_OUTPUT([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c in_port=1], [1],[dnl 0 ]) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 0ca8c24da..1e586c639 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -988,3 +988,5 @@ m4_define([TAG_UNSTABLE], [ AT_KEYWORDS([unstable]) AT_SKIP_IF([test X"$SKIP_UNSTABLE" = Xyes]) ]) + +m4_define([OFTABLE_PHY_TO_LOG], [0]) diff --git a/tests/ovn.at b/tests/ovn.at index c3ad513bb..46e711650 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9557,7 +9557,7 @@ for i in `seq 1 3`; do -- lsp-set-addresses bar$i "f0:00:0a:01:02:$i 172.16.1.$ip" done -OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=0 | grep REG13 | wc -l` -eq 4]) +OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep REG13 | wc -l` -eq 4]) OVN_CLEANUP([hv1]) @@ -16205,7 +16205,7 @@ OVS_WAIT_UNTIL([test 1 = $(grep -c "Not claiming lport lsp0" hv2/ovn-controller. wait_row_count Port_Binding 1 logical_port=lsp0 'chassis=[[]]' # (2) Chassis hv2 should not add flows in OFTABLE_PHY_TO_LOG and OFTABLE_LOG_TO_PHY tables. -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [1], []) +AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [1], []) AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=65 | grep output], [1], []) # (3) Chassis hv1 should bind lsp0 when physical to logical mapping exists on hv1. @@ -16218,7 +16218,7 @@ wait_column "$hv1_uuid" Port_Binding chassis logical_port=lsp0 # (4) Chassis hv1 should add flows in OFTABLE_PHY_TO_LOG and OFTABLE_LOG_TO_PHY tables. as hv1 ovs-ofctl dump-flows br-int -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [0], [ignore]) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [0], [ignore]) AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep actions=output:1], [0], [ignore]) # (5) Chassis hv1 should release lsp0 binding and chassis hv2 should bind lsp0 when @@ -16232,10 +16232,10 @@ OVS_WAIT_UNTIL([test 1 -le $(grep -c "Releasing lport lsp0" hv1/ovn-controller.l wait_column "$hv2_uuid" Port_Binding chassis logical_port=lsp0 # (6) Chassis hv2 should add flows and hv1 should not. -AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [0], [ignore]) +AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [0], [ignore]) AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=65 | grep actions=output:1], [0], [ignore]) -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [1], []) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [1], []) AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep output], [1], []) OVN_CLEANUP([hv1],[hv2]) @@ -16312,14 +16312,14 @@ hv1_uuid=$(fetch_column Chassis _uuid name=hv1) echo "hv1_uuid=${hv1_uuid}" OVS_WAIT_UNTIL([test 1 = $(grep -c "Claiming lport lsp0" hv1/ovn-controller.log)]) wait_column "$hv1_uuid" Port_Binding chassis logical_port=lsp0 -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [0], [ignore]) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [0], [ignore]) AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep actions=output:1], [0], [ignore]) check ovn-nbctl --wait=hv lsp-set-options lsp0 requested-chassis=non-existant-chassis OVS_WAIT_UNTIL([test 1 -le $(grep -c "Releasing lport lsp0" hv1/ovn-controller.log)]) check ovn-nbctl --wait=hv sync wait_column '' Port_Binding chasssi logical_port=lsp0 -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep in_port=1], [1], []) +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep in_port=1], [1], []) AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep output], [1], []) OVN_CLEANUP([hv1]) @@ -28195,13 +28195,13 @@ send_ipv4_pkt hv1 hv1-vif1 505400000003 00000000ff01 \ AT_CAPTURE_FILE([offlows2]) OVS_WAIT_UNTIL([ - as hv1 ovs-ofctl dump-flows br-phys table=0 > offlows2 + as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG > offlows2 test 1 -eq $(grep "priority=100,pkt_mark=0x64" offlows2 | \ grep -c "n_packets=1") ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep priority=0 | \ grep "n_packets=0" -c) ]) @@ -28212,31 +28212,31 @@ send_ipv4_pkt hv1 hv1-vif2 505400000004 00000000ff01 \ c3ac 83db AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep priority=0 | \ grep "n_packets=1" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x64" | \ grep "n_packets=1" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x3" | \ grep "n_packets=0" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x4" | \ grep "n_packets=0" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0xffffffff" | \ grep "n_packets=0" -c) ]) @@ -28257,19 +28257,19 @@ AT_CHECK([ ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x2" | \ grep "n_packets=1" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep priority=0 | \ grep "n_packets=1" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x3" | \ grep "n_packets=0" -c) ]) @@ -28281,7 +28281,7 @@ send_ipv4_pkt hv1 hv1-vif1 505400000003 00000000ff01 \ c3ab 83da OVS_WAIT_UNTIL([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x3" | \ grep "n_packets=1" -c) ]) @@ -28293,13 +28293,13 @@ dst_ip6=bef00000000000000000000000000004 send_icmp6_packet hv1 hv1-vif2 505400000004 00000000ff01 ${src_ip6} ${dst_ip6} cd16 OVS_WAIT_UNTIL([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0xffffffff" | \ grep "n_packets=1" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x4" | \ grep "n_packets=0" -c) ]) @@ -28313,13 +28313,13 @@ dst_ip6=bef00000000000000000000000000005 send_icmp6_packet hv1 hv1-vif2 505400000004 00000000ff01 ${src_ip6} ${dst_ip6} cd15 OVS_WAIT_UNTIL([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0x4" | \ grep "n_packets=1" -c) ]) AT_CHECK([ - test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=0 | \ + test 1 -eq $(as hv1 ovs-ofctl dump-flows br-phys table=OFTABLE_PHY_TO_LOG | \ grep "priority=100,pkt_mark=0xffffffff" | \ grep "n_packets=1" -c) ]) @@ -31086,7 +31086,7 @@ check ovs-vsctl set interface vif2 external_ids:iface-id=foo # is not true. wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]' -as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG > offlows_table0.txt AT_CAPTURE_FILE([offlows_table0.txt]) AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl 0 @@ -31109,7 +31109,7 @@ check ovs-vsctl set interface vif2 external_ids:iface-id=sw0-p2 as hv1 ovn-appctl -t ovn-controller recompute wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]' -as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG > offlows_table0.txt AT_CAPTURE_FILE([offlows_table0.txt]) AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl 0 @@ -31120,7 +31120,7 @@ check ovn-sbctl set SB_Global . options:northd_internal_version=$northd_version # It should claim sw0-p2 wait_row_count Port_Binding 1 logical_port=sw0-p2 chassis=$ch -as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG > offlows_table0.txt AT_CAPTURE_FILE([offlows_table0.txt]) AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [0], [dnl 1 @@ -31133,7 +31133,7 @@ check ovs-vsctl set interface vif2 external_ids:iface-id=foo # ovn-controller is not connected to the SB DB. Even though it # releases sw0-p2, it will not delete the OF flows. -as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG > offlows_table0.txt AT_CAPTURE_FILE([offlows_table0.txt]) AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [0], [dnl 1 @@ -31147,7 +31147,7 @@ check ovs-vsctl set open . external_ids:ovn-remote=$ovn_remote sleep 1 -as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG > offlows_table0.txt AT_CAPTURE_FILE([offlows_table0.txt]) AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [0], [dnl 1 @@ -31166,7 +31166,7 @@ as hv1 check ovs-vsctl set open . external_ids:ovn-remote=$ovn_remote wait_row_count Port_Binding 1 logical_port=sw0-p2 'chassis=[[]]' -as hv1 ovs-ofctl dump-flows br-int table=0 > offlows_table0.txt +as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG > offlows_table0.txt AT_CAPTURE_FILE([offlows_table0.txt]) AT_CHECK_UNQUOTED([grep -c "in_port=2" offlows_table0.txt], [1], [dnl 0 @@ -32104,11 +32104,11 @@ check as hv1 ovs-vsctl set Interface vm2 external_ids:iface-id=vm2 wait_for_ports_up -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c dl_vlan=1], [0], [dnl +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c dl_vlan=1], [0], [dnl 1 ]) -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c dl_vlan=2], [0], [dnl +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c dl_vlan=2], [0], [dnl 1 ]) @@ -32121,15 +32121,15 @@ wait_for_ports_up check ovn-nbctl --wait=hv sync -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c dl_vlan=1], [1], [dnl +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c dl_vlan=1], [1], [dnl 0 ]) -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c dl_vlan=2], [0], [dnl +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c dl_vlan=2], [0], [dnl 1 ]) -AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=0 | grep -c dl_vlan=3], [0], [dnl +AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep -c dl_vlan=3], [0], [dnl 1 ]) @@ -33698,7 +33698,7 @@ check as hv1 ovs-vsctl add-port br-int vif13 \ -- set interface vif13 external_ids:iface-id=sw0-port2 ofport-request=13 ovn-nbctl --wait=hv sync -OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=0 | grep "in_port=13" | wc -l` -eq 1]) +OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=OFTABLE_PHY_TO_LOG | grep "in_port=13" | wc -l` -eq 1]) # There should be ct zone for sw0-port2 (localport). AT_CHECK([as hv1 ovn-appctl -t ovn-controller ct-zone-list | \ @@ -33791,13 +33791,13 @@ wait_for_ports_up sw0-vm1 sw0-vm2 # Check that flows are generated for the localport OVS_WAIT_UNTIL([ as hv1 \ - ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 \ + ovs-ofctl -O OpenFlow15 dump-flows br-int table=OFTABLE_PHY_TO_LOG \ | tee 1-hv1-br-int-table-0.txt \ && grep -q in_port=13 1-hv1-br-int-table-0.txt ]) OVS_WAIT_UNTIL([ as hv2 \ - ovs-ofctl -O OpenFlow15 dump-flows br-int table=0 \ + ovs-ofctl -O OpenFlow15 dump-flows br-int table=OFTABLE_PHY_TO_LOG \ | tee 1-hv2-br-int-table-0.txt \ && grep in_port=13 1-hv2-br-int-table-0.txt ])

[ovs-dev,v2,06/29] tests: Add macro for OFTABLE_PHY_TO_LOG table number.

Checks

Commit Message

Patch