From ad8745f08f7d6b8f5a154c4047e2a299fadbdb9c Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Thu, 3 Aug 2023 08:58:25 +0200 Subject: [PATCH] tests: fixed multiple ovn-ic unit tests - ovn-ic -- gateway sync - ovn-ic -- route sync - ovn-ic -- route sync -- route tables - ovn-ic -- route sync -- IPv6 route tables Signed-off-by: Xavier Simonart Signed-off-by: Mark Michelson --- tests/ovn-ic.at | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at index ceee450925..09eac860cf 100644 --- a/tests/ovn-ic.at +++ b/tests/ovn-ic.at @@ -284,11 +284,10 @@ is-remote=true ]) ovs-vsctl set open . external-ids:ovn-is-interconn=false -AT_CHECK([ovn_as az2 ovn-sbctl show], [0], [dnl -]) +OVS_WAIT_UNTIL([test "$(ovn_as az2 ovn-sbctl show)" = ""]) ovs-vsctl set open . external-ids:ovn-is-interconn=true -AT_CHECK([ovn_as az2 ovn-sbctl show | grep gw1], [0], [ignore]) +OVS_WAIT_UNTIL([ovn_as az2 ovn-sbctl show | grep gw1]) OVN_CLEANUP_SBOX(gw1) AT_CHECK([ovn_as az2 ovn-sbctl show], [0], [dnl @@ -393,6 +392,7 @@ for i in 1 2; do # Enable route advertising at AZ level ovn-nbctl set nb_global . options:ic-route-adv=true + OVS_WAIT_UNTIL([ovn-nbctl show | grep ts1]) # Create LRP and connect to TS ovn-nbctl lr-add lr$i ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 169.254.100.$i/24 @@ -637,6 +637,8 @@ for i in 1 2; do # Enable route advertising at AZ level ovn-nbctl set nb_global . options:ic-route-adv=true + OVS_WAIT_UNTIL([ovn-nbctl show | grep ts1]) + # Create LRP and connect to TS ovn-nbctl lr-add lr$i ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 2001:db8:1::$i/64 @@ -686,6 +688,8 @@ for i in 1 2; do # Enable route advertising at AZ level ovn-nbctl set nb_global . options:ic-route-adv=true + OVS_WAIT_UNTIL([ovn-nbctl show | grep ts1]) + # Create LRP and connect to TS ovn-nbctl lr-add lr$i ovn-nbctl lrp-add lr$i lrp-lr$i-ts1 aa:aa:aa:aa:aa:0$i 169.254.100.$i/24