From 95a93307cb10d9ddb2c4c99a5e2055883371020a Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Mon, 17 Feb 2014 17:14:17 +0900
Subject: [PATCH] tests/run-ryu: Fix setup for Ryu tests

Tweak our configuration to match with Ryu tests' single-bridge assumption.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Tested-by: Simon Horman <horms@verge.net.au>
---
 tests/run-ryu | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/tests/run-ryu b/tests/run-ryu
index b907a5176..05578d493 100755
--- a/tests/run-ryu
+++ b/tests/run-ryu
@@ -86,16 +86,10 @@ do
         -- set interface $port2 ofport_request=2 type=patch options:peer=$peer2
 done
 
-# Run Ryu.
-cd $RYUDIR
 logs=
-for app in \
-    ryu/tests/switch/tester.py \
-    ryu/tests/integrated/test_add_flow_v10.py \
-    ryu/tests/integrated/test_request_reply_v12.py \
-    ryu/tests/integrated/test_add_flow_v12_actions.py \
-    ryu/tests/integrated/test_add_flow_v12_matches.py
-do
+
+run_app() {
+    app=$1
     cat <<EOF
 
 --- Running $app...
@@ -122,6 +116,26 @@ EOF
     done
     kill $pid
     wait
+}
+
+# Run Ryu.
+cd $RYUDIR
+for app in \
+    ryu/tests/switch/tester.py
+do
+    run_app $app
+done
+
+# tweak OVS setup because the following tests assume single bridge.
+run ovs-vsctl -- del-br br1
+
+for app in \
+    ryu/tests/integrated/test_add_flow_v10.py \
+    ryu/tests/integrated/test_request_reply_v12.py \
+    ryu/tests/integrated/test_add_flow_v12_actions.py \
+    ryu/tests/integrated/test_add_flow_v12_matches.py
+do
+    run_app $app
 done
 
 cat <<EOF
-- 
2.43.0