diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2016-02-10 13:58:09 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-02-10 13:52:53 +0900 |
| commit | 5cb8f8ccc7ff64f89ae6e141b0a6186d2e3bb462 (patch) | |
| tree | c20499fb510c20d0a831c4357925a8957c9727ed | |
| parent | a1fd26f89a31810cce3a3c1163671bb644cb591b (diff) | |
ofproto_v1_5_parser: Add missing field in OFPMeterFeaturesStats
"features" field is introduced in OpenFlow 1.5, but this field is
not defined in ofproto_v1_5_parser.py.
This patch adds this missing field.
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_5_parser.py | 2 | ||||
| -rw-r--r-- | ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ryu/ofproto/ofproto_v1_5_parser.py b/ryu/ofproto/ofproto_v1_5_parser.py index 24672ffb..744107c5 100644 --- a/ryu/ofproto/ofproto_v1_5_parser.py +++ b/ryu/ofproto/ofproto_v1_5_parser.py @@ -3309,7 +3309,7 @@ class OFPMeterDescStatsReply(OFPMultipartReply): class OFPMeterFeaturesStats(ofproto_parser.namedtuple('OFPMeterFeaturesStats', ('max_meter', 'band_types', 'capabilities', - 'max_bands', 'max_color'))): + 'max_bands', 'max_color', 'features'))): @classmethod def parser(cls, buf, offset): meter_features = struct.unpack_from( diff --git a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json index e3f6918f..f9fb7848 100644 --- a/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-meter_features_reply.packet.json @@ -5,6 +5,7 @@ "OFPMeterFeaturesStats": { "band_types": 2147483654, "capabilities": 15, + "features": 3, "max_bands": 255, "max_color": 0, "max_meter": 16777216 |