mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 22:06:10 +02:00
Code Issues Projects Releases Wiki Activity

of-wire json: adapt OF13 OFPMeterBand

Browse Source 
prefix OFPMeterBand.type and len with _ to avoid being picked by
stringifymixin.
they are redundant as json representation has python class name
like OFPMeterBandDrop.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-07-19 15:32:10 +09:00 committed by FUJITA Tomonori
parent 3fc9c42691
commit 60bae5eda5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ryu/ofproto/ofproto_v1_3_parser.py
View File

@ -2625,8 +2625,8 @@ class OFPMeterStatsReply(OFPMultipartReply):
class OFPMeterBand(StringifyMixin):
def __init__(self, type_, len_):
super(OFPMeterBand, self).__init__()
self.type = type_
self.len = len_
self._type = type_
self._len = len_
class OFPMeterBandHeader(OFPMeterBand):
@ -2665,7 +2665,7 @@ class OFPMeterBandDrop(OFPMeterBandHeader):
def serialize(self, buf, offset):
msg_pack_into(ofproto_v1_3.OFP_METER_BAND_DROP_PACK_STR, buf, offset,
self.type, self.len, self.rate, self.burst_size)
self._type, self._len, self.rate, self.burst_size)
@classmethod
def parser(cls, buf, offset):
@ -2688,8 +2688,8 @@ class OFPMeterBandDscpRemark(OFPMeterBandHeader):
def serialize(self, buf, offset):
msg_pack_into(ofproto_v1_3.OFP_METER_BAND_DSCP_REMARK_PACK_STR, buf,
offset, self.type, self.len, self.rate, self.burst_size,
self.prec_level)
offset, self._type, self._len, self.rate,
self.burst_size, self.prec_level)
@classmethod
def parser(cls, buf, offset):
@ -2712,8 +2712,8 @@ class OFPMeterBandExperimenter(OFPMeterBandHeader):
def serialize(self, buf, offset):
msg_pack_into(ofproto_v1_3.OFP_METER_BAND_EXPERIMENTER_PACK_STR, buf,
offset, self.type, self.len, self.rate, self.burst_size,
self.experimenter)
offset, self._type, self._len, self.rate,
self.burst_size, self.experimenter)
@classmethod
def parser(cls, buf, offset):
@ -2746,8 +2746,8 @@ class OFPMeterConfigStats(StringifyMixin):
while length < meter_config._length:
band = OFPMeterBandHeader.parser(buf, offset)
meter_config.bands.append(band)
offset += band.len
length += band.len
offset += band._len
length += band._len
return meter_config