Fixes for RegionThree and Instantiate Direct

Issue-ID: INT-1028
Change-Id: I2ffb571da6af9d16077b5d085fa9ae5611209865
Signed-off-by: Brian Freeman <bf1936@att.com>

6 files changed, 779 insertions, 9 deletions

diff --git a/ete-k8s2.sh b/ete-k8s2.sh
new file mode 100644
index 00000000..2a9bc7c6
--- /dev/null
+++ b/ete-k8s2.sh
@@ -0,0 +1,63 @@
+# Copyright © 2018 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/bash
+
+#################################################################
+#################################################################
+#################################################################
+#
+#  Example script that uses second openstack tenant for VNFs
+#  Put modified vm_properties2.py and integration_preload_parameter2.py
+#      in /tmp
+#  ./ete-k8s2.sh onap <tag>
+#
+#################################################################
+#################################################################
+#################################################################
+#################################################################
+
+#
+# Run the testsuite for the passed tag. Valid tags are ete, health, closedloop, instantiate
+# Please clean up logs when you are done...
+# Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide
+#
+if [ "$1" == "" ] || [ "$2" == "" ]; then
+   echo "Usage: ete-k8s.sh [namespace] [ health | healthdist | distribute | instantiate | instantiateVFWCL | instantiateDemoVFWCL |  | portal ]"
+   exit
+fi
+
+set -x
+
+export NAMESPACE="$1"
+
+POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
+
+
+TAGS="-i $2"
+
+if [ "$3" ]; then
+	VARIABLES="-v $3"
+fi
+
+ETEHOME=/var/opt/ONAP
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec  ${POD}  -- bash -c "ls -1q /share/logs/ | wc -l")
+OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_ete_$2
+DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
+
+#VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
+VARIABLEFILES="-V /tmp/vm_properties2.py -V /share/config/integration_robot_properties.py -V /tmp/integration_preload_parameters2.py"
+VARIABLES="$VARIABLES -v GLOBAL_BUILD_NUMBER:$$"
+
+kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display $DISPLAY_NUM
diff --git a/integration_preload_parameters2.py b/integration_preload_parameters2.py
new file mode 100755
index 00000000..ac09fa1e
--- /dev/null
+++ b/integration_preload_parameters2.py
@@ -0,0 +1,505 @@
+# Copyright (c) 2018 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+GLOBAL_PRELOAD_PARAMETERS = {
+    # heat template parameter values common to all heat template continaing these parameters
+     "defaults" : {
+         'key_name' : 'vfw_key${uuid}',
+         "pub_key" : "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh",
+         "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
+         "repo_url_artifacts" : "https://nexus.onap.org/content/repositories/releases",
+         "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}",
+         "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
+         "onap_private_subnet_id" : "oam_network_sSXO",
+         "onap_private_net_cidr" : "10.0.0.0/16",
+         "sec_group" : "onap_sg_sSXO",
+         "dcae_collector_ip" : "10.12.6.210",
+         "dcae_collector_port" : "30235",
+         "public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
+         "cloud_env" : "${GLOBAL_INJECTED_CLOUD_ENV}",
+         "install_script_version" : "${GLOBAL_INJECTED_SCRIPT_VERSION}",
+     },
+    # ##
+    # heat template parameter values for heat template instances created during Vnf-Orchestration test cases
+    # ##
+    "Vnf-Orchestration" : {
+        "vfw_preload.template": {
+            "unprotected_private_net_id" : "vofwl01_unprotected${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_id" : "vofwl01_protected${hostid}",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
+            "vfw_int_protected_private_ip_0" : "192.168.20.100",
+            "vfw_onap_private_ip_0" : "10.0.${ecompnet}.1",
+            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
+            "vpg_int_unprotected_private_ip_0" : "192.168.10.200",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.2",
+            "vsn_int_protected_private_ip_0" : "192.168.20.250",
+            "vsn_onap_private_ip_0" : "10.0.${ecompnet}.3",
+            "sec_group" : "onap_sg_sSXO",
+            'vfw_name_0':'vofwl01fwl${hostid}',
+            'vpg_name_0':'vofwl01pgn${hostid}',
+            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            'vsn_name_0':'vofwl01snk${hostid}'
+        },
+        "vfwsnk_preload.template": {
+            "int_unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
+            "int_unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "int_protected_private_net_id" : "vofwlsnk_protected${hostid}",
+            "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
+            # this should be the same value as vpg_private_ip_0
+            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
+            "vfw_int_protected_private_ip_0" : "192.168.20.100",
+            "vfw_onap_private_ip_0" : "10.0.${ecompnet}.101",
+            "vsn_int_protected_private_ip_0" : "192.168.20.250",
+            "vsn_onap_private_ip_0" : "10.0.${ecompnet}.102",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vfw_name_0':'vofwl01fwl${hostid}',
+            'vsn_name_0':'vofwl01snk${hostid}',
+            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+        },
+        "vpkg_preload.template": {
+            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
+            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_private_ip_0" : "192.168.10.100",
+            "vpg_unprotected_private_ip_0" : "192.168.10.200",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.103",
+            "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vpg_name_0':'vofwl01pgn${hostid}',
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+        },
+        #  vFWDT preload data
+        "vfwdt_vpkg_preload.template": {
+            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
+            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_private_ip_0" : "192.168.10.100",
+            "vpg_private_ip_0" : "192.168.10.200",
+            "vpg_private_ip_1" : "10.0.${ecompnet}.103",
+            "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vpg_name_0':'vofwl01pgn${hostid}',
+            "vfw_name_0": "vofwl01vfw${hostid}",
+            "vsn_name_0": "vofwl01snk${hostid}",
+            "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
+            "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
+            "ext_private_net_id": "onap_oam_ext",
+            "ext_private_subnet_id": "onap_oam_ext_sub",
+            "ext_private_net_cidr": "10.100.0.0/16",
+            "vfw_private_ip_1": "192.168.20.100",
+            "vfw_private_ip_2": "10.0.110.1",
+            "vfw_private_ip_3": "10.100.100.1",
+            "vsn_private_ip_1": "10.0.110.3",
+            "vsn_private_ip_0": "192.168.20.250",
+            "vsn_private_ip_2": "10.100.100.3",
+        },
+        "vfwdt_vfwsnk0_preload.template": {
+            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
+            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_private_ip_0" : "192.168.10.100",
+            "vpg_private_ip_0" : "192.168.10.200",
+            "vpg_private_ip_1" : "10.0.${ecompnet}.103",
+            "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vpg_name_0':'vofwl01pgn${hostid}',
+            "vsn_name_0": "vofwl01snk${hostid}",
+            "vfw_name_0": "vofwl01vfw${hostid}",
+            "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
+            "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
+            "ext_private_net_id": "onap_oam_ext",
+            "ext_private_subnet_id": "onap_oam_ext_sub",
+            "ext_private_net_cidr": "10.100.0.0/16",
+            "vfw_private_ip_1": "192.168.20.100",
+            "vfw_private_ip_2": "10.0.110.1",
+            "vfw_private_ip_3": "10.100.100.1",
+            "vsn_private_ip_1": "10.0.110.3",
+            "vsn_private_ip_0": "192.168.20.250",
+            "vpg_private_ip_2": "10.100.100.2",
+            "vsn_private_ip_1": "10.0.110.3",
+            "vsn_private_ip_0": "192.168.20.250",
+            "vsn_private_ip_2": "10.100.100.3"
+        },
+        "vfwdt_vfwsnk1_preload.template": {
+            "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
+            "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_private_ip_0" : "192.168.10.110",
+            "vpg_private_ip_0" : "192.168.10.200",
+            "vpg_private_ip_1" : "10.0.${ecompnet}.103",
+            "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vpg_name_0':'vofwl01pgn${hostid}',
+            "vsn_name_0": "vofwl01snk${hostid}",
+            "vfw_name_0": "vofwl01vfw${hostid}",
+            "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "protected_private_net_id" : "vofwlsnk01_protected${hostid}",
+            "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}",
+            "ext_private_net_id": "onap_oam_ext",
+            "ext_private_subnet_id": "onap_oam_ext_sub",
+            "ext_private_net_cidr": "10.100.0.0/16",
+            "vfw_private_ip_1": "192.168.20.110",
+            "vfw_private_ip_2": "10.0.110.4",
+            "vfw_private_ip_3": "10.100.100.4",
+            "vpg_private_ip_0": "192.168.10.200",
+            "vpg_private_ip_1": "10.0.110.2",
+            "vpg_private_ip_2": "10.100.100.2",
+            "vsn_private_ip_0": "192.168.20.240",
+            "vsn_private_ip_1": "10.0.110.5",
+            "vsn_private_ip_2": "10.100.100.5"
+        },
+        "vlb_preload.template" : {
+            "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            'vlb_name_0':'vovlblb${hostid}',
+            'vdns_name_0':'vovlbdns${hostid}',
+            "vpg_name_0" : "vovlbpgn${hostid}",
+            "vlb_private_net_id" : "volb01_private${hostid}",
+            "vlb_private_net_cidr" : "192.168.30.0/24",
+            "pktgen_private_net_id" : "volb01_pktgen${hostid}",
+            "pktgen_private_net_cidr" : "192.168.9.0/24",
+            "vlb_int_private_ip_0" : "192.168.30.100",
+            "vlb_onap_private_ip_0" : "10.0.${ecompnet}.4",
+            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
+            "vdns_int_private_ip_0" : "192.168.30.110",
+            "vdns_onap_private_ip_0" : "10.0.${ecompnet}.5",
+            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.7",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            "pg_int" : "192.168.9.109",
+            "vip" : "192.168.9.112",
+            "gre_ipaddr" : "192.168.30.112",
+            "vnf_id" : "vLoadBalancer_${hostid}",
+            "vf_module_id" : "vLoadBalancer"
+
+        },
+        "dnsscaling_preload.template" : {
+            "int_private_net_id" : "vLBMS_volb01_private${hostid}",
+            "int_private_subnet_id" : "vLBMS_volb01_private${hostid}_subnet",
+            "vlb_int_private_ip_0" : "192.168.30.100",
+            "vlb_onap_private_ip_0" : "10.0.${ecompnet}.4",
+            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
+            "vdns_int_private_ip_0" : "192.168.30.222",
+            "vdns_onap_private_ip_0" : "10.0.${ecompnet}.6",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vdns_name_0':'vovlbscaling${hostid}',
+            "vlb_private_net_cidr" : "192.168.30.0/24"
+        },
+        "vims_preload.template" : {
+            "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "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=="
+
+        },
+        "vvg_preload.template" : {
+        }
+    },
+# heat template parameter values for heat template instances created during Closed-Loop test cases
+    "Closed-Loop" : {
+        "vfw_preload.template": {
+            "unprotected_private_net_id" : "clfwl01_unprotected${hostid}",
+            "unprotected_private_net_cidr" : "192.168.110.0/24",
+            "protected_private_net_id" : "clfwl01_protected${hostid}",
+            "protected_private_net_cidr" : "192.168.120.0/24",
+            "vfw_int_unprotected_private_ip_0" : "192.168.110.100",
+            "vfw_int_protected_private_ip_0" : "192.168.120.100",
+            "vfw_onap_private_ip_0" : "10.0.${ecompnet}.11",
+            "vfw_int_protected_private_floating_ip" : "192.168.110.200",
+            "vpg_int_unprotected_private_ip_0" : "192.168.110.200",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.12",
+            "vsn_int_protected_private_ip_0" : "192.168.120.250",
+            "vsn_onap_private_ip_0" : "10.0.${ecompnet}.13",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vfw_name_0':'clfwl01fwl${hostid}',
+            'vpg_name_0':'clfwl01pgn${hostid}',
+            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            'vsn_name_0':'clfwl01snk${hostid}'
+        },
+        "vfwsnk_preload.template": {
+            "int_unprotected_private_net_id" : "clfwlsnk_unprotected${hostid}",
+            "int_unprotected_private_subnet_id" : "clfwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "int_protected_private_net_id" : "clfwlsnk_protected${hostid}",
+            "int_protected_private_subnet_id" : "clfwlsnk_protected_sub${hostid}",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
+            # this should be the same value as vpg_private_ip_0
+            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
+            "vfw_int_protected_private_ip_0" : "192.168.20.100",
+            "vfw_onap_private_ip_0" : "10.0.${ecompnet}.111",
+            "vsn_int_protected_private_ip_0" : "192.168.20.250",
+            "vsn_onap_private_ip_0" : "10.0.${ecompnet}.112",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vfw_name_0':'clfwl01fwl${hostid}',
+            'vsn_name_0':'clfwl01snk${hostid}',
+            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+        },
+        "vpkg_preload.template": {
+            "unprotected_private_net_id" : "vFWSNK_clfwlsnk_unprotected${hostid}",
+            "unprotected_private_subnet_id" : "vFWSNK_clfwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_private_ip_0" : "192.168.10.100",
+            "vpg_unprotected_private_ip_0" : "192.168.10.200",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.113",
+            "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vpg_name_0':'clfwl01pgn${hostid}',
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+        },
+        # vLBMS
+        "vlb_preload.template" : {
+            "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            'vlb_name_0':'clvlblb${hostid}',
+            'vdns_name_0':'clvlbdns${hostid}',
+            "vpg_name_0" : "clvlbpgn${hostid}",
+            "vlb_private_net_id" : "cllb01_private${hostid}",
+            "vlb_private_net_cidr" : "192.168.30.0/24",
+            "pktgen_private_net_id" : "cllb01_pktgen${hostid}",
+            "pktgen_private_net_cidr" : "192.168.9.0/24",
+            "vlb_int_private_ip_0" : "192.168.30.100",
+            "vlb_onap_private_ip_0" : "10.0.${ecompnet}.14",
+            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
+            "vdns_int_private_ip_0" : "192.168.30.110",
+            "vdns_onap_private_ip_0" : "10.0.${ecompnet}.15",
+            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.17",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            "pg_int" : "192.168.9.109",
+            "vip" : "192.168.9.112",
+            "gre_ipaddr" : "192.168.30.112",
+            "vnf_id" : "vLoadBalancer_${hostid}",
+            "vf_module_id" : "vLoadBalancer"
+        },
+        "dnsscaling_preload.template" : {
+            "int_private_net_id" : "vLBMS_cllb01_private${hostid}",
+            "int_private_subnet_id" : "vLBMS_cllb01_private${hostid}_subnet",
+            "vlb_int_private_ip_0" : "192.168.30.100",
+            "vlb_onap_private_ip_0" : "10.0.${ecompnet}.14",
+            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
+            "vdns_int_private_ip_0" : "192.168.30.222",
+            "vdns_onap_private_ip_0" : "10.0.${ecompnet}.16",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vdns_name_0':'clvlbscaling${hostid}',
+            "vlb_private_net_cidr" : "192.168.10.0/24"
+        },
+        "vims_preload.template" : {
+            "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "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=="
+        },
+        "vvg_preload.template" : {
+        }
+    },
+ # heat template parameter values for heat template instances created for hands on demo test case
+   "Demo" : {
+        "vfw_preload.template": {
+            "unprotected_private_net_id" : "demofwl_unprotected",
+            "unprotected_private_net_cidr" : "192.168.110.0/24",
+            "protected_private_net_id" : "demofwl_protected",
+            "protected_private_net_cidr" : "192.168.120.0/24",
+            "vfw_int_unprotected_private_ip_0" : "192.168.110.100",
+            "vfw_int_protected_private_ip_0" : "192.168.120.100",
+            "vfw_onap_private_ip_0" : "10.0.${ecompnet}.11",
+            "vpg_int_unprotected_private_ip_0" : "192.168.110.200",
+            "vfw_int_protected_private_floating_ip" : "192.168.110.200",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.12",
+            "vsn_int_protected_private_ip_0" : "192.168.120.250",
+            "vsn_onap_private_ip_0" : "10.0.${ecompnet}.13",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vfw_name_0':'demofwl01fwl',
+            'vpg_name_0':'demofwl01pgn',
+            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            'vsn_name_0':'demofwl01snk'
+        },
+        "vfwsnk_preload.template": {
+            "int_unprotected_private_net_id" : "demofwlsnk_unprotected${hostid}",
+            "int_unprotected_private_subnet_id" : "demofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "int_protected_private_net_id" : "demofwlsnk_protected${hostid}",
+            "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_int_unprotected_private_ip_0" : "192.168.10.100",
+            # this should be the same value as vpg_private_ip_0
+            "vfw_int_protected_private_floating_ip" : "192.168.10.200",
+            "vfw_int_protected_private_ip_0" : "192.168.20.100",
+            "vfw_onap_private_ip_0" : "10.0.${ecompnet}.121",
+            "vsn_int_protected_private_ip_0" : "192.168.20.250",
+            "vsn_onap_private_ip_0" : "10.0.${ecompnet}.122",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vfw_name_0':'${generic_vnf_name}',
+            'vsn_name_0':'demofwl01snk${hostid}',
+            "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+        },
+        "vpkg_preload.template": {
+            "unprotected_private_net_id" : "vFWSNK_demofwlsnk_unprotected${hostid}",
+            "unprotected_private_subnet_id" : "vFWSNK_demofwlsnk_unprotected_sub${hostid}",
+            "unprotected_private_net_cidr" : "192.168.10.0/24",
+            "protected_private_net_cidr" : "192.168.20.0/24",
+            "vfw_private_ip_0" : "192.168.10.100",
+            "vpg_unprotected_private_ip_0" : "192.168.10.200",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.123",
+            "vsn_private_ip_0" : "192.168.20.250",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vpg_name_0':'demofwl01pgn${hostid}',
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}"
+        },
+        # vLBMS
+        "vlb_preload.template" : {
+            "vlb_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vlb_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vdns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vdns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}",
+            "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            'vlb_name_0':'demovlblb${hostid}',
+            'vdns_name_0':'demovlbdns${hostid}',
+            "vpg_name_0" : "clvlbpgn${hostid}",
+            "vlb_private_net_id" : "demolb_private${hostid}",
+            "vlb_private_net_cidr" : "192.168.30.0/24",
+            "pktgen_private_net_id" : "demolb_pktgen${hostid}",
+            "pktgen_private_net_cidr" : "192.168.9.0/24",
+            "vlb_int_private_ip_0" : "192.168.30.100",
+            "vlb_onap_private_ip_0" : "10.0.${ecompnet}.24",
+            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
+            "vdns_int_private_ip_0" : "192.168.30.110",
+            "vdns_onap_private_ip_0" : "10.0.${ecompnet}.25",
+            "vpg_onap_private_ip_0" : "10.0.${ecompnet}.27",
+            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
+            "pg_int" : "192.168.9.109",
+            "vip" : "192.168.9.112",
+            "gre_ipaddr" : "192.168.30.112",
+            "vnf_id" : "vLoadBalancer_${hostid}",
+            "vf_module_id" : "vLoadBalancer",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380"
+        },
+        "dnsscaling_preload.template" : {
+            "int_private_net_id" : "vLBMS_demolb_private${hostid}",
+            "int_private_subnet_id" : "vLBMS_demolb_private${hostid}_subnet",
+            "vlb_int_private_ip_0" : "192.168.30.100",
+            "vlb_onap_private_ip_0" : "10.0.${ecompnet}.24",
+            "vlb_int_pktgen_private_ip_0" : "192.168.9.111",
+            "vdns_int_private_ip_0" : "192.168.30.222",
+            "vdns_onap_private_ip_0" : "10.0.${ecompnet}.26",
+            "sec_group" : "a668eaa8-efa1-4c8b-a044-b80eb16d0380",
+            'vdns_name_0':'demovlbscaling${hostid}',
+            "vlb_private_net_cidr" : "192.168.30.0/24"
+        },
+        "vims_preload.template" : {
+            "bono_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "sprout_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "homer_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "homestead_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "ralf_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "ellis_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "dns_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
+            "bono_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "sprout_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "homer_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "homestead_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "ralf_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "ellis_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "dns_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
+            "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=="
+        },
+        "vvg_preload.template" : {
+        }
+    }
+}
diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot
index afd99ad6..6e8ba136 100644
--- a/robot/resources/so/direct_instantiate.robot
+++ b/robot/resources/so/direct_instantiate.robot
@@ -40,10 +40,14 @@ Instantiate Service Direct To SO
     ${tmp_key2}=   Catenate  \$  {   GLOBAL_INJECTED_UBUNTU_1404_IMAGE  }
     ${tmp_key2}=     Evaluate  '${tmp_key2}'.replace(' ','')
     # ecompnet  13 , 14, 15
