diff options
| author | Simon Horman <horms@verge.net.au> | 2014-02-27 17:56:11 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-02-27 22:29:56 +0900 |
| commit | 8caa0029534690dbd38c10b507c473c495ab63dd (patch) | |
| tree | 50b7617d53b977f6a525ee68a6cb2bf79531257e | |
| parent | 3634f3c652bd1a77f40f9ff3f8ec38d1373f08e5 (diff) | |
of14: Add optical 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 | 256 -> 304 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 | 19 |
3 files changed, 31 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 53acde2c..5ce188b0 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 de0b3e00..d9db1238 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -543,7 +543,19 @@ x() -> properties = [#ofp_port_stats_prop_ethernet{ rx_frame_err = 0,rx_over_err = 0, - rx_crc_err = 0,collisions = 0}]}, + rx_crc_err = 0,collisions = 0}, + #ofp_port_stats_prop_optical{ + flags = [rx_tune,tx_tune], + tx_freq_lmda = 1500, + tx_offset = 700, + tx_grid_span = 500, + rx_freq_lmda = 1500, + rx_offset = 700, + rx_grid_span = 500, + tx_pwr = 2000, + rx_pwr = 2000, + bias_current = 300, + temperature = 273}]}, #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 5672a3cb..0376e7b4 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": 120, + "length": 168, "port_no": 7, "properties": [ { @@ -17,6 +17,23 @@ "rx_over_err": 0, "type": 0 } + }, + { + "OFPPortStatsPropOptical": { + "bias_current": 300, + "tx_freq_lmda": 1500, + "temperature": 273, + "rx_freq_lmda": 1500, + "tx_pwr": 2000, + "length": 44, + "flags": 3, + "rx_offset": 700, + "rx_grid_span": 500, + "rx_pwr": 2000, + "tx_offset": 700, + "type": 1, + "tx_grid_span": 500 + } } ], "rx_bytes": 0, |