diff mbox series

[ovs-dev,22/26] tests: Add macro for OFTABLE_ECMP_NH_MAC table number.

Message ID 20240201161804.210604-23-amusil@redhat.com
State Superseded
Headers show
Series Remove most of the hardcoded table numbers | expand

Checks

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

Commit Message

Ales Musil Feb. 1, 2024, 4:18 p.m. UTC 
Add macro for OFTABLE_ECMP_NH_MAC and replace all table=76
occurrences in OF with table=OFTABLE_ECMP_NH_MAC.

Signed-off-by: Ales Musil <amusil@redhat.com>
---
 tests/ovn-macros.at | 1 +
 tests/system-ovn.at | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index 9086808e2..91779455f 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -1005,3 +1005,4 @@  m4_define([OFTABLE_LOOKUP_FDB], [72])
 m4_define([OFTABLE_CHK_IN_PORT_SEC], [73])
 m4_define([OFTABLE_CHK_IN_PORT_SEC_ND], [74])
 m4_define([OFTABLE_CHK_OUT_PORT_SEC], [75])
+m4_define([OFTABLE_ECMP_NH_MAC], [76])
diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index cb4124b70..a44ff4b2b 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -6156,7 +6156,7 @@  tcp,orig=(src=172.16.0.1,dst=10.0.0.2,sport=<cleared>,dport=<cleared>),reply=(sr
 ])
 # Check entries in table 76 and 77 expires w/o traffic
 OVS_WAIT_UNTIL([
-test $(ovs-ofctl dump-flows br-int | grep -c 'table=76, n_packets') -eq 0
+test $(ovs-ofctl dump-flows br-int | grep -c 'table=OFTABLE_ECMP_NH_MAC, n_packets') -eq 0
 ])
 OVS_WAIT_UNTIL([
 test $(ovs-ofctl dump-flows br-int | grep -c 'table=77, n_packets') -eq 0
@@ -6349,7 +6349,7 @@  tcp,orig=(src=fd07::1,dst=fd01::2,sport=<cleared>,dport=<cleared>),reply=(src=fd
 
 # Check entries in table 76 and 77 expires w/o traffic
 OVS_WAIT_UNTIL([
-test $(ovs-ofctl dump-flows br-int | grep -c 'table=76, n_packets') -eq 0
+test $(ovs-ofctl dump-flows br-int | grep -c 'table=OFTABLE_ECMP_NH_MAC, n_packets') -eq 0
 ])
 OVS_WAIT_UNTIL([
 test $(ovs-ofctl dump-flows br-int | grep -c 'table=77, n_packets') -eq 0