-    Set To Dictionary   ${template}    ${tmp_key1}     14      ${tmp_key2}     ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}
+    # use same method as sdnc preload robot script
+    ${ecompnet}=    Evaluate    str((${GLOBAL_BUILD_NUMBER}%128)+128)
+
+    Set To Dictionary   ${template}    ${tmp_key1}     ${ecompnet}     ${tmp_key2}     ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}
 
     Log    ${preload_dict}  
     Log    ${template}  
-    Create Entire Service   ${csar_file}    ${vnf_template_file}   ${template}   ${name_suffix}   ${GLOBAL_INJECTED_REGION}  ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}  ${heatbridge}
-
+    ${service_instance_id}=   Create Entire Service   ${csar_file}    ${vnf_template_file}   ${template}   ${name_suffix}   ${GLOBAL_INJECTED_REGION}  ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}  ${heatbridge}
+    Log To Console     ServiceInstanceId:${service_instance_id}
+    Should Not Be Equal As Strings  ${service_instance_id}   None
 
diff --git a/robot/testsuites/create-cloud-config.robot b/robot/testsuites/create-cloud-config.robot
index 7a798a4b..d78f446d 100644
--- a/robot/testsuites/create-cloud-config.robot
+++ b/robot/testsuites/create-cloud-config.robot
@@ -4,6 +4,7 @@ Test Timeout    1 minute
 
 
 Resource          ../resources/so/create_cloud_config.robot
