From 31ee58ad3022e1073806363623c7e61ecdbc0581 Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Thu, 5 Oct 2023 13:49:18 +0200 Subject: [PATCH] tests: Add missing --wait=sb to the LB I-P test. Fixes: a24eed5cc6b4 ("northd: Add initial I-P for load balancer and load balancer groups") Signed-off-by: Dumitru Ceara Acked-by: Numan Siddique --- tests/ovn-northd.at | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index c22aff18b8..61e2fbcd4f 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -10591,7 +10591,7 @@ CHECK_NO_CHANGE_AFTER_RECOMPUTE # Test load balancer group now check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -lbg1_uuid=$(ovn-nbctl create load_balancer_group name=lbg1) +lbg1_uuid=$(ovn-nbctl --wait=sb create load_balancer_group name=lbg1) check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute @@ -10603,20 +10603,20 @@ lb1_uuid=$(fetch_column nb:Load_Balancer _uuid) # Add lb to the lbg1 group check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl add load_balancer_group . load_Balancer $lb1_uuid +check ovn-nbctl --wait=sb add load_balancer_group . load_Balancer $lb1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl clear load_balancer_group . load_Balancer +check ovn-nbctl --wait=sb clear load_balancer_group . load_Balancer check_engine_stats lb_data norecompute compute check_engine_stats northd recompute nocompute check_engine_stats lflow recompute nocompute # Add back lb to the lbg1 group check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl add load_balancer_group . load_Balancer $lb1_uuid +check ovn-nbctl --wait=sb add load_balancer_group . load_Balancer $lb1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute @@ -10624,7 +10624,7 @@ check_engine_stats lflow recompute nocompute CHECK_NO_CHANGE_AFTER_RECOMPUTE check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl add logical_switch sw0 load_balancer_group $lbg1_uuid +check ovn-nbctl --wait=sb add logical_switch sw0 load_balancer_group $lbg1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute @@ -10669,7 +10669,7 @@ check_engine_stats lflow recompute nocompute CHECK_NO_CHANGE_AFTER_RECOMPUTE check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl clear logical_switch sw0 load_balancer_group +check ovn-nbctl --wait=sb clear logical_switch sw0 load_balancer_group check_engine_stats lb_data norecompute compute check_engine_stats northd recompute nocompute check_engine_stats lflow recompute nocompute @@ -10714,20 +10714,20 @@ check_engine_stats lflow recompute nocompute CHECK_NO_CHANGE_AFTER_RECOMPUTE check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl clear logical_router lr0 load_balancer_group +check ovn-nbctl --wait=sb clear logical_router lr0 load_balancer_group check_engine_stats lb_data norecompute compute check_engine_stats northd recompute nocompute check_engine_stats lflow recompute nocompute # Add back lb group to logical switch and then delete it. check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl add logical_switch sw0 load_balancer_group $lbg1_uuid +check ovn-nbctl --wait=sb add logical_switch sw0 load_balancer_group $lbg1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl clear logical_switch sw0 load_balancer_group -- \ +check ovn-nbctl --wait=sb clear logical_switch sw0 load_balancer_group -- \ destroy load_balancer_group $lbg1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd recompute nocompute @@ -10750,26 +10750,26 @@ lb3_uuid=$(fetch_column nb:Load_Balancer _uuid name=lb3) lb4_uuid=$(fetch_column nb:Load_Balancer _uuid name=lb4) check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -lbg1_uuid=$(ovn-nbctl create load_balancer_group name=lbg1) +lbg1_uuid=$(ovn-nbctl --wait=sb create load_balancer_group name=lbg1) check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl set load_balancer_group . load_balancer="$lb2_uuid,$lb3_uuid,$lb4_uuid" +check ovn-nbctl --wait=sb set load_balancer_group . load_balancer="$lb2_uuid,$lb3_uuid,$lb4_uuid" check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl set logical_switch sw0 load_balancer_group=$lbg1_uuid +check ovn-nbctl --wait=sb set logical_switch sw0 load_balancer_group=$lbg1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute CHECK_NO_CHANGE_AFTER_RECOMPUTE check as northd ovn-appctl -t NORTHD_TYPE inc-engine/clear-stats -check ovn-nbctl set logical_router lr1 load_balancer_group=$lbg1_uuid +check ovn-nbctl --wait=sb set logical_router lr1 load_balancer_group=$lbg1_uuid check_engine_stats lb_data norecompute compute check_engine_stats northd norecompute compute check_engine_stats lflow recompute nocompute