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 <[email protected]> --- ryu/ofproto/ofproto_v1_4.py | 11 +++++++++-- 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 3f107eb..02b07b1 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 1c30348..97426d7 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 [email protected]_type(ofproto.OFPTFPT_EXPERIMENTER_SLAVE) [email protected]_type(ofproto.OFPTFPT_EXPERIMENTER_MASTER) [email protected]_type(ofproto.OFPACPT_EXPERIMENTER_SLAVE) [email protected]_type(ofproto.OFPACPT_EXPERIMENTER_MASTER) class OFPAsyncConfigPropExperimenter(OFPPropCommonExperimenter4ByteData): pass -- 1.9.1 ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
