diff options
| author | Simon Horman <horms@verge.net.au> | 2014-02-26 16:26:02 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-02-27 13:59:24 +0900 |
| commit | 948be70411fe3c499175bde1067e982c05940a12 (patch) | |
| tree | 1d928832b0794d2a779e51a4b9fbe4b1a629e427 | |
| parent | f03ff4118636fd668d067cfaedaa03783a52beac (diff) | |
of14: Add optical property to port desc reply unit test
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet | bin | 160 -> 200 bytes | |||
| -rw-r--r-- | ryu/tests/packet_data_generator/src/x5.erl | 12 | ||||
| -rw-r--r-- | ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json | 17 |
3 files changed, 27 insertions, 2 deletions
diff --git a/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet b/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet Binary files differindex 411bf209..595d023b 100644 --- a/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet +++ b/ryu/tests/packet_data/of14/5-52-ofp_port_desc_reply.packet diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl index af79f2f3..14bb17b8 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -719,7 +719,17 @@ x() -> advertised = [copper,autoneg], supported = ['100mb_fd',copper,autoneg], peer = ['100mb_fd',copper,autoneg], - curr_speed = 5000,max_speed = 5000}]}, + curr_speed = 5000,max_speed = 5000}, + #ofp_port_desc_prop_optical{ + supported = [rx_tune], + tx_min_freq_lmda = 1000, + tx_max_freq_lmda = 2000, + tx_grid_freq_lmda = 1500, + rx_min_freq_lmda = 1000, + rx_max_freq_lmda = 2000, + rx_grid_freq_lmda = 1500, + tx_pwr_min = 1000, + tx_pwr_max = 2000}]}, #ofp_port{port_no = 6,hw_addr = <<"\362\v\244}\370\352">>, name = <<"Port6">>,config = [], state = [live], diff --git a/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json index f64bb18c..babb861c 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-52-ofp_port_desc_reply.packet.json @@ -5,7 +5,7 @@ "OFPPort": { "config": 0, "hw_addr": "f2:0b:a4:d0:3f:70", - "length": 72, + "length": 112, "name": "Port7", "properties": [ { @@ -19,6 +19,21 @@ "peer": 10248, "supported": 10248 } + }, + { + "OFPPortDescPropOptical": { + "length": 40, + "type": 1, + "rx_grid_freq_lmda": 1500, + "rx_max_freq_lmda": 2000, + "rx_min_freq_lmda": 1000, + "supported": 1, + "tx_grid_freq_lmda": 1500, + "tx_max_freq_lmda": 2000, + "tx_min_freq_lmda": 1000, + "tx_pwr_max": 2000, + "tx_pwr_min": 1000 + } } ], "port_no": 7, |