Add macro for OFTABLE_LOG_TO_PHY and replace all table=65
occurrences in OF with table=OFTABLE_LOG_TO_PHY.
Signed-off-by: Ales Musil <amu...@redhat.com>
---
tests/ovn-macros.at | 1 +
tests/ovn.at | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index 1070630e9..8d00c7729 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -995,3 +995,4 @@ m4_define([OFTABLE_OUTPUT_LARGE_PKT_DETECT], [37])
m4_define([OFTABLE_OUTPUT_LARGE_PKT_PROCESS], [38])
m4_define([OFTABLE_REMOTE_OUTPUT], [39])
m4_define([OFTABLE_LOCAL_OUTPUT], [40])
+m4_define([OFTABLE_LOG_TO_PHY], [65])
diff --git a/tests/ovn.at b/tests/ovn.at
index be1b138fe..80ad679f3 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -13140,7 +13140,7 @@ for i in 1 2; do
done
done
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/ &&
!/actions=drop/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=OFTABLE_LOG_TO_PHY/
&& !/actions=drop/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
10
11
])
@@ -13149,7 +13149,7 @@ AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk
'/table=65/ && !/actions=drop/
as hv1
check ovs-vsctl del-port vif01
check ovn-nbctl --wait=hv sync
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/ &&
!/actions=drop/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=OFTABLE_LOG_TO_PHY/
&& !/actions=drop/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
11
])
@@ -13157,7 +13157,7 @@ as hv1
check ovs-vsctl add-port br-int vif01 \
-- set Interface vif01 external-ids:iface-id=lp01
check ovn-nbctl --wait=hv sync
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=65/ &&
!/actions=drop/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int |awk '/table=OFTABLE_LOG_TO_PHY/
&& !/actions=drop/{print substr($8, 16, length($8))}' |sort -n], [0], [dnl
2
11
])
@@ -13996,11 +13996,11 @@ AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], [])
check ovn-nbctl set Logical_Switch_Port ln_port tag_request=2014
# wait for earlier changes to take effect
-OVS_WAIT_UNTIL([test 1 = `as hv2 ovs-ofctl dump-flows br-int table=65 | \
+OVS_WAIT_UNTIL([test 1 = `as hv2 ovs-ofctl dump-flows br-int
table=OFTABLE_LOG_TO_PHY | \
grep "actions=mod_vlan_vid:2014" | wc -l`
])
-OVS_WAIT_UNTIL([test 1 = `as hv3 ovs-ofctl dump-flows br-int table=65 | \
+OVS_WAIT_UNTIL([test 1 = `as hv3 ovs-ofctl dump-flows br-int
table=OFTABLE_LOG_TO_PHY | \
grep "actions=mod_vlan_vid:2014" | wc -l`
])
@@ -16206,7 +16206,7 @@ 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=OFTABLE_PHY_TO_LOG | grep
in_port=1], [1], [])
-AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=65 | grep output], [1], [])
+AT_CHECK([as hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep
output], [1], [])
# (3) Chassis hv1 should bind lsp0 when physical to logical mapping exists on
hv1.
echo "verifying that hv1 binds lsp0 when hv1 physical/logical mapping is added"
@@ -16219,7 +16219,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=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])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep
actions=output:1], [0], [ignore])
# (5) Chassis hv1 should release lsp0 binding and chassis hv2 should bind lsp0
when
# the requested chassis for lsp0 is changed from hv1 to hv2.
@@ -16233,10 +16233,10 @@ 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=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 hv2 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep
actions=output:1], [0], [ignore])
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], [])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep
output], [1], [])
OVN_CLEANUP([hv1],[hv2])
@@ -16313,14 +16313,14 @@ 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=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])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | 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=OFTABLE_PHY_TO_LOG | grep
in_port=1], [1], [])
-AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=65 | grep output], [1], [])
+AT_CHECK([as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY | grep
output], [1], [])
OVN_CLEANUP([hv1])
@@ -24428,7 +24428,7 @@ m4_define([DVR_N_S_PING],
]])
# Confirm that packet went out via localnet port
- AT_CHECK([as hv1 ovs-ofctl dump-flows br-int | grep table=65 | grep
priority=150 | grep src=00:00:01:01:02:07 | grep n_packets=1 | wc -l], [0], [[1
+ AT_CHECK([as hv1 ovs-ofctl dump-flows br-int | grep
table=OFTABLE_LOG_TO_PHY | grep priority=150 | grep src=00:00:01:01:02:07 |
grep n_packets=1 | wc -l], [0], [[1
]])
echo "----------- Post Traffic hv1 dump -----------"
@@ -29383,7 +29383,7 @@ wait_row_count Port_Binding 1 logical_port=lsp1
chassis=$ch
wait_row_count Port_Binding 1 logical_port=lsp2 chassis=$ch
AS_BOX([check output flows for initial interfaces])
-as hv1 ovs-ofctl dump-flows br-int table=65 > offlows_table65.txt
+as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY >
offlows_table65.txt
AT_CAPTURE_FILE([offlows_table65.txt])
AT_CHECK_UNQUOTED([grep -c "output:1" offlows_table65.txt], [0], [dnl
1
@@ -29413,7 +29413,7 @@ as hv1 ovn-appctl -t ovn-controller debug/resume
check ovn-nbctl --wait=hv sync
AS_BOX([check output flows for new interfaces])
-as hv1 ovs-ofctl dump-flows br-int table=65 > offlows_table65_2.txt
+as hv1 ovs-ofctl dump-flows br-int table=OFTABLE_LOG_TO_PHY >
offlows_table65_2.txt
AT_CAPTURE_FILE([offlows_table65_2.txt])
AT_CHECK_UNQUOTED([grep -c "output:3" offlows_table65_2.txt], [0], [dnl
1
--
2.43.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
