test: add WAIT_FOR_DUMMY_PORTS helper macro for writing tests

Add a macro to waiting until all ports supplied are connected.

CC: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>

diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at
index b4b6dab..85ecc5c 100644 (file)
--- a/tests/ofproto-macros.at
+++ b/tests/ofproto-macros.at
@@ -123,3 +123,12 @@ m4_define([ADD_OF_PORTS],
  [ovs-vsctl m4_foreach([of_port], m4_cdr($@),
     [ \
     -- add-port $1 p[]of_port -- set Interface p[]of_port type=dummy ofport_request=of_port])])
+
+# WAIT_FOR_DUMMY_PORTS(NETDEV_DUMMY_PORT[, NETDEV_DUMMY_PORT...])
+#
+# Wait until the netdev dummy ports are connected to each other
+m4_define([WAIT_FOR_DUMMY_PORTS], \
+  [m4_foreach([dummy_port], [$@],
+      [  \
+        OVS_WAIT_WHILE([ovs-appctl netdev-dummy/conn-state dummy_port \
+                  | grep 'unknown\|disconnected'])])])