diff options
| author | Simon Horman <horms@verge.net.au> | 2014-02-27 17:56:16 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-02-27 22:29:57 +0900 |
| commit | 6e2f80e2d76b01dfce34dcaa89ec442aa3d0140e (patch) | |
| tree | 15135dbd07b0ed853fef10be407c2dd6726f0fc3 | |
| parent | 55b89f0bd8f41f443b3f4d924ebf25a2482092ab (diff) | |
of14: Add optical property to port mod reply unit test
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet | bin | 40 -> 64 bytes | |||
| -rw-r--r-- | ryu/tests/packet_data_generator/src/x5.erl | 8 | ||||
| -rw-r--r-- | ryu/tests/unit/ofproto/json/of14/5-22-ofp_port_mod.packet.json | 11 |
3 files changed, 18 insertions, 1 deletions
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 Binary files differindex 9cb5a590..9fb56651 100644 --- a/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet +++ b/ryu/tests/packet_data/of14/5-22-ofp_port_mod.packet 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 |