Reported-at:
https://mail.openvswitch.org/pipermail/ovs-dev/2025-December/428375.html
Reported-by: Xavier Simonart <[email protected]>
Signed-off-by: Dumitru Ceara <[email protected]>
---
tests/ovn-controller-vtep.at | 2 ++
tests/ovn-macros.at | 13 ++++++++++---
tests/ovn.at | 6 +-----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at
index fff5e10cc3..35402b00aa 100644
--- a/tests/ovn-controller-vtep.at
+++ b/tests/ovn-controller-vtep.at
@@ -690,4 +690,6 @@ AT_CHECK([ovn-sbctl --columns=vtep_logical_switches list
Chassis | cut -d ':' -f
])
OVN_CONTROLLER_VTEP_STOP([], vtep1)
+
+OVN_CLEANUP_DBS
AT_CLEANUP
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index 214cb9b4bb..6a8b967a2e 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -179,15 +179,22 @@ m4_define([OVN_WAIT_REMOTE_OUTPUT_FLOWS],
m4_define([OVN_WAIT_REMOTE_INPUT_FLOWS],
[ovn_wait_remote_input_flows "$1" "$2" "__file__:__line__"])
-# OVN_CLEANUP_NORTHD
+# OVN_CLEANUP_DBS
#
-# Gracefully terminate all central OVN daemons: NB, SB and ovn-northd.
-m4_define([OVN_CLEANUP_NORTHD],[
+# Gracefully terminate NB, SB OVN daemons.
+m4_define([OVN_CLEANUP_DBS],[
as ovn-sb
OVS_APP_EXIT_AND_WAIT([ovsdb-server])
as ovn-nb
OVS_APP_EXIT_AND_WAIT([ovsdb-server])
+])
+
+# OVN_CLEANUP_NORTHD
+#
+# Gracefully terminate all central OVN daemons: NB, SB and ovn-northd.
+m4_define([OVN_CLEANUP_NORTHD],[
+ OVN_CLEANUP_DBS
as northd
OVS_APP_EXIT_AND_WAIT([ovn-northd])
diff --git a/tests/ovn.at b/tests/ovn.at
index 3c4258867e..b887559023 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -7465,11 +7465,7 @@ compare_dhcp_packets 1
as hv1
OVS_APP_EXIT_AND_WAIT([ovn-controller])
-as ovn-sb
-OVS_APP_EXIT_AND_WAIT([ovsdb-server])
-
-as ovn-nb
-OVS_APP_EXIT_AND_WAIT([ovsdb-server])
+OVN_CLEANUP_DBS
AT_CLEANUP
])
--
2.51.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
