Similar to what we do for multinode tests, in multinode-macros.at.
Signed-off-by: Dumitru Ceara <[email protected]>
---
tests/system-common-macros.at | 4 +++-
tests/system-ovn-netlink.at | 27 +++++++++------------------
tests/system-ovn.at | 9 +++------
3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
index 52d420a571..ed1c24d953 100644
--- a/tests/system-common-macros.at
+++ b/tests/system-common-macros.at
@@ -385,7 +385,9 @@ m4_define([OVN_ROUTE_EQUAL],
# Will dump all v6 routes in the mentioned vrf. Trailing spaces will be removed
# and "proto 84" is converted to "proto ovn" for compatibility.
m4_define([OVN_ROUTE_V6_EQUAL],
- [OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf $1 | sed -e
's|[[[[:space:]]]]*$||g' -e 's|proto 84|proto ovn|'], [$2])
+ [OVS_WAIT_UNTIL_EQUAL([ip -6 route list vrf $1 | \
+ grep -v anycast | grep -v multicast | \
+ sed -e 's|[[[[:space:]]]]*$||g' -e 's|proto 84|proto ovn|'], [$2])
])
# OVN_NEIGH_EQUAL([interface], [options], [match], [string to compare])
diff --git a/tests/system-ovn-netlink.at b/tests/system-ovn-netlink.at
index 79988534f5..4e581aa744 100644
--- a/tests/system-ovn-netlink.at
+++ b/tests/system-ovn-netlink.at
@@ -340,8 +340,7 @@ OVN_ROUTE_EQUAL([vrf-$table_id], [dnl
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::10 via fd20::1 dev lo-test proto zebra metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([Advertise just IPv4])
OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovstest test-ovn-netlink route-sync \
@@ -359,8 +358,7 @@ blackhole 192.168.100.0/24 proto ovn])
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::10 via fd20::1 dev lo-test proto zebra metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([Advertise both IPv4 and IPv6])
OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovstest test-ovn-netlink route-sync \
@@ -379,8 +377,7 @@ OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::10 via fd20::1 dev lo-test proto zebra metric 1024 pref medium
blackhole fd20:100::/64 dev lo proto ovn metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([Advertise just IPv4, should remove the IPv6])
OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovstest test-ovn-netlink route-sync \
@@ -398,8 +395,7 @@ blackhole 192.168.100.0/24 proto ovn])
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::10 via fd20::1 dev lo-test proto zebra metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([No advertisement should remove IPv4])
OVS_WAIT_FOR_OUTPUT_UNQUOTED([ovstest test-ovn-netlink route-sync \
@@ -416,8 +412,7 @@ OVN_ROUTE_EQUAL([vrf-$table_id], [dnl
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::10 via fd20::1 dev lo-test proto zebra metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AT_CLEANUP
@@ -450,8 +445,7 @@ OVN_ROUTE_EQUAL([vrf-$table_id], [dnl
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([Advertise IPv4 via IPv4 and IPv6 via IPv6])
check ovstest test-ovn-netlink route-sync $table_id \
@@ -465,8 +459,7 @@ OVN_ROUTE_EQUAL([vrf-$table_id], [dnl
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::/64 via fd20::1 dev lo-test proto ovn metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([Advertise IPv4 via IPv6 and IPv6 via IPv6])
check ovstest test-ovn-netlink route-sync $table_id \
@@ -480,8 +473,7 @@ OVN_ROUTE_EQUAL([vrf-$table_id], [dnl
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
fd20:100::/64 via fd20::1 dev lo-test proto ovn metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AS_BOX([Replace both with blackhole])
check ovstest test-ovn-netlink route-sync $table_id \
@@ -495,7 +487,6 @@ blackhole 192.168.100.0/24 proto ovn])
OVN_ROUTE_V6_EQUAL([vrf-$table_id], [dnl
fd20::/64 dev lo-test proto kernel metric 256 pref medium
blackhole fd20:100::/64 dev lo proto ovn metric 1024 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
AT_CLEANUP
diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 4bbf1c06b9..303b10894c 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -18991,8 +18991,7 @@ blackhole 2001:db8:1003::1 dev lo proto ovn metric 100
pref medium
blackhole 2001:db8:1003::20 dev lo proto ovn metric 1000 pref medium
blackhole 2001:db8:1003::150 dev lo proto ovn metric 1000 pref medium
blackhole 2001:db8:1003::151 dev lo proto ovn metric 1000 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
check ovn-nbctl --wait=hv set logical_router R1 \
options:dynamic-routing-v4-prefix-nexthop="20.0.0.1"
@@ -19020,8 +19019,7 @@ blackhole 2001:db8:1003::1 dev lo proto ovn metric 100
pref medium
blackhole 2001:db8:1003::20 dev lo proto ovn metric 1000 pref medium
blackhole 2001:db8:1003::150 dev lo proto ovn metric 1000 pref medium
blackhole 2001:db8:1003::151 dev lo proto ovn metric 1000 pref medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
check ovn-nbctl --wait=hv set logical_router R1 \
options:dynamic-routing-v6-prefix-nexthop="2000:db8:1000::1"
@@ -19031,8 +19029,7 @@ OVN_ROUTE_V6_EQUAL([ovnvrf$vrf], [dnl
2001:db8:1003::20 via 2000:db8:1000::1 dev lo-test proto ovn metric 1000 pref
medium
2001:db8:1003::150 via 2000:db8:1000::1 dev lo-test proto ovn metric 1000 pref
medium
2001:db8:1003::151 via 2000:db8:1000::1 dev lo-test proto ovn metric 1000 pref
medium
-fe80::/64 dev lo-test proto kernel metric 256 pref medium
-multicast ff00::/8 dev lo-test proto kernel metric 256 pref medium])
+fe80::/64 dev lo-test proto kernel metric 256 pref medium])
OVN_CLEANUP_CONTROLLER([hv1])
--
2.51.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
