converting config to helm and setting demo values

To be able to run the vFW/vLB demos, these needed to be done
manually and it was a big mess.
With the power of helm we can now pass data into the config pod
and make some substitutions

Issue-ID: OOM-277

Change-Id: Ie167920fac7896661b81443aa460ce2e6f615187
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>

7 files changed, 67 insertions, 33 deletions

diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py
index 07edaa5c86..65c1711327 100755
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_preload_parameters.py
@@ -5,7 +5,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
         "pub_key" : "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAqqnA9BAiMLtjOPSYBfhzLu4CiBolWoskDg4KVwhTJVTTeB6CqrQNcadlGXxOHhCYuNCKkUmIVF4WTOisVOJ75Z1c4OMoZLL85xVPKSIeH63kgVugwgPYQu55NbbWX+rsbUha3LnElDhNviMM3iTPbD5nnhKixNERAJMTLKXvZZZGqxW94bREknYPQTT2qrk3YRqwldncopp6Nkgv3AnSJz2gc9tjxnWF0poTQnQm/3D6hiJICrzKfAV0EaPN0KdtYjPhKrYoy6Qb/tKOVaaqsvwfKBJGrT9LfcA7D7M/yj292RT1XN63hI84WC383LsaPJ6eWdDTE6zUP1eGTWCoOw== rsa-key-20161026",
         "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
         "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging",
-        "demo_artifacts_version" : "1.0.0",
+        "demo_artifacts_version" : "DEMO_ARTIFACTS_VERSION_HERE",
          "ecomp_private_net_id" : "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE",
         "ecomp_private_subnet_id" : "OPENSTACK_SUBNET_ID_WITH_ONAP_ROUTE_HERE",
         "ecomp_private_net_cidr" : "NETWORK_CIDR_WITH_ONAP_ROUTE_HERE",
@@ -23,11 +23,11 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "protected_private_net_cidr" : "192.168.20.0/24",
             "vfw_private_ip_0" : "192.168.10.100",
             "vfw_private_ip_1" : "192.168.20.100",
-            "vfw_private_ip_2" : "192.168.30.5",
+            "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.3",
             "vpg_private_ip_0" : "192.168.10.200",
-            "vpg_private_ip_1" : "192.168.30.3",
+            "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.4",
             "vsn_private_ip_0" : "192.168.20.250",
-            "vsn_private_ip_1" : "192.168.30.4",
+            "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.5",
             'vfw_name_0':'vofwl01fwl${hostid}',
             'vpg_name_0':'vofwl01pgn${hostid}',
             'vsn_name_0':'vofwl01snk${hostid}',
@@ -36,18 +36,18 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_net_id" : "volb01_private${hostid}",
             "vlb_private_net_cidr" : "192.168.30.0/24",
             "vlb_private_ip_0" : "192.168.30.100",
-            "vlb_private_ip_1" : "192.168.30.4",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.6",
             "vdns_private_ip_0" : "192.168.30.110",
