tests: Add system-userspace-testsuite.

[cascardo/ovs.git] / tests / system-kmod-macros.at

diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at
index c74d348..eacdc5d 100644 (file)
--- a/tests/system-kmod-macros.at
+++ b/tests/system-kmod-macros.at
@@ -1,4 +1,10 @@
-# OVS_KMOD_VSWITCHD_START([vsctl-args], [vsctl-output], [=override])
+# ADD_BR([name])
+#
+# Expands into the proper ovs-vsctl commands to create a bridge with the
+# appropriate type
+m4_define([ADD_BR], [[add-br $1]])
+
+# OVS_TRAFFIC_VSWITCHD_START([vsctl-args], [vsctl-output], [=override])
 #
 # Creates a database and starts ovsdb-server, starts ovs-vswitchd
 # connected to that database, calls ovs-vsctl to create a bridge named
@@ -7,23 +13,22 @@
 # output (e.g. because it includes "create" commands) then 'vsctl-output'
 # specifies the expected output after filtering through uuidfilt.pl.
 #
-m4_define([OVS_KMOD_VSWITCHD_START],
+m4_define([OVS_TRAFFIC_VSWITCHD_START],
   [ AT_CHECK([modprobe openvswitch])
     ON_EXIT([modprobe -r openvswitch])
    _OVS_VSWITCHD_START([])
    dnl Add bridges, ports, etc.
-   AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2])
+   AT_CHECK([ovs-vsctl -- ADD_BR([br0]) -- set bridge br0 protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]] fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2])
 ])
-#
-#
-# OVS_KMOD_VSWITCHD_STOP([WHITELIST], [extra_cmds])
+
+# OVS_TRAFFIC_VSWITCHD_STOP([WHITELIST], [extra_cmds])
 #
 # Gracefully stops ovs-vswitchd and ovsdb-server, checking their log files
 # for messages with severity WARN or higher and signaling an error if any
 # is present.  The optional WHITELIST may contain shell-quoted "sed"
 # commands to delete any warnings that are actually expected, e.g.:
 #
-#   OVS_KMOD_VSWITCHD_STOP(["/expected error/d"])
+#   OVS_TRAFFIC_VSWITCHD_STOP(["/expected error/d"])
 #
 # 'extra_cmds' are shell commands to be executed afte OVS_VSWITCHD_STOP() is
 # invoked. They can be used to perform additional cleanups such as name space