Merge "Add quotes to force string conversion"

diff --git a/INFO.yaml b/INFO.yaml
index 7f7b4f2..33cae2a 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -73,6 +73,11 @@ committers:
       company: 'Huawei'
       id: 'xuyang11'
       timezone: 'America/New_York'
+    - name: 'Sylvain Desbureaux'
+      email: 'sylvain.desbureaux@orange.com'
+      company: 'Orange'
+      id: 'sdesbure'
+      timezone: 'Paris/France'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:

diff --git a/docs/example-integration-override-v3.yaml b/docs/example-integration-override-v3.yaml
new file mode 100644 (file)
index 0000000..659389a
--- /dev/null
+++ b/docs/example-integration-override-v3.yaml
@@ -0,0 +1,64 @@
+global:
+  repository: 10.12.5.2:5000
+  pullPolicy: IfNotPresent
+#################################################################
+# This override file configures openstack parameters for ONAP
+#################################################################
+robot:
+  enabled: true
+  flavor: large
+  appcUsername: "appc@appc.onap.org"
+  appcPassword: "demo123456!"
+  # KEYSTONE Version 3  Required for Rocky and beyond
+  openStackKeystoneAPIVersion: "v3"
+  # OS_AUTH_URL without the /v3 from the openstack .RC file
+  openStackKeyStoneUrl: "http://10.12.25.2:5000"
+  # OS_PROJECT_ID from the openstack .RC file
+  openStackTenantId: "09d8566ea45e43aa974cf447ed591d77"
+  # OS_USERNAME from the openstack .RC file
+  openStackUserName: "OS_USERNAME_HERE"
+  #  OS_PROJECT_DOMAIN_ID from the openstack .RC file
+  #  in some environments it is a string but in other environmens it may be a numeric
+  openStackDomainId:  "default"
+  #  OS_USER_DOMAIN_NAME from the openstack .RC file
+  openStackUserDomain:  "Default"
+  openStackProjectName: "OPENSTACK_PROJECT_NAME_HERE"
+  ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+  ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+  openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+  openStackPrivateNetId: "83c84b68-80be-4990-8d7f-0220e3c6e5c8"
+  openStackPrivateSubnetId: "e571c1d1-8ac0-4744-9b40-c3218d0a53a0"
+  openStackPrivateNetCidr: "10.0.0.0/16"
+  openStackOamNetworkCidrPrefix: "10.0"
+  openStackSecurityGroup: "bbe028dc-b64f-4f11-a10f-5c6d8d26dc89"
+  dcaeCollectorIp: "10.12.6.109"
+  vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
+  demoArtifactsVersion: "1.4.0"
+  demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
+  scriptVersion: "1.4.0"
+  rancherIpAddress: "10.12.6.160"
+  config:
+    # use the python utility to encrypt the OS_PASSWORD for the OS_USERNAME
+    openStackEncryptedPasswordHere: "XXXXXXXXXXXXXXXXXXXXXXXX_OPENSTACK_PYTHON_PASSWORD_HERE_XXXXXXXXXXXXXXXX"
+    openStackSoEncryptedPassword:  "YYYYYYYYYYYYYYYYYYYYYYYY_OPENSTACK_JAVA_PASSWORD_HERE_YYYYYYYYYYYYYYYY"
+so:
+  enabled: true
+  so-catalog-db-adapter:
+    config:
+      openStackUserName: "OS_USERNAME_HERE"
+      # OS_AUTH_URL (keep the /v3) from the openstack .RC file
+      openStackKeyStoneUrl: "http://10.12.25.2:5000/v3"
+      # use the SO Java utility to encrypt the OS_PASSWORD for the OS_USERNAME
+      openStackEncryptedPasswordHere: "YYYYYYYYYYYYYYYYYYYYYYYY_OPENSTACK_JAVA_PASSWORD_HERE_YYYYYYYYYYYYYYYY"
+appc:
+  enabled: true
+  replicaCount: 3
+  config:
+    enableClustering: true
+    openStackType: "OpenStackProvider"
+    openStackName: "OpenStack"
+    openStackKeyStoneUrl: "http://10.12.25.2:5000/v3"
+    openStackServiceTenantName: "OPENSTACK_PROJECT_NAME_HERE"
+    openStackDomain: "OPEN_STACK_DOMAIN_NAME_HERE"
+    openStackUserName: "OS_USER_NAME_HERE"
+    openStackEncryptedPassword: "OPENSTACK_CLEAR_TEXT_PASSWORD_HERE"

diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index a641fab..bd5e3ee 100644 (file)
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -30,7 +30,7 @@ file like onap-all.yaml, onap-vfw.yaml or openstack.yaml file to suit your deplo
 OpenStack tenant information.
 
 .. note::
-  Standard and example override files (e.g. onap-all.yaml, openstack.yaml) can be found in 
+  Standard and example override files (e.g. onap-all.yaml, openstack.yaml) can be found in
   the oom/kubernetes/onap/resources/overrides/ directory.
 
 
@@ -77,23 +77,65 @@ Java encryption library is not easy to integrate with openssl/python that
 ROBOT uses in Dublin.
 
 .. note::
-  To generate SO openStackEncryptedPasswordHere :
+  To generate SO openStackEncryptedPasswordHere and openStackSoEncryptedPassword:
+
+  SO_ENCRYPTION_KEY=`cat ~/oom/kubernetes/so/resources/config/mso/encryption.key`
 
-  SO_ENCRYPTION_KEY=`cat ~/oom/kubenertes/so/resources/config/mso/encrypt.key`
   OS_PASSWORD=XXXX_OS_CLEARTESTPASSWORD_XXXX
 
   git clone http://gerrit.onap.org/r/integration
 
   cd integration/deployment/heat/onap-rke/scripts
+
+
   javac Crypto.java
+
+  [ if javac is not installed 'apt-get update ; apt-get install default-jdk' ]
+
   java Crypto "$OS_PASSWORD" "$SO_ENCRYPTION_KEY"
 
 
 d. Update the OpenStack parameters:
 
+There are assumptions in the demonstration VNF heat templates about the networking 
+available in the environment. To get the most value out of these templates and the 
+automation that can help confirm the setup is correct, please observe the following 
+constraints.
+
+openStackPublicNetId: 
+
+This network should allow heat templates to add interfaces. 
+This need not be an external network, floating IPs can be assigned to the ports on 
+the VMs that are created by the heat template but its important that neutron allow 
+ports to be created on them.
+
+openStackPrivateNetCidr: "10.0.0.0/16"
+
+This ip address block is used to assign OA&M addresses on VNFs to allow ONAP connectivity.
+The demonstration heat templates assume that 10.0 prefix can be used by the VNFs and the 
+demonstration ip addressing plan embodied in the preload template prevent conflicts when 
+instantiating the various VNFs. If you need to change this, you will need to modify the preload 
+data in the robot helm chart like integration_preload_parametes.py and the demo/heat/preload_data 
+in the robot container. The size of the CIDR should be sufficient for ONAP and the VMs you expect 
+to create.
+
+openStackOamNetworkCidrPrefix: "10.0"
+
+This ip prefix mush match the openStackPrivateNetCidr and is a helper variable to some of the
+robot scripts for demonstration. A production deployment need not worry about this
+setting but for the demonstration VNFs the ip asssignment strategy assumes 10.0 ip prefix.
+
+
+Example Keystone v2.0 
 .. literalinclude:: example-integration-override.yaml
    :language: yaml
 
+Example Keystone v3  (required for Rocky and later releases)
+.. literalinclude:: example-integration-override-v3.yaml
+   :language: yaml
+
+
+
 **Step 4.** To setup a local Helm server to server up the ONAP charts::
 
   > helm serve &

diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 939f838..fa2ed65 100644 (file)
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -15,9 +15,9 @@
 apiVersion: v1
 name: onap
 version: 5.0.0
-appVersion: Dublin
+appVersion: El Alto 
 description: Open Network Automation Platform (ONAP)
 home: https://www.onap.org/
 sources:
 - https://gerrit.onap.org/r/#/admin/projects/
-icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
\ No newline at end of file
+icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
deleted file mode 100644 (file)
index d58e138..0000000
--- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
+++ /dev/null
@@ -1,542 +0,0 @@
-# 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.
-
-import json
-import os.path
-from itertools import chain
-from collections import defaultdict
-
-
-GLOBAL_PRELOAD_PARAMETERS = {
-    # heat template parameter values common to all heat template continaing these parameters
-     "defaults" : {
-         'key_name' : 'vfw_key${uuid}',
-         "pub_key" : "{{ .Values.vnfPubKey }}",
-         "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
-         "repo_url_artifacts" : "{{ .Values.demoArtifactsRepoUrl }}",
-         "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}",
-         "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
-         "onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}",
-         "onap_private_net_cidr" : "{{ .Values.openStackPrivateNetCidr }}",
-         "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-         "dcae_collector_ip" : "{{ .Values.dcaeCollectorIp }}",
-         "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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.2",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.3",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.101",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.102",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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": {
-            # vFWSNK_ prepended to vpkg since the default behoir for vFWSNK tempalte is to concatenate vnf_name and network_name
-            "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}",
-            "unprotected_private_subnet_id" : "vFWSNK_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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.103",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.5",
-            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.7",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            "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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.6",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
-            "vsn_int_protected_private_ip_0" : "192.168.120.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.111",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.112",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.113",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.15",
-            "vpg_int_pktgen_private_ip_0" : "192.168.9.110",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.17",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            "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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.16",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.12",
-            "vsn_int_protected_private_ip_0" : "192.168.120.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.13",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.121",
-            "vsn_int_protected_private_ip_0" : "192.168.20.250",
-            "vsn_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.122",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.123",
-            "vsn_private_ip_0" : "192.168.20.250",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.25",
-            "vpg_onap_private_ip_0" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{ .Values.openStackSecurityGroup }}"
-        },
-        "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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${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" : "{{.Values.openStackOamNetworkCidrPrefix}}.${ecompnet}.26",
-            "sec_group" : "{{ .Values.openStackSecurityGroup }}",
-            '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" : {
-        }
-    }
-}
-
-
-# Create dictionaries for new MAPPING data to join to original MAPPING data
-GLOBAL_PRELOAD_PARAMETERS2 = {}
-
-
-folder=os.path.join('/var/opt/ONAP/demo/preload_data')
-subfolders = [d for d in os.listdir(folder) if os.path.isdir(os.path.join(folder, d))]
-
-for service in subfolders:
-    filepath=os.path.join('/var/opt/ONAP/demo/preload_data', service, 'preload_data.json')
-    with open(filepath, 'r') as f:
-        preload_data = json.load(f)
-        GLOBAL_PRELOAD_PARAMETERS2['Demo']=preload_data
-
-
-# Merge dictionaries
-#    preload_data.json is for Demo key in GLOBAL_PRELOAD_PARAMETERS
-
-
-GLOBAL_PRELOAD_PARAMETERS3 = {'Demo':{}}
-
-for k, v in chain(GLOBAL_PRELOAD_PARAMETERS['Demo'].items(), GLOBAL_PRELOAD_PARAMETERS2['Demo'].items()):
-    GLOBAL_PRELOAD_PARAMETERS3['Demo'][k] =  v
-#    print(k, v)
-
-GLOBAL_PRELOAD_PARAMETERS =  dict(GLOBAL_PRELOAD_PARAMETERS.items() + GLOBAL_PRELOAD_PARAMETERS3.items())
-
-#print GLOBAL_PRELOAD_PARAMETERS
-

diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
index 1db75b0..2bbfa56 100644 (file)
--- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py
@@ -187,5 +187,6 @@ GLOBAL_PROXY_WARNING_TITLE=""
 GLOBAL_PROXY_WARNING_CONTINUE_XPATH=""
 # dns info
 GLOBAL_DNS_TRAFFIC_DURATION = "600"
-# location where heat templates are loaded from
+# location where heat templates and data are loaded from
 GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/ONAP/demo/heat"
+GLOBAL_PRELOAD_DATA_FOLDER = "/var/opt/ONAP/demo/preload-data"

diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 9cc3031..0f3f0c2 100644 (file)
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -20,9 +20,11 @@ GLOBAL_INJECTED_AAI2_IP_ADDR = 'N/A'
 GLOBAL_INJECTED_APPC_IP_ADDR = 'appc.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_APPC_CDT_IP_ADDR = 'appc-cdt.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_ARTIFACTS_VERSION = '{{.Values.demoArtifactsVersion}}'
+GLOBAL_INJECTED_ARTIFACTS_REPO_URL = "{{ .Values.demoArtifactsRepoUrl }}"
 GLOBAL_INJECTED_CLAMP_IP_ADDR = 'clamp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_CLI_IP_ADDR = 'cli.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_CLOUD_ENV = 'openstack'
+GLOBAL_INJECTED_DCAE_COLLECTOR_IP = "{{ .Values.dcaeCollectorIp }}"
 GLOBAL_INJECTED_DCAE_IP_ADDR = 'dcae-healthcheck.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_DCAE_VES_HOST = 'dcae-ves-collector.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = 'dmaap-dr-prov.{{include "common.namespace" .}}'