-            "vdns_private_ip_1" : "192.168.30.5",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.7",
             'vlb_name_0':'vovlblb${hostid}',
             'vdns_name_0':'vovlbdns${hostid}',
         },
         "dnsscaling_preload.template" : {
             "vlb_private_net_id" : "volb01_private${hostid}",
             "vlb_private_ip_0" : "192.168.30.100",
-            "vlb_private_ip_1" : "192.168.30.4",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.8",
             "vdns_private_ip_0" : "192.168.30.222",
-            "vdns_private_ip_1" : "192.168.30.6",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.9",
             'scaling_vdns_name_0':'vovlbscaling${hostid}',
         },
         "vvg_preload.template" : {
@@ -62,11 +62,11 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "protected_private_net_cidr" : "192.168.120.0/24",
             "vfw_private_ip_0" : "192.168.110.100",
             "vfw_private_ip_1" : "192.168.120.100",
-            "vfw_private_ip_2" : "192.168.30.11",
+            "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.10",
             "vpg_private_ip_0" : "192.168.110.200",
-            "vpg_private_ip_1" : "192.168.30.12",
+            "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.11",
             "vsn_private_ip_0" : "192.168.120.250",
-            "vsn_private_ip_1" : "192.168.30.13",
+            "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.12",
             'vfw_name_0':'clfwl01fwl${hostid}',
             'vpg_name_0':'clfwl01pgn${hostid}',
             'vsn_name_0':'clfwl01snk${hostid}',
@@ -75,18 +75,18 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_net_id" : "cllb01_private${hostid}",
             "vlb_private_net_cidr" : "192.168.130.0/24",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.14",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.13",
             "vdns_private_ip_0" : "192.168.130.110",
-            "vdns_private_ip_1" : "192.168.30.15",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.14",
             'vlb_name_0':'clvlblb${hostid}',
             'vdns_name_0':'clvlbdns${hostid}',
         },
         "dnsscaling_preload.template" : {
             "vlb_private_net_id" : "cllb01_private${hostid}",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.14",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.15",
             "vdns_private_ip_0" : "192.168.130.222",
-            "vdns_private_ip_1" : "192.168.30.16",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.16",
             'scaling_vdns_name_0':'clvlbscaling${hostid}',
         },
         "vvg_preload.template" : {
@@ -101,11 +101,11 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "protected_private_net_cidr" : "192.168.120.0/24",
             "vfw_private_ip_0" : "192.168.110.100",
             "vfw_private_ip_1" : "192.168.120.100",
-            "vfw_private_ip_2" : "192.168.30.11",
+            "vfw_private_ip_2" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.17",
             "vpg_private_ip_0" : "192.168.110.200",
-            "vpg_private_ip_1" : "192.168.30.12",
+            "vpg_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.18",
             "vsn_private_ip_0" : "192.168.120.250",
-            "vsn_private_ip_1" : "192.168.30.13",
+            "vsn_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.19",
             'vfw_name_0':'demofwl01fwl',
             'vpg_name_0':'demofwl01pgn',
             'vsn_name_0':'demofwl01snk',
@@ -114,21 +114,22 @@ GLOBAL_PRELOAD_PARAMETERS = {
             "vlb_private_net_id" : "demolb_private",
             "vlb_private_net_cidr" : "192.168.130.0/24",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.14",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.20",
             "vdns_private_ip_0" : "192.168.130.110",
-            "vdns_private_ip_1" : "192.168.30.15",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.21",
             'vlb_name_0':'demovlblb',
             'vdns_name_0':'demovlbdns',
         },
         "dnsscaling_preload.template" : {
             "vlb_private_net_id" : "demolb_private",
             "vlb_private_ip_0" : "192.168.130.100",
-            "vlb_private_ip_1" : "192.168.30.16",
+            "vlb_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.22",
             "vdns_private_ip_0" : "192.168.130.222",
-            "vdns_private_ip_1" : "192.168.30.17",
+            "vdns_private_ip_1" : "OPENSTACK_OAM_NETWORK_CIDR_PREFIX_HERE.23",
             'scaling_vdns_name_0':'demovlbscaling',
         },
         "vvg_preload.template" : {
         }
     }
 }
+
diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py
index d0e0919b90..f1d0e98cc9 100755
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/integration_robot_properties.py
@@ -33,7 +33,7 @@ GLOBAL_MSO_SERVER_PORT = "8080"
 GLOBAL_MSO_USERNAME = "InfraPortalClient"
 GLOBAL_MSO_PASSWORD = "password1$"
 # openstack info - info to select right info in environment
-GLOBAL_OPENSTACK_TENANT_NAME = ""
+GLOBAL_OPENSTACK_TENANT_NAME = "OPENSTACK_TENANT_NAME_HERE"
 # packet generate vnf info - everything is from the private oam network (also called ecomp private network)
 GLOBAL_PACKET_GENERATOR_PORT = "8183"
 GLOBAL_PACKET_GENERATOR_USERNAME = "admin"
@@ -66,10 +66,10 @@ GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX"
 GLOBAL_VID_HEALTH_USERNAME = "Default"
 GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1"
 #global selenium info
