From: Shaun Crampton <[email protected]> Various minor fixes to OF1.3 parser.
- Fix undefined variables and missing import. - Add missing OFPP_NONE constant, which is equivalent to OFPP_ANY. Signed-off-by: Shaun Crampton <[email protected]> --- ryu/ofproto/ofproto_v1_3.py | 3 ++- ryu/ofproto/ofproto_v1_3_parser.py | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_3.py b/ryu/ofproto/ofproto_v1_3.py index 3a40eef..39d7dff 100644 --- a/ryu/ofproto/ofproto_v1_3.py +++ b/ryu/ofproto/ofproto_v1_3.py @@ -97,7 +97,8 @@ OFPP_FLOOD = 0xfffffffb # All physical ports except input port and OFPP_ALL = 0xfffffffc # All physical ports except input port. OFPP_CONTROLLER = 0xfffffffd # Send to controller. OFPP_LOCAL = 0xfffffffe # Local openflow "port". -OFPP_ANY = 0xffffffff # Not associated with a physical port. +OFPP_ANY = 0xffffffff # Not associated with a physical port. +OFPP_NONE = 0xffffffff # Not associated with a physical port. # All ones is used to indicate all queues in a port (for stats retrieval). OFPQ_ALL = 0xffffffff diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index 80a777d..3645d2d 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -24,6 +24,7 @@ from . import ofproto_parser from . import ofproto_v1_3 import logging +import itertools LOG = logging.getLogger('ryu.ofproto.ofproto_v1_3_parser') _MSG_PARSERS = {} @@ -1832,7 +1833,7 @@ class OFPActionPopMpls(OFPAction): class OFPActionSetField(OFPAction): def __init__(self, field): super(OFPActionSetField, self).__init__() - set.field = field + self.field = field @classmethod def parser(cls, buf, offset): @@ -1884,13 +1885,12 @@ class OFPBucket(object): @classmethod def parser(cls, buf, offset): - (msg.len, msg.weigth, msg.watch_port, - msg.watch_group) = struct.unpack_from( - ofproto_v1_3.OFP_BUCKET_PACK_STR, buf, offset) + (len_, weight, watch_port, watch_group) = struct.unpack_from( + ofproto_v1_3.OFP_BUCKET_PACK_STR, buf, offset) + msg = cls(len_, weight, watch_port, watch_group, []) length = ofproto_v1_3.OFP_BUCKET_SIZE offset += ofproto_v1_3.OFP_BUCKET_SIZE - msg.actions = [] while length < msg.len: action = OFPAction.parser(buf, offset) msg.actions.append(action) @@ -2402,7 +2402,7 @@ class OFPGroupFeaturesStatsReply(OFPMultipartReply): class OFPMeterBandStats(object): def __init__(self, packet_band_count, byte_band_count): super(OFPMeterBandStats, self).__init__() - self.packet_band_count = packet_bound_count + self.packet_band_count = packet_band_count self.byte_band_count = byte_band_count @classmethod -- 1.7.9.5 ------------------------------------------------------------------------------ Try New Relic Now & We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
