openstack/os-ken
Code Issues Proposed changes

sw test tool: Remove unused codes

Browse Source 
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
This commit is contained in:
Yuichi Ito 2014-05-08 14:03:26 +09:00 committed by FUJITA Tomonori
parent f7ca84d4ce
commit 5e60f0250c
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1048,23 +1048,20 @@ class OpenFlowSw(object):
self.dp.send_msg(msg)
return msg.xid
def add_flow(self, flow_mod=None, in_port=None, out_port=None):
def add_flow(self, in_port=None, out_port=None):
""" Add flow. """
ofp = self.dp.ofproto
parser = self.dp.ofproto_parser
if flow_mod:
mod = flow_mod
else:
match = parser.OFPMatch(in_port=in_port)
max_len = (0 if out_port != ofp.OFPP_CONTROLLER
else ofp.OFPCML_MAX)
actions = [parser.OFPActionOutput(out_port, max_len)]
inst = [parser.OFPInstructionActions(ofp.OFPIT_APPLY_ACTIONS,
actions)]
mod = parser.OFPFlowMod(self.dp, cookie=0,
command=ofp.OFPFC_ADD,
match=match, instructions=inst)
match = parser.OFPMatch(in_port=in_port)
max_len = (0 if out_port != ofp.OFPP_CONTROLLER
else ofp.OFPCML_MAX)
actions = [parser.OFPActionOutput(out_port, max_len)]
inst = [parser.OFPInstructionActions(ofp.OFPIT_APPLY_ACTIONS,
actions)]
mod = parser.OFPFlowMod(self.dp, cookie=0,
command=ofp.OFPFC_ADD,
match=match, instructions=inst)
return self._send_msg(mod)
def send_barrier_request(self):