diff options
| author | Simon Horman <horms@verge.net.au> | 2014-02-27 17:56:13 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-02-27 22:29:57 +0900 |
| commit | ec5f96daf03e5cfc6f2431579552c1be8e4a437d (patch) | |
| tree | e7dc1419bbf31507bece4935545f35b255315f62 | |
| parent | cd728e3b048546a997818cbb2d3f645e727684f0 (diff) | |
of14: Add experimenter property to port stats reply unit test
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet | bin | 304 -> 360 bytes | |||
| -rw-r--r-- | ryu/tests/packet_data_generator/src/x5.erl | 14 | ||||
| -rw-r--r-- | ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json | 29 |
3 files changed, 41 insertions, 2 deletions
diff --git a/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet b/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet Binary files differindex 5ce188b0..0fd4fea9 100644 --- a/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet +++ b/ryu/tests/packet_data/of14/5-30-ofp_port_stats_reply.packet diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl index d9db1238..70a16760 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -555,7 +555,19 @@ x() -> tx_pwr = 2000, rx_pwr = 2000, bias_current = 300, - temperature = 273}]}, + temperature = 273}, + #ofp_port_stats_prop_experimenter{ + experimenter = 101, + exp_type = 0, + data = <<>>}, + #ofp_port_stats_prop_experimenter{ + experimenter = 101, + exp_type = 1, + data = <<1:32>>}, + #ofp_port_stats_prop_experimenter{ + experimenter = 101, + exp_type = 2, + data = <<1:32,2:32>>}]}, #ofp_port_stats{ port_no = 6,rx_packets = 4,tx_packets = 4,rx_bytes = 336, tx_bytes = 336,rx_dropped = 0,tx_dropped = 0, diff --git a/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json index 0376e7b4..eb39856d 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-30-ofp_port_stats_reply.packet.json @@ -5,7 +5,7 @@ "OFPPortStats": { "duration_nsec": 0, "duration_sec": 0, - "length": 168, + "length": 224, "port_no": 7, "properties": [ { @@ -34,6 +34,33 @@ "type": 1, "tx_grid_span": 500 } + }, + { + "OFPPortStatsPropExperimenter": { + "length": 12, + "type": 65535, + "exp_type": 0, + "experimenter": 101, + "data": [] + } + }, + { + "OFPPortStatsPropExperimenter": { + "length": 16, + "type": 65535, + "exp_type": 1, + "experimenter": 101, + "data": [1] + } + }, + { + "OFPPortStatsPropExperimenter": { + "length": 20, + "type": 65535, + "exp_type": 2, + "experimenter": 101, + "data": [1, 2] + } } ], "rx_bytes": 0, |