mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-29 20:42:09 +01:00
Code Issues Projects Releases Wiki Activity

ofproto_v1_5_parser: Support OF1.5 OFPGroupDescStats structure

Browse Source 
OpenFlow Spec 1.5 adds properties field which is a list of group
properties.

This patch adds properties field support in group description
multipart reply message.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Yusuke Iwase 2015-08-03 14:24:59 +09:00 committed by FUJITA Tomonori
parent 09cef6dc1d
commit 64df2437ee
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ryu/ofproto/ofproto_v1_5_parser.py
View File

@ -3157,28 +3157,37 @@ class OFPGroupStatsReply(OFPMultipartReply):
class OFPGroupDescStats(StringifyMixin):
def __init__(self, type_=None, group_id=None, buckets=None, length=None):
def __init__(self, type_=None, group_id=None, buckets=[], properties=[],
length=None, bucket_array_len=None):
super(OFPGroupDescStats, self).__init__()
self.length = length
self.type = type_
self.group_id = group_id
self.bucket_array_len = bucket_array_len
self.buckets = buckets
self.properties = properties
@classmethod
def parser(cls, buf, offset):
stats = cls()
(stats.length, stats.type, stats.group_id) = struct.unpack_from(
(stats.length, stats.type, stats.group_id,
stats.bucket_array_len) = struct.unpack_from(
ofproto.OFP_GROUP_DESC_STATS_PACK_STR, buf, offset)
offset += ofproto.OFP_GROUP_DESC_STATS_SIZE
bucket_buf = buf[offset:offset + stats.bucket_array_len]
stats.buckets = []
length = ofproto.OFP_GROUP_DESC_STATS_SIZE
while length < stats.length:
bucket = OFPBucket.parser(buf, offset)
while bucket_buf:
bucket = OFPBucket.parser(bucket_buf, 0)
stats.buckets.append(bucket)
bucket_buf = bucket_buf[bucket.len:]
offset += stats.bucket_array_len
offset += bucket.len
length += bucket.len
rest = buf[offset:offset + stats.length]
while rest:
p, rest = OFPGroupProp.parse(rest)
stats.properties.append(p)
return stats
@ -3241,10 +3250,10 @@ class OFPGroupDescStatsReply(OFPMultipartReply):
descs = []
for stat in ev.msg.body:
descs.append('length=%d type=%d group_id=%d '
'buckets=%s' %
'buckets=%s properties=%' %
(stat.length, stat.type, stat.group_id,
stat.bucket))
self.logger.debug('GroupDescStats: %s', groups)
stat.bucket, repr(stat.properties)))
self.logger.debug('GroupDescStats: %s', descs)
"""
def __init__(self, datapath, type_=None, **kwargs):
super(OFPGroupDescStatsReply, self).__init__(datapath, **kwargs)