Corrections in data for GBP/GBPSFC demo

Strings which need to be replaced by IP address
of VM have '_' prepended. Prevention of overriding
the same string used in a different context.

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

diff --git a/csit/variables/gbp/demo-asymmetric-chain/service_function_forwarders.json b/csit/variables/gbp/demo-asymmetric-chain/service_function_forwarders.json
index 0d6f766a10dca2a8274fac9156b62c5f934a3c68..1da7b4802d09003c5a46a6f93e6cece58654ce32 100644 (file)
--- a/csit/variables/gbp/demo-asymmetric-chain/service_function_forwarders.json
+++ b/csit/variables/gbp/demo-asymmetric-chain/service_function_forwarders.json
@@ -13,7 +13,7 @@
                         "type": "service-function-type:firewall",
                         "sff-sf-data-plane-locator": {
                             "port": 6633,
-                            "ip": "SFF1",
+                            "ip": "_SFF1",
                             "transport": "service-locator:vxlan-gpe"
                         }
                     }
@@ -24,7 +24,7 @@
                         "data-plane-locator": {
                             "transport": "service-locator:vxlan-gpe",
                             "port": 6633,
-                            "ip": "SFF1"
+                            "ip": "_SFF1"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
                             "remote-ip": "flow",
@@ -52,7 +52,7 @@
                         "type": "service-function-type:dpi",
                         "sff-sf-data-plane-locator": {
                             "port": 6633,
-                            "ip": "SFF2",
+                            "ip": "_SFF2",
                             "transport": "service-locator:vxlan-gpe"
                         }
                     }
@@ -63,7 +63,7 @@
                         "data-plane-locator": {
                             "transport": "service-locator:vxlan-gpe",
                             "port": 6633,
-                            "ip": "SFF2"
+                            "ip": "_SFF2"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
                             "remote-ip": "flow",

diff --git a/csit/variables/gbp/demo-asymmetric-chain/service_functions.json b/csit/variables/gbp/demo-asymmetric-chain/service_functions.json
index f1708134fb23bea380d317984a1fb37e60c2a928..8e5e52be443ec46f46a2f86c1f2942d51b1fb47a 100644 (file)
--- a/csit/variables/gbp/demo-asymmetric-chain/service_functions.json
+++ b/csit/variables/gbp/demo-asymmetric-chain/service_functions.json
@@ -3,14 +3,14 @@
         "service-function": [
             {
                 "name": "firewall-72",
-                "ip-mgmt-address": "SF1",
+                "ip-mgmt-address": "_SF1",
                 "type": "service-function-type: firewall",
                 "nsh-aware": "true",
                 "sf-data-plane-locator": [
                     {
                         "name": "2",
                         "port": 6633,
-                        "ip": "SF1",
+                        "ip": "_SF1",
                         "transport": "service-locator: vxlan-gpe",
                         "service-function-forwarder": "SFF1"
                     }
@@ -18,14 +18,14 @@
             },
             {
                 "name": "dpi-74",
-                "ip-mgmt-address": "SF2",
+                "ip-mgmt-address": "_SF2",
                 "type": "service-function-type: dpi",
                 "nsh-aware": "true",
                 "sf-data-plane-locator": [
                     {
                         "name": "3",
                         "port": 6633,
-                        "ip": "SF2",
+                        "ip": "_SF2",
                         "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/tunels.json
index 2f24efac97494974126a6f5cf0be881977105c96..10eeb3b3e03c0679e745558eefb75aad1cbc4431 100644 (file)
--- a/csit/variables/gbp/demo-asymmetric-chain/tunels.json
+++ b/csit/variables/gbp/demo-asymmetric-chain/tunels.json
@@ -7,13 +7,13 @@
                     {
                         "tunnel-type": "overlay:tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow:1:1",
-                        "ip": "CLASSIFIER1",
+                        "ip": "_CLASSIFIER1",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay:tunnel-type-vxlan",
                         "node-connector-id": "openflow:1:2",
-                        "ip": "CLASSIFIER1",
+                        "ip": "_CLASSIFIER1",
                         "port": 4789
                     }
                 ]
@@ -24,13 +24,13 @@
                     {
                         "tunnel-type": "overlay:tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow:6:1",
-                        "ip": "CLASSIFIER2",
+                        "ip": "_CLASSIFIER2",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay:tunnel-type-vxlan",
                         "node-connector-id": "openflow:6:2",
-                        "ip": "CLASSIFIER2",
+                        "ip": "_CLASSIFIER2",
                         "port": 4789
                     }
                 ]

diff --git a/csit/variables/gbp/demo-gbp1/tunels.json b/csit/variables/gbp/demo-gbp1/tunels.json
index a9d3cc5bc898dc57bb02d2d633dc3c19bc6ef0d1..b641d5a8e2a6d68edc7c75f02bdccfd629adf04d 100644 (file)
--- a/csit/variables/gbp/demo-gbp1/tunels.json
+++ b/csit/variables/gbp/demo-gbp1/tunels.json
@@ -7,13 +7,13 @@
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 1: 1",
-                        "ip": "CLASSIFIER1",
+                        "ip": "_CLASSIFIER1",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 1: 2",
-                        "ip": "CLASSIFIER1",
+                        "ip": "_CLASSIFIER1",
                         "port": 4789
                     }
                 ]
@@ -24,13 +24,13 @@
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 2: 1",
-                        "ip": "CLASSIFIER2",
+                        "ip": "_CLASSIFIER2",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 2: 2",
-                        "ip": "CLASSIFIER2",
+                        "ip": "_CLASSIFIER2",
                         "port": 4789
                     }
                 ]