+Resource          ../resources/aai/create_tenant.robot
 
 
 *** Test Cases ***
@@ -14,12 +15,16 @@ Create Cloud Config Test
 
 Create Cloud Config RegionThree V3 Test
     [TAGS]    mso    cloudconfig  cloudconfigv3
-    #     [Arguments]    ${site_name}    ${region_id}   ${clli}   ${identity_id}   ${identity_url}   ${mso_id}    ${mso_pass}    ${admin_tenant}    ${member_role}    ${identity_server_type}    ${authentication_type}    ${project_domain_name}    ${user_domain_Name}
-    # ${region_id} in openstack is set up by cloud administration and does not have to be same as ONAP ${site_name}
-    # In Windriver/Intel test labs the os_region_id's are all set to "RegionOne"
-    # clli by testing team convention is same as onap site_name
-    #  KEYSTONE URL should end in /v3 SO will put /auth when KEYSTONE_V3 is the identity_server_type
+    [Documentation]   Create Keystone V3 in Region 3
+    ...  [Arguments]    ${site_name}    ${region_id}   ${clli}   ${identity_id}   ${identity_url}   ${mso_id}    ${mso_pass}    
+    ...      ${admin_tenant}    ${member_role}    ${identity_server_type}    ${authentication_type}    ${project_domain_name}    ${user_domain_Name}
+    ...  ${region_id} in openstack is set up by cloud administration and does not have to be same as ONAP ${site_name}
+    ...  In Windriver/Intel test labs the os_region_id's are all set to "RegionOne"
+    ...  clli by testing team convention is same as onap site_name
+    ...  KEYSTONE URL should end in /v3 SO will put /auth when KEYSTONE_V3 is the identity_server_type
     Create Cloud Configuration v3    ${GLOBAL_INJECTED_REGION_THREE}   ${GLOBAL_INJECTED_REGION}  ${GLOBAL_INJECTED_REGION_THREE}   REGION_THREE_KEYSTONE    ${GLOBAL_INJECTED_KEYSTONE_REGION_THREE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE}     ${GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE}   ${GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE}    ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE}     admin    KEYSTONE_V3    USERNAME_PASSWORD  ${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN__REGION_THREE}  ${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN__REGION_THREE}
