From 6e2f80e2d76b01dfce34dcaa89ec442aa3d0140e Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 27 Feb 2014 17:56:16 +0900 Subject: of14: Add optical property to port mod reply unit test Signed-off-by: Simon Horman --- ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet | Bin 40 -> 64 bytes ryu/tests/packet_data_generator/src/x5.erl | 8 +++++++- .../unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json | 11 +++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet b/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet index 9cb5a590..9fb56651 100644 Binary files a/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet and b/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet differ diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl index 70a16760..6918ba35 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -491,7 +491,13 @@ x() -> #ofp_port_mod{port_no = 1, hw_addr = <<0,17,0,0,17,17>>, config = [],mask = [], properties = - [#ofp_port_mod_prop_ethernet{advertise = [fiber]}]}, + [#ofp_port_mod_prop_ethernet{advertise = [fiber]}, + #ofp_port_mod_prop_optical{ + configure = [rx_tune, tx_tune], + freq_lmda = 1500, + fl_offset = 2000, + grid_span = 3000, + tx_pwr = 300}]}, #ofp_table_mod{ properties = [#ofp_table_mod_prop_eviction{flags = []}, diff --git a/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json index ce0f13b1..1aa57127 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json @@ -10,6 +10,17 @@ "length": 8, "advertise": 4096 } + }, + { + "OFPPortModPropOptical": { + "length": 24, + "type": 1, + "configure": 3, + "freq_lmda": 1500, + "fl_offset": 2000, + "grid_span": 3000, + "tx_pwr": 300 + } } ], "port_no": 1 -- cgit v1.2.3