From db3e8d470d172fd93a65c6b0d713639196e8724e Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Wed, 26 Feb 2014 16:26:05 +0900
Subject: [PATCH] of14: Add experimenter 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>
---
 .../of14/5-52-ofp_port_desc_reply.packet      | Bin 200 -> 256 bytes
 ryu/tests/packet_data_generator/src/x5.erl    |  14 ++++++++-
 .../of14/5-52-ofp_port_desc_reply.packet.json |  29 +++++++++++++++++-
 3 files changed, 41 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 595d023bfeb5b102c6e706ac2a15e19d659a997a..c844eef32cde291ab6bdf20c171ae0aee5d0366c 100644
GIT binary patch
delta 90
zcmX@X*uW&lD$K|L2D}goNU}4mm?)NI@&7*q50IA%69@7IpnQ-PMj&4V%4Y)cffz(H
IOl<G~05ysXIRF3v

delta 33
gcmZo*I>9K$D$H<#0R(u#B#2;VD3~agHF1Xr08aM>XaE2J

diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl
index 14bb17b8..ef2d52d7 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -729,7 +729,19 @@ x() ->
                                                        rx_max_freq_lmda = 2000,
                                                        rx_grid_freq_lmda = 1500,
                                                        tx_pwr_min = 1000,
-                                                       tx_pwr_max = 2000}]},
+                                                       tx_pwr_max = 2000},
+                                                    #ofp_port_desc_prop_experimenter{
+                                                       experimenter = 101,
+                                                       exp_type = 0,
+                                                       data = <<>>},
+                                                    #ofp_port_desc_prop_experimenter{
+                                                       experimenter = 101,
+                                                       exp_type = 1,
+                                                       data = <<1:32>>},
+                                                    #ofp_port_desc_prop_experimenter{
+                                                       experimenter = 101,
+                                                       exp_type = 2,
+                                                       data = <<1:32,2:32>>}]},
                                      #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 babb861c..e1b787e3 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": 112, 
+               "length": 168, 
                "name": "Port7", 
                "properties": [
                    {
@@ -34,6 +34,33 @@
                            "tx_pwr_max": 2000, 
                            "tx_pwr_min": 1000
                        }
+                    },
+                    {
+                       "OFPPortDescPropExperimenter": {
+                           "length": 12, 
+                           "type": 65535, 
+                           "exp_type": 0, 
+                           "experimenter": 101, 
+                           "data": []
+                       }
+                    },
+                    {
+                       "OFPPortDescPropExperimenter": {
+                           "length": 16, 
+                           "type": 65535, 
+                           "exp_type": 1, 
+                           "experimenter": 101, 
+                           "data": [1]
+                       }
+                    },
+                    {
+                       "OFPPortDescPropExperimenter": {
+                           "length": 20, 
+                           "type": 65535, 
+                           "exp_type": 2, 
+                           "experimenter": 101, 
+                           "data": [1, 2]
+                       }
                    }
                ],
                "port_no": 7,