mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-09 06:16:10 +02:00
Code Issues Projects Releases Wiki Activity

sw test tool: Reduce similar methods of initializing flows

Browse Source 
_test_initialize_flow_tester() is merged into _test_initialize_flow().

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Yuichi Ito 2014-05-21 17:22:02 +09:00 committed by FUJITA Tomonori
parent cc47d4d9f2
commit d02ab63a7d
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ryu/tests/switch/tester.py
View File

@ -381,8 +381,9 @@ class OfTester(app_manager.RyuApp):
try:
# Initialize.
self._test(STATE_INIT_METER)
self._test(STATE_INIT_FLOW)
self._test(STATE_INIT_THROUGHPUT_FLOW)
self._test(STATE_INIT_FLOW, self.target_sw)
self._test(STATE_INIT_THROUGHPUT_FLOW, self.tester_sw,
THROUGHPUT_COOKIE)
# Install flows.
for flow in test.prerequisite:
if isinstance(flow, ofproto_v1_3_parser.OFPFlowMod):
@ -491,7 +492,7 @@ class OfTester(app_manager.RyuApp):
def _test(self, state, *args):
test = {STATE_INIT_FLOW: self._test_initialize_flow,
STATE_INIT_THROUGHPUT_FLOW: self._test_initialize_flow_tester,
STATE_INIT_THROUGHPUT_FLOW: self._test_initialize_flow,
STATE_INIT_METER: self.target_sw.del_meters,
STATE_FLOW_INSTALL: self._test_msg_install,
STATE_THROUGHPUT_FLOW_INSTALL: self._test_msg_install,
@ -515,23 +516,11 @@ class OfTester(app_manager.RyuApp):
self.state = state
return test[state](*args)
def _test_initialize_flow(self):
xid = self.target_sw.del_flows()
def _test_initialize_flow(self, datapath, cookie=0):
xid = datapath.del_flows(cookie)
self.send_msg_xids.append(xid)
xid = self.target_sw.send_barrier_request()
self.send_msg_xids.append(xid)
self._wait()
assert len(self.rcv_msgs) == 1
msg = self.rcv_msgs[0]
assert isinstance(msg, ofproto_v1_3_parser.OFPBarrierReply)
def _test_initialize_flow_tester(self):
xid = self.tester_sw.del_flows(THROUGHPUT_COOKIE)
self.send_msg_xids.append(xid)
xid = self.tester_sw.send_barrier_request()
xid = datapath.send_barrier_request()
self.send_msg_xids.append(xid)
self._wait()