-GLOBAL_PROXY_WARNING_TITLE=""
-GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
+GLOBAL_PROXY_WARNING_TITLE = ""
+GLOBAL_PROXY_WARNING_CONTINUE_XPATH = ""
 # settings for vm to attach vvg too
-GLOBAL_VVGSERVER_IMAGE = "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)"
-GLOBAL_VVGSERVER_FLAVOR = "4 GB General Purpose v1"
+GLOBAL_VVGSERVER_IMAGE = "UBUNTU_14_IMAGE_NAME_HERE"
+GLOBAL_VVGSERVER_FLAVOR = "OPENSTACK_FLAVOUR_MEDIUM_HERE"
 # dns info
-GLOBAL_DNS_TRAFFIC_DURATION = "600"
\ No newline at end of file
+GLOBAL_DNS_TRAFFIC_DURATION = "600"
diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
index c2347d49d5..bc9d07c448 100755
--- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
+++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py
@@ -9,20 +9,20 @@ GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-controller.onap-dcae"
 GLOBAL_INJECTED_DNS_IP_ADDR = "10.0.100.1"
 GLOBAL_INJECTED_DOCKER_VERSION = "1.1-STAGING-latest"
 GLOBAL_INJECTED_GERRIT_BRANCH = "master"
-GLOBAL_INJECTED_KEYSTONE = "http://10.100.100.10:5000"
+GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE"
 GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router"
 GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso"
-GLOBAL_INJECTED_NETWORK = "oam_ecomp_1b5B"
+GLOBAL_INJECTED_NETWORK = "OPENSTACK_OAM_NETWORK_ID_HERE"
 GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001"
 GLOBAL_INJECTED_NEXUS_PASSWORD = "docker"
 GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw"
 GLOBAL_INJECTED_NEXUS_USERNAME = "docker"
-GLOBAL_INJECTED_OPENSTACK_PASSWORD = "dev"
-GLOBAL_INJECTED_OPENSTACK_USERNAME = "dev"
+GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE"
+GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE"
 GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.onap-policy"
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy"
 GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal"
-GLOBAL_INJECTED_REGION = "RegionOne"
+GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE"
 GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc"
 GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc"
 GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc"
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_clearwater/base_clearwater.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_clearwater/base_clearwater.env
new file mode 100644
index 0000000000..5c2330efcd
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_clearwater/base_clearwater.env
@@ -0,0 +1,21 @@
+parameters:
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
+  bono_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  sprout_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  homer_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  homestead_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  ralf_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  ellis_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  dns_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  bono_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  sprout_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  homer_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  homestead_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  ralf_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  ellis_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  dns_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  repo_url: http://repo.cw-ngv.com/stable
+  zone: me.cw-ngv.com
+  dn_range_start: "2425550000"
+  dn_range_length: "10000"
+  dnssec_key: 9FPdYTWhk5+LbhrqtTPQKw==
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vfw/base_vfw.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vfw/base_vfw.env
new file mode 100644
index 0000000000..1d09525ef0
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vfw/base_vfw.env
@@ -0,0 +1,4 @@
+parameters:
+  vfw_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  vfw_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/base_vlb.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/base_vlb.env
new file mode 100644
index 0000000000..e889ecc860
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/base_vlb.env
@@ -0,0 +1,4 @@
+parameters:
+  vlb_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  vlb_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
\ No newline at end of file
diff --git a/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/dnsscaling.env b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/dnsscaling.env
new file mode 100644
index 0000000000..e889ecc860
--- /dev/null
+++ b/kubernetes/config/docker/init/src/config/robot/robot/assets/asdc/base_vlb/dnsscaling.env
@@ -0,0 +1,4 @@
+parameters:
+  vlb_image_name: UBUNTU_14_IMAGE_NAME_HERE
+  vlb_flavor_name: OPENSTACK_FLAVOUR_MEDIUM_HERE
+  public_net_id: OPENSTACK_PUBLIC_NET_ID_HERE
\ No newline at end of file