Merge into master from pull request #417:
fixing support for meter config statistics (https://github.com/floodlight/loxigen/pull/417)
diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index a7415ec..1edabb2 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -1896,7 +1896,7 @@
uint16_t stats_type == 10;
enum ofp_stats_reply_flags flags;
pad(4);
- list(of_meter_band_t) entries;
+ list(of_meter_config_t) entries;
};
// FIXME stats added to get things working
diff --git a/openflow_input/standard-1.4 b/openflow_input/standard-1.4
index 18388bd..20511cc 100644
--- a/openflow_input/standard-1.4
+++ b/openflow_input/standard-1.4
@@ -2224,7 +2224,7 @@
uint16_t stats_type == 10;
enum ofp_stats_reply_flags flags;
pad(4);
- list(of_meter_band_t) entries;
+ list(of_meter_config_t) entries;
};
// FIXME stats added to get things working
diff --git a/test_data/of13/meter_config_stats_reply.data b/test_data/of13/meter_config_stats_reply.data
index 940e4f5..29ac4aa 100644
--- a/test_data/of13/meter_config_stats_reply.data
+++ b/test_data/of13/meter_config_stats_reply.data
@@ -1,25 +1,25 @@
-- binary
04 13 # version, type
-00 30 # length
+00 28 # length
12 34 56 78 # xid
00 0a # stats_type
00 00 # flags
00 00 00 00 # pad
-00 01 # entries[0].type
-00 10 # entries[0].length
-00 00 00 01 # entries[0].rate
-00 00 00 02 # entries[0].burst_size
+00 18 # entires[0].len
+00 00 # entries[0].flags
+00 00 00 01 # entries[0].meterId
+00 01 # entries[0].bands[0].type
+00 10 # entries[0].bands[0].length
+00 00 00 01 # entries[0].bands[0].rate
+00 00 00 02 # entries[0]bands[0].burst_size
00 00 00 00 # pad
-00 02 # entries[1].type
-00 10 # entries[1].length
-00 00 00 03 # entries[1].rate
-00 00 00 04 # entries[1].burst_size
-05 # entries[1].prec_level
-00 00 00 # pad
-- python
ofp.message.meter_config_stats_reply(
xid=0x12345678,
flags=0,
entries=[
- ofp.meter_band.drop(rate=1, burst_size=2),
- ofp.meter_band.dscp_remark(rate=3, burst_size=4, prec_level=5)])
+ ofp.meter_config(flags = 0,
+ meter_id = 1,
+ entries = [
+ ofp.meter_band.drop(rate=1, burst_size=2)])
+ ])