@@ -64,6 +66,7 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID = '{{ .Values.openStackTenantId }}'
 GLOBAL_INJECTED_OPENSTACK_USERNAME = '{{ .Values.openStackUserName }}'
 GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME = '{{ .Values.openStackProjectName }}'
 GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID = '{{ .Values.openStackDomainId }}'
+GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN = '{{ .Values.openStackUserDomain }}'
 GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION = '{{ .Values.openStackKeystoneAPIVersion }}'
 GLOBAL_INJECTED_REGION_THREE = '{{ .Values.openStackRegionRegionThree }}'
 GLOBAL_INJECTED_KEYSTONE_REGION_THREE = '{{ .Values.openStackKeyStoneUrlRegionThree }}'
@@ -71,11 +74,15 @@ GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE = '{{ .Values.openSt
 GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE = '{{ .Values.openStackUserNameRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE = '{{ .Values.openStackPasswordRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE  = '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}'
+GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD = '{{ .Values.config.openStackSoEncryptedPassword}}'
 GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantIdRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}'
 GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = 'public'
+GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}'
+GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}"
+GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR = "{{ .Values.openStackPrivateNetCidr }}"
 GLOBAL_INJECTED_POLICY_IP_ADDR = 'pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = 'drools.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_PORTAL_IP_ADDR = 'portal-app.{{include "common.namespace" .}}'
@@ -85,6 +92,7 @@ GLOBAL_INJECTED_POLICY_DISTRIBUTION_IP_ADDR = 'policy-distribution.{{include "co
 GLOBAL_INJECTED_POLICY_PDPX_IP_ADDR = 'policy-xacml-pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR = 'policy-apex-pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_PUBLIC_NET_ID = '{{ .Values.openStackPublicNetId }}'
+GLOBAL_INJECTED_PUBLIC_KEY = "{{ .Values.vnfPubKey }}"
 GLOBAL_INJECTED_REGION = '{{ .Values.openStackRegion }}'
 GLOBAL_INJECTED_SCRIPT_VERSION = '{{ .Values.scriptVersion }}'
 GLOBAL_INJECTED_SDC_BE_IP_ADDR = 'sdc-be.{{include "common.namespace" .}}'
@@ -117,9 +125,11 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_APPC_IP_ADDR" : 'appc.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_APPC_CDT_IP_ADDR" : 'appc-cdt.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_ARTIFACTS_VERSION" : '{{.Values.demoArtifactsVersion}}',
+    "GLOBAL_INJECTED_ARTIFACTS_REPO_URL" : "{{ .Values.demoArtifactsRepoUrl }}",
     "GLOBAL_INJECTED_CLAMP_IP_ADDR" : 'clamp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_CLI_IP_ADDR" : 'cli.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_CLOUD_ENV" : 'openstack',
+    "GLOBAL_INJECTED_DCAE_COLLECTOR_IP" : "{{ .Values.dcaeCollectorIp }}",
     "GLOBAL_INJECTED_DCAE_IP_ADDR" : 'dcae-healthcheck.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_DCAE_VES_HOST" : 'dcae-ves-collector.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR" : 'dmaap-dr-prov.{{include "common.namespace" .}}',
@@ -157,6 +167,7 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_OPENSTACK_USERNAME" : '{{ .Values.openStackUserName }}',
     "GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME" : '{{ .Values.openStackProjectName }}',
     "GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID" : '{{ .Values.openStackDomainId }}',
+    "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN" : '{{ .Values.openStackUserDomain }}',
     "GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION" : '{{ .Values.openStackKeystoneAPIVersion }}',
     "GLOBAL_INJECTED_REGION_THREE" : '{{ .Values.openStackRegionRegionThree }}',
     "GLOBAL_INJECTED_KEYSTONE_REGION_THREE" : '{{ .Values.openStackKeyStoneUrlRegionThree }}',
@@ -164,11 +175,15 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE" : '{{ .Values.openStackUserNameRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_PASSWORD_REGION_THREE" : '{{ .Values.openStackPasswordRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_MSO_ENCRYPTED_PASSWORD_REGION_THREE" : '{{ .Values.openSackMsoEncryptdPasswordRegionThree }}',
+    "GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD" :  '{{ .Values.config.openStackSoEncryptedPassword}}',
     "GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE" : '{{ .Values.openStackTenantIdRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}',
     "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : 'public',
