@@ -323,6 +323,19 @@ ovn_az_attach() {
-- --may-exist add-br br-int \
-- set bridge br-int fail-mode=secure other-config:disable-in-band=true \
|| return 1
+
+ # currently this is the optimal place to add the ovn-monitor-all=true option,
+ # this can be implemented in a different way by redefining the sim-add function
+ # to add the ovn-related external-ids when we add a new simulated node via sim-add.
+ #
+ # wait one sec to make sure that the ovn notice and update it configuration
+ # according to the new option.
+ #
+ if test X$OVN_MONITOR_ALL = Xyes; then
+ ovs-vsctl set open . external_ids:ovn-monitor-all=true
+ sleep 1
+ fi
+
start_daemon ovn-controller --enable-dummy-vif-plug || return 1
}
@@ -751,19 +764,19 @@ m4_define([OVN_FOR_EACH_NORTHD],
[m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog],
[m4_foreach([NORTHD_USE_DP_GROUPS], [yes, no],
[m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1
-])])])])
+]) m4_foreach([OVN_MONITOR_ALL], [yes], [$1])])])])
# Some tests aren't prepared for dp groups to be enabled.
m4_define([OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS],
[m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog],
[m4_foreach([NORTHD_USE_DP_GROUPS], [no],
[m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1
-])])])])
+])m4_foreach([OVN_MONITOR_ALL], [yes], [$1])])])])
# Some tests aren't prepared for ddlog to be enabled.
m4_define([OVN_FOR_EACH_NORTHD_WITHOUT_DDLOG],
[m4_foreach([NORTHD_TYPE], [ovn-northd],
[m4_foreach([NORTHD_USE_DP_GROUPS], [yes, no],
[m4_foreach([NORTHD_USE_PARALLELIZATION], [yes, no], [$1
-])])])])
+])m4_foreach([OVN_MONITOR_ALL], [yes], [$1])])])])
@@ -10,7 +10,7 @@ dnl set it as a shell variable as well.
dnl - Skip the test if it's for ovn-northd-ddlog but it didn't get built.
m4_rename([AT_SETUP], [OVS_AT_SETUP])
m4_define([AT_SETUP],
- [OVS_AT_SETUP($@[]m4_ifdef([NORTHD_TYPE], [ -- NORTHD_TYPE])[]m4_ifdef([NORTHD_USE_DP_GROUPS], [ -- dp-groups=NORTHD_USE_DP_GROUPS])[]m4_ifdef([NORTHD_USE_PARALLELIZATION], [ -- parallelization=NORTHD_USE_PARALLELIZATION]))
+ [OVS_AT_SETUP($@[]m4_ifdef([NORTHD_TYPE], [ -- NORTHD_TYPE])[]m4_ifdef([NORTHD_USE_DP_GROUPS], [ -- dp-groups=NORTHD_USE_DP_GROUPS])[]m4_ifdef([NORTHD_USE_PARALLELIZATION], [ -- parallelization=NORTHD_USE_PARALLELIZATION])[]m4_ifdef([OVN_MONITOR_ALL], [ -- ovn_monitor_all=OVN_MONITOR_ALL]))
m4_ifdef([NORTHD_TYPE], [[NORTHD_TYPE]=NORTHD_TYPE
])dnl
m4_ifdef([NORTHD_USE_DP_GROUPS], [[NORTHD_USE_DP_GROUPS]=NORTHD_USE_DP_GROUPS
@@ -19,6 +19,8 @@ m4_ifdef([NORTHD_USE_PARALLELIZATION], [[NORTHD_USE_PARALLELIZATION]=NORTHD_USE_
])dnl
m4_ifdef([NORTHD_DUMMY_NUMA], [[NORTHD_DUMMY_NUMA]=NORTHD_DUMMY_NUMA
])dnl
+m4_ifdef([OVN_MONITOR_ALL], [[OVN_MONITOR_ALL]=OVN_MONITOR_ALL
+])dnl
m4_if(NORTHD_TYPE, [ovn-northd-ddlog], [dnl
AT_SKIP_IF([test $TEST_DDLOG = no])
])dnl
currently ovn ci only has one test case with the option ovn-monitor-all enabled, this patch will add one more execution with option ovn-monitor-all=true for each test case that are wrapped by OVN_FOR_EACH_NORTHD macro. This will more or less double the number of test cases. It is possible to select a reduce set of test cases using -k "keywords". Keyword such as dp-groups=yes dp-groups=no parallelization=yes parallelization=no ovn-northd ovn-northd-ddlog ovn_monitor_all=yes can be used to select a range of tests, as title is searched as well. For instance, to run ovn-parallelization tests, with dp-groups enabled and ddlog disabled: make check TESTSUITEFLAGS="-k dp-groups=yes,ovn_monitor_all=yes,\!ovn-northd-ddlog" Signed-off-by: Mohammad Heib <mheib@redhat.com> --- tests/ovn-macros.at | 19 ++++++++++++++++--- tests/ovs-macros.at | 4 +++- 2 files changed, 19 insertions(+), 4 deletions(-)