Add missing waits that should prevent occasional failures. Also add
a missing lflow_list after a change was done.
Fixes: 7b0eb4d9ed05 ("northd: Add distributed load balancer support.")
Signed-off-by: Ales Musil <[email protected]>
---
tests/ovn-northd.at | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index 605d2ec4f..79af0e20d 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -19617,7 +19617,7 @@ check ovn-nbctl lr-lb-add lr1 lb1_ipv4
check ovn-nbctl lb-add lb1_ipv6 [[2000::1]]:80 [[2001:db8:abcd:1::2]]:10882
check ovn-nbctl set Load_Balancer lb1_ipv6
ip_port_mappings:\"[[2001:db8:abcd:1::2]]\"=\"lport1\"
-check ovn-nbctl lr-lb-add lr1 lb1_ipv6
+check ovn-nbctl --wait=sb lr-lb-add lr1 lb1_ipv6
ovn-sbctl lflow-list lr1 > lr1_lflows_before
ovn-sbctl lflow-list outside > outside_lflows_before
@@ -19676,7 +19676,7 @@ ha_g_uuid=$(fetch_column nb:HA_Chassis_Group _uuid
name=gateway2)
lr1_up_uuid=$(fetch_column nb:Logical_Router_Port _uuid name=lr1-up)
check ovn-nbctl set logical_router_port $lr1_up_uuid
ha_chassis_group=$ha_g_uuid
-check ovn-nbctl set load_balancer lb1_ipv4 options:distributed=true
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv4 options:distributed=true
ovn-sbctl lflow-list outside > outside_lflows_after
ovn-sbctl lflow-list lr1 > lr1_lflows_after
@@ -19727,7 +19727,7 @@ AT_CHECK([cat outside_lflows_after | grep
ls_in_apply_port_sec | grep priority=7
table=??(ls_in_apply_port_sec), priority=75 , match=(reg0[[22]] == 1),
action=(next;)
])
-check ovn-nbctl set load_balancer lb1_ipv6 options:distributed=true
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv6 options:distributed=true
ovn-sbctl lflow-list outside > outside_lflows_after
ovn-sbctl lflow-list lr1 > lr1_lflows_after
@@ -19749,7 +19749,9 @@ AT_CHECK([cat lr1_lflows_after | grep lr_in_dnat | grep
priority=120 | ovn_strip
table=??(lr_in_dnat ), priority=120 , match=(ct.new && !ct.rel &&
ip6 && ip6.dst == 2000::1 && reg1[[16..23]] == 6 && reg1[[0..15]] == 80),
action=(ct_lb_mark_local(backends="lport1":[[2001:db8:abcd:1::2]]:10882);)
])
-check ovn-nbctl set load_balancer lb1_ipv6 options:distributed=false
+check ovn-nbctl --wait=sb set load_balancer lb1_ipv6 options:distributed=false
+ovn-sbctl lflow-list outside > outside_lflows_after
+ovn-sbctl lflow-list lr1 > lr1_lflows_after
AT_CHECK([cat outside_lflows_after | grep ls_in_l2_lkup | grep priority=50 |
ovn_strip_lflows], [0], [dnl
table=??(ls_in_l2_lkup ), priority=50 , match=(eth.dst ==
11:11:11:11:11:11), action=(outport = "outside-down"; output;)
--
2.53.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