@@ -41,13 +41,13 @@
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 3: 1",
-                        "ip": "CLASSIFIER3",
+                        "ip": "_CLASSIFIER3",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 3: 2",
-                        "ip": "CLASSIFIER3",
+                        "ip": "_CLASSIFIER3",
                         "port": 4789
                     }
                 ]

diff --git a/csit/variables/gbp/demo-symmetric-chain/service_function_forwarders.json b/csit/variables/gbp/demo-symmetric-chain/service_function_forwarders.json
index 0d6f766a10dca2a8274fac9156b62c5f934a3c68..1da7b4802d09003c5a46a6f93e6cece58654ce32 100644 (file)
--- a/csit/variables/gbp/demo-symmetric-chain/service_function_forwarders.json
+++ b/csit/variables/gbp/demo-symmetric-chain/service_function_forwarders.json
@@ -13,7 +13,7 @@
                         "type": "service-function-type:firewall",
                         "sff-sf-data-plane-locator": {
                             "port": 6633,
-                            "ip": "SFF1",
+                            "ip": "_SFF1",
                             "transport": "service-locator:vxlan-gpe"
                         }
                     }
@@ -24,7 +24,7 @@
                         "data-plane-locator": {
                             "transport": "service-locator:vxlan-gpe",
                             "port": 6633,
-                            "ip": "SFF1"
+                            "ip": "_SFF1"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
                             "remote-ip": "flow",
@@ -52,7 +52,7 @@
                         "type": "service-function-type:dpi",
                         "sff-sf-data-plane-locator": {
                             "port": 6633,
-                            "ip": "SFF2",
+                            "ip": "_SFF2",
                             "transport": "service-locator:vxlan-gpe"
                         }
                     }
@@ -63,7 +63,7 @@
                         "data-plane-locator": {
                             "transport": "service-locator:vxlan-gpe",
                             "port": 6633,
-                            "ip": "SFF2"
+                            "ip": "_SFF2"
                         },
                         "service-function-forwarder-ovs:ovs-options": {
                             "remote-ip": "flow",

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

diff --git a/csit/variables/gbp/demo-symmetric-chain/tunel.json b/csit/variables/gbp/demo-symmetric-chain/tunel.json
index f129aad298fd9fdd1f17bb505e6f566a75f0f0be..55491ff82d43c4127a46541737e0cb6ccdd98c39 100644 (file)
--- a/csit/variables/gbp/demo-symmetric-chain/tunel.json
+++ b/csit/variables/gbp/demo-symmetric-chain/tunel.json
@@ -7,13 +7,13 @@
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 1: 1",
-                        "ip": "CLASSIFIER1",
+                        "ip": "_CLASSIFIER1",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 1: 2",
-                        "ip": "CLASSIFIER1",
+                        "ip": "_CLASSIFIER1",
                         "port": 4789
                     }
                 ]
@@ -24,13 +24,13 @@
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan-gpe",
                         "node-connector-id": "openflow: 6: 1",
-                        "ip": "CLASSIFIER2",
+                        "ip": "_CLASSIFIER2",
                         "port": 6633
                     },
                     {
                         "tunnel-type": "overlay: tunnel-type-vxlan",
                         "node-connector-id": "openflow: 6: 2",
-                        "ip": "CLASSIFIER2",
+                        "ip": "_CLASSIFIER2",
                         "port": 4789
                     }
                 ]