To reflect the name of struct ofp_port_desc_prop_* in OpenFlow Spec 1.4/1.5,
this patch renames "OFPPortProp" to "OFPPortDescProp".
e.g.) in OpenFlow Spec 1.4
struct ofp_port_desc_prop_header {
uint16_t type; /* One of OFPPDPT_*. */
uint16_t length; /* Length in bytes of this property. */
};
Signed-off-by: IWASE Yusuke <[email protected]>
---
ryu/ofproto/ofproto_v1_4_parser.py | 10 +++++-----
ryu/ofproto/ofproto_v1_5_parser.py | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ryu/ofproto/ofproto_v1_4_parser.py
b/ryu/ofproto/ofproto_v1_4_parser.py
index 95339d8..9ef636d 100644
--- a/ryu/ofproto/ofproto_v1_4_parser.py
+++ b/ryu/ofproto/ofproto_v1_4_parser.py
@@ -885,11 +885,11 @@ class OFPPropCommonExperimenter4ByteData(StringifyMixin):
return buf
-class OFPPortProp(OFPPropBase):
+class OFPPortDescProp(OFPPropBase):
_TYPES = {}
[email protected]_type(ofproto.OFPPDPT_ETHERNET)
[email protected]_type(ofproto.OFPPDPT_ETHERNET)
class OFPPortDescPropEthernet(StringifyMixin):
def __init__(self, type_=None, length=None, curr=None, advertised=None,
supported=None, peer=None, curr_speed=None, max_speed=None):
@@ -912,7 +912,7 @@ class OFPPortDescPropEthernet(StringifyMixin):
return ether
[email protected]_type(ofproto.OFPPDPT_OPTICAL)
[email protected]_type(ofproto.OFPPDPT_OPTICAL)
class OFPPortDescPropOptical(StringifyMixin):
def __init__(self, type_=None, length=None, supported=None,
tx_min_freq_lmda=None, tx_max_freq_lmda=None,
@@ -943,7 +943,7 @@ class OFPPortDescPropOptical(StringifyMixin):
return optical
[email protected]_type(ofproto.OFPPDPT_EXPERIMENTER)
[email protected]_type(ofproto.OFPPDPT_EXPERIMENTER)
class OFPPortDescPropExperimenter(OFPPropCommonExperimenter4ByteData):
pass
@@ -1844,7 +1844,7 @@ class OFPPort(StringifyMixin):
props = []
rest = buf[offset + ofproto.OFP_PORT_SIZE:offset + length]
while rest:
- p, rest = OFPPortProp.parse(rest)
+ p, rest = OFPPortDescProp.parse(rest)
props.append(p)
ofpport = cls(port_no, length, hw_addr, name, config, state, props)
return ofpport
diff --git a/ryu/ofproto/ofproto_v1_5_parser.py
b/ryu/ofproto/ofproto_v1_5_parser.py
index d3a8970..94ab55a 100644
--- a/ryu/ofproto/ofproto_v1_5_parser.py
+++ b/ryu/ofproto/ofproto_v1_5_parser.py
@@ -885,11 +885,11 @@ class OFPPropCommonExperimenter4ByteData(StringifyMixin):
return buf
-class OFPPortProp(OFPPropBase):
+class OFPPortDescProp(OFPPropBase):
_TYPES = {}
[email protected]_type(ofproto.OFPPDPT_ETHERNET)
[email protected]_type(ofproto.OFPPDPT_ETHERNET)
class OFPPortDescPropEthernet(StringifyMixin):
def __init__(self, type_=None, length=None, curr=None, advertised=None,
supported=None, peer=None, curr_speed=None, max_speed=None):
@@ -912,7 +912,7 @@ class OFPPortDescPropEthernet(StringifyMixin):
return ether
[email protected]_type(ofproto.OFPPDPT_OPTICAL)
[email protected]_type(ofproto.OFPPDPT_OPTICAL)
class OFPPortDescPropOptical(StringifyMixin):
def __init__(self, type_=None, length=None, supported=None,
tx_min_freq_lmda=None, tx_max_freq_lmda=None,
@@ -943,7 +943,7 @@ class OFPPortDescPropOptical(StringifyMixin):
return optical
[email protected]_type(ofproto.OFPPDPT_EXPERIMENTER)
[email protected]_type(ofproto.OFPPDPT_EXPERIMENTER)
class OFPPortDescPropExperimenter(OFPPropCommonExperimenter4ByteData):
pass
@@ -1844,7 +1844,7 @@ class OFPPort(StringifyMixin):
props = []
rest = buf[offset + ofproto.OFP_PORT_SIZE:offset + length]
while rest:
- p, rest = OFPPortProp.parse(rest)
+ p, rest = OFPPortDescProp.parse(rest)
props.append(p)
ofpport = cls(port_no, length, hw_addr, name, config, state, props)
return ofpport
--
1.9.1
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
