Merge "CSIT for Multicloud-Ocata HPA"
authorGary Wu <gary.i.wu@huawei.com>
Thu, 10 May 2018 20:49:33 +0000 (20:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 10 May 2018 20:49:33 +0000 (20:49 +0000)
87 files changed:
.gitignore
S3Ptools/locust_Grafana.sh [new file with mode: 0644]
S3Ptools/locustfile.py [new file with mode: 0644]
deployment/heat/onap-oom/env/default/integration-override.yaml [deleted file]
deployment/heat/onap-oom/env/gwu/onap.env
deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
deployment/heat/onap-oom/env/tlab/integration-override.yaml [deleted file]
deployment/heat/onap-oom/env/windriver/Integration-Jenkins-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-00.env [changed mode: 0755->0644]
deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
deployment/heat/onap-oom/env/windriver/Integration-SB-03-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
deployment/heat/onap-oom/env/windriver/Integration-SB-04-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
deployment/heat/onap-oom/env/windriver/Integration-SB-05-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc [deleted symlink]
deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml [deleted file]
deployment/heat/onap-oom/env/windriver/integration-override.yaml [deleted file]
deployment/heat/onap-oom/k8s_vm_entrypoint.sh
deployment/heat/onap-oom/onap-oom.yaml
deployment/heat/onap-oom/parts/onap-oom-1.yaml [new file with mode: 0644]
deployment/heat/onap-oom/parts/onap-oom-2.yaml [new file with mode: 0644]
deployment/heat/onap-oom/parts/onap-oom-3.yaml [new file with mode: 0644]
deployment/heat/onap-oom/rancher_vm_entrypoint.sh
deployment/heat/onap-oom/scripts/deploy.sh
deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh [new file with mode: 0755]
deployment/heat/onap-oom/scripts/prepull-docker.sh [new file with mode: 0755]
test/csit/plans/appc/healthcheck/setup.sh
test/csit/plans/appc/healthcheck/teardown.sh
test/csit/plans/sdnc/healthcheck/setup.sh
test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
test/csit/scripts/externalapi-nbi/start_nbi_containers.sh
test/csit/scripts/policy/script1.sh
test/csit/scripts/so/chef-config/mso-docker.json
test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-infra.sql
test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vbng.sql [new file with mode: 0644]
test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vbrgemu.sql [new file with mode: 0644]
test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vgmux.sql [new file with mode: 0644]
test/csit/tests/portal/testsuites/test1.robot
test/ete/labs/gwu/apt-proxy.sh
test/ete/labs/gwu/onap-openstack-template.env
test/ete/labs/huawei/apt-proxy.sh
test/ete/labs/tlab/apt-proxy.sh
test/ete/labs/tlab/onap-openstack-template.env
test/ete/labs/windriver/Integration-Jenkins-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-00-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-01-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-02-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-03-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-04-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-05-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-06-DNS-openrc [deleted file]
test/ete/labs/windriver/Integration-SB-07-DNS-openrc [deleted file]
test/ete/labs/windriver/apt-proxy.sh
test/ete/labs/windriver/onap-openstack-template.env
test/ete/scripts/install_openstack_cli.sh
test/ete/scripts/run-healthcheck.sh
test/vcpe/preload_templates/simple_neutron_heat.yaml [new file with mode: 0644]
test/vcpe/preload_templates/template.network.json [new file with mode: 0644]
test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json [new file with mode: 0644]
test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json [new file with mode: 0644]
test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json [new file with mode: 0644]
test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json [new file with mode: 0644]
test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json [new file with mode: 0644]
test/vcpe/preload_templates/template_sniro_data.json [new file with mode: 0644]
test/vcpe/preload_templates/template_sniro_request.json [new file with mode: 0644]
version-manifest/pom.xml
version-manifest/src/main/resources/docker-manifest.csv
version-manifest/src/main/resources/java-manifest.csv
version-manifest/src/main/scripts/add-images-from-oom.sh [new file with mode: 0755]
version-manifest/src/main/scripts/check-docker-manifest.sh [new file with mode: 0755]
version-manifest/src/main/scripts/check-sorted.sh
version-manifest/src/main/scripts/update-heat-image-versions.sh [new file with mode: 0755]
version-manifest/src/main/scripts/update-oom-image-versions.sh [new file with mode: 0755]
version.properties

index 48c5c1c..b26692d 100644 (file)
@@ -1,3 +1,4 @@
+.idea/
 .project
 .classpath
 .settings/
diff --git a/S3Ptools/locust_Grafana.sh b/S3Ptools/locust_Grafana.sh
new file mode 100644 (file)
index 0000000..5fa6fdc
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+#grafana install for the use of locust
+# localgosh:80(grafana) & localhost:81
+pip install docker==3.1.4
+git clone https://github.com/kamon-io/docker-grafana-graphite.git
+cd docker-grafana-graphite
+make up
+
diff --git a/S3Ptools/locustfile.py b/S3Ptools/locustfile.py
new file mode 100644 (file)
index 0000000..5fe5b37
--- /dev/null
@@ -0,0 +1,28 @@
+import random
+import string
+from locust import HttpLocust, TaskSet, task
+class UserBehavior(TaskSet):
+    def on_start(self):
+        """ on_start is called when a Locust start before any task is scheduled """
+        self.init()
+    def init(self):
+        pass
+    @task(1)
+    def DCI(self):
+        method = "POST"
+        url = "/ecomp/mso/infra/e2eServiceInstances/v3"
+        headers = {"Accept":"application/json","Content-Type":"application/json","Authorization":"Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="}
+        service_instance_name = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(10))
+        data = "{\"service\": {\"name\": \"E2E_volte_%s\", \"description\": \"E2E_volte_ONAP_deploy\", \"serviceDefId\": \"a16eb184-4a81-4c8c-89df-c287d390315a\", \"templateId\": \"012c3446-51db-4a2a-9e64-a936f10a5e3c\", \"parameters\": { \"globalSubscriberId\": \"Demonstration\", \"subscriberName\": \"Demonstration\", \"serviceType\": \"vIMS\", \"templateName\": \"VoLTE e2e Service:null\", \"resources\": [ { \"resourceName\": \"VL OVERLAYTUNNEL\", \"resourceDefId\": \"671d4757-b018-47ab-9df3-351c3bda0a98\", \"resourceId\": \"e859b0fd-d928-4cc8-969e-0fee7795d623\", \"nsParameters\": { \"locationConstraints\": [], \"additionalParamForNs\": { \"site2_vni\": \"5010\", \"site1_localNetworkAll\": \"false\", \"site1_vni\": \"5010\", \"site1_exportRT1\": \"11:1\", \"description\": \"overlay\", \"site2_localNetworkAll\": \"false\", \"site1_routerId\": \"9.9.9.9\", \"site1_fireWallEnable\": \"false\", \"site1_networkName\": \"network1\", \"site2_description\": \"overlay\", \"site1_importRT1\": \"11:1\", \"site1_description\": \"overlay\", \"site2_networkName\": \"network3\", \"name\": \"overlay\", \"site2_fireWallEnable\": \"false\", \"site2_id\": \"ZTE-DCI-Controller\", \"site2_routerId\": \"9.9.9.9\", \"site2_importRT1\": \"11:1\", \"site2_exportRT1\": \"11:1\", \"site2_fireWallId\": \"false\", \"site1_id\": \"DCI-Controller-1\", \"tunnelType\": \"L3-DCI\" } } } ] } } }" % service_instance_name
+        print(data)
+        response = self.client.request(method, url, headers=headers, data=data)
+        print(response.json())
+class WebsiteUser(HttpLocust):
+    task_set = UserBehavior
+    host = "http://10.0.5.1:8080"
+    min_wait = 5000
+    max_wait = 9000
diff --git a/deployment/heat/onap-oom/env/default/integration-override.yaml b/deployment/heat/onap-oom/env/default/integration-override.yaml
deleted file mode 100644 (file)
index 5341be1..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright Â© 2017 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.
-
-# This override file is useful to test one or more subcharts.
-# It overrides the default ONAP parent chart behaviour to deploy
-# all of ONAP.
-#
-# Example use to enable a single subchart (from this directory):
-#
-# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
-
-
-#################################################################
-# Global configuration overrides.
-#
-# These overrides will affect all helm charts (ie. applications)
-# that are listed below and are 'enabled'.
-#################################################################
-global:
-  # Change to an unused port prefix range to prevent port conflicts
-  # with other instances running within the same k8s cluster
-  nodePortPrefix: 302
-
-  # local nexus proxy - nexus3 default
-  repository: nexus3.onap.org:10001
-  # image pull policy
-  #pullPolicy: Always
-  pullPolicy: IfNotPresent
-
-
-  # default mount path root directory referenced
-  # by persistent volumes and log files
-#  persistence:
-#    mountPath: /onapdata
-
-#################################################################
-# Enable/disable and configure helm charts (ie. applications)
-# to customize the ONAP deployment.
-#################################################################
-aaf:
-  enabled: true
-aai:
-  enabled: true
-  # aai subchart image overrides
-  aai-champ:
-    image: onap/champ:1.2-STAGING-latest
-  aai-data-router:
-    image: onap/data-router:1.2-STAGING-latest
-  aai-modelloader:
-    image: onap/model-loader:1.2-STAGING-latest
-  aai-resources:
-    image: onap/aai-resources:1.2-STAGING-latest
-  aai-search-data:
-    image: onap/search-data-service:1.2-STAGING-latest
-  aai-sparky-be:
-    image: onap/sparky-be:1.2-STAGING-latest
-  aai-traveral:
-    image: onap/aai-traversal:1.2-STAGING-latest
-appc:
-  enabled: true 
-clamp:
-  enabled: true
-cli:
-  enabled: true
-consul:
-  enabled: true
-dcaegen2:
-  enabled: false
-esr:
-  enabled: true
-  # esr parent chart (server) image override
-  image: onap/aai/esr-server:1.1.0-SNAPSHOT
-  # esr subchart omage override
-  esr-gui:
-    image: onap/aai/esr-gui:1.1.0-SNAPSHOT
-log:
-  enabled: true
-message-router:
-  enabled: true
-#  kafka:
-#    repositoryOverride: docker.io
-#    image: wurstmeister/kafka:latest
-mock:
-  enabled: true
-msb:
-  enabled: true
-multicloud:
-  enabled: true
-policy:
-  enabled: true
-portal:
-  enabled: true
-robot:
-  enabled: true
-  #pullPolicy: Always
-#  config:
-  # openstack configuration
-  openStackUserName: "demo"
-  openStackRegion: "RegionOne"
-  openStackKeyStoneUrl: "http://10.12.25.2:5000"
-  openStackServiceTenantName: "service"
-  #openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
-  openStackPassword: "onapdemo"
-  openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-  openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
-sdc:
-  enabled: true
-sdnc:
-  enabled: true
-so:
-  enabled: true
-  # so server configuration
-  config:
-    # openstack configuration
-    openStackUserName: "demo"
-    openStackRegion: "RegionOne"
-    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-    openStackServiceTenantName: "service"
-    openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
-
-uui:
-  enabled: true
-vfc:
-  enabled: true
-vid:
-  enabled: true
-vnfsdk:
-  enabled: true
index 1a9aa9a..c510eb4 100644 (file)
@@ -1,33 +1,35 @@
 parameters:
 
-  keystone_url: http://192.168.1.11:5000
-  openstack_tenant_id: 4c93f99551604bf7af25a8f80c7f34cb
-  openstack_tenant_name: onap
-  openstack_username: demo
-  openstack_api_key: demo
-
-  ubuntu_1404_image: trusty
   ubuntu_1604_image: xenial
-  centos_7_image: centos7
 
   apt_proxy: 192.168.1.51:3142
   docker_proxy: 192.168.1.51:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
-  public_net_name: provider
 
-  oam_network_cidr: 172.16.0.0/16
-  dns_forwarder: 192.168.1.11
-  external_dns: 192.168.1.3
+  oam_network_cidr: 10.0.0.0/16
 
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v2.0"
-  dnsaas_keystone_url: http://192.168.1.11:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 4c93f99551604bf7af25a8f80c7f34cb
-  dnsaas_tenant_name: onap
-  dnsaas_username: demo
-  dnsaas_password: demo
+  integration_override_yaml: >
+    global:
+      repository: 192.168.1.51:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://192.168.1.11:5000"
+      openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "trusty"
+      ubuntu16Image: "xenial"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://192.168.1.11:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
index 88d6b74..18171f2 100644 (file)
@@ -1,33 +1,35 @@
 parameters:
 
-  keystone_url: http://10.145.122.117:5000
-  openstack_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
-  openstack_tenant_name: onap-beijing-oom
-  openstack_username: demo
-  openstack_api_key: demo
-
-  ubuntu_1404_image: trusty
   ubuntu_1604_image: xenial
-  centos_7_image: centos7
 
   apt_proxy: 10.145.122.118:3142
   docker_proxy: 10.145.122.118:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
-  public_net_name: provider
 
-  oam_network_cidr: 172.16.0.0/16
-  dns_forwarder: 10.145.122.117
-  external_dns: 10.145.122.118
+  oam_network_cidr: 10.0.0.0/16
 
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v2.0"
-  dnsaas_keystone_url: http://10.145.122.117:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
-  dnsaas_tenant_name: onap-beijing-oom
-  dnsaas_username: demo
-  dnsaas_password: demo
+  integration_override_yaml: >
+    global:
+      repository: 10.145.122.118:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.145.122.117:5000"
+      openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "trusty"
+      ubuntu16Image: "xenial"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.145.122.117:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
index daa145a..d0beefa 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: https://bdc1tlab01.research.att.com:5000
-  openstack_tenant_id: 76b1938dd3b9471fa1ed413a1b212a96
-  openstack_tenant_name: ETE-HEAT-Test
-  openstack_username: ${OS_USERNAME}
-  openstack_api_key: ${OS_PASSWORD}
-
-  ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-  centos_7_image: "centos7"
 
-  lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m2.large
-  k8s_vm_flavor: m5.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-  public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 204.178.3.230
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v3"
-  dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 76b1938dd3b9471fa1ed413a1b212a96
-  dnsaas_tenant_name: ETE-HEAT-Test
-  dnsaas_username: ${OS_USERNAME}
-  dnsaas_password: ${OS_PASSWORD}
+  integration_override_yaml: >
+    global:
+      repository: 192.168.31.204:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
index cbda112..d0beefa 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: https://bdc1tlab01.research.att.com:5000
-  openstack_tenant_id: b4062c7fbf9646b8a2bcb71c46695ff3
-  openstack_tenant_name: ETE-OOM-Test
-  openstack_username: ${OS_USERNAME}
-  openstack_api_key: ${OS_PASSWORD}
-
-  ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-  centos_7_image: "centos7"
 
-  lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m2.large
-  k8s_vm_flavor: m5.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-  public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 204.178.3.230
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v3"
-  dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: b4062c7fbf9646b8a2bcb71c46695ff3
-  dnsaas_tenant_name: ETE-OOM-Test
-  dnsaas_username: ${OS_USERNAME}
-  dnsaas_password: ${OS_PASSWORD}
+  integration_override_yaml: >
+    global:
+      repository: 192.168.31.204:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
index cb92442..d0beefa 100644 (file)
@@ -1,33 +1,35 @@
 parameters:
 
-  keystone_url: https://bdc1tlab01.research.att.com:5000
-  openstack_tenant_id: 01b47c21807242598cd5ab63d1c6ba8e
-  openstack_tenant_name: EXTONAP_DEV
-  openstack_username: ${OS_USERNAME}
-  openstack_api_key: ${OS_PASSWORD}
-
-  ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
-  centos_7_image: "centos7"
 
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-  public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 204.178.3.230
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "false"
-  dnsaas_proxied_keystone_url_path: "v3"
-  dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 01b47c21807242598cd5ab63d1c6ba8e
-  dnsaas_tenant_name: EXTONAP_DEV
-  dnsaas_username: ${OS_USERNAME}
-  dnsaas_password: ${OS_PASSWORD}
+  integration_override_yaml: >
+    global:
+      repository: 192.168.31.204:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/integration-override.yaml b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
deleted file mode 100644 (file)
index 87302c9..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright Â© 2017 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.
-
-# This override file is useful to test one or more subcharts.
-# It overrides the default ONAP parent chart behaviour to deploy
-# all of ONAP.
-#
-# Example use to enable a single subchart (from this directory):
-#
-# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
-
-
-#################################################################
-# Global configuration overrides.
-#
-# These overrides will affect all helm charts (ie. applications)
-# that are listed below and are 'enabled'.
-#################################################################
-global:
-  # Change to an unused port prefix range to prevent port conflicts
-  # with other instances running within the same k8s cluster
-  nodePortPrefix: 302
-
-  # lab local nexus proxy - nexus3 default
-  repository: 192.168.31.204:5000
-  # image pull policy
-  #pullPolicy: Always
-  pullPolicy: IfNotPresent
-
-
-  # default mount path root directory referenced
-  # by persistent volumes and log files
-#  persistence:
-#    mountPath: /onapdata
-
-#################################################################
-# Enable/disable and configure helm charts (ie. applications)
-# to customize the ONAP deployment.
-#################################################################
-aaf:
-  enabled: true
-aai:
-  enabled: true
-  # aai subchart image overrides
-  aai-champ:
-    image: onap/champ:1.2-STAGING-latest
-  aai-data-router:
-    image: onap/data-router:1.2-STAGING-latest
-  aai-modelloader:
-    image: onap/model-loader:1.2-STAGING-latest
-  aai-resources:
-    image: onap/aai-resources:1.2-STAGING-latest
-  aai-search-data:
-    image: onap/search-data-service:1.2-STAGING-latest
-  aai-sparky-be:
-    image: onap/sparky-be:1.2-STAGING-latest
-  aai-traveral:
-    image: onap/aai-traversal:1.2-STAGING-latest
-appc:
-  enabled: false
-clamp:
-  enabled: true
-cli:
-  enabled: true
-consul:
-  enabled: true
-dcaegen2:
-  enabled: false
-esr:
-  enabled: true
-  # esr parent chart (server) image override
-  image: onap/aai/esr-server:1.1.0-SNAPSHOT
-  # esr subchart omage override
-  esr-gui:
-    image: onap/aai/esr-gui:1.1.0-SNAPSHOT
-log:
-  enabled: true
-message-router:
-  enabled: true
-#  kafka:
-#    repositoryOverride: docker.io
-#    image: wurstmeister/kafka:latest
-mock:
-  enabled: true
-msb:
-  enabled: true
-multicloud:
-  enabled: true
-policy:
-  enabled: true
-portal:
-  enabled: true
-robot:
-  enabled: true
-  #pullPolicy: Always
-#  config:
-    # openstack configuration
-#    openStackUserName: "demo"
-#    openStackRegion: "RegionOne"
-#    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-#    openStackServiceTenantName: "service"
-#    openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
-sdc:
-  enabled: true
-sdnc:
-  enabled: true
-so:
-  enabled: true
-  # so server configuration
-  config:
-    # openstack configuration
-    openStackUserName: "demo"
-    openStackRegion: "RegionOne"
-    openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-    openStackServiceTenantName: "service"
-    openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
-
-uui:
-  enabled: true
-vfc:
-  enabled: true
-vid:
-  enabled: true
-vnfsdk:
-  enabled: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-DNS-openrc
deleted file mode 120000 (symlink)
index ad27388..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-Jenkins-DNS-openrc
\ No newline at end of file
index ff2f4e0..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77
-  openstack_tenant_name: Integration-Jenkins
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: bf80d09fbc804b42b3bc727d6cf1fcbe
-  dnsaas_tenant_name: Integration-Jenkins
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
deleted file mode 120000 (symlink)
index f5d04b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-00-DNS-openrc
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 1696597..fa16c25
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 41d6d38489bd40b09ea8a6b6b852dcbd
-  openstack_tenant_name: Integration-SB-00
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m1.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: a813ac529c6d4b44a3308ed38bcd7480
-  dnsaas_tenant_name: Integration-SB-00
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
deleted file mode 120000 (symlink)
index 208d760..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-01-DNS-openrc
\ No newline at end of file
index cd95096..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 087050388b204c73a3e418dd2c1fe30b
-  openstack_tenant_name: Integration-SB-01
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 4318a6c5788449cc97c88fd745b554b9
-  dnsaas_tenant_name: Integration-SB-01
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
deleted file mode 120000 (symlink)
index 814962e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-02-DNS-openrc
\ No newline at end of file
index bc113a8..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: ebb0ea7144004bacac1e39ff23105fa7
-  openstack_tenant_name: Integration-SB-02
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 89fee629f5f044739fb64380be63b6da
-  dnsaas_tenant_name: Integration-SB-02
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-03-DNS-openrc
deleted file mode 120000 (symlink)
index 10a7b0b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-03-DNS-openrc
\ No newline at end of file
index e05143e..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: bc43d50ffcb84750bac0c1707a9a765b
-  openstack_tenant_name: Integration-SB-03
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 29fb1a7806e84d8fbc93fa3945f1e2a5
-  dnsaas_tenant_name: Integration-SB-03
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-04-DNS-openrc
deleted file mode 120000 (symlink)
index cd1eeb5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-04-DNS-openrc
\ No newline at end of file
index 2c00ad6..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: d570c718cbc545029f40e50b75eb13df
-  openstack_tenant_name: Integration-SB-04
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 024b911be9514ed7885af0c6bf6f68c8
-  dnsaas_tenant_name: Integration-SB-04
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-05-DNS-openrc
deleted file mode 120000 (symlink)
index 2210fcc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-05-DNS-openrc
\ No newline at end of file
index 1a1bfa5..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: b8ad3842ab3642f7bf3fbe4e4d3b9f86
-  openstack_tenant_name: Integration-SB-05
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: d4e1d9e89456490cb7213092086e5c66
-  dnsaas_tenant_name: Integration-SB-05
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc
deleted file mode 120000 (symlink)
index 850c255..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-06-DNS-openrc
\ No newline at end of file
index 184a211..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 7fad299815104c0a8f90a8df80343f03
-  openstack_tenant_name: Integration-SB-06
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 2d7c6ec2cf9147fa974fa059b3673d7a
-  dnsaas_tenant_name: Integration-SB-06
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc
deleted file mode 120000 (symlink)
index 7e4a3af..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-SB-07-DNS-openrc
\ No newline at end of file
index 8df8435..fa16c25 100644 (file)
@@ -1,34 +1,35 @@
 parameters:
 
-  keystone_url: http://10.12.25.2:5000
-  openstack_tenant_id: 1e097c6713e74fd7ac8e4295e605ee1e
-  openstack_tenant_name: Integration-SB-07
-  openstack_username: demo
-  openstack_api_key: onapdemo
-
-  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
-  centos_7_image: CentOS-7
 
-  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m2.xxlarge
+  rancher_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
-  public_net_name: external
 
   oam_network_cidr: 10.0.0.0/16
-  dns_forwarder: 10.12.25.5
-  external_dns: 8.8.8.8
 
