openstack/os-ken
Code Issues Proposed changes

of: Fix name of class member variables

Browse Source 
Fix name of class member variables in OFPMeterFeaturesStats
to reflect OpenFlow Specification.

Accordingly, fix json pattern files for unit tests.

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:
IWASE Yusuke 2014-09-30 10:53:45 +09:00 committed by FUJITA Tomonori
parent 8f07bb29a9
commit 223dab9afe
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ryu/ofproto/ofproto_v1_3_parser.py
View File

@ -4732,7 +4732,7 @@ class OFPMeterConfigStatsReply(OFPMultipartReply):
class OFPMeterFeaturesStats(ofproto_parser.namedtuple('OFPMeterFeaturesStats',
('max_meter', 'band_types', 'capabilities',
'max_band', 'max_color'))):
'max_bands', 'max_color'))):
@classmethod
def parser(cls, buf, offset):
meter_features = struct.unpack_from(
@ -4792,10 +4792,10 @@ class OFPMeterFeaturesStatsReply(OFPMultipartReply):
features = []
for stat in ev.msg.body:
features.append('max_meter=%d band_types=0x%08x '
'capabilities=0x%08x max_band=%d '
'capabilities=0x%08x max_bands=%d '
'max_color=%d' %
(stat.max_meter, stat.band_types,
stat.capabilities, stat.max_band,
stat.capabilities, stat.max_bands,
stat.max_color))
self.logger.debug('MeterFeaturesStats: %s', configs)
"""

6
ryu/ofproto/ofproto_v1_4_parser.py
View File

@ -3347,7 +3347,7 @@ class OFPMeterConfigStatsReply(OFPMultipartReply):
class OFPMeterFeaturesStats(ofproto_parser.namedtuple('OFPMeterFeaturesStats',
('max_meter', 'band_types', 'capabilities',
'max_band', 'max_color'))):
'max_bands', 'max_color'))):
@classmethod
def parser(cls, buf, offset):
meter_features = struct.unpack_from(
@ -3407,10 +3407,10 @@ class OFPMeterFeaturesStatsReply(OFPMultipartReply):
features = []
for stat in ev.msg.body:
features.append('max_meter=%d band_types=0x%08x '
'capabilities=0x%08x max_band=%d '
'capabilities=0x%08x max_bands=%d '
'max_color=%d' %
(stat.max_meter, stat.band_types,
stat.capabilities, stat.max_band,
stat.capabilities, stat.max_bands,
stat.max_color))
self.logger.debug('MeterFeaturesStats: %s', configs)
"""

2
ryu/tests/unit/ofproto/json/of13/4-52-ofp_meter_features_reply.packet.json
View File

@ -5,7 +5,7 @@
"OFPMeterFeaturesStats": {
"band_types": 2147483654,
"capabilities": 15,
"max_band": 255,
"max_bands": 255,
"max_color": 0,
"max_meter": 16777216
}

2
ryu/tests/unit/ofproto/json/of14/5-50-ofp_meter_features_reply.packet.json
View File

@ -5,7 +5,7 @@
"OFPMeterFeaturesStats": {
"band_types": 2147483654,
"capabilities": 15,
"max_band": 255,
"max_bands": 255,
"max_color": 0,
"max_meter": 16777216
}