+    Inventory Tenant If Not Exists    CloudOwner   ${GLOBAL_INJECTED_REGION_THREE}  SharedNode  OwnerType  v1  CloudZone  ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE}  ${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN__REGION_THREE}
+
 
 Get Cloud Config Test
     [TAGS]    mso    cloudconfig
diff --git a/robot/testsuites/vnf-orchestration-direct-so.robot b/robot/testsuites/vnf-orchestration-direct-so.robot
index 4a9fd1a3..ee2759cb 100644
--- a/robot/testsuites/vnf-orchestration-direct-so.robot
+++ b/robot/testsuites/vnf-orchestration-direct-so.robot
@@ -6,11 +6,14 @@ Resource          ../resources/so/direct_instantiate.robot
 
 *** Variables ***
 ${CSAR_FILE}   
-${VFW_TEMPLATE}     ../assets/templates/vcpeutils/template.vfw_vfmodule.json
+${VFW_TEMPLATE}     robot/assets/templates/vcpeutils/template.vfw_vfmodule.json
 
 
 *** Test Cases ***
 SO Direct Instantiate vFW VNF
     [Tags]    instantiateVFWdirectso
+    [Documentation]   Direct REST API into SO
+    ...    ./ete-k8s.sh onap healtdist   (cpy csar file name)
+    ...    ./ete-k8s.sh onap instantiateVFWdirectso  CSAR_FILE:/tmp/csar/service-Vfw20190413133734-csar.csar
     Run Keyword If   '${CSAR_FILE}' == ''   Fail   "CSAR_FILE must not be empty (/tmp/csar/service-Vfw20190413133734-csar.csar)"
     Instantiate Service Direct To SO     vFW    ${CSAR_FILE}   ${VFW_TEMPLATE}
