Thanks Xavier and Ales.
I pushed this to main, branch-22.09, branch-22.06, and branch-22.03.
On 11/22/22 06:44, Ales Musil wrote:
On Tue, Nov 22, 2022 at 12:20 PM Xavier Simonart <[email protected]>
wrote:
Signed-off-by: Xavier Simonart <[email protected]>
---
tests/ovn.at | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/ovn.at b/tests/ovn.at
index dde0f582b..9f4d1b2d4 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -28576,7 +28576,11 @@ ovs-vsctl add-br br-phys
ovn_attach n1 br-phys 192.168.0.1 24 geneve
# Get the encap rec, should be just one - with geneve/192.168.0.1
-encap_rec=$(ovn-sbctl --data=bare --no-heading --column encaps list
chassis hv1)
+# Skip initial null encap
+OVS_WAIT_UNTIL(
+ [encap_rec=$(ovn-sbctl --bare --no-heading --columns encaps list
chassis hv1)
+ echo "encap_rec = $encap_rec"
+ test $encap_rec])
# Set multiple IPs
as hv1
@@ -28585,9 +28589,10 @@ ovs-vsctl \
# Check if the encap_rec changed - should have, no need to
# compare the exact values.
-encap_rec_mvtep=$(ovn-sbctl --data=bare --no-heading --column encaps list
chassis hv1)
-
-AT_CHECK([test "$encap_rec" != "$encap_rec_mvtep"], [0], [])
+OVS_WAIT_UNTIL(
+ [encap_rec_mvtep=$(ovn-sbctl --bare --no-heading --columns encaps list
chassis hv1)
+ echo "encap_rec_mvtep = $encap_rec_mvtep"
+ test "$encap_rec" != "$encap_rec_mvtep"])
# now, wait for a couple of secs - should be enough time, I suppose.
sleep 2
--
2.31.1
Thanks!
Acked-by: Ales Musil <[email protected]>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
