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>
-- set interface $port2 ofport_request=2 type=patch options:peer=$peer2
done
-- set interface $port2 ofport_request=2 type=patch options:peer=$peer2
done
-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
cat <<EOF
--- Running $app...
cat <<EOF
--- Running $app...
+}
+
+# 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