Data adaptation for GBPSFC test cases

JSONs for ODL initialization

Change-Id: I32f4ce484e96152c7404e253ac03ca66c2e22592
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

diff --git a/csit/variables/gbp/demo-asymmetric-chain/service_function_chains.json b/csit/variables/gbp/demo-asymmetric-chain/service_function_chains.json
index be3c6768a0819d094b885292b157d3b0664c0ccc..e3189791846189145b2ca70db5ea0d0547d37c65 100644 (file)
--- a/csit/variables/gbp/demo-asymmetric-chain/service_function_chains.json
+++ b/csit/variables/gbp/demo-asymmetric-chain/service_function_chains.json
@@ -7,11 +7,11 @@
                 "sfc-service-function": [
                     {
                         "name": "firewall-abstract1",
-                        "type": "service-function-type: firewall"
+                        "type": "service-function-type:firewall"
                     },
                     {
                         "name": "dpi-abstract1",
-                        "type": "service-function-type: dpi"
+                        "type": "service-function-type:dpi"
                     }
                 ]
             }

diff --git a/csit/variables/gbp/demo-asymmetric-chain/service_functions.json b/csit/variables/gbp/demo-asymmetric-chain/service_functions.json
index 8e5e52be443ec46f46a2f86c1f2942d51b1fb47a..f3c0d76506c6210984f4a3fc2616e23b716d07a7 100644 (file)
--- a/csit/variables/gbp/demo-asymmetric-chain/service_functions.json
+++ b/csit/variables/gbp/demo-asymmetric-chain/service_functions.json
@@ -4,14 +4,14 @@
             {
                 "name": "firewall-72",
                 "ip-mgmt-address": "_SF1",
-                "type": "service-function-type: firewall",
+                "type": "service-function-type:firewall",
                 "nsh-aware": "true",
                 "sf-data-plane-locator": [
                     {
                         "name": "2",
                         "port": 6633,
                         "ip": "_SF1",
-                        "transport": "service-locator: vxlan-gpe",
+                        "transport": "service-locator:vxlan-gpe",
                         "service-function-forwarder": "SFF1"
                     }
                 ]
@@ -19,14 +19,14 @@
             {
                 "name": "dpi-74",
                 "ip-mgmt-address": "_SF2",
-                "type": "service-function-type: dpi",
+                "type": "service-function-type:dpi",
                 "nsh-aware": "true",
                 "sf-data-plane-locator": [
                     {
                         "name": "3",
                         "port": 6633,
                         "ip": "_SF2",
-                        "transport": "service-locator: vxlan-gpe",
+                        "transport": "service-locator:vxlan-gpe",
                         "service-function-forwarder": "SFF2"
                     }
                 ]

diff --git a/csit/variables/gbp/demo-asymmetric-chain/tunels.json b/csit/variables/gbp/demo-asymmetric-chain/tunnels.json
similarity index 100%
rename from csit/variables/gbp/demo-asymmetric-chain/tunels.json
rename to csit/variables/gbp/demo-asymmetric-chain/tunnels.json

diff --git a/csit/variables/gbp/demo-symmetric-chain/tunnels.json b/csit/variables/gbp/demo-symmetric-chain/tunnels.json
index 64276f76f36017db310f6f69f2d108a7e04272ff..c7a2181584d31a43d381963bd74a19b435f63958 100644 (file)
--- a/csit/variables/gbp/demo-symmetric-chain/tunnels.json
+++ b/csit/variables/gbp/demo-symmetric-chain/tunnels.json
@@ -11,7 +11,7 @@
                         "port": 6633
                     },
                     {
-                        "tunnel-type": "overlay: tunnel-type-vxlan",
+                        "tunnel-type": "overlay:tunnel-type-vxlan",
                         "node-connector-id": "openflow:1:2",
                         "ip": "_CLASSIFIER1",
                         "port": 4789