Fixes: 94a2cfa0182c ("tests: Fix the 'Distributed load balancers: logical-flow
test'.")
Signed-off-by: Alexandra Rukomoinikova <[email protected]>
---
tests/ovn-ic.at | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at
index 114969231..1a53c1e18 100644
--- a/tests/ovn-ic.at
+++ b/tests/ovn-ic.at
@@ -3708,7 +3708,7 @@ AT_CHECK([ovn-nbctl --wait=sb \
# We will leave one backend without a service monitor since it is not expected
to participate in load balancing.
check ovn-nbctl set load_balancer az1_lb1
ip_port_mappings:1.1.1.1=lport1_az1:1.1.1.9
check ovn-nbctl set load_balancer az1_lb1
ip_port_mappings:3.3.3.1=lport3_az2:3.3.3.9:az2
-check ovn-nbctl set load_balancer az1_lb1
ip_port_mappings:5.5.5.1=lport5_az3:5.5.5.9:az3
+check ovn-nbctl --wait=sb set load_balancer az1_lb1
ip_port_mappings:5.5.5.1=lport5_az3:5.5.5.9:az3
# Сheck that all remote and local service monitors have been created.
check_row_count sb:Service_Monitor 3
@@ -3771,7 +3771,7 @@ AT_CHECK([ovn-nbctl --wait=sb \
# Create a cross-cutting backend with a balancer in the first availability
zone to check that everything works correctly
check ovn-nbctl set load_balancer az2_lb1
ip_port_mappings:3.3.3.1=lport3_az2:3.3.3.9
-check ovn-nbctl set load_balancer az2_lb1
ip_port_mappings:1.1.1.1=lport1_az1:1.1.1.9:az1
+check ovn-nbctl --wait=sb set load_balancer az2_lb1
ip_port_mappings:1.1.1.1=lport1_az1:1.1.1.9:az1
check_row_count sb:Service_Monitor 2
check_row_count ic-sb:Service_Monitor 3
@@ -3800,7 +3800,7 @@ check_column az1 ic-sb:Service_Monitor
source_availability_zone logical_port=lpo
# AZ3 Configuration
ovn_as az3
check ovn-nbctl set NB_Global . options:svc_monitor_mac="13:13:13:13:13:13"
-check ovn-nbctl ls-add az3_ls1
+check ovn-nbctl --wait=sb ls-add az3_ls1
# Check there no Service_Monitor when we have no ports.
check_row_count sb:Service_Monitor 0
@@ -3808,7 +3808,7 @@ check_row_count nb:Load_Balancer 0
check ovn-nbctl lsp-add az3_ls1 lport5_az3
check ovn-nbctl lsp-add az3_ls1 lport6_az3
-check ovn-nbctl lsp-add az3_ls1 lport7_az3
+check ovn-nbctl --wait=sb lsp-add az3_ls1 lport7_az3
# Check there is one Service Monitor learned from az1.
check_row_count sb:Service_Monitor 1
@@ -3839,7 +3839,7 @@ AT_CHECK([ovn-nbctl --wait=sb \
# We will leave one backend without a service monitor since it is not expected
to participate in load balancing.
check ovn-nbctl set load_balancer az2_lb2
ip_port_mappings:2.2.2.1=lport2_az1:2.2.2.9:az1
-check ovn-nbctl set load_balancer az2_lb2
ip_port_mappings:6.6.6.1=lport6_az3:6.6.6.9:az3
+check ovn-nbctl --wait=sb set load_balancer az2_lb2
ip_port_mappings:6.6.6.1=lport6_az3:6.6.6.9:az3
ovn_as az1
check_row_count sb:Service_Monitor 4
@@ -3953,7 +3953,7 @@ az1_lb1_uuid=$(ovn-nbctl --bare --no-headings
--columns=_uuid find Load_Balancer
check_row_count sb:Service_Monitor 1 logical_port=lport3_az2
check ovn-nbctl set Load_Balancer $az1_lb1_uuid
vip='"10.10.10.1:80"="1.1.1.1:10880,5.5.5.1:10880,2.2.2.1:10880"'
-check ovn-nbctl set load_balancer az1_lb1
ip_port_mappings:2.2.2.1=lport2_az1:2.2.2.9
+check ovn-nbctl --wait=sb set load_balancer az1_lb1
ip_port_mappings:2.2.2.1=lport2_az1:2.2.2.9
check_row_count sb:Service_Monitor 0 logical_port=lport3_az2
# Check deletion from ICSB.
@@ -4003,7 +4003,7 @@ AT_CHECK([ovn-sbctl lflow-list az2_ls1 | grep ls_in_lb |
grep backends | ovn_str
# Check deletion.
ovn_as az1
-check ovn-nbctl lb-del az1_lb1
+check ovn-nbctl --wait=sb lb-del az1_lb1
# az1_lb1 had : 1.1.1.1:10880,5.5.5.1:10880,2.2.2.1:10880,4.4.4.1:10880
backends
# (4.4.4.1 - no hc, 5.5.5.1 - no hc)
# az2: az2_lb1 20.20.20.1:80 3.3.3.1:10880,1.1.1.1:10880
@@ -4020,7 +4020,7 @@ ovn_as az2
# Need to check that there is no service_monitor left in az3,
# in az1 there will be one service monitors for 1.1.1.1 (used by az2_lb1)
# and in az2 there will be two service monitor for 3.3.3.1 and 1.1.1.1
-check ovn-nbctl lb-del az2_lb2
+check ovn-nbctl --wait=sb lb-del az2_lb2
ovn_as az1
# Check that the ic_learned records have been deleted
@@ -4034,7 +4034,7 @@ ovn_as az3
check_row_count sb:Service_Monitor 0
ovn_as az2
-check ovn-nbctl lb-del az2_lb1
+check ovn-nbctl --wait=sb lb-del az2_lb1
check_row_count sb:Service_Monitor 0
check_row_count ic-sb:Service_Monitor 0
--
2.48.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
