remove items that are in demo now

starting in beijing the heat templates are no longer in the testsuite
repo

Change-Id: If1e6e888508fca5ca5ab8d876a4eb633407e0498
Issue-ID: TEST-148
Signed-off-by: DR695H <dr695h@att.com>

3 files changed, 0 insertions, 504 deletions

diff --git a/robot/assets/asdc/base_vcpe_infra/MANIFEST.json b/robot/assets/asdc/base_vcpe_infra/MANIFEST.json
deleted file mode 100644
index 11ce42f9..00000000
--- a/robot/assets/asdc/base_vcpe_infra/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "", 
-    "description": "", 
-    "data": [
-        {
-            "file": "base_vcpe_infra.yaml", 
-            "type": "HEAT", 
-            "isBase": "true", 
-            "data": [
-                {
-                    "file": "base_vcpe_infra.env", 
-                    "type": "HEAT_ENV"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.env b/robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.env
deleted file mode 100644
index 1d820705..00000000
--- a/robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.env
+++ /dev/null
@@ -1,37 +0,0 @@
-parameters:
-  vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)
-  vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
-  public_net_id: PUT THE PUBLIC NETWORK ID HERE
-  cpe_signal_net_id: zdfw1cpe01_private
-  cpe_signal_subnet_id: zdfw1cpe01_sub_private
-  cpe_public_net_id: zdfw1cpe01_public
-  cpe_public_subnet_id: zdfw1cpe01_sub_public
-  onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
-  onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE
-  onap_private_net_cidr: 10.0.0.0/16
-  cpe_signal_net_cidr: 10.4.0.0/24
-  cpe_public_net_cidr: 10.2.0.0/24
-  vdhcp_private_ip_0: 10.4.0.1
-  vdhcp_private_ip_1: 10.0.101.1
-  vaaa_private_ip_0: 10.4.0.4
-  vaaa_private_ip_1: 10.0.101.2
-  vdns_private_ip_0: 10.2.0.1
-  vdns_private_ip_1: 10.0.101.3
-  vweb_private_ip_0: 10.2.0.10
-  vweb_private_ip_1: 10.0.101.40
-  mr_ip_addr: 10.0.11.1
-  vaaa_name_0: zdcpe1cpe01aaa01
-  vdns_name_0: zdcpe1cpe01dns01
-  vdhcp_name_0: zdcpe1cpe01dhcp01
-  vweb_name_0: zdcpe1cpe01web01
-  vnf_id: vCPE_Infrastructure_demo_app
-  vf_module_id: vCPE_Intrastructure
-  dcae_collector_ip: 10.0.4.102
-  dcae_collector_port: 8080
-  repo_url_blob: https://nexus.onap.org/content/sites/raw
-  repo_url_artifacts: https://nexus.onap.org/content/groups/staging
-  demo_artifacts_version: 1.1.0
-  install_script_version: 1.1.0-SNAPSHOT
-  key_name: vaaa_key
-  pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
-  cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
diff --git a/robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.yaml b/robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.yaml
deleted file mode 100644
index c6349581..00000000
--- a/robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.yaml
+++ /dev/null
@@ -1,450 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-# 
-#
-# Copyright 2017 AT&T Intellectual Property. All rights reserved.
-#
-# 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.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer)
-
-##############
-#            #
-# PARAMETERS #
-#            #
-##############
-
-parameters:
-  vcpe_image_name:
-    type: string
-    label: Image name or ID
-    description: Image to be used for compute instance
-  vcpe_flavor_name:
-    type: string
-    label: Flavor
-    description: Type of instance (flavor) to be used
-  public_net_id:
-    type: string
-    label: Public network name or ID
-    description: Public network that enables remote connection to VNF
-  onap_private_net_id:
-    type: string
-    label: ONAP management network name or ID
-    description: Private network that connects ONAP components and the VNF
-  onap_private_subnet_id:
-    type: string
-    label: ONAP management sub-network name or ID
-    description: Private sub-network that connects ONAP components and the VNF
-  onap_private_net_cidr:
-    type: string
-    label: ONAP private network CIDR
-    description: The CIDR of the protected private network
-  cpe_signal_net_id:
-    type: string
-    label: vAAA private network name or ID
-    description: Private network that connects vAAA with vDNSs
-  cpe_signal_subnet_id:
-    type: string
-    label: CPE Signal subnet
-    description: CPE Signal subnet
-  cpe_signal_net_cidr:
-    type: string
-    label: vAAA private network CIDR
-    description: The CIDR of the vAAA private network
-  cpe_public_net_id:
-    type: string
-    label: vCPE Public network (emulates internet) name or ID
-    description: Private network that connects vGW to emulated internet
-  cpe_public_subnet_id:
-    type: string
-    label: CPE Public subnet
-    description: CPE Public subnet
-  cpe_public_net_cidr:
-    type: string
-    label: vCPE public network CIDR
-    description: The CIDR of the vCPE public
-  vaaa_private_ip_0:
-    type: string
-    label: vAAA private IP address towards the CPE_SIGNAL private network
-    description: Private IP address that is assigned to the vAAA to communicate with the vCPE components
-  vaaa_private_ip_1:
-    type: string
-    label: vAAA private IP address towards the ONAP management network
-    description: Private IP address that is assigned to the vAAA to communicate with ONAP components
-  vdns_private_ip_0:
-    type: string
-    label: vDNS private IP address towards the CPE_PUBLIC private network
-    description: Private IP address that is assigned to the vDNS to communicate with the vCPE components
-  vdns_private_ip_1:
-    type: string
-    label: vDNS private IP address towards the ONAP management network
-    description: Private IP address that is assigned to the vDNS to communicate with ONAP components
-  vdhcp_private_ip_0:
-    type: string
-    label: vDHCP  private IP address towards the CPE_SIGNAL private network
-    description: Private IP address that is assigned to the vDHCP to communicate with the vCPE components
-  vdhcp_private_ip_1:
-    type: string
-    label: vDNS private IP address towards the ONAP management network
-    description: Private IP address that is assigned to the vDHCP to communicate with ONAP components
-  vweb_private_ip_0:
-    type: string
-    label: vWEB private IP address towards the CPE_PUBLIC private network
-    description: Private IP address that is assigned to the vWEB to communicate with the vGWs 
-  vweb_private_ip_1:
-    type: string
-    label: vWEB private IP address towards the ONAP management network
-    description: Private IP address that is assigned to the vWEB to communicate with ONAP components
-  vaaa_name_0:
-    type: string
-    label: vAAA name
-    description: Name of the vAAA
-  vdns_name_0:
-    type: string
-    label: vDNS name
-    description: Name of the vDNS
-  vdhcp_name_0:
-    type: string
-    label: vDHCP name
-    description: Name of the vDHCP
-  vweb_name_0:
-    type: string
-    label: vWEB name
-    description: Name of the vWEB 
-  vnf_id:
-    type: string
-    label: VNF ID
-    description: The VNF ID is provided by ONAP
-  vf_module_id:
-    type: string
-    label: vFirewall module ID
-    description: The vAAA Module ID is provided by ONAP
-  dcae_collector_ip:
-    type: string
-    label: DCAE collector IP address
-    description: IP address of the DCAE collector
-  dcae_collector_port:
-    type: string
-    label: DCAE collector port
-    description: Port of the DCAE collector
-  mr_ip_addr:
-    type: string
-    label: Message Router IP address
-    description: IP address of the Message Router that for vDHCP configuration 
-  key_name:
-    type: string
-    label: Key pair name
-    description: Public/Private key pair name
-  pub_key:
-    type: string
-    label: Public key
-    description: Public key to be installed on the compute instance
-  repo_url_blob:
-    type: string
-    label: Repository URL
-    description: URL of the repository that hosts the demo packages
-  repo_url_artifacts:
-    type: string
-    label: Repository URL
-    description: URL of the repository that hosts the demo packages
-  install_script_version:
-    type: string
-    label: Installation script version number
-    description: Version number of the scripts that install the vFW demo app
-  demo_artifacts_version:
-    type: string
-    label: Artifacts version used in demo vnfs
-    description: Artifacts (jar, tar.gz) version used in demo vnfs
-  cloud_env:
-    type: string
-    label: Cloud environment
-    description: Cloud environment (e.g., openstack, rackspace)
-
-#############
-#           #
-# RESOURCES #
-#           #
-#############
-
-resources:
-
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-  my_keypair:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-
-  # Virtual AAA server Instantiation
-  vaaa_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: cpe_signal_net_id }
-      fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vaaa_private_ip_0 }}]
-
-  vaaa_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vaaa_private_ip_1 }}]
-
-  vaaa_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vcpe_image_name }
-      flavor: { get_param: vcpe_flavor_name }
-      name: { get_param: vaaa_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vaaa_private_0_port }
-        - port: { get_resource: vaaa_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __dcae_collector_ip__: { get_param: dcae_collector_ip }
-            __dcae_collector_port__: { get_param: dcae_collector_port }
-            __cpe_signal_net_ipaddr__: { get_param: vaaa_private_ip_0 }
-            __oam_ipaddr__: { get_param: vaaa_private_ip_1 }
-            __oam_cidr__: { get_param: onap_private_net_cidr }
-            __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir /opt/config
-            echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
-            echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
-            echo "__cpe_signal_net_ipaddr__" > /opt/config/cpe_signal_net_ipaddr.txt
-            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
-            echo "__oam_cidr__" > /opt/config/oam_cidr.txt
-            echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt
-            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
-            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
-            echo "__install_script_version__" > /opt/config/install_script_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-
-            # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_aaa_install.sh -o /opt/v_aaa_install.sh
-            cd /opt
-            chmod +x v_aaa_install.sh
-            ./v_aaa_install.sh
-
-
-  # Virtual DNS Instantiation
-  vdns_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: cpe_public_net_id }
-      fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
-
-  vdns_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
-
-  vdns_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vcpe_image_name }
-      flavor: { get_param: vcpe_flavor_name }
-      name: { get_param: vdns_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vdns_private_0_port }
-        - port: { get_resource: vdns_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __oam_ipaddr__ : { get_param: vdns_private_ip_1 }
-            __cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 }
-            __oam_cidr__: { get_param: onap_private_net_cidr }
-            __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir /opt/config
-            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
-            echo "__cpe_public_net_ipaddr__" > /opt/config/cpe_public_net_ipaddr.txt
-            echo "__oam_cidr__" > /opt/config/oam_cidr.txt
-            echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt
-            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
-            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
-            echo "__install_script_version__" > /opt/config/install_script_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-
-            # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
-            cd /opt
-            chmod +x v_dns_install.sh
-            ./v_dns_install.sh
-
-
-  # Virtual DHCP Instantiation
-  vdhcp_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: cpe_signal_net_id }
-      fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vdhcp_private_ip_0 }}]
-
-  vdhcp_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdhcp_private_ip_1 }}]
-
-  vdhcp_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vcpe_image_name }
-      flavor: { get_param: vcpe_flavor_name }
-      name: { get_param: vdhcp_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vdhcp_private_0_port }
-        - port: { get_resource: vdhcp_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __oam_ipaddr__ : { get_param: vdhcp_private_ip_1 }
-            __cpe_signal_ipaddr__ : { get_param: vdhcp_private_ip_0 }
-            __oam_cidr__ : { get_param: onap_private_net_cidr }
-            __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr }
-            __mr_ip_addr__ : { get_param: mr_ip_addr }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir /opt/config
-            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
-            echo "__cpe_signal_ipaddr__" > /opt/config/cpe_signal_ipaddr.txt
-            echo "__oam_cidr__" > /opt/config/oam_cidr.txt
-            echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
-            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
-            echo "__install_script_version__" > /opt/config/install_script_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-
-            # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_dhcp_install.sh -o /opt/v_dhcp_install.sh
-            cd /opt
-            chmod +x v_dhcp_install.sh
-            ./v_dhcp_install.sh
-
-  # vWEB instantiaion
-  vweb_private_0_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: cpe_public_net_id }
-      fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vweb_private_ip_0 }}]
-
-  vweb_private_1_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_param: onap_private_net_id }
-      fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vweb_private_ip_1 }}]
-
-
-  vweb_0:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: vcpe_image_name }
-      flavor: { get_param: vcpe_flavor_name }
-      name: { get_param: vweb_name_0 }
-      key_name: { get_resource: my_keypair }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vweb_private_0_port }
-        - port: { get_resource: vweb_private_1_port }
-      metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __oam_ipaddr__ : { get_param: vweb_private_ip_1 }
-            __cpe_public_ipaddr__: { get_param: vweb_private_ip_0 }
-            __oam_cidr__: { get_param: onap_private_net_cidr }
-            __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr }
-            __repo_url_blob__ : { get_param: repo_url_blob }
-            __repo_url_artifacts__ : { get_param: repo_url_artifacts }
-            __demo_artifacts_version__ : { get_param: demo_artifacts_version }
-            __install_script_version__ : { get_param: install_script_version }
-            __cloud_env__ : { get_param: cloud_env }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir /opt/config
-            echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt
-            echo "__cpe_public_ipaddr__" > /opt/config/cpe_public_ipaddr.txt
-            echo "__oam_cidr__" > /opt/config/oam_cidr.txt
-            echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt
-            echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
-            echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
-            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
-            echo "__install_script_version__" > /opt/config/install_script_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-
-            # Download and run install script
-            curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_web_install.sh -o /opt/v_web_install.sh
-            cd /opt
-            chmod +x v_web_install.sh
-            ./v_web_install.sh