-  dnsaas_proxy_enable: "true"
-  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
-  dnsaas_keystone_url: http://10.12.25.5:5000
-  dnsaas_region: RegionOne
-  dnsaas_tenant_id: 885777d5e9074f31ad7801f9e6876b84
-  dnsaas_tenant_name: Integration-SB-07
-  dnsaas_username: demo
-  dnsaas_password: onapdemo
+  integration_override_yaml: >
+    global:
+      repository: 10.12.5.2:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml b/deployment/heat/onap-oom/env/windriver/integration-override-minimal.yaml
deleted file mode 100644 (file)
index 7e12046..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright Â© 2017 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.
-
-# This override file is useful to test one or more subcharts.
-# It overrides the default ONAP parent chart behaviour to deploy
-# all of ONAP.
-#
-# Example use to enable a single subchart (from this directory):
-#
-# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
-
-
-#################################################################
-# Global configuration overrides.
-#
-# These overrides will affect all helm charts (ie. applications)
-# that are listed below and are 'enabled'.
-#################################################################
-global:
-  # Change to an unused port prefix range to prevent port conflicts
-  # with other instances running within the same k8s cluster
-  nodePortPrefix: 302
-
-  # windriver local nexus proxy - nexus3 default
-  repository: 10.12.5.2:5000
-  # image pull policy
-  #pullPolicy: Always
-  pullPolicy: IfNotPresent
-
-
-  # default mount path root directory referenced
-  # by persistent volumes and log files
-#  persistence:
-#    mountPath: /onapdata
-
-#################################################################
-# Enable/disable and configure helm charts (ie. applications)
-# to customize the ONAP deployment.
-#################################################################
-aaf:
-  enabled: true
-aai:
-  enabled: true
-  # aai subchart image overrides
-  aai-champ:
-    image: onap/champ:1.2-STAGING-latest
-  aai-data-router:
-    image: onap/data-router:1.2-STAGING-latest
-  aai-modelloader:
-    image: onap/model-loader:1.2-STAGING-latest
-  aai-resources:
-    image: onap/aai-resources:1.2-STAGING-latest
-  aai-search-data:
-    image: onap/search-data-service:1.2-STAGING-latest
-  aai-sparky-be:
-    image: onap/sparky-be:1.2-STAGING-latest
-  aai-traveral:
-    image: onap/aai-traversal:1.2-STAGING-latest
-appc:
-  enabled: false 
-clamp:
-  enabled: true
-cli:
-  enabled: false 
-consul:
-  enabled: true
-dcaegen2:
-  enabled: true 
-esr:
-  enabled: false
-  # esr parent chart (server) image override
-  image: onap/aai/esr-server:1.1.0-SNAPSHOT
-  # esr subchart omage override
-  esr-gui:
-    image: onap/aai/esr-gui:1.1.0-SNAPSHOT
-log:
-  enabled: true
-message-router:
-  enabled: true
-#  kafka:
-#    repositoryOverride: docker.io
-#    image: wurstmeister/kafka:latest
-mock:
-  enabled: true
-msb:
-  enabled: true
-multicloud:
-  enabled: true
-policy:
-  enabled: true
-portal:
-  enabled: true
-robot:
-  enabled: true
-  #pullPolicy: Always
-#  config:
-    # openstack configuration
-#    openStackUserName: "demo"
-#    openStackRegion: "RegionOne"
-#    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-#    openStackServiceTenantName: "service"
-#    openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
-sdc:
-  enabled: true
-sdnc:
-  enabled: true
-so:
-  enabled: true
-  # so server configuration
-  config:
-    # openstack configuration
-    openStackUserName: "demo"
-    openStackRegion: "RegionOne"
-    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-    openStackServiceTenantName: "service"
-    openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
-
-uui:
-  enabled: false
-vfc:
-  enabled: false
-vid:
-  enabled: true
-vnfsdk:
-  enabled: false
diff --git a/deployment/heat/onap-oom/env/windriver/integration-override.yaml b/deployment/heat/onap-oom/env/windriver/integration-override.yaml
deleted file mode 100644 (file)
index 31c28fe..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright Â© 2017 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.
-
-# This override file is useful to test one or more subcharts.
-# It overrides the default ONAP parent chart behaviour to deploy
-# all of ONAP.
-#
-# Example use to enable a single subchart (from this directory):
-#
-# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
-
-
-#################################################################
-# Global configuration overrides.
-#
-# These overrides will affect all helm charts (ie. applications)
-# that are listed below and are 'enabled'.
-#################################################################
-global:
-  # Change to an unused port prefix range to prevent port conflicts
-  # with other instances running within the same k8s cluster
-  nodePortPrefix: 302
-
-  # windriver local nexus proxy - nexus3 default
-  repository: 10.12.5.2:5000
-  # image pull policy
-  #pullPolicy: Always
-  pullPolicy: IfNotPresent
-
-
-  # default mount path root directory referenced
-  # by persistent volumes and log files
-#  persistence:
-#    mountPath: /onapdata
-
-#################################################################
-# Enable/disable and configure helm charts (ie. applications)
-# to customize the ONAP deployment.
-#################################################################
-aaf:
-  enabled: true
-aai:
-  enabled: true
-  # aai subchart image overrides
-  aai-champ:
-    image: onap/champ:1.2-STAGING-latest
-  aai-data-router:
-    image: onap/data-router:1.2-STAGING-latest
-  aai-modelloader:
-    image: onap/model-loader:1.2-STAGING-latest
-  aai-resources:
-    image: onap/aai-resources:1.2-STAGING-latest
-  aai-search-data:
-    image: onap/search-data-service:1.2-STAGING-latest
-  aai-sparky-be:
-    image: onap/sparky-be:1.2-STAGING-latest
-  aai-traveral:
-    image: onap/aai-traversal:1.2-STAGING-latest
-appc:
-  enabled: false
-clamp:
-  enabled: true
-cli:
-  enabled: true
-consul:
-  enabled: true
-dcaegen2:
-  enabled: false
-esr:
-  enabled: true
-  # esr parent chart (server) image override
-  image: onap/aai/esr-server:1.1.0-SNAPSHOT
-  # esr subchart omage override
-  esr-gui:
-    image: onap/aai/esr-gui:1.1.0-SNAPSHOT
-log:
-  enabled: true
-message-router:
-  enabled: true
-#  kafka:
-#    repositoryOverride: docker.io
-#    image: wurstmeister/kafka:latest
-mock:
-  enabled: true
-msb:
-  enabled: true
-multicloud:
-  enabled: true
-policy:
-  enabled: true
-portal:
-  enabled: true
-robot:
-  enabled: true
-  #pullPolicy: Always
-#  config:
-    # openstack configuration
-#    openStackUserName: "demo"
-#    openStackRegion: "RegionOne"
-#    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-#    openStackServiceTenantName: "service"
-#    openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
-sdc:
-  enabled: true
-sdnc:
-  enabled: true
-so:
-  enabled: true
-  # so server configuration
-  config:
-    # openstack configuration
-    openStackUserName: "demo"
-    openStackRegion: "RegionOne"
-    openStackKeyStoneUrl: "http://10.12.25.2:5000"
-    openStackServiceTenantName: "service"
-    openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
-
-uui:
-  enabled: true
-vfc:
-  enabled: true
-vid:
-  enabled: true
-vnfsdk:
-  enabled: true
index 7e8ca46..1ec659c 100644 (file)
@@ -3,7 +3,9 @@ printenv
 
 mkdir -p /opt/config
 echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt
-echo `hostname -I` `hostname` >> /etc/hosts
+HOST_IP=$(hostname -I)
+echo $HOST_IP `hostname` >> /etc/hosts
+
 mkdir -p /etc/docker
 if [ ! -z "__docker_proxy__" ]; then
     cat > /etc/docker/daemon.json <<EOF
@@ -19,7 +21,11 @@ Acquire::https::Proxy "DIRECT";
 EOF
 fi
 apt-get -y update
-apt-get -y install linux-image-extra-$(uname -r) jq make
+
+mkdir -p /dockerdata-nfs
+echo "__rancher_ip_addr__:/dockerdata-nfs /dockerdata-nfs nfs auto,nofail,noatime,nolock,intr,tcp,actimeo=1800 0 0" | tee -a /etc/fstab
+
+apt-get -y install linux-image-extra-$(uname -r) jq nfs-common
 
 cd ~
 
@@ -27,155 +33,16 @@ cd ~
 curl -s https://releases.rancher.com/install-docker/17.03.sh | sh
 usermod -aG docker ubuntu
 
-# install kubernetes 1.8.6
-curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.6/bin/linux/amd64/kubectl
-chmod +x ./kubectl
-sudo mv ./kubectl /usr/local/bin/kubectl
-mkdir ~/.kube
-
-# install helm
-wget -q http://storage.googleapis.com/kubernetes-helm/helm-v2.7.2-linux-amd64.tar.gz
-tar -zxvf helm-v2.7.2-linux-amd64.tar.gz
-sudo mv linux-amd64/helm /usr/local/bin/helm
-
 # Fix virtual memory allocation for onap-log:elasticsearch:
 echo "vm.max_map_count=262144" >> /etc/sysctl.conf
 sysctl -p
 
-# install rancher agent
-echo export RANCHER_IP=__rancher_ip_addr__ > api-keys-rc
-source api-keys-rc
-
-sleep 50
-until curl -s -o projects.json -H "Accept: application/json" http://$RANCHER_IP:8080/v2-beta/projects; do
-    sleep 10
-done
-OLD_PID=$(jq -r '.data[0].id' projects.json)
-
-curl -s -H "Accept: application/json" -H "Content-Type: application/json" -d '{"accountId":"1a1"}' http://$RANCHER_IP:8080/v2-beta/apikeys > apikeys.json
-echo export RANCHER_ACCESS_KEY=`jq -r '.publicValue' apikeys.json` >> api-keys-rc
-echo export RANCHER_SECRET_KEY=`jq -r '.secretValue' apikeys.json` >> api-keys-rc
-source api-keys-rc
-
-curl -s -u "${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}" -X DELETE -H 'Content-Type: application/json' "http://$RANCHER_IP:8080/v2-beta/projects/$OLD_PID"
-
-until [ ! -z "$TEMPLATE_ID" ] && [ "$TEMPLATE_ID" != "null" ]; do
-    sleep 5
-    curl -s -H "Accept: application/json" http://$RANCHER_IP:8080/v2-beta/projectTemplates?name=Kubernetes > projectTemplatesKubernetes.json
-    TEMPLATE_ID=$(jq -r '.data[0].id' projectTemplatesKubernetes.json)
-done
-
-curl -s -u "${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}" -X POST -H 'Content-Type: application/json' -d '{ "name":"oom", "projectTemplateId":"'$TEMPLATE_ID'" }' "http://$RANCHER_IP:8080/v2-beta/projects" > project.json
-PID=`jq -r '.id' project.json`
-echo export RANCHER_URL=http://$RANCHER_IP:8080/v1/projects/$PID >> api-keys-rc
-source api-keys-rc
-
-until [ $(jq -r '.state' project.json) == "active" ]; do
-    sleep 5
-    curl -s -H "Accept: application/json" http://$RANCHER_IP:8080/v1/projects/$PID > project.json
-done
+sleep 100
 
-TID=$(curl -s -X POST -H "Accept: application/json" -H "Content-Type: application/json" http://$RANCHER_IP:8080/v1/projects/$PID/registrationTokens | jq -r '.id')
-touch token.json
-while [ $(jq -r .command token.json | wc -c) -lt 10 ]; do
+while [ ! -e /dockerdata-nfs/rancher_agent_cmd.sh ]; do
+    mount /dockerdata-nfs
     sleep 5
-    curl -s -X GET -H "Accept: application/json" http://$RANCHER_IP:8080/v1/projects/$PID/registrationToken/$TID > token.json
 done
-RANCHER_AGENT_CMD=$(jq -r .command token.json)
-eval $RANCHER_AGENT_CMD
-
-
-KUBETOKEN=$(echo -n 'Basic '$(echo -n "$RANCHER_ACCESS_KEY:$RANCHER_SECRET_KEY" | base64 -w 0) | base64 -w 0)
-
-# create .kube/config
-cat > ~/.kube/config <<EOF
-apiVersion: v1
-kind: Config
-clusters:
-- cluster:
-    api-version: v1
-    insecure-skip-tls-verify: true
-    server: "https://$RANCHER_IP:8080/r/projects/$PID/kubernetes:6443"
-  name: "oom"
-contexts:
-- context:
-    cluster: "oom"
-    user: "oom"
-  name: "oom"
-current-context: "oom"
-users:
-- name: "oom"
-  user:
-    token: "$KUBETOKEN"
-EOF
-
-export KUBECONFIG=/root/.kube/config
-kubectl config view
-
-# wait for kubernetes to initialze
-sleep 100
-until [ $(kubectl get pods --namespace kube-system | tail -n +2 | grep -c Running) -ge 6 ]; do
-    sleep 10
-done
-
-
-# Install using OOM
-export HOME=/root
-
-# Clone OOM:
-cd ~
-git clone -b master http://gerrit.onap.org/r/oom
-cd oom
-git log -1
-
-# Update values.yaml to point to docker-proxy instead of nexus3:
-cd ~/oom/kubernetes
-#perl -p -i -e 's/nexus3.onap.org:10001/__docker_proxy__/g' `find ./ -name values.yaml`
-sed -i 's/nexus3.onap.org:10001/__docker_proxy__/g' onap/values.yaml
-sed -i 's/#repository:/repository:/g' onap/values.yaml
-sed -i 's/#repositorySecret:/repositorySecret:/g' onap/values.yaml
-git diff
-
-
-# Clone integration:
-cd ~
-git clone -b master http://gerrit.onap.org/r/integration
-cd integration
-git log -1
-
-cd ~
-ln -s ~/integration/deployment/heat/onap-oom/env/__lab_name__/integration-override.yaml
-sed -i 's/nexus3.onap.org:10001/__docker_proxy__/g' integration-override.yaml
-
-
-# version control the persistence volume to see what's happening
-mkdir -p /dockerdata-nfs/
-cd /dockerdata-nfs/
-git init
-git config user.email "root@k8s"
-git config user.name "root"
-git add -A
-git commit -m "initial commit"
-
-# Run ONAP:
-cd ~/oom/kubernetes/
-# verify version
-helm version
-helm init --client-only
-helm init --upgrade
-helm serve &
-sleep 3
-helm repo add local http://127.0.0.1:8879
-helm repo list
-make all
-helm search -l | grep local
-if [ -e ~/integration-override.yaml ]; then
-    helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml
-else
-    helm install local/onap -n dev --namespace onap
-fi
-
-
-# Check ONAP status:
-sleep 3
-kubectl get pods --all-namespaces
+cp /dockerdata-nfs/rancher_agent_cmd.sh .
+sed -i "s/docker run/docker run -e CATTLE_AGENT_IP=${HOST_IP}/g" rancher_agent_cmd.sh
+source rancher_agent_cmd.sh
index a6a5cf0..c290e17 100644 (file)
@@ -1,10 +1,10 @@
+#
+# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST
+#
 heat_template_version: 2015-10-15
 description: ONAP on Kubernetes using OOM
 
 parameters:
-  lab_name:
-    type: string
-
   docker_proxy:
     type: string
 
@@ -15,93 +15,25 @@ parameters:
     type: string
     description: The ID of the Public network for floating IP address allocation
 
-  public_net_name:
-    type: string
-    description: The name of the Public network referred by public_net_id
-
   oam_network_cidr:
     type: string
     description: CIDR of the OAM ONAP network
 
-  keystone_url:
-    type: string
-    description: URL of OpenStack Keystone
-
-  openstack_tenant_id:
-    type: string
-    description: OpenStack tenant ID
-
-  openstack_tenant_name:
-    type: string
-    description: OpenStack tenant name (matching with the openstack_tenant_id)
-
-  openstack_username:
-    type: string
-    description: OpenStack username
-
-  openstack_api_key:
-    type: string
-    description: OpenStack password or API Key
-
-  ubuntu_1404_image:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
   ubuntu_1604_image:
     type: string
     description: Name of the Ubuntu 16.04 image
 
-  centos_7_image:
-    type: string
-    description: the id/name of the CentOS 7 VM imange
-
   rancher_vm_flavor:
     type: string
-    description: Name of the Ubuntu 14.04 image
+    description: VM flavor for Rancher
 
   k8s_vm_flavor:
     type: string
-    description: Name of the Ubuntu 14.04 image
+    description: VM flavor for k8s hosts
 
-  dns_forwarder:
+  integration_override_yaml:
     type: string
-    description: the forwarder address for setting up ONAP's private DNS server
-
-  external_dns:
-    type: string
-    description: Public IP of the external DNS for ONAP network
-
-  dnsaas_proxy_enable:
-    type: string
-    description: whether to enable DNSaaS proxy via multicloud
-
-  dnsaas_region:
-    type: string
-    description: the region of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_proxied_keystone_url_path:
-    type: string
-    description: the proxy keystone URL path for DCAE to use (via MultiCloud)
-
-  dnsaas_keystone_url:
-    type: string
-    description: the keystone URL of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_username:
-    type: string
-    description: the username of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_password:
-    type: string
-    description: the password of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_tenant_id:
-    type: string
-    description: the ID of the tenant in the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_tenant_name:
-    type: string
-    description: the name of the tenant in the cloud instance providing the Designate DNS as a Service
+    description: Content for integration_override.yaml
 
 resources:
   random-str:
@@ -157,7 +89,7 @@ resources:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_network }
       cidr: { get_param: oam_network_cidr }
-      dns_nameservers: [ get_param: dns_forwarder ]
+      dns_nameservers: [ "8.8.8.8" ]
 
   router:
     type: OS::Neutron::Router
@@ -195,15 +127,60 @@ resources:
       networks:
       - port: { get_resource: rancher_private_port }
       user_data_format: RAW
+      user_data:
+        str_replace:
+          template:
+            get_file: rancher_vm_entrypoint.sh
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+            __integration_override_yaml__: { get_param: integration_override_yaml }
+            __oam_network_id__: { get_resource: oam_network }
+            __oam_subnet_id__: { get_resource: oam_subnet }
+            __k8s_vm_ips__: [
+              get_attr: [k8s_1_floating_ip, floating_ip_address],
+              get_attr: [k8s_2_floating_ip, floating_ip_address],
+              get_attr: [k8s_3_floating_ip, floating_ip_address],
+              get_attr: [k8s_4_floating_ip, floating_ip_address],
+              get_attr: [k8s_5_floating_ip, floating_ip_address],
+              get_attr: [k8s_6_floating_ip, floating_ip_address],
+              get_attr: [k8s_7_floating_ip, floating_ip_address],
+            ]
+  k8s_1_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  k8s_1_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: k8s_1_private_port }
+
+  k8s_1_vm:
+    type: OS::Nova::Server
+    properties:
+      name: k8s_1
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: k8s_1_private_port }
+      user_data_format: RAW
       user_data:
         str_replace:
           params:
             __docker_proxy__: { get_param: docker_proxy }
             __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
           template:
-            get_file: rancher_vm_entrypoint.sh
+            get_file: k8s_vm_entrypoint.sh
 
-  k8s_private_port:
+  k8s_2_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_network }
@@ -211,53 +188,193 @@ resources:
       security_groups:
       - { get_resource: onap_sg }
 
-  k8s_floating_ip:
+  k8s_2_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: k8s_private_port }
+      port_id: { get_resource: k8s_2_private_port }
 
-  k8s_vm:
+  k8s_2_vm:
     type: OS::Nova::Server
     properties:
-      name: k8s
+      name: k8s_2
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: k8s_vm_flavor }
       key_name: onap_key
       networks:
-      - port: { get_resource: k8s_private_port }
+      - port: { get_resource: k8s_2_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
+  k8s_3_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  k8s_3_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: k8s_3_private_port }
+
+  k8s_3_vm:
+    type: OS::Nova::Server
+    properties:
+      name: k8s_3
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: k8s_3_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
+  k8s_4_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  k8s_4_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: k8s_4_private_port }
+
+  k8s_4_vm:
+    type: OS::Nova::Server
+    properties:
+      name: k8s_4
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: k8s_4_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
+  k8s_5_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  k8s_5_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: k8s_5_private_port }
+
+  k8s_5_vm:
+    type: OS::Nova::Server
+    properties:
+      name: k8s_5
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: k8s_5_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
+  k8s_6_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  k8s_6_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: k8s_6_private_port }
+
+  k8s_6_vm:
+    type: OS::Nova::Server
+    properties:
+      name: k8s_6
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: k8s_6_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
+  k8s_7_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  k8s_7_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: k8s_7_private_port }
+
+  k8s_7_vm:
+    type: OS::Nova::Server
+    properties:
+      name: k8s_7
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: k8s_7_private_port }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
-            __lab_name__: { get_param: lab_name }
             __docker_proxy__: { get_param: docker_proxy }
             __apt_proxy__: { get_param: apt_proxy }
             __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
-            __k8s_ip_addr__: { get_attr: [k8s_floating_ip, floating_ip_address] }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_tenant_name__: { get_param: openstack_tenant_name }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __public_net_id__: { get_param: public_net_id }
-            __public_net_name__: { get_param: public_net_name }
-            __oam_network_id__: { get_resource: oam_network }
-            __oam_subnet_id__: { get_resource: oam_subnet }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
-            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-            __centos_7_image__: { get_param: centos_7_image }
-            __keystone_url__: { get_param: keystone_url }
-            __dns_forwarder__: { get_param: dns_forwarder }
-            __external_dns__: { get_param: external_dns }
-            __dnsaas_proxy_enable__: { get_param: dnsaas_proxy_enable }
-            __dnsaas_proxied_keystone_url_path__: { get_param: dnsaas_proxied_keystone_url_path }
-            __dnsaas_keystone_url__: { get_param: dnsaas_keystone_url }
-            __dnsaas_region__: { get_param: dnsaas_region }
-            __dnsaas_tenant_id__: { get_param: dnsaas_tenant_id }
-            __dnsaas_tenant_name__: { get_param: dnsaas_tenant_name }
-            __dnsaas_username__: { get_param: dnsaas_username }
-            __dnsaas_password__: { get_param: dnsaas_password }
           template:
             get_file: k8s_vm_entrypoint.sh
 
@@ -266,6 +383,31 @@ outputs:
     description: The IP address of the rancher instance
     value: { get_attr: [rancher_floating_ip, floating_ip_address] }
 
-  k8s_vm_ip:
-    description: The IP address of the k8s instance
-    value: { get_attr: [k8s_floating_ip, floating_ip_address] }
+  k8s_1_vm_ip:
+    description: The IP address of the k8s_1 instance
+    value: { get_attr: [k8s_1_floating_ip, floating_ip_address] }
+
+  k8s_2_vm_ip:
+    description: The IP address of the k8s_2 instance
+    value: { get_attr: [k8s_2_floating_ip, floating_ip_address] }
+
+  k8s_3_vm_ip:
+    description: The IP address of the k8s_3 instance
+    value: { get_attr: [k8s_3_floating_ip, floating_ip_address] }
+
+  k8s_4_vm_ip:
+    description: The IP address of the k8s_4 instance
+    value: { get_attr: [k8s_4_floating_ip, floating_ip_address] }
+
+  k8s_5_vm_ip:
+    description: The IP address of the k8s_5 instance
+    value: { get_attr: [k8s_5_floating_ip, floating_ip_address] }
+
+  k8s_6_vm_ip:
+    description: The IP address of the k8s_6 instance
+    value: { get_attr: [k8s_6_floating_ip, floating_ip_address] }
+
+  k8s_7_vm_ip:
+    description: The IP address of the k8s_7 instance
+    value: { get_attr: [k8s_7_floating_ip, floating_ip_address] }
+
diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
new file mode 100644 (file)
index 0000000..e29f6cd
--- /dev/null
@@ -0,0 +1,116 @@
+heat_template_version: 2015-10-15
+description: ONAP on Kubernetes using OOM
+
+parameters:
+  docker_proxy:
+    type: string
+
+  apt_proxy:
+    type: string
+
+  public_net_id:
+    type: string
+    description: The ID of the Public network for floating IP address allocation
+
+  oam_network_cidr:
+    type: string
+    description: CIDR of the OAM ONAP network
+
+  ubuntu_1604_image:
+    type: string
+    description: Name of the Ubuntu 16.04 image
+
+  rancher_vm_flavor:
+    type: string
+    description: VM flavor for Rancher
+
+  k8s_vm_flavor:
+    type: string
+    description: VM flavor for k8s hosts
+
+  integration_override_yaml:
+    type: string
+    description: Content for integration_override.yaml
+
+resources:
+  random-str:
+    type: OS::Heat::RandomString
+    properties:
+      length: 4
+
+  # ONAP security group
+  onap_sg:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      name:
+        str_replace:
+          template: base_rand
+          params:
+            base: onap_sg
+            rand: { get_resource: random-str }
+      description: security group used by ONAP
+      rules:
+        # All egress traffic
+        - direction: egress
+          ethertype: IPv4
+        - direction: egress
+          ethertype: IPv6
+        # ingress traffic
+        # ICMP
+        - protocol: icmp
+        - protocol: udp
+          port_range_min: 1
+          port_range_max: 65535
+        - protocol: tcp
+          port_range_min: 1
+          port_range_max: 65535
+
+
+  # ONAP management private network
+  oam_network:
+    type: OS::Neutron::Net
+    properties:
+      name:
+        str_replace:
+          template: oam_network_rand
+          params:
+            rand: { get_resource: random-str }
+
+  oam_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name:
+        str_replace:
+          template: oam_network_rand
+          params:
+            rand: { get_resource: random-str }
+      network_id: { get_resource: oam_network }
+      cidr: { get_param: oam_network_cidr }
+      dns_nameservers: [ "8.8.8.8" ]
+
+  router:
+    type: OS::Neutron::Router
+    properties:
+      external_gateway_info:
+        network: { get_param: public_net_id }
+
+  router_interface:
+    type: OS::Neutron::RouterInterface
+    properties:
+      router_id: { get_resource: router }
+      subnet_id: { get_resource: oam_subnet }
+
+  rancher_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  rancher_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: rancher_private_port }
+
diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml
new file mode 100644 (file)
index 0000000..7ee9021
--- /dev/null
@@ -0,0 +1,33 @@
+  ${K8S_VM_NAME}_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_network }
+      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  ${K8S_VM_NAME}_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: ${K8S_VM_NAME}_private_port }
+
+  ${K8S_VM_NAME}_vm:
+    type: OS::Nova::Server
+    properties:
+      name: ${K8S_VM_NAME}
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: k8s_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: ${K8S_VM_NAME}_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
diff --git a/deployment/heat/onap-oom/parts/onap-oom-3.yaml b/deployment/heat/onap-oom/parts/onap-oom-3.yaml
new file mode 100644 (file)
index 0000000..8dc35b6
--- /dev/null
@@ -0,0 +1,5 @@
+outputs:
+  rancher_vm_ip:
+    description: The IP address of the rancher instance
+    value: { get_attr: [rancher_floating_ip, floating_ip_address] }
+
index 12ed51f..a729b6b 100644 (file)
@@ -1,6 +1,19 @@
 #!/bin/bash -x
 printenv
 
