diff mbox

[ovs-dev,5/5] tests: Allow extra cmd line args to OVS_VSWITCHD_START.

Message ID 1465264294-52098-5-git-send-email-diproiettod@vmware.com
State Accepted
Headers show

Commit Message

Daniele Di Proietto June 7, 2016, 1:51 a.m. UTC
This will be used by a following commit, to add dummy-numa options.

Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
---
 tests/ofproto-macros.at | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Ilya Maximets June 7, 2016, 12:26 p.m. UTC | #1
For the series:
Acked-by: Ilya Maximets <i.maximets@samsung.com>

One little issue is that initialization of dummy-numa is usually
occurs before enabling of log file. This means that information
about discovered cores and numas not available in ovs-vswitchd.log.
But in testing time this log messages are available inside stderr,
so, it's doesn't really matter.

Best regards, Ilya Maximets.
Daniele Di Proietto June 7, 2016, 9:09 p.m. UTC | #2
On 07/06/2016 05:26, "Ilya Maximets" <i.maximets@samsung.com> wrote:

>For the series:

>Acked-by: Ilya Maximets <i.maximets@samsung.com>


Thanks for the prompt review!

>

>One little issue is that initialization of dummy-numa is usually

>occurs before enabling of log file. This means that information

>about discovered cores and numas not available in ovs-vswitchd.log.

>But in testing time this log messages are available inside stderr,

>so, it's doesn't really matter.


You're right, I didn't realize that

I changed ovs_numa_init_dummy() to ovs_numa_set_dummy() and postponed
the actual initialization to ovs_numa_init() to fix this problem.

With that changed I pushed this to master.

>

>Best regards, Ilya Maximets.
diff mbox

Patch

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index 632f747..105d9ca 100644
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -285,7 +285,8 @@  m4_define([_OVS_VSWITCHD_START],
 /dpdk|INFO|DPDK Disabled - to change this requires a restart./d']])
 ])
 
-# OVS_VSWITCHD_START([vsctl-args], [vsctl-output], [=override])
+# OVS_VSWITCHD_START([vsctl-args], [vsctl-output], [=override],
+#                    [vswitchd-aux-args])
 #
 # Creates a database and starts ovsdb-server, starts ovs-vswitchd
 # connected to that database, calls ovs-vsctl to create a bridge named
@@ -298,8 +299,11 @@  m4_define([_OVS_VSWITCHD_START],
 # =override (literally) as the third argument.  Otherwise, system devices
 # won't work at all (which makes sense because tests should not access a
 # system's real Ethernet devices).
+#
+# 'vswitchd-aux-args' provides a way to pass extra command line arguments
+# to ovs-vswitchd
 m4_define([OVS_VSWITCHD_START],
-  [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system])
+  [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system $4])
    AT_CHECK([add_of_br 0 $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2])
 ])