Signed-off-by: Simon Horman <[email protected]>
---
.../packet_data/of14/5-52-ofp_port_desc_reply.packet | Bin 160 -> 200 bytes
ryu/tests/packet_data_generator/src/x5.erl | 12 +++++++++++-
.../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
index
411bf20951facf418fdcc7fd9a511568df3a5930..595d023bfeb5b102c6e706ac2a15e19d659a997a
100644
GIT binary patch
delta 73
zcmZ3$c!E)kRhZ!f0|@YfNf5!#P%u%<S)GwV11iMGz`*<hD1L!~f%OhDoB0L%g^3X!
E0AE`SSpWb4
delta 33
gcmX@XxPVcNRhVG`0|@YfNf5!#;4x9md19kG08Kmu*Z=?k
diff --git a/ryu/tests/packet_data_generator/src/x5.erl
b/ryu/tests/packet_data_generator/src/x5.erl
index c129ebc..e1cbde5 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -716,7 +716,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 f64bb18..a699263 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_req_lmda": 1500,
+ "rx_max_req_lmda": 2000,
+ "rx_min_req_lmda": 1000,
+ "supported": 1,
+ "tx_grid_req_lmda": 1500,
+ "tx_max_req_lmda": 2000,
+ "tx_min_req_lmda": 1000,
+ "tx_pwr_max": 2000,
+ "tx_pwr_min": 1000
+ }
}
],
"port_no": 7,
--
1.8.5.2
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
