From 8caa0029534690dbd38c10b507c473c495ab63dd Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 27 Feb 2014 17:56:11 +0900 Subject: [PATCH] of14: Add optical property to port stats reply unit test Signed-off-by: Simon Horman --- .../of14/5-30-ofp_port_stats_reply.packet | Bin 256 -> 304 bytes ryu/tests/packet_data_generator/src/x5.erl | 14 ++++++++++++- .../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 index 53acde2c43d402ddb46300eae6b12929c7c2abf2..5ce188b08612d08a1334e69d7af55eba56c05b90 100644 GIT binary patch literal 304 zcmZP-W;9>`0TwXHz_0>LvqO346igLVoG}1h0T#Xn7BNgAMg|?IATt94>m3FLracS{ nj9-x1>=)QCFzPT0g4I=kNj5ZtVD5v`F!#Y|G}WkFqTC4p{d@`! literal 256 zcmZP-W@G>Z76`>q0jAlZJah`C3M$SRfUW=wUjvI6rVzwlHZ%#CeNY-^AB;v*jmjm; FUI1YA0%`yN 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,