On very slow systems, all GARP from hv1 might already be sent when sending mcast
packets from hv2, resulting in mac being learned on main/hv2 port.
This test was added by [1] to fix a flaky behavior where GARP from hv1
were sent before migration completion, but received after migration
and after multicast packet sent by hv2.
Fix both issues by potentially (re) sending GARP from hv2.
[1]: d22611775ac0
Fixes: d22611775ac0 ("tests: fixed flaky test localnet connectivity with
multiple requested-chassis")
Signed-off-by: Xavier Simonart <[email protected]>
---
tests/ovn.at | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/tests/ovn.at b/tests/ovn.at
index 4c0f8acf4..e4736245e 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -16467,11 +16467,7 @@ echo $request >> hv2/n1.expected
check_packets
-# Wait for MAC address of migrator to be on hv1 related port in main switch.
-# Hence the MAC will not migrate back unexpectedly later.
-p1=$(as main ovs-ofctl show n1 | grep hv1_br-phys | awk '{print int($1)}')
p2=$(as main ovs-ofctl show n1 | grep hv2_br-phys | awk '{print int($1)}')
-OVS_WAIT_UNTIL([test x`as main ovs-appctl fdb/show n1 | grep 00:00:00:00:00:ff
| awk '{print $1}'` = x$p1])
# Complete migration: destination is bound
check ovn-nbctl lsp-set-options migrator requested-chassis=hv2
@@ -16484,13 +16480,14 @@ wait_for_ports_up
check ovn-nbctl --wait=hv sync
OVS_WAIT_UNTIL([test `as hv2 ovs-vsctl get Interface migrator
external_ids:ovn-installed` = '"true"'])
-# advertise new location of the port through localnet port
-send_garp hv2 migrator 2 "00:00:00:00:00:ff" "ff:ff:ff:ff:ff:ff" 10.0.0.100
10.0.0.100
-
reset_env
+# advertise new location of the port through localnet port
# Wait for MAC address of migrator to be on hv2 port in main switch
-OVS_WAIT_UNTIL([test x`as main ovs-appctl fdb/show n1 | grep 00:00:00:00:00:ff
| awk '{print $1}'` = x$p2])
+OVS_WAIT_UNTIL([
+ send_garp hv2 migrator 2 "00:00:00:00:00:ff" "ff:ff:ff:ff:ff:ff"
10.0.0.100 10.0.0.100
+ test x`as main ovs-appctl fdb/show n1 | grep 00:00:00:00:00:ff | awk
'{print $1}'` = x$p2
+])
# check that...
# unicast from Third doesn't arrive to hv1:Migrator
--
2.47.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
