openstack/os-ken
Code Issues Proposed changes

ofproto: Fixes invalid async config property types

Browse Source 
The following types are presents in Openflow Spec v1.4.0 and 1.4.1.

OFPTFPT_EXPERIMENTER_SLAVE = 0xFFFE
OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF

Prefix of async config property type should be 'OFPACPT_' but the above are starting with 'OFPTFPT_'.
Because these types have been fixed in Openflow v1.5.0, this patch fixes the above types in ofproto_v1_4.py as follows.

OFPTFPT_EXPERIMENTER_SLAVE = 0xFFFE  <-- treated as deprecated[*1]
OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF <-- treated as deprecated[*1]
OFPACPT_EXPERIMENTER_SLAVE = 0xFFFE
OFPACPT_EXPERIMENTER_MASTER = 0xFFFF

[*1] OFPTFPT_EXPERIMENTER_SLAVE/MASTER are left in ofproto_v1_4.py for backward compatibility.

Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2016-02-18 13:06:11 +09:00 committed by FUJITA Tomonori
parent ede171c529
commit 6b3c4dfd43
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ryu/ofproto/ofproto_v1_4.py
View File

@ -1406,8 +1406,15 @@ OFPACPT_TABLE_STATUS_SLAVE = 8 # Table status mask for slave.
OFPACPT_TABLE_STATUS_MASTER = 9 # Table status mask for master.
OFPACPT_REQUESTFORWARD_SLAVE = 10 # RequestForward mask for slave.
OFPACPT_REQUESTFORWARD_MASTER = 11 # RequestForward mask for master.
OFPTFPT_EXPERIMENTER_SLAVE = 0xFFFE # Experimenter for slave.
OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF # Experimenter for master.
OFPTFPT_EXPERIMENTER_SLAVE = 0xFFFE # Experimenter for slave (depracated).
OFPTFPT_EXPERIMENTER_MASTER = 0xFFFF # Experimenter for master (depracated).
# New or updated Ryu applications shall use
# OFPACPT_EXPERIMENTER_SLAVE and OFPACPT_EXPERIMENTER_MASTER.
# The variable name is a typo of in specifications before v1.5.0.
OFPACPT_EXPERIMENTER_SLAVE = 0xFFFE # Experimenter for slave.
OFPACPT_EXPERIMENTER_MASTER = 0xFFFF # Experimenter for master.
# Backporting from ofproto_v1_5 for consistency with
# later OF specs.
# struct ofp_async_config_prop_reasons
OFP_ASYNC_CONFIG_PROP_REASONS_PACK_STR = '!HHI'

4
ryu/ofproto/ofproto_v1_4_parser.py
View File

@ -5419,8 +5419,8 @@ class OFPAsyncConfigPropReasons(OFPAsyncConfigProp):
return buf
@OFPAsyncConfigProp.register_type(ofproto.OFPTFPT_EXPERIMENTER_SLAVE)
@OFPAsyncConfigProp.register_type(ofproto.OFPTFPT_EXPERIMENTER_MASTER)
@OFPAsyncConfigProp.register_type(ofproto.OFPACPT_EXPERIMENTER_SLAVE)
@OFPAsyncConfigProp.register_type(ofproto.OFPACPT_EXPERIMENTER_MASTER)
class OFPAsyncConfigPropExperimenter(OFPPropCommonExperimenter4ByteData):
pass