From dd71b6894b48ef1ef1f2c8db8cb82e47afdfb090 Mon Sep 17 00:00:00 2001
From: Arne Goetje <arne_goetje@accton.com>
Date: Wed, 9 Apr 2014 09:43:14 +0800
Subject: [PATCH] Fix vlan_vid values in flows to match the intended behaviour.

Signed-off-by: Arne Goetje <arne_goetje@accton.com>
---
 .../switch/of13/action/25_SET_FIELD/06_VLAN_VID.json   | 12 ++++++------
 .../switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json   |  6 +++---
 ryu/tests/switch/of13/match/06_VLAN_VID.json           | 18 +++++++++---------
 ryu/tests/switch/of13/match/07_VLAN_PCP.json           | 18 +++++++++---------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json b/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json
index 284c271..fefc4f9 100644
--- a/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json
+++ b/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json
@@ -12,7 +12,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -27,7 +27,7 @@
                                             "field":{
                                                 "OXMTlv":{
                                                     "field":"vlan_vid",
-                                                    "value":4299
+                                                    "value":203
                                                 }
                                             }
                                         }
@@ -76,7 +76,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -91,7 +91,7 @@
                                             "field":{
                                                 "OXMTlv":{
                                                     "field":"vlan_vid",
-                                                    "value":4299
+                                                    "value":203
                                                 }
                                             }
                                         }
@@ -140,7 +140,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -155,7 +155,7 @@
                                             "field":{
                                                 "OXMTlv":{
                                                     "field":"vlan_vid",
-                                                    "value":4299
+                                                    "value":203
                                                 }
                                             }
                                         }
diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json b/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json
index 61709c6..cac793e 100644
--- a/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json
+++ b/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json
@@ -12,7 +12,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -82,7 +82,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -152,7 +152,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
diff --git a/ryu/tests/switch/of13/match/06_VLAN_VID.json b/ryu/tests/switch/of13/match/06_VLAN_VID.json
index bb6f9a4..7d5e18c 100644
--- a/ryu/tests/switch/of13/match/06_VLAN_VID.json
+++ b/ryu/tests/switch/of13/match/06_VLAN_VID.json
@@ -12,7 +12,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -66,7 +66,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -121,7 +121,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -171,7 +171,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -225,7 +225,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -280,7 +280,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -330,7 +330,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -382,7 +382,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
@@ -435,7 +435,7 @@
                                 {
                                     "OXMTlv":{
                                         "field":"vlan_vid",
-                                        "value":4196
+                                        "value":100
                                     }
                                 }
                             ]
diff --git a/ryu/tests/switch/of13/match/07_VLAN_PCP.json b/ryu/tests/switch/of13/match/07_VLAN_PCP.json
index 35f1357..8caff66 100644
--- a/ryu/tests/switch/of13/match/07_VLAN_PCP.json
+++ b/ryu/tests/switch/of13/match/07_VLAN_PCP.json
@@ -13,7 +13,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -74,7 +74,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -136,7 +136,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -193,7 +193,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -254,7 +254,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -316,7 +316,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -373,7 +373,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -432,7 +432,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
@@ -492,7 +492,7 @@
                                     "OXMTlv":{
                                         "field":"vlan_vid",
                                         "mask":null,
-                                        "value":4196
+                                        "value":100
                                     }
                                 },
                                 {
-- 
1.8.5.2.msysgit.0