Use --wait=sb in ovn-nbctl commands before checking sb content.
Fixes: f40a5c3c803a ("ic: Implement cross-AZ service monitor synchronization.")
Signed-off-by: Xavier Simonart <[email protected]>
---
tests/ovn-northd.at | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index f82902c61..ed7515d86 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -19279,7 +19279,7 @@ check ovn-nbctl ls-lb-add ls1 lb1_ipv4
check ovn-nbctl lsp-add ls1 lport1
check ovn-nbctl lsp-add ls1 sw0-p1
-check ovn-nbctl set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:192.168.0.99
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:192.168.0.99
# Check that the service monitor was created correctly.
check_row_count sb:Service_Monitor 1
@@ -19292,19 +19292,19 @@ check_column false sb:Service_Monitor remote
logical_port=lport1
# Empty src_ip.
check ovn-nbctl clear load_balancer lb1_ipv4 ip_port_mappings
-check ovn-nbctl set load_balancer lb1_ipv4 ip_port_mappings:192.168.0.1=lport1:
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:
check_row_count sb:Service_Monitor 0
# Incorrect ip_address.
-check ovn-nbctl set load_balancer lb1_ipv4
ip_port_mappings:invalid=lport2_az1:2.2.2.9
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:invalid=lport2_az1:2.2.2.9
check_row_count sb:Service_Monitor 0
-check ovn-nbctl set load_balancer lb1_ipv4
ip_port_mappings:2.2.2.1=lport2_az1:invalid
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:2.2.2.1=lport2_az1:invalid
check_row_count sb:Service_Monitor 0
-check ovn-nbctl set load_balancer lb1_ipv4 ip_port_mappings:2.2.2.1=:2.2.2.9
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:2.2.2.1=:2.2.2.9
check_row_count sb:Service_Monitor 0
OVS_WAIT_UNTIL([test $(grep -c "Invalid svc mon src IP" northd/ovn-northd.log)
-eq 4])
-check ovn-nbctl set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:192.168.0.99:az_name
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:192.168.0.99:az_name
check_row_count sb:Service_Monitor 1
check_column "192.168.0.1" sb:Service_Monitor ip logical_port=lport1
@@ -19326,7 +19326,7 @@ AT_CHECK([ovn-sbctl get Service_Monitor ${hc_uuid}
options:failure_count],
])
# Empty availability zone name.
-check ovn-nbctl set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:192.168.0.99:
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4
ip_port_mappings:192.168.0.1=lport1:192.168.0.99:
check_row_count sb:Service_Monitor 0
OVS_WAIT_UNTIL([grep "Empty AZ name specified" northd/ovn-northd.log])
@@ -19350,7 +19350,7 @@ AT_CHECK([cat lr1_lflow | grep lr_in_dnat | grep
priority=120 | ovn_strip_lflows
table=??(lr_in_dnat ), priority=120 , match=(ct.new && !ct.rel &&
ip4 && ip4.dst == 1.1.1.1 && reg1[[16..23]] == 6 && reg1[[0..15]] == 80),
action=(ct_lb_mark_local(backends="lport1":192.168.0.1:10880);)
])
-check ovn-nbctl set load_balancer lb_distubuted
ip_port_mappings:192.168.0.2=lport2
+check ovn-nbctl --wait=sb set load_balancer lb_distubuted
ip_port_mappings:192.168.0.2=lport2
ovn-sbctl lflow-list lr1 > lr1_lflow
AT_CHECK([cat lr1_lflow | grep lr_in_dnat | grep priority=120 |
ovn_strip_lflows], [0], [dnl
table=??(lr_in_dnat ), priority=120 , match=(ct.new && !ct.rel &&
ip4 && ip4.dst == 1.1.1.1 && reg1[[16..23]] == 6 && reg1[[0..15]] == 80),
action=(ct_lb_mark_local(backends="lport1":192.168.0.1:10880,"lport2":192.168.0.2:10880);)
--
2.47.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
