From 2b4500ab3d738736d0699bf2f884b6ed88baf176 Mon Sep 17 00:00:00 2001 From: Yuichi Ito Date: Tue, 27 May 2014 10:03:08 +0900 Subject: [PATCH] sw test tool: Add a link between switches This change is for tests that use group_table. Signed-off-by: Yuichi Ito Signed-off-by: FUJITA Tomonori --- ryu/tests/switch/run_mininet.py | 1 + ryu/tests/switch/tester.py | 18 +++++++++--------- 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 @@ -34,6 +34,7 @@ if '__main__' == __name__: s1 = net.addSwitch('s1') s2 = net.addSwitch('s2') + Link(s1, s2) Link(s1, s2) Link(s1, s2) 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