Modifications in JSONs for GBPSFC demo

Changes made for demo-gbp1

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

diff --git a/csit/variables/gbp/demo-gbp1/tenants.json b/csit/variables/gbp/demo-gbp1/tenants.json
index 759c28614807ce3e3057928931a96327c31dc6d0..c830c6f43cda32b78c4376ebcef9fd876ea6b8ac 100644 (file)
--- a/csit/variables/gbp/demo-gbp1/tenants.json
+++ b/csit/variables/gbp/demo-gbp1/tenants.json
@@ -1,5 +1,5 @@
 {
-    "policy: tenant": {
+    "tenant": {
         "contract": [
             {
                 "clause": [
@@ -176,4 +176,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}

diff --git a/csit/variables/gbp/demo-gbp1/tunels.json b/csit/variables/gbp/demo-gbp1/tunels.json
index 50f180778c412b767477719bef7e10dc240fe933..a9d3cc5bc898dc57bb02d2d633dc3c19bc6ef0d1 100644 (file)
--- a/csit/variables/gbp/demo-gbp1/tunels.json
+++ b/csit/variables/gbp/demo-gbp1/tunels.json
@@ -1,9 +1,9 @@
 {
-    "opendaylight-inventory: nodes": {
+    "nodes": {
         "node": [
             {
                 "id": "openflow: 1",
-                "ofoverlay: tunnel": [
+                "ofoverlay:tunnel": [
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 1: 1",
@@ -13,45 +13,45 @@
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 1: 2",
-                        "ip": "192.168.50.70",
+                        "ip": "CLASSIFIER1",
                         "port": 4789
                     }
                 ]
             },
             {
                 "id": "openflow: 2",
-                "ofoverlay: tunnel": [
+                "ofoverlay:tunnel": [
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 2: 1",
-                        "ip": "192.168.50.71",
+                        "ip": "CLASSIFIER2",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 2: 2",
-                        "ip": "SFF",
+                        "ip": "CLASSIFIER2",
                         "port": 4789
                     }
                 ]
             },
             {
                 "id": "openflow: 3",
-                "ofoverlay: tunnel": [
+                "ofoverlay:tunnel": [
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 3: 1",
-                        "ip": "192.168.50.72",
+                        "ip": "CLASSIFIER3",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 3: 2",
-                        "ip": "CLASSIFIER2",
+                        "ip": "CLASSIFIER3",
                         "port": 4789
                     }
                 ]
             }
         ]
     }
-}
\ No newline at end of file
+}