diff options
| author | Yusuke Iwase <iwase.yusuke0@gmail.com> | 2015-07-22 14:08:48 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-07-22 19:01:01 +0900 |
| commit | 8cb9b9a67aeb5e8c0b55fc527e00343fad347a55 (patch) | |
| tree | 65ee6395f8148da88106e86e3ce994e6e5dd95a8 | |
| parent | 7e313b90fd32248a131ee4e32a9a454aeced7af3 (diff) | |
ofproto_v1_[45]_parser: Rename Port Description Properties class
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 <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_4_parser.py | 10 | ||||
| -rw-r--r-- | 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 b9b873fc..4ef644fc 100644 --- a/ryu/ofproto/ofproto_v1_4_parser.py +++ b/ryu/ofproto/ofproto_v1_4_parser.py @@ -886,11 +886,11 @@ class OFPPropCommonExperimenter4ByteData(StringifyMixin): return buf -class OFPPortProp(OFPPropBase): +class OFPPortDescProp(OFPPropBase): _TYPES = {} -@OFPPortProp.register_type(ofproto.OFPPDPT_ETHERNET) +@OFPPortDescProp.register_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): @@ -913,7 +913,7 @@ class OFPPortDescPropEthernet(StringifyMixin): return ether -@OFPPortProp.register_type(ofproto.OFPPDPT_OPTICAL) +@OFPPortDescProp.register_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, @@ -944,7 +944,7 @@ class OFPPortDescPropOptical(StringifyMixin): return optical -@OFPPortProp.register_type(ofproto.OFPPDPT_EXPERIMENTER) +@OFPPortDescProp.register_type(ofproto.OFPPDPT_EXPERIMENTER) class OFPPortDescPropExperimenter(OFPPropCommonExperimenter4ByteData): pass @@ -1845,7 +1845,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 4f173770..123a56ec 100644 --- a/ryu/ofproto/ofproto_v1_5_parser.py +++ b/ryu/ofproto/ofproto_v1_5_parser.py @@ -1027,11 +1027,11 @@ class OFPPropCommonExperimenter4ByteData(StringifyMixin): return buf -class OFPPortProp(OFPPropBase): +class OFPPortDescProp(OFPPropBase): _TYPES = {} -@OFPPortProp.register_type(ofproto.OFPPDPT_ETHERNET) +@OFPPortDescProp.register_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): @@ -1054,7 +1054,7 @@ class OFPPortDescPropEthernet(StringifyMixin): return ether -@OFPPortProp.register_type(ofproto.OFPPDPT_OPTICAL) +@OFPPortDescProp.register_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, @@ -1085,7 +1085,7 @@ class OFPPortDescPropOptical(StringifyMixin): return optical -@OFPPortProp.register_type(ofproto.OFPPDPT_EXPERIMENTER) +@OFPPortDescProp.register_type(ofproto.OFPPDPT_EXPERIMENTER) class OFPPortDescPropExperimenter(OFPPropCommonExperimenter4ByteData): pass @@ -1986,7 +1986,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 |