+mkdir -p /opt/config
+echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt
+echo "__k8s_vm_ips__" > /opt/config/k8s_vm_ips.txt
+echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+echo "__oam_subnet_id__" > /opt/config/oam_subnet_id.txt
+
+cat <<EOF > /opt/config/integration-override.yaml
+__integration_override_yaml__
+EOF
+sed -i 's/\_\_oam_network_id__/__oam_network_id__/g' /opt/config/integration-override.yaml
+sed -i 's/\_\_oam_subnet_id__/__oam_subnet_id__/g' /opt/config/integration-override.yaml
+cp /opt/config/integration-override.yaml /root
+
 echo `hostname -I` `hostname` >> /etc/hosts
 mkdir -p /etc/docker
 if [ ! -z "__docker_proxy__" ]; then
@@ -17,6 +30,165 @@ Acquire::https::Proxy "DIRECT";
 EOF
 fi
 apt-get -y update
-apt-get -y install docker.io
+apt-get -y install linux-image-extra-$(uname -r) jq make nfs-kernel-server
+
+
+# version control the persistence volume to see what's happening
+mkdir -p /dockerdata-nfs/
+chmod 777 /dockerdata-nfs/
+chown nobody:nogroup /dockerdata-nfs/
+cd /dockerdata-nfs/
+git init
+git config user.email "root@onap"
+git config user.name "root"
+git add -A
+git commit -m "initial commit"
+
+# export NFS mount
+NFS_EXP=""
+for K8S_VM_IP in $(tr -d ',[]' < /opt/config/k8s_vm_ips.txt); do
+    NFS_EXP+="$K8S_VM_IP(rw,sync,no_root_squash,no_subtree_check) "
+done
+echo "/dockerdata-nfs $NFS_EXP" | tee /etc/exports
+
+
+exportfs -a
+systemctl restart nfs-kernel-server
+
+cd ~
+
+# install docker 17.03
+curl -s https://releases.rancher.com/install-docker/17.03.sh | sh
 usermod -aG docker ubuntu
-docker run --restart unless-stopped -d -p 8080:8080 rancher/server:v1.6.14
+
+docker run --restart unless-stopped -d -p 8080:8080  -e CATTLE_BOOTSTRAP_REQUIRED_IMAGE=__docker_proxy__/rancher/agent:v1.2.9 __docker_proxy__/rancher/server:v1.6.14
+
+# install kubernetes 1.8.6
+curl -s -LO https://storage.googleapis.com/kubernetes-release/release/v1.8.10/bin/linux/amd64/kubectl
+chmod +x ./kubectl
+sudo mv ./kubectl /usr/local/bin/kubectl
+mkdir ~/.kube
+
+# install helm
+wget -q http://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz
+tar -zxvf helm-v2.8.2-linux-amd64.tar.gz
+sudo mv linux-amd64/helm /usr/local/bin/helm
+
+echo export RANCHER_IP=__rancher_ip_addr__ > api-keys-rc
+source api-keys-rc
+
+sleep 50
+until curl -s -o projects.json -H "Accept: application/json" http://$RANCHER_IP:8080/v2-beta/projects; do
+    sleep 10
+done
+OLD_PID=$(jq -r '.data[0].id' projects.json)
+
+curl -s -H "Accept: application/json" -H "Content-Type: application/json" -d '{"accountId":"1a1"}' http://$RANCHER_IP:8080/v2-beta/apikeys > apikeys.json
+echo export RANCHER_ACCESS_KEY=`jq -r '.publicValue' apikeys.json` >> api-keys-rc
+echo export RANCHER_SECRET_KEY=`jq -r '.secretValue' apikeys.json` >> api-keys-rc
+source api-keys-rc
+
+
+curl -u "${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}" -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -d '{"id":"registry.default","type":"activeSetting","baseType":"setting","name":"registry.default","activeValue":"__docker_proxy__","inDb":true,"source":"Database","value":"__docker_proxy__"}'  http://$RANCHER_IP:8080/v2-beta/settings/registry.default
+
+curl -s -u "${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}" -X DELETE -H 'Content-Type: application/json' "http://$RANCHER_IP:8080/v2-beta/projects/$OLD_PID"
+
+until [ ! -z "$TEMPLATE_ID" ] && [ "$TEMPLATE_ID" != "null" ]; do
+    sleep 5
+    curl -s -H "Accept: application/json" http://$RANCHER_IP:8080/v2-beta/projectTemplates?name=Kubernetes > projectTemplatesKubernetes.json
+    TEMPLATE_ID=$(jq -r '.data[0].id' projectTemplatesKubernetes.json)
+done
+
+curl -s -u "${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}" -X POST -H 'Content-Type: application/json' -d '{ "name":"oom", "projectTemplateId":"'$TEMPLATE_ID'" }' "http://$RANCHER_IP:8080/v2-beta/projects" > project.json
+PID=`jq -r '.id' project.json`
+echo export RANCHER_URL=http://$RANCHER_IP:8080/v1/projects/$PID >> api-keys-rc
+source api-keys-rc
+
+until [ $(jq -r '.state' project.json) == "active" ]; do
+    sleep 5
+    curl -s -H "Accept: application/json" http://$RANCHER_IP:8080/v1/projects/$PID > project.json
+done
+
+
+curl -s -u $RANCHER_ACCESS_KEY:$RANCHER_SECRET_KEY -X POST -H 'Accept: application/json' -H 'Content-Type: application/json' -d '{"name":"docker-proxy", "serverAddress":"__docker_proxy__"}' $RANCHER_URL/registries > registry.json
+RID=$(jq -r '.id' registry.json)
+
+
+curl -u "${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}" -X POST -H 'Accept: application/json' -H 'Content-Type: application/json' -d '{"publicValue":"docker", "registryId":"'$RID'", "secretValue":"docker", "type":"registryCredential"}' "http://$RANCHER_IP:8080/v2-beta/projects/$PID/registrycredential"
+
+
+
+TID=$(curl -s -X POST -H "Accept: application/json" -H "Content-Type: application/json" http://$RANCHER_IP:8080/v1/projects/$PID/registrationTokens | jq -r '.id')
+touch token.json
+while [ $(jq -r .command token.json | wc -c) -lt 10 ]; do
+    sleep 5
+    curl -s -X GET -H "Accept: application/json" http://$RANCHER_IP:8080/v1/projects/$PID/registrationToken/$TID > token.json
+done
+jq -r .command token.json > rancher_agent_cmd.sh
+chmod +x rancher_agent_cmd.sh
+cp rancher_agent_cmd.sh /dockerdata-nfs
+cd /dockerdata-nfs
+git add -A
+git commit -a -m "Add rancher agent command file"
+cd ~
+
+
+KUBETOKEN=$(echo -n 'Basic '$(echo -n "$RANCHER_ACCESS_KEY:$RANCHER_SECRET_KEY" | base64 -w 0) | base64 -w 0)
+
+# create .kube/config
+cat > ~/.kube/config <<EOF
+apiVersion: v1
+kind: Config
+clusters:
+- cluster:
+    api-version: v1
+    insecure-skip-tls-verify: true
+    server: "https://$RANCHER_IP:8080/r/projects/$PID/kubernetes:6443"
+  name: "oom"
+contexts:
+- context:
+    cluster: "oom"
+    user: "oom"
+  name: "oom"
+current-context: "oom"
+users:
+- name: "oom"
+  user:
+    token: "$KUBETOKEN"
+EOF
+
+export KUBECONFIG=/root/.kube/config
+kubectl config view
+
+# wait for kubernetes to initialze
+sleep 100
+until [ $(kubectl get pods --namespace kube-system | tail -n +2 | grep -c Running) -ge 6 ]; do
+    sleep 10
+done
+
+
+# Install using OOM
+export HOME=/root
+
+# Clone OOM:
+cd ~
+git clone -b master http://gerrit.onap.org/r/oom
+cd oom
+git log -1
+
+# Run ONAP:
+cd ~/oom/kubernetes/
+helm init --client-only
+helm init --upgrade
+helm serve &
+sleep 3
+helm repo add local http://127.0.0.1:8879
+helm repo list
+make all
+helm search -l | grep local
+helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml
+
+
+# Check ONAP status:
+sleep 3
+kubectl get pods --all-namespaces
index 056174d..656b410 100755 (executable)
@@ -12,6 +12,9 @@ ENV_FILE=$1
 
 source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
 
+SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
+
 for n in $(seq 1 5); do
     $WORKSPACE/test/ete/scripts/teardown-onap.sh
 
@@ -21,31 +24,32 @@ for n in $(seq 1 5); do
 
     for i in $(seq 1 30); do
        sleep 30
-       K8S_IP=$(openstack stack output show onap-oom k8s_vm_ip -c output_value -f value)
        RANCHER_IP=$(openstack stack output show onap-oom rancher_vm_ip -c output_value -f value)
-       timeout 1 ping -c 1 "$K8S_IP" && timeout 1 ping -c 1 "$RANCHER_IP" && break
+       timeout 1 ping -c 1 "$RANCHER_IP" && break
     done
 
-    timeout 1 ping -c 1 "$K8S_IP" && timeout 1 ping -c 1 "$RANCHER_IP" && break
+    timeout 1 ping -c 1 "$RANCHER_IP" && break
 
-    echo Error: OpenStack infrastructure issue: unable to reach both rancher "$RANCHER_IP" and k8s "$K8S_IP"
+    echo Error: OpenStack infrastructure issue: unable to reach rancher "$RANCHER_IP"
     sleep 10
 done
 
-if ! timeout 1 ping -c 1 "$K8S_IP" || ! timeout 1 ping -c 1 "$RANCHER_IP"; then
+if ! timeout 1 ping -c 1 "$RANCHER_IP"; then
     exit 2
 fi
 
-ssh-keygen -R $K8S_IP
-for n in $(seq 1 10); do
-    timeout 15m ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$K8S_IP  'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"'
+ssh-keygen -R $RANCHER_IP
+for n in $(seq 1 6); do
+    timeout 15m ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP  'sudo su -l root -c "/root/oom/kubernetes/robot/ete-k8s.sh onap health"'
     RESULT=$?
     if [ $RESULT -eq 0 ]; then
        break
     fi
     sleep 15m
 done
-ROBOT_POD=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$K8S_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//')
-LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$K8S_IP "sudo su -c \"kubectl exec $ROBOT_POD --namespace onap -- ls -1t /share/logs | head -1\"")
+ROBOT_POD=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP 'sudo su -c "kubectl --namespace onap get pods"' | grep robot | sed 's/ .*//')
+LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ~/.ssh/onap_key ubuntu@$RANCHER_IP "sudo su -c \"kubectl exec $ROBOT_POD --namespace onap -- ls -1t /share/logs | head -1\"")
+
+K8S_IP=$(openstack stack output show onap-oom k8s_1_vm_ip -c output_value -f value)
 wget --user=robot --password=robot -r -np -nH --cut-dirs=2 -R "index.html*" -P $WORKSPACE/archives/ http://$K8S_IP:30209/logs/$LOG_DIR/
 exit 0
diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
new file mode 100755 (executable)
index 0000000..19e7b60
--- /dev/null
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+NUM_K8S_VMS=7
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+PARTS_DIR=$WORKSPACE/deployment/heat/onap-oom/parts
+
+cat <<EOF
+#
+# Generated by scripts/gen-onap-oom-yaml.sh; MANUAL CHANGES WILL BE LOST
+#
+EOF
+
+cat $PARTS_DIR/onap-oom-1.yaml
+
+cat <<EOF
+  rancher_vm:
+    type: OS::Nova::Server
+    properties:
+      name: rancher
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: rancher_vm_flavor }
+      key_name: onap_key
+      networks:
+      - port: { get_resource: rancher_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          template:
+            get_file: rancher_vm_entrypoint.sh
+          params:
+            __docker_proxy__: { get_param: docker_proxy }
+            __apt_proxy__: { get_param: apt_proxy }
+            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+            __integration_override_yaml__: { get_param: integration_override_yaml }
+            __oam_network_id__: { get_resource: oam_network }
+            __oam_subnet_id__: { get_resource: oam_subnet }
+            __k8s_vm_ips__: [
+EOF
+
+for VM_NUM in $(seq $NUM_K8S_VMS); do
+    K8S_VM_NAME=k8s_$VM_NUM
+    cat <<EOF
+              get_attr: [${K8S_VM_NAME}_floating_ip, floating_ip_address],
+EOF
+done
+
+cat <<EOF
+            ]
+EOF
+
+for VM_NUM in $(seq $NUM_K8S_VMS); do
+    K8S_VM_NAME=k8s_$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
+done
+
+cat $PARTS_DIR/onap-oom-3.yaml
+
+for VM_NUM in $(seq $NUM_K8S_VMS); do
+    K8S_VM_NAME=k8s_$VM_NUM
+    cat <<EOF
+  ${K8S_VM_NAME}_vm_ip:
+    description: The IP address of the ${K8S_VM_NAME} instance
+    value: { get_attr: [${K8S_VM_NAME}_floating_ip, floating_ip_address] }
+
+EOF
+done
diff --git a/deployment/heat/onap-oom/scripts/prepull-docker.sh b/deployment/heat/onap-oom/scripts/prepull-docker.sh
new file mode 100755 (executable)
index 0000000..d3556a8
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/bash -x
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <docker-proxy>"
+    exit 1
+fi
+DOCKER_PROXY=$1
+
+for DOCKER_IMAGE in $(tail -n +2 $WORKSPACE/version-manifest/src/main/resources/docker-manifest.csv | tr ',' ':'); do
+    docker pull $DOCKER_PROXY/$DOCKER_IMAGE
+done
index 014aa95..afc9520 100755 (executable)
@@ -21,7 +21,7 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source ${WORKSPACE}/test/csit/scripts/appc/script1.sh
 
 export APPC_DOCKER_IMAGE_VERSION=1.3.0-SNAPSHOT-latest
-export CCSDK_DOCKER_IMAGE_VERSION=0.2.1
+export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest
 export BRANCH=master
 export SOLUTION_NAME=onap
 
@@ -48,8 +48,11 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.ym
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-image:$APPC_DOCKER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-image:$APPC_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/appc-image:latest
-docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest
+docker pull $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/ccsdk-dgbuilder-image:latest
+docker pull $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-cdt-image:$APPC_DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/${SOLUTION_NAME}/appc-cdt-image:$APPC_DOCKER_IMAGE_VERSION ${SOLUTION_NAME}/appc-cdt-image:latest
+
 # start APPC containers with docker compose and configuration from docker-compose.yml
 docker-compose up -d
 # WAIT 5 minutes maximum and test every 5 seconds if APPC is up using HealthCheck API
index 357ead8..94d1bc7 100755 (executable)
@@ -18,7 +18,8 @@
 #
 
 kill-instance.sh appc_controller_container
-kill-instance.sh sdnc_dgbuilder_container
+kill-instance.sh ccsdk_dgbuilder_container
+kill-instance.sh appc_cdt_container
 kill-instance.sh sdnc_db_container
 
 # $WORKSPACE/archives/appc deleted with archives folder when tests starts so we keep it at the end for debugging
index 0b906f4..a8119f6 100644 (file)
@@ -49,6 +49,9 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION onap/sdnc-image:latest
 
+docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$DOCKER_IMAGE_VERSION onap/sdnc-ansible-server-image:latest
+
 docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest
 
index d1930ce..ecee227 100644 (file)
@@ -23,7 +23,7 @@ docker run -d -i -t --name=postgres   -p 5432:5432 nexus3.onap.org:10001/onap/vn
 POSTGRES=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' postgres`
 
 #Start market place
-docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES  -p 8702:8702 nexus3.onap.org:10001/onap/vnfsdk/refrepo:1.1-STAGING-latest
+docker run -d -i -t --name=refrepo -e POSTGRES_SERVICE_HOST=$POSTGRES  -p 8702:8702 nexus3.onap.org:10001/onap/vnfsdk/refrepo:1.1-STAGING-latest
 
 # Wait for Market place initialization
 echo Wait for VNF Repository initialization
index 7237a1f..24de740 100644 (file)
@@ -34,18 +34,33 @@ docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 docker pull $NEXUS_DOCKER_REPO/onap/externalapi/nbi:$DOCKER_IMAGE_VERSION
 
 # Start nbi, MariaDB and MongoDB containers with docker compose and nbi/docker-compose.yml
-docker-compose up -d mariadb mongo && sleep 5 # to ensure that these services are ready for connections
+docker-compose up -d mariadb mongo
+
+# inject a script to ensure that these services are ready for connections
+docker-compose run --rm --entrypoint='/bin/sh' nbi -c '\
+    attempt=1; \
+    while ! nc -z mariadb 3306 || ! nc -z mongo 27017; do \
+        if [ $attempt = 30 ]; then \
+            echo "Timed out!"; \
+            exit 1; \
+        fi; \
+        echo "waiting for db services (attempt #$attempt)..."; \
+        sleep 1; \
+        attempt=$(( attempt + 1)); \
+    done; \
+    echo "all db services are ready for connections!" \
+'
+
 docker-compose up -d nbi
 
 NBI_CONTAINER_NAME=$(docker-compose ps 2> /dev/null | tail -n+3 | tr -s ' ' | cut -d' ' -f1 | grep _nbi_)
-NBI_IP=$(docker inspect $NBI_CONTAINER_NAME --format='{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}')
+NBI_IP=$(docker inspect --format='{{ range .NetworkSettings.Networks }}{{ .IPAddress }}{{ end }}' ${NBI_CONTAINER_NAME})
 
 echo "IP address for NBI main container ($NBI_CONTAINER_NAME) is set to ${NBI_IP}."
 
 # Wait for initialization
 for i in {1..30}; do
-    curl -sS ${NBI_IP}:8080 > /dev/null 2>&1 && break
+    curl -sS ${NBI_IP}:8080 > /dev/null 2>&1 && echo 'nbi initialized' && break
     echo sleep $i
     sleep $i
 done
-
index 0db34f0..d2229aa 100755 (executable)
@@ -85,8 +85,6 @@ cd ${WORK_DIR}
 git clone http://gerrit.onap.org/r/policy/docker
 cd docker
 
-docker build -t onap/policy-nexus  policy-nexus
-
 chmod +x config/drools/drools-tweaks.sh
 
 echo $IP > config/pe/ip_addr.txt
index a94fa66..120db11 100644 (file)
       "sniroTimeout": "PT30M",
       "serviceAgnosticSniroHost": "http://sniro.api.simpledemo.openecomp.org:8080",
       "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
-      "aaiEndpoint": "https://aai.api.simpledemo.openecomp.org:8443",
+      "aaiEndpoint": "https://aai.api.simpledemo.onap.org:8443",
       "aaiAuth": "2630606608347B7124C244AB0FE34F6F",
       "adaptersNamespace": "http://org.openecomp.mso",
       "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
index 1500105..c8610aa 100644 (file)
@@ -14,46 +14,57 @@ FLUSH PRIVILEGES;
 
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
 
-INSERT INTO `heat_environment` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('EnvArtifact-UUID3','base_vfw.env','1.0','base_vfw ENV file','parameters:\n  vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)\n  vfw_flavor_name: 4 GB General Purpose v1\n  public_net_id: 00000000-0000-0000-0000-000000000000\n  unprotected_private_net_id: zdfw1fwl01_unprotected\n  protected_private_net_id: zdfw1fwl01_protected\n  ecomp_private_net_id: oam_ecomp\n  unprotected_private_net_cidr: 192.168.10.0/24\n  protected_private_net_cidr: 192.168.20.0/24\n  ecomp_private_net_cidr: 192.168.9.0/24\n  vfw_private_ip_0: 192.168.10.100\n  vfw_private_ip_1: 192.168.20.100\n  vfw_private_ip_2: 192.168.9.100\n  vpg_private_ip_0: 192.168.10.200\n  vpg_private_ip_1: 192.168.9.200\n  vsn_private_ip_0: 192.168.20.250\n  vsn_private_ip_1: 192.168.9.250\n  vfw_name_0: zdfw1fwl01fwl01\n  vpg_name_0: zdfw1fwl01pgn01\n  vsn_name_0: zdfw1fwl01snk01\n  vnf_id: vFirewall_demo_app\n  vf_module_id: vFirewall\n  webserver_ip: 162.242.237.182\n  dcae_collector_ip: 192.168.9.1\n  key_name: vfw_key\n  pub_key: INSERT YOUR PUBLIC KEY HERE','MANUAL RECORD','2016-11-14 13:04:07');
-
-INSERT INTO `heat_template` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `TIMEOUT_MINUTES`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('Artifact-UUID3','base_vfw.yaml','1.0','Base VFW Heat','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vFirewall demo app for OpenECOMP\n\nparameters:\n  vfw_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vfw_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  unprotected_private_net_id:\n    type: string\n    label: Unprotected private network name or ID\n    description: Private network that connects vPacketGenerator with vFirewall\n  protected_private_net_id:\n    type: string\n    label: Protected private network name or ID\n    description: Private network that connects vFirewall with vSink\n  ecomp_private_net_id:\n    type: string\n    label: ECOMP management network name or ID\n    description: Private network that connects ECOMP component and the VNF\n  unprotected_private_net_cidr:\n    type: string\n    label: Unprotected private network CIDR\n    description: The CIDR of the unprotected private network\n  protected_private_net_cidr:\n    type: string\n    label: Protected private network CIDR\n    description: The CIDR of the protected private network\n  ecomp_private_net_cidr:\n    type: string\n    label: ECOMP private network CIDR\n    description: The CIDR of the protected private network\n  vfw_private_ip_0:\n    type: string\n    label: vFirewall private IP address towards the unprotected network\n    description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator\n  vfw_private_ip_1:\n    type: string\n    label: vFirewall private IP address towards the protected network\n    description: Private IP address that is assigned to the vFirewall to communicate with the vSink\n  vfw_private_ip_2:\n    type: string\n    label: vFirewall private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components\n  vpg_private_ip_0:\n    type: string\n    label: vPacketGenerator private IP address towards the unprotected network\n    description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall\n  vpg_private_ip_1:\n    type: string\n    label: vPacketGenerator private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components\n  vsn_private_ip_0:\n    type: string\n    label: vSink private IP address towards the protected network\n    description: Private IP address that is assigned to the vSink to communicate with the vFirewall\n  vsn_private_ip_1:\n    type: string\n    label: vSink private IP address towards the ECOMP management network\n    description: Private IP address that is assigned to the vSink to communicate with ECOMP components\n  vfw_name_0:\n    type: string\n    label: vFirewall name\n    description: Name of the vFirewall\n  vpg_name_0:\n    type: string\n    label: vPacketGenerator name\n    description: Name of the vPacketGenerator\n  vsn_name_0:\n    type: string\n    label: vSink name\n    description: Name of the vSink\n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ECOMP\n  vf_module_id:\n    type: string\n    label: vFirewall module ID\n    description: The vFirewall Module ID is provided by ECOMP\n  webserver_ip:\n    type: string\n    label: Webserver IP address\n    description: IP address of the webserver that hosts the source code and binaries\n  dcae_collector_ip:\n    type: string\n    label: DCAE collector IP address\n    description: IP address of the DCAE collector\n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n\nresources:\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name: { get_param: key_name }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n  unprotected_private_network:\n    type: OS::Neutron::Net\n    properties:\n      name: { get_param: unprotected_private_net_id }\n\n  protected_private_network:\n    type: OS::Neutron::Net\n    properties:\n      name: { get_param: protected_private_net_id }\n\n  unprotected_private_subnet:\n    type: OS::Neutron::Subnet\n    properties:\n      network_id: { get_resource: unprotected_private_network }\n      cidr: { get_param: unprotected_private_net_cidr }\n\n  protected_private_subnet:\n    type: OS::Neutron::Subnet\n    properties:\n      network_id: { get_resource: protected_private_network }\n      cidr: { get_param: protected_private_net_cidr }\n\n  vfw_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vfw_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vfw_private_0_port }\n        - port: { get_resource: vfw_private_1_port }\n        - port: { get_resource: vfw_private_2_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __dcae_collector_ip__ : { get_param: dcae_collector_ip }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            DCAE_COLLECTOR_IP=__dcae_collector_ip__\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_firewall_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vfirewall.sh\n            chmod +x v_firewall_init.sh\n            chmod +x vfirewall.sh\n            echo $WEBSERVER_IP > config/webserver_ip.txt\n            echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt\n            echo \"no\" > config/install.txt\n            mv vfirewall.sh /etc/init.d\n            sudo update-rc.d vfirewall.sh defaults\n            ./v_firewall_init.sh\n\n  vfw_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: unprotected_private_network }\n      fixed_ips: [{\"subnet\": { get_resource: unprotected_private_subnet }, \"ip_address\": { get_param: vfw_private_ip_0 }}]\n\n  vfw_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: protected_private_network }\n      fixed_ips: [{\"subnet\": { get_resource: protected_private_subnet }, \"ip_address\": { get_param: vfw_private_ip_1 }}]\n\n  vfw_private_2_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{\"subnet\": { get_param: ecomp_private_net_id }, \"ip_address\": { get_param: vfw_private_ip_2 }}]\n\n  vpg_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vpg_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vpg_private_0_port }\n        - port: { get_resource: vpg_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __fw_ipaddr__: { get_param: vfw_private_ip_0 }\n            __protected_net_cidr__: { get_param: protected_private_net_cidr }\n            __sink_ipaddr__: { get_param: vsn_private_ip_0 }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            FW_IPADDR=__fw_ipaddr__\n            PROTECTED_NET_CIDR=__protected_net_cidr__\n            SINK_IPADDR=__sink_ipaddr__\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_packetgen_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vpacketgen.sh\n            chmod +x v_packetgen_init.sh\n            chmod +x vpacketgen.sh\n            echo $WEBSERVER_IP > config/webserver_ip.txt\n            echo $FW_IPADDR > config/fw_ipaddr.txt\n            echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt\n            echo $SINK_IPADDR > config/sink_ipaddr.txt\n            echo \"no\" > config/install.txt\n            mv vpacketgen.sh /etc/init.d\n            sudo update-rc.d vpacketgen.sh defaults\n            ./v_packetgen_init.sh\n\n  vpg_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: unprotected_private_network }\n      fixed_ips: [{\"subnet\": { get_resource: unprotected_private_subnet }, \"ip_address\": { get_param: vpg_private_ip_0 }}]\n\n  vpg_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{\"subnet\": { get_param: ecomp_private_net_id }, \"ip_address\": { get_param: vpg_private_ip_1 }}]\n\n  vsn_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vfw_image_name }\n      flavor: { get_param: vfw_flavor_name }\n      name: { get_param: vsn_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vsn_private_0_port }\n        - port: { get_resource: vsn_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __webserver__: { get_param: webserver_ip }\n            __protected_net_gw__: { get_param: vfw_private_ip_1 }\n            __unprotected_net__: { get_param: unprotected_private_net_cidr }\n          template: |\n            #!/bin/bash\n\n            WEBSERVER_IP=__webserver__\n            PROTECTED_NET_GW=__protected_net_gw__\n            UNPROTECTED_NET=__unprotected_net__\n            UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d\'/\' -f1)\n\n            mkdir /opt/config\n            cd /opt\n            wget http://$WEBSERVER_IP/demo_repo/v_sink_init.sh\n            wget http://$WEBSERVER_IP/demo_repo/vsink.sh\n            chmod +x v_sink_init.sh\n            chmod +x vsink.sh\n            echo $PROTECTED_NET_GW > config/protected_net_gw.txt\n            echo $UNPROTECTED_NET > config/unprotected_net.txt\n            echo \"no\" > config/install.txt\n            mv vsink.sh /etc/init.d\n            sudo update-rc.d vsink.sh defaults\n            ./v_sink_init.sh\n\n  vsn_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_resource: protected_private_network }\n      fixed_ips: [{\"subnet\": { get_resource: protected_private_subnet }, \"ip_address\": { get_param: vsn_private_ip_0 }}]\n\n  vsn_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: ecomp_private_net_id }\n      fixed_ips: [{\"subnet\": { get_param: ecomp_private_net_id }, \"ip_address\": { get_param: vsn_private_ip_1 }}]\n \n',300,'MANUAL RECORD','2016-11-14 13:04:07');
-
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','dcae_collector_ip','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','ecomp_private_net_cidr','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','ecomp_private_net_id','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','key_name','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','protected_private_net_cidr','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','protected_private_net_id','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','public_net_id','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','pub_key','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','unprotected_private_net_cidr','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','unprotected_private_net_id','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vfw_flavor_name','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vfw_image_name','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vfw_name_0','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vfw_private_ip_0','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vfw_private_ip_1','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vfw_private_ip_2','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vf_module_id','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vnf_id','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vpg_name_0','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vpg_private_ip_0','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vpg_private_ip_1','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vsn_name_0','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vsn_private_ip_0','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','vsn_private_ip_1','\ 1','string',NULL);
-INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID3','webserver_ip','\ 1','string',NULL);
-
-INSERT INTO `service` (`MODEL_UUID`, `MODEL_NAME`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `TOSCA_CSAR_ARTIFACT_UUID`) VALUES ('2e34774e-715e-4fd5-bd09-7b654622f35i','vfw-service','585822c7-4027-4f84-ba50-e9248606f112','1.0','VFW service','2016-11-14 13:04:07',NULL);
-
-INSERT INTO `vf_module` (`MODEL_UUID`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `DESCRIPTION`, `IS_BASE`, `HEAT_TEMPLATE_ARTIFACT_UUID`, `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group','585822c7-4027-4f84-ba50-e9248606f134','1.0','VF_RI1_VFW::module-1',NULL,1,'Artifact-UUID3',NULL,'2016-11-14 13:04:07','685822c7-4027-4f84-ba50-e9248606f132');
-
-INSERT INTO `vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`, `LABEL`, `INITIAL_COUNT`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_COUNT`, `HEAT_ENVIRONMENT_ARTIFACT_UUID`, `VOL_ENVIRONMENT_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VF_MODULE_MODEL_UUID`) VALUES ('5aa23938-a9fe-11e7-8b4b-0242ac120002',NULL,1,0,NULL,NULL,'EnvArtifact-UUID3',NULL,'2017-10-05 18:52:03','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group');
-
-INSERT INTO `vnf_res_custom_to_vf_module_custom` (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`, `CREATION_TIMESTAMP`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','5aa23938-a9fe-11e7-8b4b-0242ac120002','2017-10-05 18:52:03');
-
-INSERT INTO `vnf_resource` (`ORCHESTRATION_MODE`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `MODEL_UUID`, `AIC_VERSION_MIN`, `AIC_VERSION_MAX`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `TOSCA_NODE_TYPE`, `HEAT_TEMPLATE_ARTIFACT_UUID`) VALUES ('HEAT','VFW service1707MIGRATED','2016-11-14 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','VFWResource',NULL,NULL);
-
-INSERT INTO `vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`, `MODEL_INSTANCE_NAME`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_MAX_COUNT`, `NF_TYPE`, `NF_ROLE`, `NF_FUNCTION`, `NF_NAMING_CODE`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','VFWResource-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2017-10-05 18:52:03','685822c7-4027-4f84-ba50-e9248606f132');
+INSERT INTO `heat_environment` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('EnvArtifact-UUID2','base_vcpe_infra.env','1.0','base_vcpe_infra ENV file','parameters:\n  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)\n  vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)\n  public_net_id: PUT THE PUBLIC NETWORK ID HERE\n  cpe_signal_net_id: zdfw1cpe01_private\n  cpe_signal_subnet_id: zdfw1cpe01_sub_private\n  cpe_public_net_id: zdfw1cpe01_public\n  cpe_public_subnet_id: zdfw1cpe01_sub_public\n  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\n  onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE\n  onap_private_net_cidr: 10.0.0.0/16\n  cpe_signal_net_cidr: 10.4.0.0/24\n  cpe_public_net_cidr: 10.2.0.0/24\n  vdhcp_private_ip_0: 10.4.0.1\n  vdhcp_private_ip_1: 10.0.101.1\n  vaaa_private_ip_0: 10.4.0.4\n  vaaa_private_ip_1: 10.0.101.2\n  vdns_private_ip_0: 10.2.0.1\n  vdns_private_ip_1: 10.0.101.3\n  vweb_private_ip_0: 10.2.0.10\n  vweb_private_ip_1: 10.0.101.40\n  mr_ip_addr: 10.0.11.1\n  vaaa_name_0: zdcpe1cpe01aaa01\n  vdns_name_0: zdcpe1cpe01dns01\n  vdhcp_name_0: zdcpe1cpe01dhcp01\n  vweb_name_0: zdcpe1cpe01web01\n  vnf_id: vCPE_Infrastructure_demo_app\n  vf_module_id: vCPE_Intrastructure\n  dcae_collector_ip: 10.0.4.1\n  dcae_collector_port: 8081\n  repo_url_blob: https://nexus.onap.org/content/sites/raw\n  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\n  demo_artifacts_version: 1.2.0\n  install_script_version: 1.2.0-SNAPSHOT\n  key_name: vaaa_key\n  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN\n  cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)\n','MANUAL RECORD','2018-04-28 13:04:07a');
+
+INSERT INTO `heat_template` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `TIMEOUT_MINUTES`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('Artifact-UUID2','base_vcpe_infra.yaml','1.0','Base VCPE INFRA Heat','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer)\n\nparameters:\n  vcpe_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vcpe_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  onap_private_net_id:\n    type: string\n    label: ONAP management network name or ID\n    description: Private network that connects ONAP components and the VNF\n  onap_private_subnet_id:\n    type: string\n    label: ONAP management sub-network name or ID\n    description: Private sub-network that connects ONAP components and the VNF\n  onap_private_net_cidr:\n    type: string\n    label: ONAP private network CIDR\n    description: The CIDR of the protected private network\n  cpe_signal_net_id:\n    type: string\n    label: vAAA private network name or ID\n    description: Private network that connects vAAA with vDNSs\n  cpe_signal_subnet_id:\n    type: string\n    label: CPE Signal subnet\n    description: CPE Signal subnet\n  cpe_signal_net_cidr:\n    type: string\n    label: vAAA private network CIDR\n    description: The CIDR of the vAAA private network\n  cpe_public_net_id:\n    type: string\n    label: vCPE Public network (emulates internet) name or ID\n    description: Private network that connects vGW to emulated internet\n  cpe_public_subnet_id:\n    type: string\n    label: CPE Public subnet\n    description: CPE Public subnet\n  cpe_public_net_cidr:\n    type: string\n    label: vCPE public network CIDR\n    description: The CIDR of the vCPE public\n  vaaa_private_ip_0:\n    type: string\n    label: vAAA private IP address towards the CPE_SIGNAL private network\n    description: Private IP address that is assigned to the vAAA to communicate with the vCPE components\n  vaaa_private_ip_1:\n    type: string\n    label: vAAA private IP address towards the ONAP management network\n    description: Private IP address that is assigned to the vAAA to communicate with ONAP components\n  vdns_private_ip_0:\n    type: string\n    label: vDNS private IP address towards the CPE_PUBLIC private network\n    description: Private IP address that is assigned to the vDNS to communicate with the vCPE components\n  vdns_private_ip_1:\n    type: string\n    label: vDNS private IP address towards the ONAP management network\n    description: Private IP address that is assigned to the vDNS to communicate with ONAP components\n  vdhcp_private_ip_0:\n    type: string\n    label: vDHCP  private IP address towards the CPE_SIGNAL private network\n    description: Private IP address that is assigned to the vDHCP to communicate with the vCPE components\n  vdhcp_private_ip_1:\n    type: string\n    label: vDNS private IP address towards the ONAP management network\n    description: Private IP address that is assigned to the vDHCP to communicate with ONAP components\n  vweb_private_ip_0:\n    type: string\n    label: vWEB private IP address towards the CPE_PUBLIC private network\n    description: Private IP address that is assigned to the vWEB to communicate with the vGWs \n  vweb_private_ip_1:\n    type: string\n    label: vWEB private IP address towards the ONAP management network\n    description: Private IP address that is assigned to the vWEB to communicate with ONAP components\n  vaaa_name_0:\n    type: string\n    label: vAAA name\n    description: Name of the vAAA\n  vdns_name_0:\n    type: string\n    label: vDNS name\n    description: Name of the vDNS\n  vdhcp_name_0:\n    type: string\n    label: vDHCP name\n    description: Name of the vDHCP\n  vweb_name_0:\n    type: string\n    label: vWEB name\n    description: Name of the vWEB \n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ONAP\n  vf_module_id:\n    type: string\n    label: vFirewall module ID\n    description: The vAAA Module ID is provided by ONAP\n  dcae_collector_ip:\n    type: string\n    label: DCAE collector IP address\n    description: IP address of the DCAE collector\n  dcae_collector_port:\n    type: string\n    label: DCAE collector port\n    description: Port of the DCAE collector\n  mr_ip_addr:\n    type: string\n    label: Message Router IP address\n    description: IP address of the Message Router that for vDHCP configuration \n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n  repo_url_blob:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  repo_url_artifacts:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  install_script_version:\n    type: string\n    label: Installation script version number\n    description: Version number of the scripts that install the vFW demo app\n  demo_artifacts_version:\n    type: string\n    label: Artifacts version used in demo vnfs\n    description: Artifacts (jar, tar.gz) version used in demo vnfs\n  cloud_env:\n    type: string\n    label: Cloud environment\n    description: Cloud environment (e.g., openstack, rackspace)\n\nresources:\n\n  random-str:\n    type: OS::Heat::RandomString\n    properties:\n      length: 4\n\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name:\n        str_replace:\n          template: base_rand\n          params:\n            base: { get_param: key_name }\n            rand: { get_resource: random-str }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n\n  vaaa_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: cpe_signal_net_id }\n      fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vaaa_private_ip_0 }}]\n\n  vaaa_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: onap_private_net_id }\n      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vaaa_private_ip_1 }}]\n\n  vaaa_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vaaa_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vaaa_private_0_port }\n        - port: { get_resource: vaaa_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __dcae_collector_ip__: { get_param: dcae_collector_ip }\n            __dcae_collector_port__: { get_param: dcae_collector_port }\n            __cpe_signal_net_ipaddr__: { get_param: vaaa_private_ip_0 }\n            __oam_ipaddr__: { get_param: vaaa_private_ip_1 }\n            __oam_cidr__: { get_param: onap_private_net_cidr }\n            __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt\n            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt\n            echo "__cpe_signal_net_ipaddr__" > /opt/config/cpe_signal_net_ipaddr.txt\n            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt\n            echo "__oam_cidr__" > /opt/config/oam_cidr.txt\n            echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_aaa_install.sh -o /opt/v_aaa_install.sh\n            cd /opt\n            chmod +x v_aaa_install.sh\n            ./v_aaa_install.sh\n\n\n  vdns_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: cpe_public_net_id }\n      fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vdns_private_ip_0 }}]\n\n  vdns_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: onap_private_net_id }\n      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]\n\n  vdns_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vdns_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vdns_private_0_port }\n        - port: { get_resource: vdns_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __oam_ipaddr__ : { get_param: vdns_private_ip_1 }\n            __cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 }\n            __oam_cidr__: { get_param: onap_private_net_cidr }\n            __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt\n            echo "__cpe_public_net_ipaddr__" > /opt/config/cpe_public_net_ipaddr.txt\n            echo "__oam_cidr__" > /opt/config/oam_cidr.txt\n            echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh\n            cd /opt\n            chmod +x v_dns_install.sh\n            ./v_dns_install.sh\n\n\n  vdhcp_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: cpe_signal_net_id }\n      fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vdhcp_private_ip_0 }}]\n\n  vdhcp_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: onap_private_net_id }\n      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdhcp_private_ip_1 }}]\n\n  vdhcp_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vdhcp_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vdhcp_private_0_port }\n        - port: { get_resource: vdhcp_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __oam_ipaddr__ : { get_param: vdhcp_private_ip_1 }\n            __cpe_signal_ipaddr__ : { get_param: vdhcp_private_ip_0 }\n            __oam_cidr__ : { get_param: onap_private_net_cidr }\n            __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr }\n            __mr_ip_addr__ : { get_param: mr_ip_addr }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt\n            echo "__cpe_signal_ipaddr__" > /opt/config/cpe_signal_ipaddr.txt\n            echo "__oam_cidr__" > /opt/config/oam_cidr.txt\n            echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt\n            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n            cd /opt\n            chmod +x v_dhcp_install.sh\n            ./v_dhcp_install.sh\n\n  vweb_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: cpe_public_net_id }\n      fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vweb_private_ip_0 }}]\n\n  vweb_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: onap_private_net_id }\n      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vweb_private_ip_1 }}]\n\n\n  vweb_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vweb_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vweb_private_0_port }\n        - port: { get_resource: vweb_private_1_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __oam_ipaddr__ : { get_param: vweb_private_ip_1 }\n            __cpe_public_ipaddr__: { get_param: vweb_private_ip_0 }\n            __oam_cidr__: { get_param: onap_private_net_cidr }\n            __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt\n            echo "__cpe_public_ipaddr__" > /opt/config/cpe_public_ipaddr.txt\n            echo "__oam_cidr__" > /opt/config/oam_cidr.txt\n            echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_web_install.sh -o /opt/v_web_install.sh\n            cd /opt\n            chmod +x v_web_install.sh\n            ./v_web_install.sh\n',300,'MANUAL RECORD','2018-04-28 13:04:07');
+
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cloud_env','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','pub_key','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','key_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','install_script_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','demo_artifacts_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','repo_url_artifacts','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','repo_url_blob','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','dcae_collector_port','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','dcae_collector_ip','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vf_module_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vnf_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vweb_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vdhcp_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vdns_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vaaa_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','mr_ip_addr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vweb_private_ip_1','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vweb_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vdns_private_ip_1','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vdns_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vaaa_private_ip_1','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vaaa_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vdhcp_private_ip_1','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vdhcp_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cpe_public_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cpe_signal_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','onap_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','onap_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','onap_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cpe_public_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cpe_public_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cpe_signal_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','cpe_signal_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','public_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vcpe_flavor_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID2','vcpe_image_name','\ 1','string',NULL);
+
+INSERT INTO `service` (`MODEL_UUID`, `MODEL_NAME`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `TOSCA_CSAR_ARTIFACT_UUID`) VALUES ('2e34774e-715e-4fd5-bd09-7b654622f35i','infra-service','585822c7-4027-4f84-ba50-e9248606f112','1.0','INFRA service','2018-04-28 13:04:07',NULL);
+
+INSERT INTO `vf_module` (`MODEL_UUID`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `DESCRIPTION`, `IS_BASE`, `HEAT_TEMPLATE_ARTIFACT_UUID`, `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group','585822c7-4027-4f84-ba50-e9248606f134','1.0','VF_RI1_VFW::module-1',NULL,1,'Artifact-UUID2',NULL,'2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132');
+
+INSERT INTO `vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`, `LABEL`, `INITIAL_COUNT`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_COUNT`, `HEAT_ENVIRONMENT_ARTIFACT_UUID`, `VOL_ENVIRONMENT_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VF_MODULE_MODEL_UUID`) VALUES ('5aa23938-a9fe-11e7-8b4b-0242ac120002',NULL,1,0,NULL,NULL,'EnvArtifact-UUID2',NULL,'2018-04-28 18:52:03','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group');
+
+INSERT INTO `vnf_res_custom_to_vf_module_custom` (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`, `CREATION_TIMESTAMP`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','5aa23938-a9fe-11e7-8b4b-0242ac120002','2018-04-28 18:52:03');
+
+INSERT INTO `vnf_resource` (`ORCHESTRATION_MODE`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `MODEL_UUID`, `AIC_VERSION_MIN`, `AIC_VERSION_MAX`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `TOSCA_NODE_TYPE`, `HEAT_TEMPLATE_ARTIFACT_UUID`) VALUES ('HEAT','INFRA service1707MIGRATED','2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','INFRAResource',NULL,NULL);
+
+INSERT INTO `vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`, `MODEL_INSTANCE_NAME`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_MAX_COUNT`, `NF_TYPE`, `NF_ROLE`, `NF_FUNCTION`, `NF_NAMING_CODE`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','VFWResource-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2018-04-28 18:52:03','685822c7-4027-4f84-ba50-e9248606f132');
 
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
diff --git a/test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vbng.sql b/test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vbng.sql
new file mode 100644 (file)
index 0000000..baf9632
--- /dev/null
@@ -0,0 +1,69 @@
+SOURCE ../default/create_mso_db-default.sql
+
+USE `mso_requests`;
+DROP USER 'mso';
+CREATE USER 'mso';
+GRANT ALL on mso_requests.* to 'mso' identified by 'mso123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+
+USE `mso_catalog`;
+DROP USER 'catalog';
+CREATE USER 'catalog';
+GRANT ALL on mso_catalog.* to 'catalog' identified by 'catalog123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+
+INSERT INTO `heat_environment` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('EnvArtifact-UUID5','base_vcpe_vbng.env','1.2.0','base_vbng ENV file','parameters:\n  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)\n  vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)\n  public_net_id: PUT THE PUBLIC NETWORK ID HERE\n  brgemu_bng_private_net_id: zdfw1bngin01_private\n  brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private\n  bng_gmux_private_net_id: zdfw1bngmux01_private\n  bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private\n  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\n  onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE\n  onap_private_net_cidr: 10.0.0.0/16\n  cpe_signal_net_id: zdfw1cpe01_private\n  cpe_signal_subnet_id: zdfw1cpe01_sub_private\n  brgemu_bng_private_net_cidr: 10.3.0.0/24\n  bng_gmux_private_net_cidr: 10.1.0.0/24\n  cpe_signal_private_net_cidr: 10.4.0.0/24\n  vbng_private_ip_0: 10.3.0.1\n  vbng_private_ip_1: 10.0.101.10\n  vbng_private_ip_2: 10.4.0.3\n  vbng_private_ip_3: 10.1.0.10\n  vbng_name_0: zdcpe1cpe01bng01\n  vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app\n  vf_module_id: vCPE_Intrastructure_Metro_vBNG\n  sdnc_ip_addr: 10.0.7.1\n  dcae_collector_ip: 10.0.4.1\n  dcae_collector_port: 8081\n  repo_url_blob: https://nexus.onap.org/content/sites/raw\n  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\n  demo_artifacts_version: 1.2.0\n  install_script_version: 1.2.0-SNAPSHOT\n  key_name: vbng_key\n  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN\n  cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)\n  vpp_source_repo_url: https://gerrit.fd.io/r/vpp\n  vpp_source_repo_branch: stable/1704\n  vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch','MANUAL RECORD','2018-04-28 13:04:07');
+
+INSERT INTO `heat_template` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `TIMEOUT_MINUTES`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('Artifact-UUID5','base_vcpe_vbng.yaml','1.0','Base VBNG Heat','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vCPE virtual Broadband Network Gateway (vBNG)\n\nparameters:\n  vcpe_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vcpe_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  brgemu_bng_private_net_id:\n    type: string\n    label: vBNG IN private network name or ID\n    description: Private network that connects vBRG to vBNG\n  brgemu_bng_private_subnet_id:\n    type: string\n    label: vBNG IN private sub-network name or ID\n    description: vBNG IN private sub-network name or ID\n  brgemu_bng_private_net_cidr:\n    type: string\n    label: vBNG IN private network CIDR\n    description: The CIDR of the input side of vBNG private network\n  bng_gmux_private_net_id:\n    type: string\n    label: vBNG vGMUX private network name or ID\n    description: Private network that connects vBNG to vGMUX\n  bng_gmux_private_subnet_id:\n    type: string\n    label: vBNG vGMUX private sub-network name or ID\n    description: vBNG vGMUX private sub-network name or ID\n  bng_gmux_private_net_cidr:\n    type: string\n    label: vGMUX private network CIDR\n    description: The CIDR of the input side of vGMUX private network\n  onap_private_net_id:\n    type: string\n    label: ONAP management network name or ID\n    description: Private network that connects ONAP components and the VNF\n  onap_private_subnet_id:\n    type: string\n    label: ONAP management sub-network name or ID\n    description: Private sub-network that connects ONAP components and the VNF\n  onap_private_net_cidr:\n    type: string\n    label: ONAP private network CIDR\n    description: The CIDR of the protected private network\n  cpe_signal_net_id:\n    type: string\n    label: vCPE private network name or ID\n    description: Private network that connects vCPE elements with vCPE infrastructure elements\n  cpe_signal_subnet_id:\n    type: string\n    label: vCPE private sub-network name or ID\n    description: vCPE private sub-network name or ID\n  cpe_signal_private_net_cidr:\n    type: string\n    label: vAAA private network CIDR\n    description: The CIDR of the vAAA private network\n  vbng_private_ip_0:\n    type: string\n    label: vBNG IN private IP address\n    description: Private IP address that is assigned to the vBNG IN\n  vbng_private_ip_1:\n    type: string\n    label: vBNG private IP address towards the ONAP management network\n    description: Private IP address that is assigned to the vBNG to communicate with ONAP components\n  vbng_private_ip_2:\n    type: string\n    label: vBNG to CPE_SIGNAL private IP address\n    description: Private IP address that is assigned to the vBNG in the CPE_SIGNAL network\n  vbng_private_ip_3:\n    type: string\n    label: vBNG to vGMUX private IP address\n    description: Private IP address that is assigned to the vBNG to vGMUX port\n  vbng_name_0:\n    type: string\n    label: vBNG name\n    description: Name of the vBNG\n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ONAP\n  vf_module_id:\n    type: string\n    label: vCPE module ID\n    description: The vCPE Module ID is provided by ONAP\n  dcae_collector_ip:\n    type: string\n    label: DCAE collector IP address\n    description: IP address of the DCAE collector\n  dcae_collector_port:\n    type: string\n    label: DCAE collector port\n    description: Port of the DCAE collector\n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n  repo_url_blob:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  repo_url_artifacts:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  install_script_version:\n    type: string\n    label: Installation script version number\n    description: Version number of the scripts that install the vFW demo app\n  demo_artifacts_version:\n    type: string\n    label: Artifacts version used in demo vnfs\n    description: Artifacts (jar, tar.gz) version used in demo vnfs\n  cloud_env:\n    type: string\n    label: Cloud environment\n    description: Cloud environment (e.g., openstack, rackspace)\n  vpp_source_repo_url:\n    type: string\n    label: VPP Source Git Repo\n    description: URL for VPP source codes\n  vpp_source_repo_branch:\n    type: string\n    label: VPP Source Git Branch\n    description: Git Branch for the VPP source codes\n  vpp_patch_url:\n    type: string\n    label: VPP Patch URL\n    description: URL for VPP patch for vBNG\n  sdnc_ip_addr:\n    type: string\n    label: SDNC IP address\n    description: IP address of the SDNC\n\nresources:\n\n  random-str:\n    type: OS::Heat::RandomString\n    properties:\n      length: 4\n\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name:\n        str_replace:\n          template: base_rand\n          params:\n            base: { get_param: key_name }\n            rand: { get_resource: random-str }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n\n  vbng_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: brgemu_bng_private_net_id }\n      fixed_ips: [{"subnet": { get_param: brgemu_bng_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_0 }}]\n\n  vbng_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: onap_private_net_id }\n      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_1 }}]\n\n  vbng_private_2_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: cpe_signal_net_id }\n      fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vbng_private_ip_2 }}]\n\n  vbng_private_3_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: bng_gmux_private_net_id }\n      fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_3 }}]\n\n  vbng_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vbng_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vbng_private_0_port }\n        - port: { get_resource: vbng_private_1_port }\n        - port: { get_resource: vbng_private_2_port }\n        - port: { get_resource: vbng_private_3_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __oam_ipaddr__: { get_param: vbng_private_ip_1 }\n            __brgemu_bng_net_ipaddr__: { get_param: vbng_private_ip_0 }\n            __cpe_signal_net_ipaddr__: { get_param: vbng_private_ip_2 }\n            __bng_gmux_net_ipaddr__: { get_param: vbng_private_ip_3 }\n            __oam_cidr__: { get_param: onap_private_net_cidr }\n            __brgemu_bng_cidr__: { get_param: brgemu_bng_private_net_cidr }\n            __cpe_signal_cidr__: { get_param: cpe_signal_private_net_cidr }\n            __bng_gmux_cidr__: { get_param: bng_gmux_private_net_cidr }\n            __dcae_collector_ip__: { get_param: dcae_collector_ip }\n            __dcae_collector_port__: { get_param: dcae_collector_port }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n            __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }\n            __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }\n            __vpp_patch_url__ : { get_param: vpp_patch_url }\n            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__brgemu_bng_net_ipaddr__" > /opt/config/brgemu_bng_net_ipaddr.txt\n            echo "__cpe_signal_net_ipaddr__" > /opt/config/cpe_signal_net_ipaddr.txt\n            echo "__bng_gmux_net_ipaddr__" > /opt/config/bng_gmux_net_ipaddr.txt\n            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt\n            echo "__oam_cidr__" > /opt/config/oam_cidr.txt\n            echo "__bng_gmux_cidr__" > /opt/config/bng_gmux_net_cidr.txt\n            echo "__cpe_signal_cidr__" > /opt/config/cpe_signal_net_cidr.txt\n            echo "__brgemu_bng_cidr__" > /opt/config/brgemu_bng_net_cidr.txt\n            echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt\n            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n            echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt\n            echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt\n            echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt\n            echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh\n            cd /opt\n            chmod +x v_bng_install.sh\n            ./v_bng_install.sh\n',300,'MANUAL RECORD','2018-04-27 13:04:07');
+
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vpp_patch_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vpp_source_repo_branch','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vpp_source_repo_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','cloud_env','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','pub_key','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','key_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','install_script_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','demo_artifacts_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','repo_url_artifacts','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','repo_url_blob','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','dcae_collector_port','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','dcae_collector_ip','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','sdnc_ip_addr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vf_module_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vnf_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vbng_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vbng_private_ip_3','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vbng_private_ip_2','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vbng_private_ip_1','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vbng_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','cpe_signal_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','bng_gmux_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','brgemu_bng_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','cpe_signal_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','cpe_signal_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','onap_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','onap_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','onap_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','bng_gmux_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','bng_gmux_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','brgemu_bng_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','brgemu_bng_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','public_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vcpe_flavor_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID5','vcpe_image_name','\ 1','string',NULL);
+
+INSERT INTO `service` (`MODEL_UUID`, `MODEL_NAME`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `TOSCA_CSAR_ARTIFACT_UUID`) VALUES ('a94f8ff8-442d-11e8-8a14-0320c6d83cc0','vbng-service','fba765a0-442d-11e8-b89d-57dec24c6cba','1.0','VBNG service','2018-04-28 13:04:07',NULL);
+
+INSERT INTO `vf_module` (`MODEL_UUID`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `DESCRIPTION`, `IS_BASE`, `HEAT_TEMPLATE_ARTIFACT_UUID`, `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group','585822c7-4027-4f84-ba50-e9248606f134','1.0','VF_RI1_VFW::module-1',NULL,1,'Artifact-UUID5',NULL,'2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132');
+
+INSERT INTO `vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`, `LABEL`, `INITIAL_COUNT`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_COUNT`, `HEAT_ENVIRONMENT_ARTIFACT_UUID`, `VOL_ENVIRONMENT_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VF_MODULE_MODEL_UUID`) VALUES ('5aa23938-a9fe-11e7-8b4b-0242ac120002',NULL,1,0,NULL,NULL,'EnvArtifact-UUID5',NULL,'2018-04-28 18:52:03','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group');
+
+INSERT INTO `vnf_res_custom_to_vf_module_custom` (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`, `CREATION_TIMESTAMP`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','5aa23938-a9fe-11e7-8b4b-0242ac120002','2018-04-28 18:52:03');
+
+INSERT INTO `vnf_resource` (`ORCHESTRATION_MODE`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `MODEL_UUID`, `AIC_VERSION_MIN`, `AIC_VERSION_MAX`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `TOSCA_NODE_TYPE`, `HEAT_TEMPLATE_ARTIFACT_UUID`) VALUES ('HEAT','VBNG service1707MIGRATED','2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','VFWResource',NULL,NULL);
+
+INSERT INTO `vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`, `MODEL_INSTANCE_NAME`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_MAX_COUNT`, `NF_TYPE`, `NF_ROLE`, `NF_FUNCTION`, `NF_NAMING_CODE`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','VBNGResource-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2018-04-28 18:52:03','685822c7-4027-4f84-ba50-e9248606f132');
+
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
diff --git a/test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vbrgemu.sql b/test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vbrgemu.sql
new file mode 100644 (file)
index 0000000..36aaa99
--- /dev/null
@@ -0,0 +1,58 @@
+SOURCE ../default/create_mso_db-default.sql
+
+USE `mso_requests`;
+DROP USER 'mso';
+CREATE USER 'mso';
+GRANT ALL on mso_requests.* to 'mso' identified by 'mso123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+
+USE `mso_catalog`;
+DROP USER 'catalog';
+CREATE USER 'catalog';
+GRANT ALL on mso_catalog.* to 'catalog' identified by 'catalog123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+
+INSERT INTO `heat_environment` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('EnvArtifact-UUID6','base_vcpe_vbrgemu.env','1.0','base_vcpe_vbrgemu ENV file','parameters:\n  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED)\n  vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)\n  compile_state: PUT THE COMPILE STATE (done, auto or build)\n  public_net_id: PUT THE PUBLIC NETWORK ID HERE\n  vbrgemu_bng_private_net_id: zdfw1bngin01_private\n  vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private\n  vbrgemu_bng_private_net_cidr: 10.3.0.0/24\n  vbrgemu_private_ip_0: 10.3.0.4\n  sdnc_ip: 10.0.7.1\n  vbrgemu_name_0: zdcpe1cpe01brgemu01\n  vnf_id: vCPE_Infrastructure_BGREMU_demo_app\n  vf_module_id: vCPE_Customer_BRGEMU\n  repo_url_blob: https://nexus.onap.org/content/sites/raw\n  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\n  demo_artifacts_version: 1.2.0\n  install_script_version: 1.2.0-SNAPSHOT\n  key_name: vbrgemu_key\n  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh\n  cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)\n  vpp_source_repo_url: https://gerrit.fd.io/r/vpp\n  vpp_source_repo_branch: stable/1704\n  hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp\n  hc2vpp_source_repo_branch: stable/1704\n  vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch\n ','MANUAL RECORD','2018-04-28 13:04:07');
+
+INSERT INTO `heat_template` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `TIMEOUT_MINUTES`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('Artifact-UUID6','base_vcpe_vbrgemu.yaml','1.0','Base VBRGEMU Heat','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vCPE vBRG Emulator (vBRGEMU)\n\nparameters:\n  vcpe_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vcpe_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  vbrgemu_bng_private_net_id:\n    type: string\n    label: vBNG private network name or ID\n    description: Private network that connects vBRGEMU to vBNG\n  vbrgemu_bng_private_subnet_id:\n    type: string\n    label: vBNG private sub-network name or ID\n    description: vBNG private sub-network name or ID\n  vbrgemu_bng_private_net_cidr:\n    type: string\n    label: vBNG IN private network CIDR\n    description: The CIDR of the input side of vBNG private network\n  vbrgemu_private_ip_0:\n    type: string\n    label: vGW private IP address\n    description: Private IP address towards the BRGEMU-BNG network\n  vbrgemu_name_0:\n    type: string\n    label: vGW  name\n    description: Name of the vGW\n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ONAP\n  vf_module_id:\n    type: string\n    label: vCPE module ID\n    description: The vCPE Module ID is provided by ONAP\n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n  repo_url_blob:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  repo_url_artifacts:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  install_script_version:\n    type: string\n    label: Installation script version number\n    description: Version number of the scripts that install the vFW demo app\n  demo_artifacts_version:\n    type: string\n    label: Artifacts version used in demo vnfs\n    description: Artifacts (jar, tar.gz) version used in demo vnfs\n  cloud_env:\n    type: string\n    label: Cloud environment\n    description: Cloud environment (e.g., openstack, rackspace)\n  vpp_source_repo_url:\n    type: string\n    label: VPP Source Git Repo\n    description: URL for VPP source codes\n  vpp_source_repo_branch:\n    type: string\n    label: VPP Source Git Branch\n    description: Git Branch for the VPP source codes\n  hc2vpp_source_repo_url:\n    type: string\n    label: Honeycomb Source Git Repo\n    description: URL for Honeycomb source codes\n  hc2vpp_source_repo_branch:\n    type: string\n    label: Honeycomb Source Git Branch\n    description: Git Branch for the Honeycomb source codes\n  vpp_patch_url:\n    type: string\n    label: VPP Patch URL\n    description: URL for VPP patch for vBRG Emulator\n  sdnc_ip:\n    type: string\n    label: SDNC ip address\n    description: SDNC ip address used to set NAT\n  compile_state:\n    type: string\n    label: Compile State\n    description: State to compile code or not\n\nresources:\n\n  random-str:\n    type: OS::Heat::RandomString\n    properties:\n      length: 4\n\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name:\n        str_replace:\n          template: base_rand\n          params:\n            base: { get_param: key_name }\n            rand: { get_resource: random-str }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n  vbrgemu_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: vbrgemu_bng_private_net_id }\n      fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}]\n\n  vbrgemu_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vbrgemu_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vbrgemu_private_0_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n            __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }\n            __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }\n            __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }\n            __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }\n            __vpp_patch_url__ : { get_param: vpp_patch_url }\n            __sdnc_ip__ : { get_param: sdnc_ip }\n            __compile_state__ : { get_param: compile_state }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_net_cidr.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n            echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt\n            echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt\n            echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt\n            echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt\n            echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt\n            echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt\n            echo "__compile_state__" > /opt/config/compile_state.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh\n            cd /opt\n            chmod +x v_brgemu_install.sh\n            ./v_brgemu_install.sh\n ', 300, 'MANUAL RECORD', '2018-04-28 13:04:07');
+
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vpp_patch_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','hc2vpp_source_repo_branch','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','hc2vpp_source_repo_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vpp_source_repo_branch','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vpp_source_repo_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','cloud_env','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','pub_key','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','key_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','install_script_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','demo_artifacts_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','repo_url_artifacts','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','repo_url_blob','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vf_module_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vnf_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vbrgemu_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','sdnc_ip','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vbrgemu_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vbrgemu_bng_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vbrgemu_bng_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vbrgemu_bng_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','public_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','compile_state','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vcpe_flavor_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID6','vcpe_image_name','\ 1','string',NULL);
+
+INSERT INTO `service` (`MODEL_UUID`, `MODEL_NAME`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `TOSCA_CSAR_ARTIFACT_UUID`) VALUES ('a94f8ff8-442d-11e8-8a14-0320c6d83cc0','vbrgemu-service','fba765a0-442d-11e8-b89d-57dec24c6cba','1.0','VBRGEMU service','2018-04-28 13:04:07',NULL);
+
+INSERT INTO `vf_module` (`MODEL_UUID`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `DESCRIPTION`, `IS_BASE`, `HEAT_TEMPLATE_ARTIFACT_UUID`, `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group','585822c7-4027-4f84-ba50-e9248606f134','1.0','VF_RI1_VFW::module-1',NULL,1,'Artifact-UUID6',NULL,'2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132');
+
+INSERT INTO `vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`, `LABEL`, `INITIAL_COUNT`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_COUNT`, `HEAT_ENVIRONMENT_ARTIFACT_UUID`, `VOL_ENVIRONMENT_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VF_MODULE_MODEL_UUID`) VALUES ('5aa23938-a9fe-11e7-8b4b-0242ac120002',NULL,1,0,NULL,NULL,'EnvArtifact-UUID6',NULL,'2018-04-28 18:52:03','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group');
+
+INSERT INTO `vnf_res_custom_to_vf_module_custom` (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`, `CREATION_TIMESTAMP`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','5aa23938-a9fe-11e7-8b4b-0242ac120002','2018-04-28 18:52:03');
+
+INSERT INTO `vnf_resource` (`ORCHESTRATION_MODE`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `MODEL_UUID`, `AIC_VERSION_MIN`, `AIC_VERSION_MAX`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `TOSCA_NODE_TYPE`, `HEAT_TEMPLATE_ARTIFACT_UUID`) VALUES ('HEAT','VBRGEMU service1707MIGRATED','2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','VFWResource',NULL,NULL);
+
+INSERT INTO `vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`, `MODEL_INSTANCE_NAME`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_MAX_COUNT`, `NF_TYPE`, `NF_ROLE`, `NF_FUNCTION`, `NF_NAMING_CODE`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','VBRGEMUResource-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2018-04-28 18:52:03','685822c7-4027-4f84-ba50-e9248606f132');
+
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
diff --git a/test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vgmux.sql b/test/csit/scripts/so/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vCPE/create_mso_db-demo-vCPE-vgmux.sql
new file mode 100644 (file)
index 0000000..169ff71
--- /dev/null
@@ -0,0 +1,71 @@
+SOURCE ../default/create_mso_db-default.sql
+
+USE `mso_requests`;
+DROP USER 'mso';
+CREATE USER 'mso';
+GRANT ALL on mso_requests.* to 'mso' identified by 'mso123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+
+USE `mso_catalog`;
+DROP USER 'catalog';
+CREATE USER 'catalog';
+GRANT ALL on mso_catalog.* to 'catalog' identified by 'catalog123' with GRANT OPTION;
+FLUSH PRIVILEGES;
+
+SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
+
+INSERT INTO `heat_environment` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('EnvArtifact-UUID7','base_vcpe_vgw.env','1.0','base_vcpe_vgmux ENV file','parameters:\n  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)\n  vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)\n  public_net_id: PUT THE PUBLIC NETWORK ID HERE\n  bng_gmux_private_net_id: zdfw1bngmux01_private\n  bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private\n  mux_gw_private_net_id: zdfw1muxgw01_private\n  mux_gw_private_subnet_id: zdfw1muxgw01_sub_private\n  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\n  onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE\n  onap_private_net_cidr: 10.0.0.0/16\n  bng_gmux_private_net_cidr: 10.1.0.0/24\n  mux_gw_private_net_cidr: 10.5.0.0/24\n  brgemu_bng_private_net_cidr: 10.3.0.0/24\n  vgmux_private_ip_0: 10.1.0.20\n  vgmux_private_ip_1: 10.0.101.20\n  vgmux_private_ip_2: 10.5.0.20\n  vgmux_name_0: zdcpe1cpe01mux01\n  vnf_id: vCPE_Infrastructure_vGMUX_demo_app\n  vf_module_id: vCPE_Intrastructure_Metro_vGMUX\n  bng_gmux_private_ip: 10.1.0.10\n  dcae_collector_ip: 10.0.4.1\n  dcae_collector_port: 8081\n  repo_url_blob: https://nexus.onap.org/content/sites/raw\n  repo_url_artifacts: https://nexus.onap.org/content/groups/staging\n  demo_artifacts_version: 1.2.0\n  install_script_version: 1.2.0-SNAPSHOT\n  key_name: vgmux_key\n  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN\n  cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)\n  vpp_source_repo_url: https://gerrit.fd.io/r/vpp\n  vpp_source_repo_branch: stable/1704\n  hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp\n  hc2vpp_source_repo_branch: stable/1704\n  vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch\n  hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch\n  libevel_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch\n ','MANUAL RECORD','2018-04-28 13:04:07');
+
+INSERT INTO `heat_template` (`ARTIFACT_UUID`, `NAME`, `VERSION`, `DESCRIPTION`, `BODY`, `TIMEOUT_MINUTES`, `ARTIFACT_CHECKSUM`, `CREATION_TIMESTAMP`) VALUES ('Artifact-UUID7','base_vcpe_vgmux.yaml','1.0','Base VGMUX Heat','heat_template_version: 2013-05-23\n\ndescription: Heat template to deploy vCPE Infrastructue Metro vGMUX\n\nparameters:\n  vcpe_image_name:\n    type: string\n    label: Image name or ID\n    description: Image to be used for compute instance\n  vcpe_flavor_name:\n    type: string\n    label: Flavor\n    description: Type of instance (flavor) to be used\n  public_net_id:\n    type: string\n    label: Public network name or ID\n    description: Public network that enables remote connection to VNF\n  bng_gmux_private_net_id:\n    type: string\n    label: vBNG vGMUX private network name or ID\n    description: Private network that connects vBNG to vGMUX\n  bng_gmux_private_subnet_id:\n    type: string\n    label: vBNG vGMUX private sub-network name or ID\n    description: vBNG vGMUX private sub-network name or ID\n  bng_gmux_private_net_cidr:\n    type: string\n    label: vBNG vGMUX private network CIDR\n    description: The CIDR of the vBNG-vGMUX private network\n  mux_gw_private_net_id:\n    type: string\n    label: vGMUX vGWs network name or ID\n    description: Private network that connects vGMUX to vGWs\n  mux_gw_private_subnet_id:\n    type: string\n    label: vGMUX vGWs sub-network name or ID\n    description: vGMUX vGWs sub-network name or ID\n  mux_gw_private_net_cidr:\n    type: string\n    label: vGMUX private network CIDR\n    description: The CIDR of the vGMUX private network\n  brgemu_bng_private_net_cidr:\n    type: string\n    label: vBRG vBNG private network CIDR\n    description: The CIDR of the vBRG-vBNG private network\n  onap_private_net_id:\n    type: string\n    label: ONAP management network name or ID\n    description: Private network that connects ONAP components and the VNF\n  onap_private_subnet_id:\n    type: string\n    label: ONAP management sub-network name or ID\n    description: Private sub-network that connects ONAP components and the VNF\n  onap_private_net_cidr:\n    type: string\n    label: ONAP private network CIDR\n    description: The CIDR of the protected private network\n  vgmux_private_ip_0:\n    type: string\n    label: vGMUX private IP address towards the vBNG-vGMUX private network\n    description: Private IP address that is assigned to the vGMUX to communicate with the vBNG\n  vgmux_private_ip_1:\n    type: string\n    label: vGMUX private IP address towards the ONAP management network\n    description: Private IP address that is assigned to the vGMUX to communicate with ONAP components\n  vgmux_private_ip_2:\n    type: string\n    label: vGMUX private IP address towards the vGMUX-vGW private network\n    description: Private IP address that is assigned to the vGMUX to communicate with vGWs\n  vgmux_name_0:\n    type: string\n    label: vGMUX name\n    description: Name of the vGMUX\n  vnf_id:\n    type: string\n    label: VNF ID\n    description: The VNF ID is provided by ONAP\n  vf_module_id:\n    type: string\n    label: vCPE module ID\n    description: The vCPE Module ID is provided by ONAP\n  bng_gmux_private_ip:\n    type: string\n    label: vBNG private IP address towards the vBNG-vGMUX private network\n    description: Private IP address that is assigned to the vBNG to communicate with the vGMUX\n  dcae_collector_ip:\n    type: string\n    label: DCAE collector IP address\n    description: IP address of the DCAE collector\n  dcae_collector_port:\n    type: string\n    label: DCAE collector port\n    description: Port of the DCAE collector\n  key_name:\n    type: string\n    label: Key pair name\n    description: Public/Private key pair name\n  pub_key:\n    type: string\n    label: Public key\n    description: Public key to be installed on the compute instance\n  repo_url_blob:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  repo_url_artifacts:\n    type: string\n    label: Repository URL\n    description: URL of the repository that hosts the demo packages\n  install_script_version:\n    type: string\n    label: Installation script version number\n    description: Version number of the scripts that install the vFW demo app\n  demo_artifacts_version:\n    type: string\n    label: Artifacts version used in demo vnfs\n    description: Artifacts (jar, tar.gz) version used in demo vnfs\n  cloud_env:\n    type: string\n    label: Cloud environment\n    description: Cloud environment (e.g., openstack, rackspace)\n  vpp_source_repo_url:\n    type: string\n    label: VPP Source Git Repo\n    description: URL for VPP source codes\n  vpp_source_repo_branch:\n    type: string\n    label: VPP Source Git Branch\n    description: Git Branch for the VPP source codes\n  hc2vpp_source_repo_url:\n    type: string\n    label: Honeycomb Source Git Repo\n    description: URL for Honeycomb source codes\n  hc2vpp_source_repo_branch:\n    type: string\n    label: Honeycomb Source Git Branch\n    description: Git Branch for the Honeycomb source codes\n  vpp_patch_url:\n    type: string\n    label: VPP Patch URL\n    description: URL for VPP patch for vG-MUX\n  hc2vpp_patch_url:\n    type: string\n    label: Honeycomb Patch URL\n    description: URL for Honeycomb patch for vG-MUX\n  libevel_patch_url:\n    type: string\n    label: libevel Patch URL\n    description: URL for libevel patch for vG-MUX\n\n\nresources:\n\n  random-str:\n    type: OS::Heat::RandomString\n    properties:\n      length: 4\n\n  my_keypair:\n    type: OS::Nova::KeyPair\n    properties:\n      name:\n        str_replace:\n          template: base_rand\n          params:\n            base: { get_param: key_name }\n            rand: { get_resource: random-str }\n      public_key: { get_param: pub_key }\n      save_private_key: false\n\n\n  vgmux_private_0_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: bng_gmux_private_net_id }\n      fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_0 }}]\n\n  vgmux_private_1_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: onap_private_net_id }\n      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_1 }}]\n\n  vgmux_private_2_port:\n    type: OS::Neutron::Port\n    properties:\n      network: { get_param: mux_gw_private_net_id }\n      fixed_ips: [{"subnet": {  get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}]\n\n  vgmux_0:\n    type: OS::Nova::Server\n    properties:\n      image: { get_param: vcpe_image_name }\n      flavor: { get_param: vcpe_flavor_name }\n      name: { get_param: vgmux_name_0 }\n      key_name: { get_resource: my_keypair }\n      networks:\n        - network: { get_param: public_net_id }\n        - port: { get_resource: vgmux_private_0_port }\n        - port: { get_resource: vgmux_private_1_port }\n        - port: { get_resource: vgmux_private_2_port }\n      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}\n      user_data_format: RAW\n      user_data:\n        str_replace:\n          params:\n            __mux_to_bng_net_ipaddr__ : { get_param: vgmux_private_ip_0 }\n            __oam_ipaddr__ : { get_param: vgmux_private_ip_1 }\n            __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 }\n            __bng_to_mux_ipaddr__ : { get_param: bng_gmux_private_ip }\n            __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr }\n            __oam_cidr__ : { get_param: onap_private_net_cidr }\n            __mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr }\n            __brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr }\n            __repo_url_blob__ : { get_param: repo_url_blob }\n            __repo_url_artifacts__ : { get_param: repo_url_artifacts }\n            __demo_artifacts_version__ : { get_param: demo_artifacts_version }\n            __install_script_version__ : { get_param: install_script_version }\n            __cloud_env__ : { get_param: cloud_env }\n            __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }\n            __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }\n            __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }\n            __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }\n            __vpp_patch_url__ : { get_param: vpp_patch_url }\n            __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url }\n            __libevel_patch_url__ : { get_param: libevel_patch_url }\n          template: |\n            #!/bin/bash\n\n            mkdir /opt/config\n            echo "__mux_to_bng_net_ipaddr__" > /opt/config/mux_to_bng_net_ipaddr.txt\n            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt\n            echo "__mux_gw_net_ipaddr__" > /opt/config/mux_gw_net_ipaddr.txt\n            echo "__bng_to_mux_ipaddr__ " > /opt/config/bng_to_mux_net_ipaddr.txt\n            echo "__bng_mux_net_cidr__" > /opt/config/bng_mux_net_cidr.txt\n            echo "__oam_cidr__" > /opt/config/oam_cidr.txt\n            echo "__mux_gw_net_cidr__" > /opt/config/mux_gw_net_cidr.txt\n            echo "__brg_bng_net_cidr__" > /opt/config/brg_bng_net_cidr.txt\n            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt\n            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt\n            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt\n            echo "__install_script_version__" > /opt/config/install_script_version.txt\n            echo "__cloud_env__" > /opt/config/cloud_env.txt\n            echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt\n            echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt\n            echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt\n            echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt\n            echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt\n            echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt\n            echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt\n\n            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh\n            cd /opt\n            chmod +x v_gmux_install.sh\n            ./v_gmux_install.sh\n',300, 'MANUAL RECORD', '2018-04-28 13:04:07');
+
+
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','libevel_patch_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','hc2vpp_patch_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vpp_patch_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','hc2vpp_source_repo_branch','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','hc2vpp_source_repo_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vpp_source_repo_branch','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vpp_source_repo_url','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','cloud_env','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','pub_key','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','key_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','install_script_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','demo_artifacts_version','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','repo_url_artifacts','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','repo_url_blob','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','dcae_collector_port','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','dcae_collector_ip','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','bng_gmux_private_ip','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vf_module_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vnf_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vgmux_name_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vgmux_private_ip_2','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vgmux_private_ip_1','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vgmux_private_ip_0','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','brgemu_bng_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','mux_gw_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','bng_gmux_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','onap_private_net_cidr','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','onap_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','onap_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','mux_gw_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','mux_gw_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','bng_gmux_private_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','bng_gmux_private_subnet_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','public_net_id','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vcpe_flavor_name','\ 1','string',NULL);
+INSERT INTO `heat_template_params` (`HEAT_TEMPLATE_ARTIFACT_UUID`, `PARAM_NAME`, `IS_REQUIRED`, `PARAM_TYPE`, `PARAM_ALIAS`) VALUES ('Artifact-UUID7','vcpe_image_name','\ 1','string',NULL);
+
+INSERT INTO `service` (`MODEL_UUID`, `MODEL_NAME`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `TOSCA_CSAR_ARTIFACT_UUID`) VALUES ('a94f8ff8-442d-11e8-8a14-0320c6d83cc0','vgmux-service','fba765a0-442d-11e8-b89d-57dec24c6cba','1.0','VGMUX service','2018-04-28 13:04:07',NULL);
+
+INSERT INTO `vf_module` (`MODEL_UUID`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `DESCRIPTION`, `IS_BASE`, `HEAT_TEMPLATE_ARTIFACT_UUID`, `VOL_HEAT_TEMPLATE_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group','585822c7-4027-4f84-ba50-e9248606f134','1.0','VF_RI1_VFW::module-1',NULL,1,'Artifact-UUID7',NULL,'2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132');
+
+INSERT INTO `vf_module_customization` (`MODEL_CUSTOMIZATION_UUID`, `LABEL`, `INITIAL_COUNT`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_COUNT`, `HEAT_ENVIRONMENT_ARTIFACT_UUID`, `VOL_ENVIRONMENT_ARTIFACT_UUID`, `CREATION_TIMESTAMP`, `VF_MODULE_MODEL_UUID`) VALUES ('5aa23938-a9fe-11e7-8b4b-0242ac120002',NULL,1,0,NULL,NULL,'EnvArtifact-UUID7',NULL,'2018-04-28 18:52:03','1e34774e-715e-4fd5-bd08-7b654622f33f.VF_RI1_VFW::module-1::module-1.group');
+
+INSERT INTO `vnf_res_custom_to_vf_module_custom` (`VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID`, `VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID`, `CREATION_TIMESTAMP`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','5aa23938-a9fe-11e7-8b4b-0242ac120002','2018-04-28 18:52:03');
+
+INSERT INTO `vnf_resource` (`ORCHESTRATION_MODE`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `MODEL_UUID`, `AIC_VERSION_MIN`, `AIC_VERSION_MAX`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `TOSCA_NODE_TYPE`, `HEAT_TEMPLATE_ARTIFACT_UUID`) VALUES ('HEAT','VGMUX service1707MIGRATED','2018-04-28 13:04:07','685822c7-4027-4f84-ba50-e9248606f132',NULL,NULL,'585822c7-4027-4f84-ba50-e9248606f113','1.0','VFWResource',NULL,NULL);
+
+INSERT INTO `vnf_resource_customization` (`MODEL_CUSTOMIZATION_UUID`, `MODEL_INSTANCE_NAME`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_MAX_COUNT`, `NF_TYPE`, `NF_ROLE`, `NF_FUNCTION`, `NF_NAMING_CODE`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`) VALUES ('5a9bd247-a9fe-11e7-8b4b-0242ac120002','VGMUXResource-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2018-04-28 18:52:03','685822c7-4027-4f84-ba50-e9248606f132');
+
+SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
index b2728f0..373098d 100644 (file)
@@ -40,6 +40,7 @@ ${Test_Loginpwd}    demo123456!
 ${Test_LoginPwdCheck}    demo123456!
 ${Existing_User}    portal
 ${PORTAL_HEALTH_CHECK_PATH}        /ONAPPORTAL/portalApi/healthCheck
+${PORTAL_XDEMPAPP_REST_URL}        http://portal-sdk:8080/ONAPPORTALSDK/api/v2
 ${PORTAL_ASSETS_DIRECTORY}    ${CURDIR}
 ${GLOBAL_APPLICATION_ID}           robot-functional
 ${GLOBAL_PORTAL_ADMIN_USER}            demo
@@ -52,7 +53,7 @@ ${GLOBAL_SELENIUM_BROWSER}        chrome
 ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES}        Create Dictionary
 ${GLOBAL_SELENIUM_DELAY}          0
 ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}        5
-${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}        15
+${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}        45
 ${GLOBAL_OPENSTACK_HEAT_SERVICE_TYPE}    orchestration
 ${GLOBAL_OPENSTACK_CINDER_SERVICE_TYPE}    volume
 ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE}    compute
@@ -81,11 +82,15 @@ Login into Portal URL
    # [Documentation]    ONAP Portal R1 functionality  test
     # Notification on ONAP Portal
     # Portal Application Account Management validation
+
+Portal Change REST URL Of X-DemoApp
+   [Documentation]    Portal Change REST URL Of X-DemoApp    
+      Portal Change REST URL
     
 Portal R1 Release for AAF
    [Documentation]    ONAP Portal R1 functionality for AAF test    
       Portal AAF new fields    
-    
+         
 Create Microse service onboarding
        Portal admin Microservice Onboarding
        
@@ -107,8 +112,8 @@ Create Widget for Application Roles
 #EP Admin widget download
        #Admin widget download
     
-#EP Admin widget layout reset
-       #Reset widget layout option   
+EP Admin widget layout reset
+       Reset widget layout option   
 
 Validate Functional Top Menu Get Access    
        Functional Top Menu Get Access  
@@ -145,14 +150,14 @@ Add Application Admin for Exisitng User
 Delete Application Admin for Exisitng User   
        Portal admin Delete Application Admin Existing User
     
-#Add Standard User Role for Existing user 
-       #Portal admin Add Standard User Existing user     
+Add Standard User Role for Existing user 
+       Portal admin Add Standard User Existing user     
     
-#Edit Standard User Role for Existing user
-       #Portal admin Edit Standard User Existing user 
+Edit Standard User Role for Existing user
+       Portal admin Edit Standard User Existing user 
     
-#Delete Standard User Role for Existing user    
-       #Portal admin Delete Standard User Existing user 
+Delete Standard User Role for Existing user    
+       Portal admin Delete Standard User Existing user 
 
 #Add Account new account from App Account Management
        #Portal admin Add New Account
@@ -160,6 +165,12 @@ Delete Application Admin for Exisitng User
 #Delete Account new account from App Account Management
        #Portal admin Delete Account
 
+#EP Create Portal Admin
+       #Add Portal Admin       
+
+#EP Portal Admin delete
+    #Delete Portal Admin       
+       
 Logout from Portal GUI as Portal Admin
     Portal admin Logout from Portal GUI
 
@@ -171,14 +182,14 @@ Login To Portal GUI as APP Admin
 ##Navigate Functional Link as APP Admin  
        ##Application Admin Navigation Functional Menu   
     
-#Add Standard User Role for Existing user as APP Admin
-       #Application admin Add Standard User Existing user    
+Add Standard User Role for Existing user as APP Admin
+       Application admin Add Standard User Existing user    
     
-#Edit Standard User Role for Existing user as APP Admin
-       #Application admin Edit Standard User Existing user 
+Edit Standard User Role for Existing user as APP Admin
+       Application admin Edit Standard User Existing user 
     
-#Delete Standard User Role for Existing user as APP Admin   
-       #Application admin Delete Standard User Existing user 
+Delete Standard User Role for Existing user as APP Admin   
+       Application admin Delete Standard User Existing user 
         
 #Navigate Application Link as APP Admin  
        #Application Admin Navigation Application Link Tab       
@@ -513,8 +524,8 @@ Portal admin Add Standard User Existing user
      Click Button    xpath=//button[@id='next-button']
 #     Click Element    xpath=//*[@id='div-app-name-dropdown-Default']
 #     Click Element    xpath=//*[@id='div-app-name-Default']/following::input[@id='Standard-User-checkbox']
-     Click Element    xpath=//div[@id='div-app-name-dropdown-xDemo-App']
-     Click Element    xpath=//div[@id='div-app-name-xDemo-App']/following::input[@id='Standard-User-checkbox']
+     Click Element    xpath=//div[@id='app-select-Select roles1']
+     Click Element    xpath=//div[@id='app-select-Select roles1']/following::input[@id='Standard-User-checkbox']
      Set Selenium Implicit Wait    3000
      Click Button    xpath=//button[@id='new-user-save-button']
      Set Selenium Implicit Wait    3000
@@ -524,13 +535,13 @@ Portal admin Add Standard User Existing user
      #Page Should Contain      Users
      #Focus    xpath=//input[@name='dropdown1']
      Go To    ${PORTAL_HOME_PAGE}
-     Click Link    xpath=//a[@title='Users']
-     Click Element    xpath=//input[@id='dropdown1']
+     #Click Link    xpath=//a[@title='Users']
+     #Click Element    xpath=//input[@id='dropdown1']
 #     Click Element    xpath=//li[contains(.,'Default')]
-     Click Element    xpath=//li[contains(.,'XDemo App')]
-     Input Text    xpath=//input[@id='input-table-search']    ${Existing_User}
-     Element Text Should Be      xpath=(.//*[@id='rowheader_t1_0'])[2]   Standard User     
-     Set Selenium Implicit Wait    3000
+     #Click Element    xpath=//li[contains(.,'XDemo App')]
+     #Input Text    xpath=//input[@id='input-table-search']    ${Existing_User}
+     #Element Text Should Be      xpath=(.//*[@id='rowheader_t1_0'])[2]   Standard User     
+     #Set Selenium Implicit Wait    3000
          
 Portal admin Edit Standard User Existing user
      [Documentation]    Naviage to Users tab
@@ -583,6 +594,7 @@ Portal admin Edit Standard User Existing user
      Click Element    xpath=(.//*[@id='rowheader_t1_0'])[2]
 #     Scroll Element Into View    xpath=//*[@id='div-app-name-Default']/following::*[@id='app-item-delete'][1]
 #     Click Element    xpath=//*[@id='div-app-name-Default']/following::*[@id='app-item-delete'][1]
+     Set Selenium Implicit Wait    9000     
      Scroll Element Into View    xpath=//*[@id='div-app-name-xDemo-App']/following::*[@id='app-item-delete'][1]
      Click Element    xpath=//*[@id='div-app-name-xDemo-App']/following::*[@id='app-item-delete'][1]
 #     Scroll Element Into View    xpath=//*[@id='div-app-name-SDC']/following::*[@id='app-item-delete'][1]
@@ -594,6 +606,7 @@ Portal admin Edit Standard User Existing user
      Element Should Not Contain     xpath=//*[@table-data='users.accountUsers']    Portal   
       #Element Should Not Contain     xpath=//*[@table-data='users.accountUsers']    demo      
      Set Selenium Implicit Wait    3000     
+        
      
 Functional Top Menu Get Access     
     [Documentation]    Naviage to Support tab
@@ -1118,6 +1131,17 @@ Portal AAF new fields
     Page Should Contain    Name Space
     Page Should Contain    Centralized
        Click Element    xpath=//button[@id='button-notification-cancel']
+       Set Selenium Implicit Wait    3000
+
+Portal Change REST URL
+    [Documentation]    Naviage to user Application details tab 
+    Click Link    xpath=//a[@title='Application Onboarding']
+    Click Element    xpath=//td[contains(.,'xDemo App')]
+    Input Text    xpath=//input[@name='restUrl']    ${PORTAL_XDEMPAPP_REST_URL}
+       Click Element    xpath=//button[@id='button-save-app']
+       Set Selenium Implicit Wait    6000
+       Go To    ${PORTAL_HOME_PAGE}
+    Wait Until Element Is Visible    xpath=//a[@title='Application Onboarding']    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
        
 Admin widget download   
     Go To    ${PORTAL_HOME_URL}
@@ -1141,3 +1165,21 @@ Reset widget layout option
     Execute Javascript      document.getElementById('widgets').scrollTo(0,document.getElementById('widgets').scrollHeight);
     Execute Javascript      document.getElementById('dashboardDefaultPreference').click()
     Execute Javascript      document.getElementById('div-confirm-ok-button').click()
+
+Add Portal Admin
+    Click Link    xpath=//a[@id='parent-item-Portal-Admins']
+    Scroll Element Into View    xpath=//button[@id='portal-admin-button-add']
+    Click Button    xpath=//button[@id='portal-admin-button-add']
+    Input Text    xpath=//input[@id='input-user-search']    ${Existing_User}
+    Click Button    xpath=//button[@id='button-search-users']
+    Wait Until Page Contains Element     xpath=//span[@id='result-uuid-0']    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
+    Click Element    xpath=//span[@id='result-uuid-0']
+    Click Button     xpath=//button[@id='pa-search-users-button-save']
+    Click Button     xpath=//button[@id='admin-div-ok-button']
+      
+
+Delete Portal Admin
+       Wait Until Page Does Not Contain Element     xpath=//*[@class='b2b-modal-header']
+    Click Link    xpath=//a[@id='parent-item-Portal-Admins']
+    Click Element    xpath=//td[contains(.,'portal')]/following::span[@id='1-button-portal-admin-remove']
+    Click Button     xpath=//*[@id='div-confirm-ok-button']    
index d69415b..e1c4f08 100755 (executable)
@@ -13,6 +13,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
index 97adca2..16e147d 100644 (file)
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.1.1
+  artifacts_version: 1.2.0-SNAPSHOT
 
   openstack_tenant_id: ${OS_PROJECT_ID}
 
@@ -89,6 +89,11 @@ parameters:
   vid_ip_addr: 172.16.8.1
   clamp_ip_addr: 172.16.12.1
   openo_ip_addr: 172.16.14.1
+  music_ip_addr: 172.16.15.1
+  oof_ip_addr: 172.16.16.1
+  aaf_ip_addr: 172.16.13.1
+  sms_ip_addr: 172.16.13.2
+  nbi_ip_addr: 172.16.17.1
 
   ###########################
   #                         #
@@ -96,6 +101,7 @@ parameters:
   #                         #
   ###########################
 
+  dcae_deployment_profile: R2MVP
   dnsaas_config_enabled: false
   dnsaas_region: RegionOne
   dnsaas_keystone_url: http://192.168.1.11:5000/v3
index 37018ca..b952993 100755 (executable)
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
index f2094ee..3cf5474 100755 (executable)
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
index 3da2ca9..3b702c4 100644 (file)
@@ -92,6 +92,7 @@ parameters:
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
+  sms_ip_addr: 10.0.13.2
   nbi_ip_addr: 10.0.17.1
 
   ###########################
diff --git a/test/ete/labs/windriver/Integration-Jenkins-DNS-openrc b/test/ete/labs/windriver/Integration-Jenkins-DNS-openrc
deleted file mode 100644 (file)
index 313cf12..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-export OS_PROJECT_ID=bf80d09fbc804b42b3bc727d6cf1fcbe
-
-export OS_PROJECT_NAME=Integration-Jenkins
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-00-DNS-openrc b/test/ete/labs/windriver/Integration-SB-00-DNS-openrc
deleted file mode 100644 (file)
index cfbe22f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=a813ac529c6d4b44a3308ed38bcd7480
-export OS_PROJECT_NAME=Integration-SB-00
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-01-DNS-openrc b/test/ete/labs/windriver/Integration-SB-01-DNS-openrc
deleted file mode 100644 (file)
index e9007da..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=4318a6c5788449cc97c88fd745b554b9
-export OS_PROJECT_NAME=Integration-SB-01
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-02-DNS-openrc b/test/ete/labs/windriver/Integration-SB-02-DNS-openrc
deleted file mode 100644 (file)
index 968904d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=89fee629f5f044739fb64380be63b6da
-export OS_PROJECT_NAME=Integration-SB-02
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-03-DNS-openrc b/test/ete/labs/windriver/Integration-SB-03-DNS-openrc
deleted file mode 100644 (file)
index 44073b7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=29fb1a7806e84d8fbc93fa3945f1e2a5
-export OS_PROJECT_NAME=Integration-SB-03
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-04-DNS-openrc b/test/ete/labs/windriver/Integration-SB-04-DNS-openrc
deleted file mode 100644 (file)
index d7ba190..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=024b911be9514ed7885af0c6bf6f68c8
-export OS_PROJECT_NAME=Integration-SB-04
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-05-DNS-openrc b/test/ete/labs/windriver/Integration-SB-05-DNS-openrc
deleted file mode 100644 (file)
index f761263..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=d4e1d9e89456490cb7213092086e5c66
-export OS_PROJECT_NAME=Integration-SB-05
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-06-DNS-openrc b/test/ete/labs/windriver/Integration-SB-06-DNS-openrc
deleted file mode 100644 (file)
index 5f21158..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=2d7c6ec2cf9147fa974fa059b3673d7a
-export OS_PROJECT_NAME=Integration-SB-06
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-07-DNS-openrc b/test/ete/labs/windriver/Integration-SB-07-DNS-openrc
deleted file mode 100644 (file)
index 170859f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=885777d5e9074f31ad7801f9e6876b84
-export OS_PROJECT_NAME=Integration-SB-07
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
index 54b15bb..365b5d0 100755 (executable)
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
index 6f4ea87..da4b0e7 100644 (file)
@@ -92,6 +92,7 @@ parameters:
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
+  sms_ip_addr: 10.0.13.2
   nbi_ip_addr: 10.0.17.1
 
   ###########################
index 8f15296..842034e 100755 (executable)
@@ -24,10 +24,10 @@ else
     ONAP_VENV=$(mktemp -d --suffix=_onap_venv)
     virtualenv ${ONAP_VENV}
     source ${ONAP_VENV}/bin/activate
-    
+
     pip install --upgrade pip
-    pip install openstacksdk==0.9.19 python-openstackclient python-heatclient python-designateclient
-    
+    pip install python-openstackclient python-heatclient python-designateclient
+
     echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties
 fi
 echo "ONAP_VENV=${ONAP_VENV}"
index 4111c3c..e2ed398 100755 (executable)
@@ -19,7 +19,7 @@ fi
 
 ssh-keygen -R ${ROBOT_IP}
 
-timeout 2m ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh
+timeout 15m ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh
 RESULT=$?
 
 LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | head -1")
diff --git a/test/vcpe/preload_templates/simple_neutron_heat.yaml b/test/vcpe/preload_templates/simple_neutron_heat.yaml
new file mode 100644 (file)
index 0000000..d20c081
--- /dev/null
@@ -0,0 +1,21 @@
+heat_template_version: 2013-05-23
+description: A simple Neutron network
+parameters:
+  network_name:
+    type: string
+    description: Name of the Neutron Network
+    default: ONAP-NW1
+  shared:
+     type: boolean
+     description: Shared amongst tenants
+     default: True
+outputs:
+  network_id:
+    description: Openstack network identifier
+    value: { get_resource: network }
+resources:
+  network:
+    type: OS::Neutron::Net
+    properties:
+      name: { get_param: network_name }
+      shared: { get_param: shared }
diff --git a/test/vcpe/preload_templates/template.network.json b/test/vcpe/preload_templates/template.network.json
new file mode 100644 (file)
index 0000000..2acb9e3
--- /dev/null
@@ -0,0 +1,42 @@
+{
+  "VNF-API:input": {
+    "VNF-API:request-information": {
+      "VNF-API:request-id": "robot0012",
+      "VNF-API:notification-url": "http://so.onap.org",
+      "VNF-API:order-number": "robot0012",
+      "VNF-API:request-sub-action": "SUPP",
+      "VNF-API:request-action": "PreloadNetworkRequest",
+      "VNF-API:source": "robot",
+      "VNF-API:order-version": "1.0"
+    },
+    "VNF-API:network-topology-information": {
+      "VNF-API:network-topology-identifier": {
+        "VNF-API:network-role": "${network_role}",
+        "VNF-API:network-technology": "neutron",
+        "VNF-API:service-type": "${service_type}",
+        "VNF-API:network-name": "${network_name}",
+        "VNF-API:network-type": "${network_type}"
+      },
+      "VNF-API:provider-network-information": {
+        "VNF-API:is-external-network": "true",
+        "VNF-API:physical-network-name": "${network_name}",
+        "VNF-API:is-provider-network": "true",
+        "VNF-API:is-shared-network": "true"
+      },
+      "VNF-API:subnets": [
+        {
+          "VNF-API:start-address": "${subnet_start_ip}",
+          "VNF-API:cidr-mask": "24",
+          "VNF-API:ip-version": "4",
+          "VNF-API:dhcp-enabled": "N",
+          "VNF-API:gateway-address": "${subnet_gateway}"
+        }
+       ]
+    },
+    "VNF-API:sdnc-request-header": {
+      "VNF-API:svc-action": "reserve",
+      "VNF-API:svc-notification-url": "http://so.onap.org",
+      "VNF-API:svc-request-id": "robot0012"
+    }
+  }
+}
diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json
new file mode 100644 (file)
index 0000000..a95d456
--- /dev/null
@@ -0,0 +1,168 @@
+{
+   "VNF-API:input": {
+     "VNF-API:request-information": {
+       "VNF-API:request-id": "robot12",
+       "VNF-API:notification-url": "https://so.onap.org",
+       "VNF-API:order-number": "robot12",
+       "VNF-API:request-sub-action": "SUPP",
+       "VNF-API:request-action": "PreloadVNFRequest",
+       "VNF-API:source": "VID",
+       "VNF-API:order-version": "1.0"
+     },
+     "VNF-API:sdnc-request-header": {
+       "VNF-API:svc-action": "reserve",
+       "VNF-API:svc-notification-url": "https://son.onap.org",
+       "VNF-API:svc-request-id": "robot12"
+     },
+     "VNF-API:vnf-topology-information": {
+             "vnf-topology-identifier": {
+               "service-type": "${service_type}",
+               "vnf-type": "${vnf_type}",
+               "generic-vnf-name": "${generic_vnf_name}",
+               "generic-vnf-type": "${generic_vnf_type}",
+               "vnf-name": "${vnf_name}"
+       },
+       "VNF-API:vnf-parameters": [
+               {
+               "vnf-parameter-name": "vcpe_image_name",
+               "vnf-parameter-value": "vbng-base-ubuntu-16-04"
+               },
+               {
+               "vnf-parameter-name": "vcpe_flavor_name",
+               "vnf-parameter-value": "m1.medium"
+               },
+               {
+               "vnf-parameter-name": "public_net_id",
+               "vnf-parameter-value": "${public_net_id}"
+               },
+               {
+               "vnf-parameter-name": "brgemu_bng_private_net_id",
+               "vnf-parameter-value": "${brg_bng_net}"
+               },
+               {
+               "vnf-parameter-name": "brgemu_bng_private_subnet_id",
+               "vnf-parameter-value": "${brg_bng_subnet}"
+               },
+               {
+               "vnf-parameter-name": "bng_gmux_private_net_id",
+               "vnf-parameter-value": "${bng_mux_net}"
+               },
+               {
+               "vnf-parameter-name": "bng_gmux_private_subnet_id",
+               "vnf-parameter-value": "${bng_mux_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_id",
+               "vnf-parameter-value": "${oam_onap_net}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_subnet_id",
+               "vnf-parameter-value": "${oam_onap_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_cidr",
+               "vnf-parameter-value": "10.0.0.0/16"
+               },
+               {
+               "vnf-parameter-name": "cpe_signal_net_id",
+               "vnf-parameter-value": "${cpe_signal_net}"
+               },
+               {
+               "vnf-parameter-name": "cpe_signal_subnet_id",
+               "vnf-parameter-value": "${cpe_signal_subnet}"
+               },
+               {
+               "vnf-parameter-name": "brgemu_bng_private_net_cidr",
+               "vnf-parameter-value": "10.3.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "bng_gmux_private_net_cidr",
+               "vnf-parameter-value": "10.1.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "cpe_signal_private_net_cidr",
+               "vnf-parameter-value": "10.4.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "vbng_private_ip_0",
+               "vnf-parameter-value": "10.3.0.1"
+               },
+               {
+               "vnf-parameter-name": "vbng_private_ip_1",
+               "vnf-parameter-value": "10.0.101.10"
+               },
+               {
+               "vnf-parameter-name": "vbng_private_ip_2",
+               "vnf-parameter-value": "10.4.0.3"
+               },
+               {
+               "vnf-parameter-name": "vbng_private_ip_3",
+               "vnf-parameter-value": "10.1.0.10"
+               },
+               {
+               "vnf-parameter-name": "vbng_name_0",
+               "vnf-parameter-value": "zdcpe1cpe01bng01_${suffix}"
+               },
+               {
+               "vnf-parameter-name": "vnf_id",
+               "vnf-parameter-value": "vCPE_Infrastructure_Metro_vBNG_demo_app"
+               },
+               {
+               "vnf-parameter-name": "vf_module_id",
+               "vnf-parameter-value": "vCPE_Intrastructure_Metro_vBNG"
+               },
+               {
+               "vnf-parameter-name": "dcae_collector_ip",
+               "vnf-parameter-value": "10.0.4.102"
+               },
+               {
+               "vnf-parameter-name": "dcae_collector_port",
+               "vnf-parameter-value": "8080"
+               },
+               {
+               "vnf-parameter-name": "repo_url_blob",
+               "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+               },
+               {
+               "vnf-parameter-name": "repo_url_artifacts",
+               "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging"
+               },
+               {
+               "vnf-parameter-name": "demo_artifacts_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "install_script_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "key_name",
+               "vnf-parameter-value": "vbng_key"
+               },
+               {
+               "vnf-parameter-name": "pub_key",
+               "vnf-parameter-value": "${pub_key}"
+               },
+               {
+               "vnf-parameter-name": "cloud_env",
+               "vnf-parameter-value": "openstack"
+               },
+               {
+               "vnf-parameter-name": "vpp_source_repo_url",
+               "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
+               },
+               {
+               "vnf-parameter-name": "vpp_source_repo_branch",
+               "vnf-parameter-value": "stable/1704"
+               },
+               {
+               "vnf-parameter-name": "vpp_patch_url",
+               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch"
+               }
+       ],
+       "VNF-API:vnf-assignments": {
+         }
+       }
+     }
+}
+
diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
new file mode 100644 (file)
index 0000000..12303f4
--- /dev/null
@@ -0,0 +1,145 @@
+{
+   "VNF-API:input": {
+     "VNF-API:request-information": {
+       "VNF-API:request-id": "robot12",
+       "VNF-API:notification-url": "https://so.onap.org",
+       "VNF-API:order-number": "robot12",
+       "VNF-API:request-sub-action": "SUPP",
+       "VNF-API:request-action": "PreloadVNFRequest",
+       "VNF-API:source": "VID",
+       "VNF-API:order-version": "1.0"
+     },
+     "VNF-API:sdnc-request-header": {
+       "VNF-API:svc-action": "reserve",
+       "VNF-API:svc-notification-url": "https://son.onap.org",
+       "VNF-API:svc-request-id": "robot12"
+     },
+     "VNF-API:vnf-topology-information": {
+             "vnf-topology-identifier": {
+               "service-type": "${service_type}",
+               "vnf-type": "${vnf_type}",
+               "generic-vnf-name": "${generic_vnf_name}",
+               "generic-vnf-type": "${generic_vnf_type}",
+               "vnf-name": "${vnf_name}"
+       },
+       "VNF-API:vnf-parameters": [
+
+
+               {
+               "vnf-parameter-name": "vcpe_image_name",
+               "vnf-parameter-value": "vbrg-base-ubuntu-16-04-new"
+               },
+               {
+               "vnf-parameter-name": "vcpe_flavor_name",
+               "vnf-parameter-value": "m1.medium"
+               },
+
+               {
+               "vnf-parameter-name": "public_net_id",
+               "vnf-parameter-value": "${public_net_id}"
+               },
+               {
+               "vnf-parameter-name": "vbrgemu_bng_private_net_id",
+               "vnf-parameter-value": "${brg_bng_net}"
+               },
+               {
+               "vnf-parameter-name": "vbrgemu_bng_private_subnet_id",
+               "vnf-parameter-value": "${brg_bng_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_id",
+               "vnf-parameter-value": "${oam_onap_net}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_subnet_id",
+               "vnf-parameter-value": "${oam_onap_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_cidr",
+               "vnf-parameter-value": "10.0.0.0/16"
+               },
+
+               {
+               "vnf-parameter-name": "compile_state",
+               "vnf-parameter-value": "done"
+               },
+               {
+               "vnf-parameter-name": "vbrgemu_bng_private_net_cidr",
+               "vnf-parameter-value": "10.3.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "vbrgemu_private_ip_0",
+               "vnf-parameter-value": "10.3.0.14"
+               },
+               {
+               "vnf-parameter-name": "sdnc_ip",
+               "vnf-parameter-value": "10.0.7.1"
+               },
+               {
+               "vnf-parameter-name": "vbrgemu_name_0",
+               "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}"
+               },
+               {
+               "vnf-parameter-name": "vnf_id",
+               "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app"
+               },
+               {
+               "vnf-parameter-name": "vf_module_id",
+               "vnf-parameter-value": "vCPE_Customer_BRGEMU"
+               },
+               {
+               "vnf-parameter-name": "repo_url_blob",
+               "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+               },
+               {
+               "vnf-parameter-name": "repo_url_artifacts",
+               "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging"
+               },
+               {
+               "vnf-parameter-name": "demo_artifacts_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "install_script_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "key_name",
+               "vnf-parameter-value": "vbrgemu_key"
+               },
+               {
+               "vnf-parameter-name": "pub_key",
+               "vnf-parameter-value": "${pub_key}"
+               },
+               {
+               "vnf-parameter-name": "cloud_env",
+               "vnf-parameter-value": "openstack"
+               },
+               {
+               "vnf-parameter-name": "vpp_source_repo_url",
+               "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
+               },
+               {
+               "vnf-parameter-name": "vpp_source_repo_branch",
+               "vnf-parameter-value": "stable/1704"
+               },
+               {
+               "vnf-parameter-name": "hc2vpp_source_repo_url",
+               "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp"
+               },
+               {
+               "vnf-parameter-name": "hc2vpp_source_repo_branch",
+               "vnf-parameter-value": "stable/1704"
+               },
+               {
+               "vnf-parameter-name": "vpp_patch_url",
+               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch"
+               }
+
+       ],
+       "VNF-API:vnf-assignments": {
+         }
+       }
+     }
+}
+
diff --git a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json
new file mode 100644 (file)
index 0000000..9dc7473
--- /dev/null
@@ -0,0 +1,160 @@
+{
+   "VNF-API:input": {
+     "VNF-API:request-information": {
+       "VNF-API:request-id": "robot12",
+       "VNF-API:notification-url": "https://so.onap.org",
+       "VNF-API:order-number": "robot12",
+       "VNF-API:request-sub-action": "SUPP",
+       "VNF-API:request-action": "PreloadVNFRequest",
+       "VNF-API:source": "VID",
+       "VNF-API:order-version": "1.0"
+     },
+     "VNF-API:sdnc-request-header": {
+       "VNF-API:svc-action": "reserve",
+       "VNF-API:svc-notification-url": "https://son.onap.org",
+       "VNF-API:svc-request-id": "robot12"
+     },
+     "VNF-API:vnf-topology-information": {
+             "vnf-topology-identifier": {
+               "service-type": "${service_type}",
+               "vnf-type": "${vnf_type}",
+               "generic-vnf-name": "${generic_vnf_name}",
+               "generic-vnf-type": "${generic_vnf_type}",
+               "vnf-name": "${vnf_name}"
+       },
+       "VNF-API:vnf-parameters": [
+               {
+               "vnf-parameter-name": "vcpe_image_name",
+               "vnf-parameter-value": "vgmux2-base-ubuntu-16-04"
+               },
+               {
+               "vnf-parameter-name": "vcpe_flavor_name",
+               "vnf-parameter-value": "m1.medium"
+               },
+               {
+               "vnf-parameter-name": "public_net_id",
+               "vnf-parameter-value": "${public_net_id}"
+               },
+               {
+               "vnf-parameter-name": "bng_gmux_private_net_id",
+               "vnf-parameter-value": "${bng_mux_net}"
+               },
+               {
+               "vnf-parameter-name": "bng_gmux_private_subnet_id",
+               "vnf-parameter-value": "${bng_mux_subnet}"
+               },
+               {
+               "vnf-parameter-name": "mux_gw_private_net_id",
+               "vnf-parameter-value": "${mux_gw_net}"
+               },
+               {
+               "vnf-parameter-name": "mux_gw_private_subnet_id",
+               "vnf-parameter-value": "${mux_gw_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_id",
+               "vnf-parameter-value": "${oam_onap_net}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_subnet_id",
+               "vnf-parameter-value": "${oam_onap_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_cidr",
+               "vnf-parameter-value": "10.0.0.0/16"
+               },
+               {
+               "vnf-parameter-name": "mux_gw_private_net_cidr",
+               "vnf-parameter-value": "10.5.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "bng_gmux_private_net_cidr",
+               "vnf-parameter-value": "10.1.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "vgmux_private_ip_0",
+               "vnf-parameter-value": "10.1.0.21"
+               },
+               {
+               "vnf-parameter-name": "vgmux_private_ip_1",
+               "vnf-parameter-value": "10.0.101.21"
+               },
+               {
+               "vnf-parameter-name": "vgmux_private_ip_2",
+               "vnf-parameter-value": "10.5.0.21"
+               },
+               {
+               "vnf-parameter-name": "vgmux_name_0",
+               "vnf-parameter-value": "zdcpe1cpe01mux01_${suffix}"
+               },
+               {
+               "vnf-parameter-name": "vnf_id",
+               "vnf-parameter-value": "vCPE_Infrastructure_Metro_vGMUX_demo_app"
+               },
+               {
+               "vnf-parameter-name": "vf_module_id",
+               "vnf-parameter-value": "vCPE_Intrastructure_Metro_vGMUX"
+               },
+               {
+               "vnf-parameter-name": "dcae_collector_ip",
+               "vnf-parameter-value": "10.0.4.102"
+               },
+               {
+               "vnf-parameter-name": "dcae_collector_port",
+               "vnf-parameter-value": "8080"
+               },
+               {
+               "vnf-parameter-name": "repo_url_blob",
+               "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+               },
+               {
+               "vnf-parameter-name": "repo_url_artifacts",
+               "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging"
+               },
+               {
+               "vnf-parameter-name": "demo_artifacts_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "install_script_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "key_name",
+               "vnf-parameter-value": "vgmux_key"
+               },
+               {
+               "vnf-parameter-name": "pub_key",
+               "vnf-parameter-value": "${pub_key}"
+               },
+               {
+               "vnf-parameter-name": "cloud_env",
+               "vnf-parameter-value": "openstack"
+               },
+               {
+               "vnf-parameter-name": "vpp_source_repo_url",
+               "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
+               },
+               {
+               "vnf-parameter-name": "vpp_source_repo_branch",
+               "vnf-parameter-value": "stable/1704"
+               },
+               {
+               "vnf-parameter-name": "vpp_patch_url",
+               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch"
+               },
+               {
+               "vnf-parameter-name": "hc2vpp_patch_url",
+               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch"
+               },
+               {
+               "vnf-parameter-name": "libevel_patch_url",
+               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch"
+               }
+       ],
+       "VNF-API:vnf-assignments": {
+         }
+       }
+     }
+}
+
diff --git a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
new file mode 100644 (file)
index 0000000..1323630
--- /dev/null
@@ -0,0 +1,176 @@
+{
+   "VNF-API:input": {
+     "VNF-API:request-information": {
+       "VNF-API:request-id": "robot12",
+       "VNF-API:notification-url": "https://so.onap.org",
+       "VNF-API:order-number": "robot12",
+       "VNF-API:request-sub-action": "SUPP",
+       "VNF-API:request-action": "PreloadVNFRequest",
+       "VNF-API:source": "VID",
+       "VNF-API:order-version": "1.0"
+     },
+     "VNF-API:sdnc-request-header": {
+       "VNF-API:svc-action": "reserve",
+       "VNF-API:svc-notification-url": "https://son.onap.org",
+       "VNF-API:svc-request-id": "robot12"
+     },
+     "VNF-API:vnf-topology-information": {
+             "vnf-topology-identifier": {
+               "service-type": "${service_type}",
+               "vnf-type": "${vnf_type}",
+               "generic-vnf-name": "${generic_vnf_name}",
+               "generic-vnf-type": "${generic_vnf_type}",
+               "vnf-name": "${vnf_name}"
+       },
+       "VNF-API:vnf-parameters": [
+       {
+       "vnf-parameter-name": "vcpe_image_name",
+       "vnf-parameter-value": "ubuntu-16-04-cloud-amd64"
+       },
+       {
+       "vnf-parameter-name": "vcpe_flavor_name",
+       "vnf-parameter-value": "m1.medium"
+       },
+       {
+       "vnf-parameter-name": "public_net_id",
+       "vnf-parameter-value": "${public_net_id}"
+       },
+       {
+       "vnf-parameter-name": "cpe_signal_net_id",
+       "vnf-parameter-value": "${cpe_signal_net}"
+       },
+       {
+       "vnf-parameter-name": "cpe_signal_subnet_id",
+       "vnf-parameter-value": "${cpe_signal_subnet}" 
+       },
+       {
+       "vnf-parameter-name": "cpe_public_net_id",
+       "vnf-parameter-value": "${cpe_public_net}"
+       },
+       {
+       "vnf-parameter-name": "cpe_public_subnet_id",
+       "vnf-parameter-value": "${cpe_public_subnet}"
+       },
+       {
+       "vnf-parameter-name": "onap_private_net_id",
+       "vnf-parameter-value": "${oam_onap_net}"
+       },
+       {
+       "vnf-parameter-name": "onap_private_subnet_id",
+       "vnf-parameter-value": "${oam_onap_subnet}"
+       },
+       {
+       "vnf-parameter-name": "onap_private_net_cidr",
+       "vnf-parameter-value": "10.0.0.0/16"
+       },
+       {
+       "vnf-parameter-name": "cpe_signal_net_cidr",
+       "vnf-parameter-value": "10.4.0.0/24"
+       },
+       {
+       "vnf-parameter-name": "cpe_public_net_cidr",
+       "vnf-parameter-value": "10.2.0.0/24"
+       },
+       {
+       "vnf-parameter-name": "vdhcp_private_ip_0",
+       "vnf-parameter-value": "10.4.0.1"
+       },
+       {
+       "vnf-parameter-name": "vdhcp_private_ip_1",
+       "vnf-parameter-value": "10.0.101.1"
+       },
+       {
+       "vnf-parameter-name": "vaaa_private_ip_0",
+       "vnf-parameter-value": "10.4.0.2"
+       },
+       {
+       "vnf-parameter-name": "vaaa_private_ip_1",
+       "vnf-parameter-value": "10.0.101.2"
+       },
+       {
+       "vnf-parameter-name": "vdns_private_ip_0",
+       "vnf-parameter-value": "10.2.0.1"
+       },
+       {
+       "vnf-parameter-name": "vdns_private_ip_1",
+       "vnf-parameter-value": "10.0.101.3"
+       },
+       {
+       "vnf-parameter-name": "vweb_private_ip_0",
+       "vnf-parameter-value": "10.2.0.10"
+       },
+       {
+       "vnf-parameter-name": "vweb_private_ip_1",
+       "vnf-parameter-value": "10.0.101.40"
+       },
+       {
+       "vnf-parameter-name": "mr_ip_addr",
+       "vnf-parameter-value": "10.0.11.1"
+       },
+       {
+       "vnf-parameter-name": "vaaa_name_0",
+       "vnf-parameter-value": "zdcpe1cpe01aaa01_${suffix}"
+       },
+       {
+       "vnf-parameter-name": "vdns_name_0",
+       "vnf-parameter-value": "zdcpe1cpe01dns01_${suffix}"
+       },
+       {
+       "vnf-parameter-name": "vdhcp_name_0",
+       "vnf-parameter-value": "zdcpe1cpe01dhcp01_${suffix}"
+       },
+       {
+       "vnf-parameter-name": "vweb_name_0",
+       "vnf-parameter-value": "zdcpe1cpe01web01_${suffix}"
+       },
+       {
+       "vnf-parameter-name": "vnf_id",
+       "vnf-parameter-value": "vCPE_Infrastructure_demo_app_${suffix}"
+       },
+       {
+       "vnf-parameter-name": "vf_module_id",
+       "vnf-parameter-value": "vCPE_Intrastructure_${suffix}"
+       },
+       {
+       "vnf-parameter-name": "dcae_collector_ip",
+       "vnf-parameter-value": "10.0.4.102"
+       },
+       {
+       "vnf-parameter-name": "dcae_collector_port",
+       "vnf-parameter-value": "8080"
+       },
+       {
+       "vnf-parameter-name": "repo_url_blob",
+       "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+       },
+       {
+       "vnf-parameter-name": "repo_url_artifacts",
+       "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging"
+       },
+       {
+       "vnf-parameter-name": "demo_artifacts_version",
+       "vnf-parameter-value": "1.2.0"
+       },
+       {
+       "vnf-parameter-name": "install_script_version",
+       "vnf-parameter-value": "1.2.0-SNAPSHOT"
+       },
+       {
+       "vnf-parameter-name": "key_name",
+       "vnf-parameter-value": "vaaa_key"
+       },
+       {
+       "vnf-parameter-name": "pub_key",
+       "vnf-parameter-value": "${pub_key}"
+       },
+       {
+       "vnf-parameter-name": "cloud_env",
+       "vnf-parameter-value": "openstack"
+       }
+       ],
+       "VNF-API:vnf-assignments": {
+         }
+       }
+     }
+}
+
diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
new file mode 100644 (file)
index 0000000..8b33482
--- /dev/null
@@ -0,0 +1,121 @@
+{
+   "VNF-API:input": {
+     "VNF-API:request-information": {
+       "VNF-API:request-id": "robot12",
+       "VNF-API:notification-url": "https://so.onap.org",
+       "VNF-API:order-number": "robot12",
+       "VNF-API:request-sub-action": "SUPP",
+       "VNF-API:request-action": "PreloadVNFRequest",
+       "VNF-API:source": "VID",
+       "VNF-API:order-version": "1.0"
+     },
+     "VNF-API:sdnc-request-header": {
+       "VNF-API:svc-action": "reserve",
+       "VNF-API:svc-notification-url": "https://son.onap.org",
+       "VNF-API:svc-request-id": "robot12"
+     },
+     "VNF-API:vnf-topology-information": {
+             "vnf-topology-identifier": {
+               "service-type": "VGW-SERVICE-TYPE",
+               "vnf-type": "VGW-VNF-TYPE",
+               "generic-vnf-name": "GENERIC-VGW-VNF-NAME0",
+               "generic-vnf-type": "GENERIC-VGW-VNF-TYPE",
+               "vnf-name": "VGW2BRG-${brg_mac}"
+       },
+       "VNF-API:vnf-parameters": [
+
+               {
+               "vnf-parameter-name": "public_net_id",
+               "vnf-parameter-value": "${public_net_id}"
+               },
+               {
+               "vnf-parameter-name": "mux_gw_private_net_id",
+               "vnf-parameter-value": "${mux_gw_net}"
+               },
+               {
+               "vnf-parameter-name": "mux_gw_private_subnet_id",
+               "vnf-parameter-value": "${mux_gw_subnet}"
+               },
+               {
+               "vnf-parameter-name": "mux_gw_private_net_cidr",
+               "vnf-parameter-value": "10.5.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "cpe_public_net_id",
+               "vnf-parameter-value": "${cpe_public_net}"
+               },
+               {
+               "vnf-parameter-name": "cpe_public_subnet_id",
+               "vnf-parameter-value": "${cpe_public_subnet}"
+               },
+               {
+               "vnf-parameter-name": "cpe_public_net_cidr",
+               "vnf-parameter-value": "10.2.0.0/24"
+               },
+               {
+               "vnf-parameter-name": "vgw_private_ip_0",
+               "vnf-parameter-value": "10.5.0.22"
+               },
+               {
+               "vnf-parameter-name": "vgw_private_ip_1",
+               "vnf-parameter-value": "10.0.101.30"
+               },
+               {
+               "vnf-parameter-name": "vgw_name_0",
+               "vnf-parameter-value": "zdcpe1cpe01gw01_${suffix}"
+               },
+               {
+               "vnf-parameter-name": "mux_ip_addr",
+               "vnf-parameter-value": "10.5.0.21"
+               },
+               {
+               "vnf-parameter-name": "vg_vgmux_tunnel_vni",
+               "vnf-parameter-value": "100"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_id",
+               "vnf-parameter-value": "${oam_onap_net}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_subnet_id",
+               "vnf-parameter-value": "${oam_onap_subnet}"
+               },
+               {
+               "vnf-parameter-name": "onap_private_net_cidr",
+               "vnf-parameter-value": "10.0.0.0/16"
+               },
+               {
+               "vnf-parameter-name": "repo_url_blob",
+               "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+               },
+               {
+               "vnf-parameter-name": "repo_url_artifacts",
+               "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging"
+               },
+               {
+               "vnf-parameter-name": "demo_artifacts_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "install_script_version",
+               "vnf-parameter-value": "1.1.1"
+               },
+               {
+               "vnf-parameter-name": "key_name",
+               "vnf-parameter-value": "vgw_key"
+               },
+               {
+               "vnf-parameter-name": "pub_key",
+               "vnf-parameter-value": "${pub_key}"
+               },
+               {
+               "vnf-parameter-name": "cloud_env",
+               "vnf-parameter-value": "openstack"
+               }
+       ],
+       "VNF-API:vnf-assignments": {
+         }
+       }
+     }
+}
+
diff --git a/test/vcpe/preload_templates/template_sniro_data.json b/test/vcpe/preload_templates/template_sniro_data.json
new file mode 100644 (file)
index 0000000..6fa2003
--- /dev/null
@@ -0,0 +1,34 @@
+{
+   "solutionInfo" : {
+      "placement" : [
+         {
+            "cloudRegionId" : "RegionOne",
+            "inventoryType" : "service",
+            "resourceModuleName" : "${tunnelxconn_ar_name}",
+            "serviceInstanceId" : "${vgmux_svc_instance_uuid}",
+            "serviceResourceId" : "TUNNEL-RESOURCE-ID-REPLACE",
+                       "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] 
+         },
+         {
+            "cloudRegionId" : "RegionOne",
+            "inventoryType" : "cloud",
+            "resourceModuleName" : "${vgw_name}",
+            "serviceInstanceId" : "vG-service-instance-id",
+            "serviceResourceId" : "VGW-RESOURCE-ID-REPLACE",
+                       "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] 
+         },
+         {
+            "cloudRegionId" : "RegionOne",
+            "inventoryType" : "service",
+            "resourceModuleName" : "${brg_ar_name}",
+            "serviceInstanceId" : "${vbrg_svc_instance_uuid}",
+            "serviceResourceId" : "BRG-RESOURCE-ID-REPLACE",
+                       "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] 
+         }
+      ]
+   },
+   "requestId" : "111-111-1111",
+   "statusMessage" : "",
+   "transactionId" : "111-111-1111",
+   "requestState" : "complete"
+}
diff --git a/test/vcpe/preload_templates/template_sniro_request.json b/test/vcpe/preload_templates/template_sniro_request.json
new file mode 100644 (file)
index 0000000..565e14c
--- /dev/null
@@ -0,0 +1,20 @@
+{
+  "request" : {
+    "urlPath" : "/sniro/api/v2/placement",
+    "method" : "POST"
+  },
+  "response" : {
+    "status" : "202",
+    "body": "{\"requestId\": \"1111-111-11\"}"
+  },
+  "postServeActions" : {
+    "webhook" : {
+      "headers" : {
+        "Content-Type" : "application/json"
+      },
+      "method" : "POST",
+      "base64Body" : "${base64_sniro_data}",
+      "url" : "https://${sniro_ip}:8080/adapters/rest/SDNCNotify/SNIROResponse"
+    }
+  }
+}
index b2102d5..daa957e 100644 (file)
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>org.onap.integration</groupId>
   <artifactId>version-manifest</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>ONAP Version Manifest and Maven Plugin</name>
   <url>https://www.onap.org</url>
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <id>check-docker-images-exist</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <arguments>
+                <argument>${project.basedir}/src/main/scripts/check-docker-manifest.sh</argument>
+                <argument>${project.basedir}/src/main/resources/docker-manifest.csv</argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
index e8e6f58..23fe561 100644 (file)
@@ -1,38 +1,55 @@
 image,tag
-onap/aaf,2.1.0-SNAPSHOT
+onap/aaf/aaf_cm,2.1.0-SNAPSHOT
+onap/aaf/aaf_fs,2.1.0-SNAPSHOT
+onap/aaf/aaf_gui,2.1.0-SNAPSHOT
+onap/aaf/aaf_hello,2.1.0-SNAPSHOT
+onap/aaf/aaf_locate,2.1.0-SNAPSHOT
+onap/aaf/aaf_oauth,2.1.0-SNAPSHOT
+onap/aaf/aaf_service,2.1.0-SNAPSHOT
+onap/aaf/authz-service,latest
+onap/aaf/sms,latest
+onap/aaf/smsquorumclient,latest
 onap/aai-resources,1.2-STAGING-latest
 onap/aai-traversal,1.2-STAGING-latest
 onap/aai/esr-gui,1.1.0-SNAPSHOT
 onap/aai/esr-server,1.1.0-SNAPSHOT
 onap/admportal-sdnc-image,1.3-STAGING-latest
+onap/appc-cdt-image,1.3.0-SNAPSHOT-latest
 onap/appc-image,1.3.0-SNAPSHOT-latest
-onap/ccsdk-dgbuilder-image,0.2.1-SNAPSHOT
-onap/ccsdk-odl-image,0.2.1-SNAPSHOT
-onap/ccsdk-odlsli-image,0.2.1-SNAPSHOT
+onap/babel,1.2-STAGING-latest
+onap/ccsdk-dgbuilder-image,0.2-STAGING-latest
+onap/ccsdk-odl-image,0.2-STAGING-latest
+onap/ccsdk-odlsli-image,0.2-STAGING-latest
+onap/champ,1.2-STAGING-latest
 onap/clamp,2.0-STAGING-latest
-onap/cli,v1.1.0
+onap/cli,2.0-STAGING-latest
 onap/data-router,1.2-STAGING-latest
-onap/dmaap/dmaap-mr,1.0.1
+onap/dmaap/buscontroller,latest
+onap/dmaap/dmaap-mr,1.1.4
 onap/externalapi/nbi,latest
-onap/holmes/engine-management,v1.0.0
-onap/holmes/rule-management,v1.0.0
+onap/gizmo,1.1-STAGING-latest
+onap/holmes/engine-management,latest
+onap/holmes/rule-management,latest
 onap/model-loader,1.2-STAGING-latest
 onap/modeling/javatoscachecker,latest
 onap/msb/msb_apigateway,1.1.0-STAGING-latest
 onap/msb/msb_discovery,1.1.0-STAGING-latest
-onap/multicloud/framework,v1.0.0
-onap/multicloud/openstack-newton,1.0.0-SNAPSHOT
-onap/multicloud/openstack-ocata,1.0.0-SNAPSHOT
-onap/multicloud/openstack-windriver,1.0.0-SNAPSHOT
-onap/multicloud/vio,1.0.0-SNAPSHOT
+onap/multicloud/framework,1.1.2-STAGING
+onap/multicloud/openstack-newton,1.1.2-SNAPSHOT
+onap/multicloud/openstack-ocata,1.1.2-SNAPSHOT
+onap/multicloud/openstack-windriver,1.1.2-SNAPSHOT
+onap/multicloud/vio,1.1.2-STAGING
 onap/multicloud/vio-vesagent,1.0.0
-onap/music,latest
-onap/oof,latest
-onap/oom/kube2msb,1.0.0
+onap/music/cassandra_music,3.0.0
+onap/music/music,latest
+onap/oom/kube2msb,latest
+onap/optf-has,latest
+onap/optf-osdf,latest
 onap/org.onap.dcaegen2.collectors.snmptrap,latest
 onap/org.onap.dcaegen2.collectors.ves.vescollector,latest
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.2
 onap/org.onap.dcaegen2.deployments.cm-container,latest
+onap/org.onap.dcaegen2.deployments.healthcheck-container,1.0.0
 onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,latest
 onap/org.onap.dcaegen2.deployments.redis-cluster-container,latest
 onap/org.onap.dcaegen2.deployments.tca-cdap-container,latest
@@ -44,25 +61,29 @@ onap/org.onap.dcaegen2.platform.policy-handler,latest
 onap/org.onap.dcaegen2.platform.servicechange-handler,latest
 onap/org.onap.dcaegen2.services.heartbeat,latest
 onap/org.onap.dcaegen2.services.prh.prh-app-server,latest
-onap/policy-drools,v1.2.0
-onap/policy-pe,v1.2.0
-onap/portal-app,2.1-STAGING-latest
-onap/portal-db,2.1-STAGING-latest
-onap/portal-wms,2.1-STAGING-latest
+onap/policy-drools,1.2.0
+onap/policy-pe,1.2.0
+onap/portal-app,v2.2.0
+onap/portal-db,v2.2.0
+onap/portal-sdk,v2.2.0
+onap/portal-wms,v2.2.0
 onap/sdc-backend,1.2-STAGING-latest
+onap/sdc-cassandra,1.2-STAGING-latest
 onap/sdc-elasticsearch,1.2-STAGING-latest
 onap/sdc-frontend,1.2-STAGING-latest
 onap/sdc-kibana,1.2-STAGING-latest
+onap/sdc-onboard-backend,1.2-STAGING-latest
 onap/sdc-sanity,1.2-STAGING-latest
 onap/sdc/sdc-workflow-designer,1.1.0-SNAPSHOT-STAGING-latest
+onap/sdnc-ansible-server-image,1.3-STAGING-latest
 onap/sdnc-dmaap-listener-image,1.3-STAGING-latest
 onap/sdnc-image,1.3-STAGING-latest
 onap/sdnc-ueb-listener-image,1.3-STAGING-latest
 onap/search-data-service,1.2-STAGING-latest
 onap/sparky-be,1.2-STAGING-latest
 onap/testsuite,1.2-STAGING-latest
-onap/usecase-ui,1.1.0-SNAPSHOT-STAGING-latest
-onap/usecase-ui/usecase-ui-server,1.1.0-SNAPSHOT-STAGING-latest
+onap/usecase-ui,latest
+onap/usecase-ui/usecase-ui-server,latest
 onap/vfc/catalog,1.1.0-STAGING-latest
 onap/vfc/emsdriver,1.1.0-STAGING-latest
 onap/vfc/gvnfmdriver,1.1.0-STAGING-latest
@@ -82,6 +103,6 @@ onap/vfc/ztesdncdriver,1.1.0-STAGING-latest
 onap/vfc/ztevmanagerdriver,1.0.3-STAGING-latest
 onap/vfc/ztevnfmdriver,1.1.0-STAGING-latest
 onap/vid,1.2.1
-onap/vnfsdk/refrepo,1.0.0
-onap/vnfsdk/refrepo-postgres,1.0.0
+onap/vnfsdk/refrepo,1.1-STAGING-latest
+onap/vnfsdk/refrepo/postgres,latest
 openecomp/mso,1.2.1
index b008a9f..f0acf3c 100644 (file)
@@ -55,26 +55,34 @@ org.onap.aai.sparky-be,sparky-be,1.2.0
 org.onap.aai.sparky-fe,sparky-fe,1.2.0
 org.onap.aai.traversal,aai-traversal,1.2.0
 org.onap.aai.traversal,traversal,1.2.0
-org.onap.ccsdk.parent,odlparent-carbon-sr1,0.0.2
-org.onap.ccsdk.sli.adaptors,aai-service-provider,0.1.0
-org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.1.0
-org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.1.0
-org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.1.0
-org.onap.ccsdk.sli.core,dblib-provider,0.1.2
-org.onap.ccsdk.sli.core,filters-provider,0.1.2
-org.onap.ccsdk.sli.core,sli-common,0.1.2
-org.onap.ccsdk.sli.core,sli-provider,0.1.2
-org.onap.ccsdk.sli.core,sli-recording,0.1.2
-org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.1.2
-org.onap.ccsdk.sli.core,sliapi-provider,0.1.2
-org.onap.ccsdk.sli.core,utils-provider,1.0.0
-org.onap.ccsdk.sli.northbound,asdcApi-provider,0.1.0
-org.onap.ccsdk.sli.northbound,dataChange-provider,0.1.0
-org.onap.ccsdk.sli.northbound,dmaap-listener,0.1.0
-org.onap.ccsdk.sli.northbound,ueb-listener,0.1.0
-org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.1.0
-org.onap.ccsdk.sli.plugins,properties-node-provider,0.1.0
-org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.1.0
+org.onap.ccsdk.parent,binding-parent,1.0.1
+org.onap.ccsdk.parent,bundle-parent,1.0.1
+org.onap.ccsdk.parent,feature-repo-parent,1.0.1
+org.onap.ccsdk.parent,karaf4-parent,1.0.1
+org.onap.ccsdk.parent,mdsal-it-parent,1.0.1
+org.onap.ccsdk.parent,odlparent,1.0.1
+org.onap.ccsdk.parent,odlparent-lite,1.0.1
+org.onap.ccsdk.parent,single-feature-parent,1.0.1
+org.onap.ccsdk.sli.adaptors,aai-service-provider,0.2.1
+org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.2.1
+org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.2.1
+org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.2.1
+org.onap.ccsdk.sli.core,dblib-provider,0.2.1
+org.onap.ccsdk.sli.core,filters-provider,0.2.1
+org.onap.ccsdk.sli.core,sli-common,0.2.1
+org.onap.ccsdk.sli.core,sli-provider,0.2.1
+org.onap.ccsdk.sli.core,sli-recording,0.2.1
+org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.2.1
+org.onap.ccsdk.sli.core,sliapi-provider,0.2.1
+org.onap.ccsdk.sli.core,utils-provider,0.2.1
+org.onap.ccsdk.sli.northbound,asdcApi-provider,0.2.1
+org.onap.ccsdk.sli.northbound,dataChange-provider,0.2.1
+org.onap.ccsdk.sli.northbound,dmaap-listener,0.2.1
+org.onap.ccsdk.sli.northbound,lcm-provider,0.2.1
+org.onap.ccsdk.sli.northbound,ueb-listener,0.2.1
+org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.2.1
+org.onap.ccsdk.sli.plugins,properties-node-provider,0.2.1
+org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.1
 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0
 org.onap.ccsdk.utils,utils,1.0.0
 org.onap.clamp.clds.clamp,clamp,2.0.0
@@ -128,21 +136,21 @@ org.onap.multicloud.openstack,ocata,1.0.0
 org.onap.multicloud.openstack,windriver,1.0.0
 org.onap.multicloud.openstack.vmware,vesagent,1.0.0
 org.onap.multicloud.openstack.vmware,vio,1.0.0
-org.onap.oparent,oparent,1.1.0
+org.onap.oparent,oparent,1.1.1
 org.onap.policy.common,common-modules,1.2.0
 org.onap.policy.drools-applications,drools-pdp-apps,1.2.0
 org.onap.policy.drools-pdp,drools-pdp,1.2.0
 org.onap.policy.engine,PolicyEngineSuite,1.2.0
-org.onap.portal.sdk,epsdk-analytics,1.3.2
-org.onap.portal.sdk,epsdk-app-common,1.3.2
-org.onap.portal.sdk,epsdk-app-overlay,1.3.2
-org.onap.portal.sdk,epsdk-core,1.3.2
-org.onap.portal.sdk,epsdk-fw,1.3.2
-org.onap.portal.sdk,epsdk-workflow,1.3.2
+org.onap.portal.sdk,epsdk-analytics,2.2.0
+org.onap.portal.sdk,epsdk-app-common,2.2.0
+org.onap.portal.sdk,epsdk-app-overlay,2.2.0
+org.onap.portal.sdk,epsdk-core,2.2.0
+org.onap.portal.sdk,epsdk-fw,2.2.0
+org.onap.portal.sdk,epsdk-workflow,2.2.0
 org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0
-org.onap.sdnc.northbound,generic-resource-api.provider,1.2.2
-org.onap.sdnc.northbound,vnfapi-provider,1.2.2
-org.onap.sdnc.northbound,vnftools-provider,1.2.2
+org.onap.sdnc.northbound,generic-resource-api.provider,1.3.1
+org.onap.sdnc.northbound,vnfapi-provider,1.3.1
+org.onap.sdnc.northbound,vnftools-provider,1.3.1
 org.onap.usecase-ui,usecaseui-common,1.0.1
 org.onap.usecase-ui.server,usecase-ui-server,1.0.1
 org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.0.1
diff --git a/version-manifest/src/main/scripts/add-images-from-oom.sh b/version-manifest/src/main/scripts/add-images-from-oom.sh
new file mode 100755 (executable)
index 0000000..f720770
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+    echo This script adds new docker images from OOM helm charts into docker-manifest.csv
+    echo "$0 <docker-manifest.csv> <oom repo directory>"
+    exit 1
+fi
+
+# expected parameters
+MANIFEST=$(realpath $1)
+OOM_DIR=$(realpath $2)
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+DIR=$(dirname $(readlink -f "$0"))
+TARGET_DIR=$DIR/target
+rm -rf $TARGET_DIR
+mkdir -p $TARGET_DIR
+cd $TARGET_DIR
+
+cd $OOM_DIR
+rgrep "image: .*" --include=values.yaml -h | cut -d ' ' -f 2 | tr -d '"'| grep -v '<' | grep -e "^onap" -e "^openecomp" | LC_ALL=C sort -u > $TARGET_DIR/oom-manifest.txt
+touch $TARGET_DIR/docker-manifest-new-entries.txt
+
+for line in $(cat $TARGET_DIR/oom-manifest.txt); do
+    image=$(echo $line | cut -d : -f 1)
+    tag=$(echo $line | cut -s -d : -f 2)
+    if [ -z "$tag" ]; then
+        tag="latest"
+    fi
+    if ! grep -q "$image" $MANIFEST; then
+        echo $image,$tag >> $TARGET_DIR/docker-manifest-new-entries.txt
+    fi
+done
+
+cat $MANIFEST $TARGET_DIR/docker-manifest-new-entries.txt | LC_ALL=C sort -u > $MANIFEST.tmp
+mv $MANIFEST.tmp $MANIFEST
diff --git a/version-manifest/src/main/scripts/check-docker-manifest.sh b/version-manifest/src/main/scripts/check-docker-manifest.sh
new file mode 100755 (executable)
index 0000000..26e63b8
--- /dev/null
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+if [ "$#" -ne 1 ]; then
+    echo This script checks docker-manifest.csv to verify that the specified versions exist in nexus3
+    echo "$0 <docker-manifest.csv>"
+    exit 1
+fi
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+NEXUS_PUBLIC_PREFIX="https://nexus3.onap.org/repository/docker.public/v2"
+NEXUS_RELEASE_PREFIX="https://nexus3.onap.org/repository/docker.release/v2"
+
+err=0
+for line in $(tail -n +2 $1); do
+    image=$(echo $line | cut -d , -f 1)
+    tag=$(echo $line | cut -d , -f 2)
+
+    tags=$(curl -s $NEXUS_PUBLIC_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
+    echo "$tags" | grep -q "^$tag\$"
+    if [ $? -ne 0 ]; then
+        echo "[ERROR] $image:$tag not found"
+        #echo "$tags" | sed 's/^/  /'
+        (( err++ ))
+
+    else
+        tags=$(curl -s $NEXUS_RELEASE_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
+        echo "$tags" | grep -q "^$tag\$"
+        if [ $? -ne 0 ]; then
+            echo "[WARN] $image:$tag not released"
+            #echo "$tags" | sed 's/^/  /'
+        fi
+    fi
+done
+exit $err
index d926409..70ca5ac 100755 (executable)
@@ -1,9 +1,16 @@
 #!/bin/bash
+
+if [ "$#" -ne 1 ]; then
+    echo This script checks the input file to verify that it is sorted
+    echo "$0 <manifest.csv>"
+    exit 1
+fi
+
 LC_ALL=C sort -c $1
 retval=$?
 if [ $retval -ne 0 ]; then
     echo
-    echo "ERROR: $1 is not properly sorted.  Please sort it with the following commands:"
+    echo "[ERROR] $1 is not properly sorted.  Please sort it with the following commands:"
     echo
     echo "  LC_ALL=C sort < $1 > $1.tmp"
     echo "  mv $1.tmp $1"
diff --git a/version-manifest/src/main/scripts/update-heat-image-versions.sh b/version-manifest/src/main/scripts/update-heat-image-versions.sh
new file mode 100755 (executable)
index 0000000..19415bb
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+    echo This script updates HEAT docker versions to use versions in docker-manifest.csv
+    echo "$0 <docker-manifest.csv> <demo repo directory>"
+    exit 1
+fi
+
+# expected parameters
+MANIFEST=$(realpath $1)
+DEMO_DIR=$(realpath $2)
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+cd $DEMO_DIR/heat/ONAP
+
+source <(./manifest-to-env.sh < $MANIFEST)
+envsubst < onap_openstack_template.env > onap_openstack.env
diff --git a/version-manifest/src/main/scripts/update-oom-image-versions.sh b/version-manifest/src/main/scripts/update-oom-image-versions.sh
new file mode 100755 (executable)
index 0000000..1a82b49
--- /dev/null
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+    echo This script updates OOM helm charts to use versions in docker-manifest.csv
+    echo "$0 <docker-manifest.csv> <oom repo directory>"
+    exit 1
+fi
+
+# expected parameters
+MANIFEST=$(realpath $1)
+OOM_DIR=$(realpath $2)
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+cd $OOM_DIR/kubernetes
+
+for line in $(tail -n +2 $MANIFEST); do
+    image=$(echo $line | cut -d , -f 1)
+    tag=$(echo $line | cut -s -d , -f 2)
+    perl -p -i -e "s|image: $image(:.*$\|$)|image: $image:$tag|g" $(find ./ -name values.yaml)
+done
+
index 17a717c..af0373d 100644 (file)
@@ -3,9 +3,9 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-major_version=1
+major_version=2
 minor_version=0
-patch_version=1
+patch_version=0
 
 base_version=${major_version}.${minor_version}.${patch_version}