From d268e10bf6ab438e29b67724c8e2bec1f6c6196e Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Thu, 20 Feb 2014 09:11:07 +0900
Subject: of14: table mod with properties

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 .../packet_data/of14/5-23-ofp_table_mod.packet     | Bin 16 -> 88 bytes
 ryu/tests/packet_data_generator/src/x5.erl         |  21 ++++++++-
 .../json/of14/5-23-ofp_table_mod.packet.json       |  47 ++++++++++++++++++++-
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet b/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet
index 6e1ce45b..8df2590c 100644
Binary files a/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet and b/ryu/tests/packet_data/of14/5-23-ofp_table_mod.packet differ
diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl
index 91ccc687..81bb7694 100644
--- a/ryu/tests/packet_data_generator/src/x5.erl
+++ b/ryu/tests/packet_data_generator/src/x5.erl
@@ -489,7 +489,26 @@ x() ->
             config = [],mask = [],
             properties = 
                 [#ofp_port_mod_prop_ethernet{advertise = [fiber]}]},
-        #ofp_table_mod{table_id = all},
+        #ofp_table_mod{
+            properties =
+                 [#ofp_table_mod_prop_eviction{flags = []},
+                  #ofp_table_mod_prop_vacancy{
+                      vacancy = 0,
+                      vacancy_down = 0,
+                      vacancy_up = 0},
+                  #ofp_table_mod_prop_experimenter{
+                      experimenter = 101,
+                      exp_type = 0,
+                      data = <<>>},
+                  #ofp_table_mod_prop_experimenter{
+                      experimenter = 101,
+                      exp_type = 1,
+                      data = <<1:32>>},
+                  #ofp_table_mod_prop_experimenter{
+                      experimenter = 101,
+                      exp_type = 2,
+                      data = <<1:32,2:32>>}],
+            table_id = all},
         #ofp_desc_request{},
         #ofp_aggregate_stats_request{
             flags = [],table_id = all,out_port = any,out_group = any,
diff --git a/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json b/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
index 5019c29b..1725e199 100644
--- a/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
+++ b/ryu/tests/unit/ofproto/json/of14/5-23-ofp_table_mod.packet.json
@@ -1,6 +1,51 @@
 {
    "OFPTableMod": {
       "config": 0, 
-      "table_id": 255
+      "table_id": 255, 
+       "properties": [
+           {
+               "OFPTableModPropEviction": {
+                   "flags": 0, 
+                   "length": 8, 
+                   "type": 2
+               }
+           },
+           {
+               "OFPTableModPropVacancy": {
+                   "length": 8, 
+                   "type": 3, 
+                   "vacancy": 0, 
+                   "vacancy_down": 0, 
+                   "vacancy_up": 0
+               }
+           },
+           {
+               "OFPTableModPropExperimenter": {
+                   "length": 12, 
+                   "type": 65535, 
+                   "exp_type": 0, 
+                   "experimenter": 101, 
+                   "data": []
+               }
+           },
+           {
+               "OFPTableModPropExperimenter": {
+                   "length": 16, 
+                   "type": 65535, 
+                   "exp_type": 1, 
+                   "experimenter": 101, 
+                   "data": [1]
+               }
+           },
+           {
+               "OFPTableModPropExperimenter": {
+                   "length": 20, 
+                   "type": 65535, 
+                   "exp_type": 2, 
+                   "experimenter": 101, 
+                   "data": [1, 2]
+               }
+           }
+       ]
    }
 }
-- 
cgit v1.2.3