tests: Fix flaky ovn-controller - CT zone min/max boundaries.

Controller might still be running even after debug/status stops returning "running". Fixes: 8d652c5 ("controller: Do not remove snat-ct-zone requested by the CMS.") Signed-off-by: Xavier Simonart <[email protected]> Signed-off-by: 0-day Robot <[email protected]>
ovsrobot · Dec 10, 2024 · 1e29444 · 1e29444
1 parent 8385488
commit 1e29444
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at
@@ -3225,9 +3225,10 @@ AS_BOX([Check LR snat requested zone 2])
 AT_CHECK([test $(ovn-appctl -t ovn-controller ct-zone-list | awk '/lr_snat/{print $2}') -eq 2])
 
 n_flush=$(grep -c -i flush hv1/ovs-vswitchd.log)
-check ovn-appctl -t ovn-controller exit --restart
-# Make sure ovn-controller stopped before restarting it
-OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != "running"])
+
+# Stop ovn-controller on hv1 with --restart flag
+OVN_CONTROLLER_EXIT([hv1])
+
 start_daemon ovn-controller --verbose="ct_zone:dbg"
 wait_for_ports_up
 check ovn-nbctl --wait=hv sync
@@ -3244,9 +3245,7 @@ check_ct_zone_max 22
 AT_CHECK([test $(ovn-appctl -t ovn-controller ct-zone-list | awk '/lr_snat/{print $2}') -eq 0])
 
 n_flush=$(grep -c -i flush hv1/ovs-vswitchd.log)
-check ovn-appctl -t ovn-controller exit --restart
-# Make sure ovn-controller stopped before restarting it
-OVS_WAIT_UNTIL([test "$(ovn-appctl -t ovn-controller debug/status)" != "running"])
+OVN_CONTROLLER_EXIT([hv1])
 start_daemon ovn-controller --verbose="ct_zone:dbg"
 wait_for_ports_up
 check ovn-nbctl --wait=hv sync