+    "GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP": '{{ .Values.openStackSecurityGroup }}',
+    "GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID" : "{{ .Values.openStackPrivateSubnetId }}",
+    "GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR" : "{{ .Values.openStackPrivateNetCidr }}",
     "GLOBAL_INJECTED_POLICY_IP_ADDR" : 'pdp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : 'drools.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : 'policy-api.{{include "common.namespace" .}}',
@@ -178,6 +193,7 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_POLICY_APEX_PDP_IP_ADDR" : 'policy-apex-pdp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_PORTAL_IP_ADDR" : 'portal-app.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_PUBLIC_NET_ID" : '{{ .Values.openStackPublicNetId }}',
+    "GLOBAL_INJECTED_PUBLIC_KEY" : "{{ .Values.vnfPubKey }}",
     "GLOBAL_INJECTED_REGION" : '{{ .Values.openStackRegion }}',
     "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : 'sdc-be.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_SDC_BE_ONBOARD_IP_ADDR" : 'sdc-onboarding-be.{{include "common.namespace" .}}',
@@ -203,4 +219,4 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_VM_FLAVOR" : '{{ .Values.openStackFlavourMedium }}',
     "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : 'refrepo.{{include "common.namespace" .}}'
 
-}
+}
\ No newline at end of file

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 65da947..5443771 100644 (file)
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -37,6 +37,7 @@ config:
 
 # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment
   openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+  openStackSoEncryptedPassword: "SAME_STRING_AS_SO_JAVA_ENCRYPTED_PASSWORD"
 
 # Demo configuration
 # Nexus demo artifact version.  Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION
@@ -45,24 +46,46 @@ demoArtifactsVersion: "1.4.0"
 demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
 # Openstack medium sized flavour name.  Maps GLOBAL_INJECTED_VM_FLAVOR
 openStackFlavourMedium: "m1.medium"
+
+#################  Openstack .RC Parameters ################################333
+# KEYSTONE Version 3  Required for Rocky and beyond
+# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
+openStackKeystoneAPIVersion: "v2.0"
+
+# OS_AUTH_URL without the /v3 or /v2.0 from the openstack .RC file
 # Openstack keystone URL.  Maps to GLOBAL_INJECTED_KEYSTONE
 openStackKeyStoneUrl: "http://1.2.3.4:5000"
+
+# OS_PROJECT_ID from the openstack .RC file
+# Openstack tenant UUID where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_TENANT_ID
+openStackTenantId: "47899782ed714295b1151681fdfd51f5"
+
+#  OS_PROJECT_NAME from the openstack .RC file
+# Project name of Openstack where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME
+openStackProjectName: "onap"
+
+# OS_USERNAME from the openstack .RC file
+# username for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_USERNAME
+openStackUserName: "tenantUsername"
+
+#  OS_PROJECT_DOMAIN_ID from the openstack .RC file
+#  in some environments it is a string but in other environmens it may be a numeric
+# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
+openStackDomainId: "default"
+
+#  OS_USER_DOMAIN from the openstack .RC file
+# Use Domain of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN
+openStackUserDomain:  "Default"
+
+
 # UUID of the Openstack network that can assign floating ips.  Maps to GLOBAL_INJECTED_PUBLIC_NET_ID
 openStackPublicNetId: "e8f51958045716781ffc"
 # password for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_PASSWORD
 openStackPassword: "tenantPassword"
 # Openstack region.  Maps to GLOBAL_INJECTED_REGION
 openStackRegion: "RegionOne"
-# Openstack tenant UUID where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_TENANT_ID
-openStackTenantId: "47899782ed714295b1151681fdfd51f5"
-# username for Openstack tenant where VNFs will be spawned.  Maps to GLOBAL_INJECTED_OPENSTACK_USERNAME
-openStackUserName: "tenantUsername"
-# Project name of Openstack where VNFs will be spawned. Maps to GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME
-openStackProjectName: "onap"
-# Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID
-openStackDomainId: "Default"
-# Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION
-openStackKeystoneAPIVersion: "v2.0"
+
+
 # Values for second cloud instante for VNF instantiatioen testing and keystone v3
 openStackRegionRegionThree: "RegionThree"
 openStackKeyStoneUrlRegionThree: "http://1.2.3.4:5000"