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

sw test tool: Reduce similar methods

Browse Source 
- _test_flow_install()
 - _test_meter_install()

are merged as

 - _test_msg_install()

Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
This commit is contained in:
Yuichi Ito 2014-05-08 14:02:49 +09:00 committed by FUJITA Tomonori
parent 882c28820f
commit f7ca84d4ce
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,7 +389,7 @@ class OfTester(app_manager.RyuApp):
self._test(STATE_FLOW_INSTALL, self.target_sw, flow)
self._test(STATE_FLOW_EXIST_CHK, self.target_sw, flow)
elif isinstance(flow, ofproto_v1_3_parser.OFPMeterMod):
self._test(STATE_METER_INSTALL, flow)
self._test(STATE_METER_INSTALL, self.target_sw, flow)
self._test(STATE_METER_EXIST_CHK, flow)
# Do tests.
for pkt in test.tests:
@ -493,9 +493,9 @@ class OfTester(app_manager.RyuApp):
test = {STATE_INIT_FLOW: self._test_initialize_flow,
STATE_INIT_THROUGHPUT_FLOW: self._test_initialize_flow_tester,
STATE_INIT_METER: self._test_initialize_meter,
STATE_FLOW_INSTALL: self._test_flow_install,
STATE_THROUGHPUT_FLOW_INSTALL: self._test_flow_install,
STATE_METER_INSTALL: self._test_meter_install,
STATE_FLOW_INSTALL: self._test_msg_install,
STATE_THROUGHPUT_FLOW_INSTALL: self._test_msg_install,
STATE_METER_INSTALL: self._test_msg_install,
STATE_FLOW_EXIST_CHK: self._test_flow_exist_check,
STATE_THROUGHPUT_FLOW_EXIST_CHK: self._test_flow_exist_check,
STATE_METER_EXIST_CHK: self._test_meter_exist_check,
@ -542,8 +542,8 @@ class OfTester(app_manager.RyuApp):
def _test_initialize_meter(self):
self.target_sw.del_test_meter()
def _test_flow_install(self, datapath, flow):
xid = datapath.add_flow(flow_mod=flow)
def _test_msg_install(self, datapath, message):
xid = datapath._send_msg(message)
self.send_msg_xids.append(xid)
xid = datapath.send_barrier_request()
@ -554,18 +554,6 @@ class OfTester(app_manager.RyuApp):
msg = self.rcv_msgs[0]
assert isinstance(msg, ofproto_v1_3_parser.OFPBarrierReply)
def _test_meter_install(self, meter):
xid = self.target_sw._send_msg(meter)
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_flow_exist_check(self, datapath, flow_mod):
xid = datapath.send_flow_stats()
self.send_msg_xids.append(xid)