From f03ff4118636fd668d067cfaedaa03783a52beac Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Wed, 26 Feb 2014 16:26:01 +0900
Subject: [PATCH] of14: Add optical property to port status unit test

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 .../of14/5-37-ofp_port_status.packet           | Bin 88 -> 128 bytes
 ryu/tests/packet_data_generator/src/x5.erl     |  12 +++++++++++-
 .../json/of14/5-37-ofp_port_status.packet.json |  17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ryu/tests/packet_data/of14/5-37-ofp_port_status.packet b/ryu/tests/packet_data/of14/5-37-ofp_port_status.packet
index 2b57ab96cebed70d244c196838ef31c211a28e00..e8310212b732fa30440297f6d9ffb0e59366d1a7 100644
GIT binary patch
delta 70
ycma!OU=(BJVQ64L1?&t36UCe~7#JBepc0G>49qVW7}zf`FtFZ1W;4HFzW@LL$_hIG

delta 29
XcmZo*j1XhxVTfQr1?&tS6UCeWCe;Fw

diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl
index 26e01935..af79f2f3 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -602,7 +602,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_flow_removed{
             cookie = <<0,0,0,0,0,0,0,0>>,
diff --git a/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json b/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
index 0cc6179f..8897dcfe 100644
--- a/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-37-ofp_port_status.packet.json
@@ -4,7 +4,7 @@
          "OFPPort": {
             "config": 0, 
             "hw_addr": "f2:0b:a4:d0:3f:70", 
-            "length": 72, 
+            "length": 112, 
             "name": "\u79c1\u306e\u30dd\u30fc\u30c8", 
             "port_no": 7, 
             "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
+                   }
                }
             ],
             "state": 4