summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYuichi Ito <ito.yuichi0@gmail.com>2014-05-27 10:03:08 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-05-27 20:24:17 +0900
commit2b4500ab3d738736d0699bf2f884b6ed88baf176 (patch)
treecb272fd048ac077e1f9581efd0398cc2a4520851
parent41a52adaf8506bbbc1f2be007717990ebff2bba1 (diff)
sw test tool: Add a link between switches
This change is for tests that use group_table. Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rwxr-xr-xryu/tests/switch/run_mininet.py1
-rw-r--r--ryu/tests/switch/tester.py18
2 files changed, 10 insertions, 9 deletions
diff --git a/ryu/tests/switch/run_mininet.py b/ryu/tests/switch/run_mininet.py
index 03bb91d7..9dce788d 100755
--- a/ryu/tests/switch/run_mininet.py
+++ b/ryu/tests/switch/run_mininet.py
@@ -36,6 +36,7 @@ if '__main__' == __name__:
Link(s1, s2)
Link(s1, s2)
+ Link(s1, s2)
net.build()
c0.start()
diff --git a/ryu/tests/switch/tester.py b/ryu/tests/switch/tester.py
index aef92b6d..ebc3e3d7 100644
--- a/ryu/tests/switch/tester.py
+++ b/ryu/tests/switch/tester.py
@@ -51,15 +51,15 @@ from ryu.ofproto import ofproto_v1_3_parser
""" Required test network:
- +-----------+
- +----------| target sw | The switch to be tested
- | +-----------+
- +------------+ (1) (2)
- | controller | | |
- +------------+ (1) (2)
- | +-----------+
- +----------| tester sw | OpenFlow Switch
- +-----------+
+ +-------------------+
+ +----------| target sw | The switch to be tested
+ | +-------------------+
+ +------------+ (1) (2) (3)
+ | controller | | | |
+ +------------+ (1) (2) (3)
+ | +-------------------+
+ +----------| tester sw | OpenFlow Switch
+ +-------------------+
(X) : port number