diff --git a/vm_properties2.py b/vm_properties2.py
new file mode 100644
index 00000000..9a821927
--- /dev/null
+++ b/vm_properties2.py
@@ -0,0 +1,190 @@
+# Copyright (c) 2018 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# File generated from /opt/config
+#
+GLOBAL_INJECTED_AAF_IP_ADDR = "aaf-service.onap"
+GLOBAL_INJECTED_AAI1_IP_ADDR = "aai.onap"
+GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A"
+GLOBAL_INJECTED_APPC_IP_ADDR = "appc.onap"
+GLOBAL_INJECTED_APPC_CDT_IP_ADDR = "appc-cdt.onap"
+GLOBAL_INJECTED_ARTIFACTS_VERSION = "1.3.0"
+GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap"
+GLOBAL_INJECTED_CLI_IP_ADDR = "cli.onap"
+GLOBAL_INJECTED_CLOUD_ENV = "openstack"
+GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-healthcheck.onap"
+GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = "dmaap-dr-prov.onap"
+GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR = "dmaap-dr-node.onap"
+GLOBAL_INJECTED_DNS_IP_ADDR = "N/A"
+GLOBAL_INJECTED_DOCKER_VERSION = "1.2-STAGING-latest"
+GLOBAL_INJECTED_EXTERNAL_DNS = "N/A"
+GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR = "log-es.onap"
+GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.onap"
+GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls-http.onap"
+GLOBAL_INJECTED_POMBA_AAI_CONTEXT_BUILDER_IP_ADDR = "pomba-aaictxbuilder.onap"
+GLOBAL_INJECTED_POMBA_SDC_CONTEXT_BUILDER_IP_ADDR = "pomba-sdcctxbuilder.onap"
+GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXT_BUILDER_IP_ADDR = "pomba-networkdiscoveryctxbuilder.onap"
+GLOBAL_INJECTED_POMBA_SERVICE_DECOMPOSITION_IP_ADDR = "pomba-servicedecomposition.onap"
+GLOBAL_INJECTED_POMBA_SDNC_CTX_BUILDER_IP_ADDR = "pomba-sdncctxbuilder.onap"
+GLOBAL_INJECTED_POMBA_NETWORKDISCOVERY_MICROSERVICE_IP_ADDR = "pomba-networkdiscovery.onap"
+GLOBAL_INJECTED_POMBA_VALIDATION_SERVICE_IP_ADDR = "pomba-validation-service.onap"
+GLOBAL_INJECTED_POMBA_KIBANA_IP_ADDR = "pomba-kibana.onap"
+GLOBAL_INJECTED_POMBA_ELASTIC_SEARCH_IP_ADDR = "pomba-es.onap"
+GLOBAL_INJECTED_POMBA_CONTEX_TAGGREGATOR_IP_ADDR = "pomba-contextaggregator.onap"
+GLOBAL_INJECTED_KEYSTONE = "http://10.12.25.2:5000"
+GLOBAL_INJECTED_MR_IP_ADDR = "message-router.onap"
+GLOBAL_INJECTED_BC_IP_ADDR = "dmaap-bc.onap"
+GLOBAL_INJECTED_MUSIC_IP_ADDR = "music.onap"
+GLOBAL_INJECTED_NBI_IP_ADDR = "nbi.onap"
+GLOBAL_INJECTED_NETWORK = "oam_network_sSXO"
+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_OOF_IP_ADDR = "N/A"
+GLOBAL_INJECTED_OOF_HOMING_IP_ADDR = "oof-has-api.onap"
+GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR = "oof-osdf.onap"
+GLOBAL_INJECTED_OOF_CMSO_IP_ADDR = "oof-cmso.onap"
+GLOBAL_INJECTED_MSB_IP_ADDR = "msb-iag.onap"
+GLOBAL_INJECTED_OPENSTACK_API_KEY = "bbaef6cd76625ab9eb60deedeae7dbb9"
+GLOBAL_INJECTED_OPENSTACK_PASSWORD = "tenantPassword"
+GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "3583253e932845a09cd4c8ca2f31d095"
+GLOBAL_INJECTED_OPENSTACK_USERNAME = "demo"
+GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME = "onap"
+GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID = "default"
+GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION = "v2.0"
+
+GLOBAL_INJECTED_REGION_THREE = "RegionThree"
+GLOBAL_INJECTED_KEYSTONE_REGION_THREE = "http://10.12.25.2:5000"
+GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE = "v3"
+GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE = "demo"
+GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE  = "4C40E5362BF66194152B2BB48BC5A9700DA2BF4018631CE709366C1459BCCD779C7BCC1A"
+GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = "3583253e932845a09cd4c8ca2f31d095"
+GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN__REGION_THREE = "Integration-HEAT-Staging-Daily"
+GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN__REGION_THREE = "Default"
+
+GLOBAL_INJECTED_POLICY_IP_ADDR = "pdp.onap"
+GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap"
+GLOBAL_INJECTED_PORTAL_IP_ADDR = "portal-app.onap"
+GLOBAL_INJECTED_PUBLIC_NET_ID = "971040b2-7059-49dc-b220-4fab50cb2ad4"
+GLOBAL_INJECTED_REGION = "RegionThree"
+GLOBAL_INJECTED_SCRIPT_VERSION = "1.3.0"
+GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap"
+GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR = "sdc-onboarding-be.onap"
+GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap"
+GLOBAL_INJECTED_SDC_IP_ADDR = "N/A"
+GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnc.onap"
+GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.onap"
+GLOBAL_INJECTED_SO_APIHAND_IP_ADDR = "so.onap"
+GLOBAL_INJECTED_SO_ASDCHAND_IP_ADDR = "so-sdc-controller.onap"
+GLOBAL_INJECTED_SO_BPMN_IP_ADDR = "so-bpmn-infra.onap"
+GLOBAL_INJECTED_SO_CATDB_IP_ADDR = "so-catalog-db-adapter.onap"
+GLOBAL_INJECTED_SO_IP_ADDR = "so.onap"
+GLOBAL_INJECTED_SO_OPENSTACK_IP_ADDR = "so-openstack-adapter.onap"
+GLOBAL_INJECTED_SO_REQDB_IP_ADDR = "so-request-db-adapter.onap"
+GLOBAL_INJECTED_SO_SDNC_IP_ADDR = "so-sdnc-adapter.onap"
+GLOBAL_INJECTED_SO_VFC_IP_ADDR = "so-vfc-adapter.onap"
+GLOBAL_INJECTED_SO_VNFM_IP_ADDR = "so-vnfm-adapter.onap"
+GLOBAL_INJECTED_UBUNTU_1404_IMAGE = "ubuntu-14-04-cloud-amd64"
+GLOBAL_INJECTED_UBUNTU_1604_IMAGE = "ubuntu-16-04-cloud-amd64"
+GLOBAL_INJECTED_VM_IMAGE_NAME = "ubuntu-14-04-cloud-amd64"
+GLOBAL_INJECTED_VID_IP_ADDR = "vid.onap"
+GLOBAL_INJECTED_VM_FLAVOR = "m1.medium"
+GLOBAL_INJECTED_VNFSDK_IP_ADDR = "refrepo.onap"
+
+GLOBAL_INJECTED_PROPERTIES = {
+    "GLOBAL_INJECTED_AAF_IP_ADDR" : "aaf-service.onap",
+    "GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai.onap",
+    "GLOBAL_INJECTED_AAI2_IP_ADDR" : "N/A",
+    "GLOBAL_INJECTED_APPC_IP_ADDR" : "appc.onap",
+    "GLOBAL_INJECTED_APPC_CDT_IP_ADDR" : "appc-cdt.onap",
+    "GLOBAL_INJECTED_ARTIFACTS_VERSION" : "1.3.0",
+    "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.onap",
+    "GLOBAL_INJECTED_CLI_IP_ADDR" : "cli.onap",
+    "GLOBAL_INJECTED_CLOUD_ENV" : "openstack",
+    "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-healthcheck.onap",
+    "GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : "dmaap-dr-prov.onap",
+    "GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR" : "dmaap-dr-node.onap",
+    "GLOBAL_INJECTED_DNS_IP_ADDR" : "N/A",
+    "GLOBAL_INJECTED_DOCKER_VERSION" : "1.2-STAGING-latest",
+    "GLOBAL_INJECTED_EXTERNAL_DNS" : "N/A",
+    "GLOBAL_INJECTED_KEYSTONE" : "http://10.12.25.2:5000",
+    "GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR" : "log-es.onap",
+    "GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR" : "log-kibana.onap",
+    "GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR" : "log-ls.onap",
+    "GLOBAL_INJECTED_MR_IP_ADDR" : "message-router.onap",
+    "GLOBAL_INJECTED_BC_IP_ADDR" : "dmaap-bc.onap",
+    "GLOBAL_INJECTED_POMBA_AAI_CONTEXT_BUILDER_IP_ADDR" : "pomba-aaictxbuilder.onap",
+    "GLOBAL_INJECTED_POMBA_SDC_CONTEXT_BUILDER_IP_ADDR" : "pomba-sdcctxbuilder.onap",
+    "GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXT_BUILDER_IP_ADDR" : "pomba-networkdiscovery.onap",
+    "GLOBAL_INJECTED_POMBA_SERVICE_DECOMPOSITION_IP_ADDR" : "pomba-servicedecomposition.onap",
+    "GLOBAL_INJECTED_POMBA_SDNC_CTX_BUILDER_IP_ADDR" : "pomba-sdncctxbuilder.onap",
+    "GLOBAL_INJECTED_POMBA_CONTEX_TAGGREGATOR_IP_ADDR" : "pomba-contextaggregator.onap",
+    "GLOBAL_INJECTED_MUSIC_IP_ADDR" : "music.onap",
+    "GLOBAL_INJECTED_NBI_IP_ADDR" : "nbi.onap",
+    "GLOBAL_INJECTED_NETWORK" : "oam_network_sSXO",
+    "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_OOF_IP_ADDR" : "N/A",
+    "GLOBAL_INJECTED_OOF_HOMING_IP_ADDR" : "oof-has-api.onap",
+    "GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR" : "oof-osdf.onap",
+    "GLOBAL_INJECTED_OOF_CMSO_IP_ADDR" : "oof-cmso.onap",
+    "GLOBAL_INJECTED_MSB_IP_ADDR" : "msb-iag.onap",
+    "GLOBAL_INJECTED_OPENSTACK_API_KEY" : "bbaef6cd76625ab9eb60deedeae7dbb9",
+    "GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "tenantPassword",
+    "GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "3583253e932845a09cd4c8ca2f31d095",
+    "GLOBAL_INJECTED_OPENSTACK_USERNAME" : "demo",
+    "GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME" : "onap",
+    "GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID" : "default",
+    "GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION" : "v2.0",
+    "GLOBAL_INJECTED_REGION_THREE" : "RegionThree",
+    "GLOBAL_INJECTED_KEYSTONE_REGION_THREE" : "http://10.12.25.2:5000",
+    "GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE" : "v3",
+    "GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE" : "demo",
+    "GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE" : "4C40E5362BF66194152B2BB48BC5A9700DA2BF4018631CE709366C1459BCCD779C7BCC1A",
+    "GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE" : "3583253e932845a09cd4c8ca2f31d095",
+    "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN__REGION_THREE" : "Integration-HEAT-Staging-Daily",
+    "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN__REGION_THREE" : "Default",
+    "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pdp.onap",
+    "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.onap",
+    "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portal-app.onap",
+    "GLOBAL_INJECTED_PUBLIC_NET_ID" : "971040b2-7059-49dc-b220-4fab50cb2ad4",
+    "GLOBAL_INJECTED_REGION" : "RegionThree",
+    "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.onap",
+    "GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : "sdc-onboarding-be.onap",
+    "GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.onap",
+    "GLOBAL_INJECTED_SDC_IP_ADDR" : "N/A",
+    "GLOBAL_INJECTED_SCRIPT_VERSION" : "1.3.0",
+    "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnc.onap",
+    "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.onap",
+    "GLOBAL_INJECTED_SO_APIHAND_IP_ADDR" : "so.onap",
+    "GLOBAL_INJECTED_SO_ASDCHAND_IP_ADDR" : "so-sdc-controller.onap",
+    "GLOBAL_INJECTED_SO_BPMN_IP_ADDR" : "so-bpmn-infra.onap",
+    "GLOBAL_INJECTED_SO_CATDB_IP_ADDR" : "so-catalog-db-adapter.onap",
+    "GLOBAL_INJECTED_SO_IP_ADDR" : "so.onap",
+    "GLOBAL_INJECTED_SO_OPENSTACK_IP_ADDR" : "so-openstack-adapter.onap",
+    "GLOBAL_INJECTED_SO_REQDB_IP_ADDR" : "so-request-db-adapter.onap",
+    "GLOBAL_INJECTED_SO_SDNC_IP_ADDR" : "so-sdnc-adapter.onap",
+    "GLOBAL_INJECTED_SO_VFC_IP_ADDR" : "so-vfc-adapter.onap",
+    "GLOBAL_INJECTED_SO_VNFM_IP_ADDR" : "so-vnfm-adapter.onap",
+    "GLOBAL_INJECTED_UBUNTU_1404_IMAGE" : "ubuntu-14-04-cloud-amd64",
+    "GLOBAL_INJECTED_UBUNTU_1604_IMAGE" : "ubuntu-16-04-cloud-amd64",
+    "GLOBAL_INJECTED_VM_IMAGE_NAME" : "ubuntu-14-04-cloud-amd64",
+    "GLOBAL_INJECTED_VID_IP_ADDR" : "vid.onap",
+    "GLOBAL_INJECTED_VM_FLAVOR" : "m1.medium",
+    "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : "refrepo.onap"
+
+}