Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
ryu/ofproto/ofproto_v1_3_parser.py | 78 +++++++++++++++++---------------------
1 file changed, 35 insertions(+), 43 deletions(-)
diff --git a/ryu/ofproto/ofproto_v1_3_parser.py
b/ryu/ofproto/ofproto_v1_3_parser.py
index 0d38dee..7b451da 100644
--- a/ryu/ofproto/ofproto_v1_3_parser.py
+++ b/ryu/ofproto/ofproto_v1_3_parser.py
@@ -1793,9 +1793,7 @@ class OFPInstruction(object):
@OFPInstruction.register_instruction_type([ofproto_v1_3.OFPIT_GOTO_TABLE])
class OFPInstructionGotoTable(StringifyMixin):
- _base_attributes = ['type', 'len']
-
- def __init__(self, table_id):
+ def __init__(self, table_id, type_=None, len_=None):
super(OFPInstructionGotoTable, self).__init__()
self.type = ofproto_v1_3.OFPIT_GOTO_TABLE
self.len = ofproto_v1_3.OFP_INSTRUCTION_GOTO_TABLE_SIZE
@@ -1815,9 +1813,7 @@ class OFPInstructionGotoTable(StringifyMixin):
@OFPInstruction.register_instruction_type([ofproto_v1_3.OFPIT_WRITE_METADATA])
class OFPInstructionWriteMetadata(StringifyMixin):
- _base_attributes = ['type', 'len']
-
- def __init__(self, metadata, metadata_mask):
+ def __init__(self, metadata, metadata_mask, len_=None):
super(OFPInstructionWriteMetadata, self).__init__()
self.type = ofproto_v1_3.OFPIT_WRITE_METADATA
self.len = ofproto_v1_3.OFP_INSTRUCTION_WRITE_METADATA_SIZE
@@ -1841,9 +1837,7 @@ class OFPInstructionWriteMetadata(StringifyMixin):
ofproto_v1_3.OFPIT_APPLY_ACTIONS,
ofproto_v1_3.OFPIT_CLEAR_ACTIONS])
class OFPInstructionActions(StringifyMixin):
- _base_attributes = ['len']
-
- def __init__(self, type_, actions=None):
+ def __init__(self, type_, actions=None, len_=None):
super(OFPInstructionActions, self).__init__()
self.type = type_
self.actions = actions
@@ -1906,8 +1900,6 @@ class OFPInstructionMeter(StringifyMixin):
class OFPActionHeader(StringifyMixin):
- _base_attributes = ['type', 'len']
-
def __init__(self, type_, len_):
self.type = type_
self.len = len_
@@ -1946,7 +1938,7 @@ class OFPAction(OFPActionHeader):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_OUTPUT,
ofproto_v1_3.OFP_ACTION_OUTPUT_SIZE)
class OFPActionOutput(OFPAction):
- def __init__(self, port, max_len):
+ def __init__(self, port, max_len, type_=None, len_=None):
super(OFPActionOutput, self).__init__()
self.port = port
self.max_len = max_len
@@ -1965,7 +1957,7 @@ class OFPActionOutput(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_GROUP,
ofproto_v1_3.OFP_ACTION_GROUP_SIZE)
class OFPActionGroup(OFPAction):
- def __init__(self, group_id):
+ def __init__(self, group_id, type_=None, len_=None):
super(OFPActionGroup, self).__init__()
self.group_id = group_id
@@ -1983,7 +1975,7 @@ class OFPActionGroup(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_SET_QUEUE,
ofproto_v1_3.OFP_ACTION_SET_QUEUE_SIZE)
class OFPActionSetQueue(OFPAction):
- def __init__(self, queue_id):
+ def __init__(self, queue_id, type_=None, len_=None):
super(OFPActionSetQueue, self).__init__()
self.queue_id = queue_id
@@ -2001,7 +1993,7 @@ class OFPActionSetQueue(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_SET_MPLS_TTL,
ofproto_v1_3.OFP_ACTION_MPLS_TTL_SIZE)
class OFPActionSetMplsTtl(OFPAction):
- def __init__(self, mpls_ttl):
+ def __init__(self, mpls_ttl, type_=None, len_=None):
super(OFPActionSetMplsTtl, self).__init__()
self.mpls_ttl = mpls_ttl
@@ -2019,14 +2011,14 @@ class OFPActionSetMplsTtl(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_DEC_MPLS_TTL,
ofproto_v1_3.OFP_ACTION_HEADER_SIZE)
class OFPActionDecMplsTtl(OFPAction):
- def __init__(self):
+ def __init__(self, type_=None, len_=None):
super(OFPActionDecMplsTtl, self).__init__()
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_SET_NW_TTL,
ofproto_v1_3.OFP_ACTION_NW_TTL_SIZE)
class OFPActionSetNwTtl(OFPAction):
- def __init__(self, nw_ttl):
+ def __init__(self, nw_ttl, type_=None, len_=None):
super(OFPActionSetNwTtl, self).__init__()
self.nw_ttl = nw_ttl
@@ -2044,7 +2036,7 @@ class OFPActionSetNwTtl(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_DEC_NW_TTL,
ofproto_v1_3.OFP_ACTION_HEADER_SIZE)
class OFPActionDecNwTtl(OFPAction):
- def __init__(self):
+ def __init__(self, type_=None, len_=None):
super(OFPActionDecNwTtl, self).__init__()
@classmethod
@@ -2056,7 +2048,7 @@ class OFPActionDecNwTtl(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_COPY_TTL_OUT,
ofproto_v1_3.OFP_ACTION_HEADER_SIZE)
class OFPActionCopyTtlOut(OFPAction):
- def __init__(self):
+ def __init__(self, type_=None, len_=None):
super(OFPActionCopyTtlOut, self).__init__()
@classmethod
@@ -2068,7 +2060,7 @@ class OFPActionCopyTtlOut(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_COPY_TTL_IN,
ofproto_v1_3.OFP_ACTION_HEADER_SIZE)
class OFPActionCopyTtlIn(OFPAction):
- def __init__(self):
+ def __init__(self, type_=None, len_=None):
super(OFPActionCopyTtlIn, self).__init__()
@classmethod
@@ -2080,7 +2072,7 @@ class OFPActionCopyTtlIn(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_PUSH_VLAN,
ofproto_v1_3.OFP_ACTION_PUSH_SIZE)
class OFPActionPushVlan(OFPAction):
- def __init__(self, ethertype):
+ def __init__(self, ethertype, type_=None, len_=None):
super(OFPActionPushVlan, self).__init__()
self.ethertype = ethertype
@@ -2098,7 +2090,7 @@ class OFPActionPushVlan(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_PUSH_MPLS,
ofproto_v1_3.OFP_ACTION_PUSH_SIZE)
class OFPActionPushMpls(OFPAction):
- def __init__(self, ethertype):
+ def __init__(self, ethertype, type_=None, len_=None):
super(OFPActionPushMpls, self).__init__()
self.ethertype = ethertype
@@ -2116,7 +2108,7 @@ class OFPActionPushMpls(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_POP_VLAN,
ofproto_v1_3.OFP_ACTION_HEADER_SIZE)
class OFPActionPopVlan(OFPAction):
- def __init__(self):
+ def __init__(self, type_=None, len_=None):
super(OFPActionPopVlan, self).__init__()
@classmethod
@@ -2128,7 +2120,7 @@ class OFPActionPopVlan(OFPAction):
@OFPAction.register_action_type(ofproto_v1_3.OFPAT_POP_MPLS,
ofproto_v1_3.OFP_ACTION_POP_MPLS_SIZE)
class OFPActionPopMpls(OFPAction):
- def __init__(self, ethertype):
+ def __init__(self, ethertype, type_=None, len_=None):
super(OFPActionPopMpls, self).__init__()
self.ethertype = ethertype
@@ -2259,7 +2251,7 @@ class OFPActionSetField(OFPAction):
ofproto_v1_3.OFPAT_EXPERIMENTER,
ofproto_v1_3.OFP_ACTION_EXPERIMENTER_HEADER_SIZE)
class OFPActionExperimenter(OFPAction):
- def __init__(self, experimenter):
+ def __init__(self, experimenter, type_=None, len_=None):
super(OFPActionExperimenter, self).__init__()
self.experimenter = experimenter
@@ -2275,7 +2267,7 @@ class OFPActionExperimenter(OFPAction):
class OFPBucket(StringifyMixin):
- def __init__(self, weight, watch_port, watch_group, actions):
+ def __init__(self, weight, watch_port, watch_group, actions, len_=None):
super(OFPBucket, self).__init__()
self.weight = weight
self.watch_port = watch_port
@@ -2287,11 +2279,11 @@ class OFPBucket(StringifyMixin):
(len_, weight, watch_port, watch_group) = struct.unpack_from(
ofproto_v1_3.OFP_BUCKET_PACK_STR, buf, offset)
msg = cls(weight, watch_port, watch_group, [])
- msg._len = len_
+ msg.len = len_
length = ofproto_v1_3.OFP_BUCKET_SIZE
offset += ofproto_v1_3.OFP_BUCKET_SIZE
- while length < msg._len:
+ while length < msg.len:
action = OFPAction.parser(buf, offset)
msg.actions.append(action)
offset += action.len
@@ -2307,10 +2299,9 @@ class OFPBucket(StringifyMixin):
action_offset += a.len
action_len += a.len
- self._len = utils.round_up(ofproto_v1_3.OFP_BUCKET_SIZE + action_len,
- 8)
+ self.len = utils.round_up(ofproto_v1_3.OFP_BUCKET_SIZE + action_len, 8)
msg_pack_into(ofproto_v1_3.OFP_BUCKET_PACK_STR, buf, offset,
- self._len, self.weight, self.watch_port,
+ self.len, self.weight, self.watch_port,
self.watch_group)
@@ -2331,7 +2322,7 @@ class OFPGroupMod(MsgBase):
offset = ofproto_v1_3.OFP_GROUP_MOD_SIZE
for b in self.buckets:
b.serialize(self.buf, offset)
- offset += b._len
+ offset += b.len
@_set_msg_type(ofproto_v1_3.OFPT_PORT_MOD)
@@ -2780,8 +2771,8 @@ class OFPGroupDescStats(StringifyMixin):
bucket = OFPBucket.parser(buf, offset)
stats.buckets.append(bucket)
- offset += bucket._len
- length += bucket._len
+ offset += bucket.len
+ length += bucket.len
return stats
@@ -3185,11 +3176,11 @@ class OFPQueueGetConfigRequest(MsgBase):
class OFPQueuePropHeader(StringifyMixin):
def __init__(self, property_, len_):
self._property = property_
- self._len = len_
+ self.len = len_
def serialize(self, buf, offset):
msg_pack_into(ofproto_v1_3.OFP_QUEUE_PROP_HEADER_PACK_STR,
- buf, offset, self._property, self._len)
+ buf, offset, self._property, self.len)
class OFPQueueProp(OFPQueuePropHeader):
@@ -3223,7 +3214,7 @@ class OFPQueueProp(OFPQueuePropHeader):
ofproto_v1_3.OFPQT_MIN_RATE,
ofproto_v1_3.OFP_QUEUE_PROP_MIN_RATE_SIZE)
class OFPQueuePropMinRate(OFPQueueProp):
- def __init__(self, rate):
+ def __init__(self, rate, len_=None):
super(OFPQueuePropMinRate, self).__init__()
self.rate = rate
@@ -3238,7 +3229,7 @@ class OFPQueuePropMinRate(OFPQueueProp):
ofproto_v1_3.OFPQT_MAX_RATE,
ofproto_v1_3.OFP_QUEUE_PROP_MAX_RATE_SIZE)
class OFPQueuePropMaxRate(OFPQueueProp):
- def __init__(self, rate):
+ def __init__(self, rate, len_=None):
super(OFPQueuePropMaxRate, self).__init__()
self.rate = rate
@@ -3253,10 +3244,11 @@ class OFPQueuePropMaxRate(OFPQueueProp):
class OFPPacketQueue(StringifyMixin):
- def __init__(self, queue_id, port, properties):
+ def __init__(self, queue_id, port, properties, len_=None):
super(OFPPacketQueue, self).__init__()
self.queue_id = queue_id
self.port = port
+ self.len = len_
self.properties = properties
@classmethod
@@ -3269,10 +3261,10 @@ class OFPPacketQueue(StringifyMixin):
while length < len_:
queue_prop = OFPQueueProp.parser(buf, offset)
properties.append(queue_prop)
- offset += queue_prop._len
- length += queue_prop._len
+ offset += queue_prop.len
+ length += queue_prop.len
o = cls(queue_id, port, properties)
- o._len = len_
+ o.len = len_
return o
@@ -3298,7 +3290,7 @@ class OFPQueueGetConfigReply(MsgBase):
while offset < msg_len:
queue = OFPPacketQueue.parser(msg.buf, offset)
msg.queues.append(queue)
- offset += queue._len
+ offset += queue.len
return msg
--
1.8.3.1
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
