[ovs-dev] [PATCH ovn v2 3/6] tests: remove strict check for table=N for N > 9
Vladislav Odintsov
odivlad at gmail.com
Fri Sep 3 10:34:38 UTC 2021
Previously patch [1] with same summary was submitted,
but it was applied lated then a new feature in commit
[2] was accepted.
There was added a new test, which also checks exact
logical flow table number.
This commit replaces table=NN with table=?? in those new tests.
[1] https://github.com/ovn-org/ovn/commit/e3ae68ed9a1bb231f7b069539693474508f3ed86
[2] https://github.com/ovn-org/ovn/commit/c0085228893e7bf07190fcccf50cf588b028edaa
Signed-off-by: Vladislav Odintsov <odivlad at gmail.com>
---
tests/ovn-northd.at | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index 11886b94e..1c0cb7c0e 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -5131,15 +5131,15 @@ wait_row_count nb:Logical_Router_Static_Route 0
check ovn-nbctl --wait=sb lr-route-add lr0 1.0.0.0/24 192.168.0.10
ovn-sbctl dump-flows lr0 > lr0flows
-AT_CHECK([grep -e "lr_in_ip_routing.*192.168.0.10" lr0flows |sort], [0], [dnl
- table=10(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 1.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = 192.168.0.10; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;)
+AT_CHECK([grep -e "lr_in_ip_routing.*192.168.0.10" lr0flows | sed 's/table=../table=??/' | sort], [0], [dnl
+ table=??(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 1.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = 192.168.0.10; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;)
])
check ovn-nbctl --wait=sb lr-route-add lr0 2.0.0.0/24 lr0-public
ovn-sbctl dump-flows lr0 > lr0flows
-AT_CHECK([grep -e "lr_in_ip_routing.*2.0.0.0" lr0flows |sort], [0], [dnl
- table=10(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 2.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = ip4.dst; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;)
+AT_CHECK([grep -e "lr_in_ip_routing.*2.0.0.0" lr0flows | sed 's/table=../table=??/' | sort], [0], [dnl
+ table=??(lr_in_ip_routing ), priority=49 , match=(ip4.dst == 2.0.0.0/24), action=(ip.ttl--; reg8[[0..15]] = 0; reg0 = ip4.dst; reg1 = 192.168.0.1; eth.src = 00:00:20:20:12:13; outport = "lr0-public"; flags.loopback = 1; next;)
])
AT_CLEANUP
--
2.30.0
More information about the dev
mailing list