openstack/deb-ryu
Code Issues Proposed changes

ofctl v1.0/v1.2: add miss_send_len for packet in

Browse Source 
Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka@nttcom.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
watanabe.fumitaka 2013-09-03 17:06:42 +09:00 committed by FUJITA Tomonori
parent 23013d8389
commit 05cdadc900
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ryu/lib/ofctl_v1_0.py
View File

@ -33,7 +33,12 @@ def to_actions(dp, acts):
action_type = a.get('type')
if action_type == 'OUTPUT':
out_port = int(a.get('port', ofproto_v1_0.OFPP_NONE))
actions.append(dp.ofproto_parser.OFPActionOutput(out_port))
if out_port == dp.ofproto.OFPP_CONTROLLER:
miss_send_len = ofproto_v1_0.OFP_DEFAULT_MISS_SEND_LEN
actions.append(dp.ofproto_parser.OFPActionOutput(
out_port, max_len=miss_send_len))
else:
actions.append(dp.ofproto_parser.OFPActionOutput(out_port))
elif action_type == 'SET_VLAN_VID':
vlan_vid = int(a.get('vlan_vid', 0xffff))
actions.append(dp.ofproto_parser.OFPActionVlanVid(vlan_vid))

5
ryu/lib/ofctl_v1_2.py
View File

@ -36,7 +36,10 @@ def to_actions(dp, acts):
action_type = a.get('type')
if action_type == 'OUTPUT':
out_port = int(a.get('port', ofproto_v1_2.OFPP_ANY))
actions = [dp.ofproto_parser.OFPActionOutput(out_port, 0)]
miss_send_len = (128 if out_port == dp.ofproto.OFPP_CONTROLLER
else 0)
actions = [dp.ofproto_parser.OFPActionOutput(
out_port, max_len=miss_send_len)]
inst_type = dp.ofproto.OFPIT_APPLY_ACTIONS
inst = [dp.ofproto_parser.OFPInstructionActions(
inst_type, actions)]