diff options
| author | Minoru TAKAHASHI <takahashi.minoru7@gmail.com> | 2016-02-18 13:06:11 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-02-18 13:24:06 +0900 |
| commit | 6b3c4dfd4350b621f00ebe2593d92a16f2e542ca (patch) | |
| tree | 709494a8ccae16d2e2b109ddd02ebb5a4279e65b | |
| parent | ede171c5298bc892fc24700d742eeeb613e5c27f (diff) | |
ofproto: Fixes invalid async config property types
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>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_4.py | 11 | ||||
| -rw-r--r-- | ryu/ofproto/ofproto_v1_4_parser.py | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ryu/ofproto/ofproto_v1_4.py b/ryu/ofproto/ofproto_v1_4.py index 3f107eb7..02b07b1b 100644 --- a/ryu/ofproto/ofproto_v1_4.py +++ b/ryu/ofproto/ofproto_v1_4.py @@ -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' diff --git a/ryu/ofproto/ofproto_v1_4_parser.py b/ryu/ofproto/ofproto_v1_4_parser.py index 1c303483..97426d72 100644 --- a/ryu/ofproto/ofproto_v1_4_parser.py +++ b/ryu/ofproto/ofproto_v1_4_parser.py @@ -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 |