From 0772b9ce9d9fa86e5805aba781388671369b9043 Mon Sep 17 00:00:00 2001 From: DR695H Date: Thu, 9 May 2019 16:49:40 -0400 Subject: 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 --- robot/assets/asdc/base_vcpe_infra/MANIFEST.json | 17 - .../asdc/base_vcpe_infra/base_vcpe_infra.env | 37 -- .../asdc/base_vcpe_infra/base_vcpe_infra.yaml | 450 --------------------- robot/assets/asdc/base_vcpe_vbng/MANIFEST.json | 17 - .../assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env | 35 -- .../assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml | 287 ------------- robot/assets/asdc/base_vcpe_vbrgemu/MANIFEST.json | 17 - .../asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.env | 27 -- .../asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.yaml | 248 ------------ robot/assets/asdc/base_vcpe_vgmux/MANIFEST.json | 17 - .../asdc/base_vcpe_vgmux/base_vcpe_vgmux.env | 35 -- .../asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml | 281 ------------- robot/assets/asdc/base_vcpe_vgw/MANIFEST.json | 17 - robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.env | 32 -- robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.yaml | 261 ------------ robot/assets/asdc/base_vfw/MANIFEST.json | 17 - robot/assets/asdc/base_vfw/base_vfw.env | 4 - robot/assets/asdc/base_vfw/base_vfw.yaml | 387 ------------------ robot/assets/asdc/base_vlb/MANIFEST.json | 28 -- robot/assets/asdc/base_vlb/base_vlb.env | 4 - robot/assets/asdc/base_vlb/base_vlb.yaml | 408 ------------------- robot/assets/asdc/base_vlb/dnsscaling.env | 4 - robot/assets/asdc/base_vlb/dnsscaling.yaml | 190 --------- robot/assets/asdc/base_vvg/MANIFEST.json | 17 - robot/assets/asdc/base_vvg/base_vvg.env | 3 - robot/assets/asdc/base_vvg/base_vvg.yaml | 22 - 26 files changed, 2862 deletions(-) delete mode 100644 robot/assets/asdc/base_vcpe_infra/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.env delete mode 100644 robot/assets/asdc/base_vcpe_infra/base_vcpe_infra.yaml delete mode 100644 robot/assets/asdc/base_vcpe_vbng/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env delete mode 100644 robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml delete mode 100644 robot/assets/asdc/base_vcpe_vbrgemu/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.env delete mode 100644 robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.yaml delete mode 100644 robot/assets/asdc/base_vcpe_vgmux/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env delete mode 100644 robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml delete mode 100644 robot/assets/asdc/base_vcpe_vgw/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.env delete mode 100644 robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.yaml delete mode 100644 robot/assets/asdc/base_vfw/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vfw/base_vfw.env delete mode 100644 robot/assets/asdc/base_vfw/base_vfw.yaml delete mode 100644 robot/assets/asdc/base_vlb/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vlb/base_vlb.env delete mode 100644 robot/assets/asdc/base_vlb/base_vlb.yaml delete mode 100644 robot/assets/asdc/base_vlb/dnsscaling.env delete mode 100644 robot/assets/asdc/base_vlb/dnsscaling.yaml delete mode 100644 robot/assets/asdc/base_vvg/MANIFEST.json delete mode 100644 robot/assets/asdc/base_vvg/base_vvg.env delete mode 100644 robot/assets/asdc/base_vvg/base_vvg.yaml (limited to 'robot') 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 diff --git a/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json b/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json deleted file mode 100644 index 0b34111e..00000000 --- a/robot/assets/asdc/base_vcpe_vbng/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "", - "description": "", - "data": [ - { - "file": "base_vcpe_vbng.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vcpe_vbng.env", - "type": "HEAT_ENV" - } - ] - } - ] -} diff --git a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env b/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env deleted file mode 100644 index be4f9728..00000000 --- a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.env +++ /dev/null @@ -1,35 +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 - brgemu_bng_private_net_id: zdfw1bngin01_private - brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private - bng_gmux_private_net_id: zdfw1bngmux01_private - bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private - 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_id: zdfw1cpe01_private - cpe_signal_subnet_id: zdfw1cpe01_sub_private - brgemu_bng_private_net_cidr: 10.3.0.0/24 - bng_gmux_private_net_cidr: 10.1.0.0/24 - cpe_signal_private_net_cidr: 10.4.0.0/24 - vbng_private_ip_0: 10.3.0.1 - vbng_private_ip_1: 10.0.101.10 - vbng_private_ip_2: 10.4.0.3 - vbng_private_ip_3: 10.1.0.10 - vbng_name_0: zdcpe1cpe01bng01 - vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app - vf_module_id: vCPE_Intrastructure_Metro_vBNG - 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: vbng_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) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_branch: stable/1704 - 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 diff --git a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml b/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml deleted file mode 100644 index 9cc44840..00000000 --- a/robot/assets/asdc/base_vcpe_vbng/base_vcpe_vbng.yaml +++ /dev/null @@ -1,287 +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 virtual Broadband Network Gateway (vBNG) - -############## -# # -# 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 - brgemu_bng_private_net_id: - type: string - label: vBNG IN private network name or ID - description: Private network that connects vBRG to vBNG - brgemu_bng_private_subnet_id: - type: string - label: vBNG IN private sub-network name or ID - description: vBNG IN private sub-network name or ID - brgemu_bng_private_net_cidr: - type: string - label: vBNG IN private network CIDR - description: The CIDR of the input side of vBNG private network - bng_gmux_private_net_id: - type: string - label: vBNG vGMUX private network name or ID - description: Private network that connects vBNG to vGMUX - bng_gmux_private_subnet_id: - type: string - label: vBNG vGMUX private sub-network name or ID - description: vBNG vGMUX private sub-network name or ID - bng_gmux_private_net_cidr: - type: string - label: vGMUX private network CIDR - description: The CIDR of the input side of vGMUX private network - 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: vCPE private network name or ID - description: Private network that connects vCPE elements with vCPE infrastructure elements - cpe_signal_subnet_id: - type: string - label: vCPE private sub-network name or ID - description: vCPE private sub-network name or ID - cpe_signal_private_net_cidr: - type: string - label: vAAA private network CIDR - description: The CIDR of the vAAA private network - vbng_private_ip_0: - type: string - label: vBNG IN private IP address - description: Private IP address that is assigned to the vBNG IN - vbng_private_ip_1: - type: string - label: vBNG private IP address towards the ONAP management network - description: Private IP address that is assigned to the vBNG to communicate with ONAP components - vbng_private_ip_2: - type: string - label: vBNG to CPE_SIGNAL private IP address - description: Private IP address that is assigned to the vBNG in the CPE_SIGNAL network - vbng_private_ip_3: - type: string - label: vBNG to vGMUX private IP address - description: Private IP address that is assigned to the vBNG to vGMUX port - vbng_name_0: - type: string - label: vBNG name - description: Name of the vBNG - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE 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 - 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) - vpp_source_repo_url: - type: string - label: VPP Source Git Repo - description: URL for VPP source codes - vpp_source_repo_branch: - type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vBNG - -############# -# # -# 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 BNG Instantiation - vbng_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: brgemu_bng_private_net_id } - fixed_ips: [{"subnet": { get_param: brgemu_bng_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_0 }}] - - vbng_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: vbng_private_ip_1 }}] - - vbng_private_2_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: vbng_private_ip_2 }}] - - vbng_private_3_port: - type: OS::Neutron::Port - properties: - network: { get_param: bng_gmux_private_net_id } - fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vbng_private_ip_3 }}] - - vbng_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vbng_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vbng_private_0_port } - - port: { get_resource: vbng_private_1_port } - - port: { get_resource: vbng_private_2_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: vbng_private_ip_1 } - __brgemu_bng_net_ipaddr__: { get_param: vbng_private_ip_0 } - __cpe_signal_net_ipaddr__: { get_param: vbng_private_ip_2 } - __bng_gmux_net_ipaddr__: { get_param: vbng_private_ip_3 } - __oam_cidr__: { get_param: onap_private_net_cidr } - __brgemu_bng_cidr__: { get_param: brgemu_bng_private_net_cidr } - __cpe_signal_cidr__: { get_param: cpe_signal_private_net_cidr } - __bng_gmux_cidr__: { get_param: bng_gmux_private_net_cidr } - __dcae_collector_ip__: { get_param: dcae_collector_ip } - __dcae_collector_port__: { get_param: dcae_collector_port } - __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 } - __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } - __vpp_patch_url__ : { get_param: vpp_patch_url } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__brgemu_bng_net_ipaddr__" > /opt/config/brgemu_bng_net_ipaddr.txt - echo "__cpe_signal_net_ipaddr__" > /opt/config/cpe_signal_net_ipaddr.txt - echo "__bng_gmux_net_ipaddr__" > /opt/config/bng_gmux_net_ipaddr.txt - echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt - echo "__oam_cidr__" > /opt/config/oam_cidr.txt - echo "__bng_gmux_cidr__" > /opt/config/bng_gmux_net_cidr.txt - echo "__cpe_signal_cidr__" > /opt/config/cpe_signal_net_cidr.txt - echo "__brgemu_bng_cidr__" > /opt/config/brgemu_bng_net_cidr.txt - echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt - echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 - echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt - echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh - cd /opt - chmod +x v_bng_install.sh - ./v_bng_install.sh diff --git a/robot/assets/asdc/base_vcpe_vbrgemu/MANIFEST.json b/robot/assets/asdc/base_vcpe_vbrgemu/MANIFEST.json deleted file mode 100644 index 603f92d9..00000000 --- a/robot/assets/asdc/base_vcpe_vbrgemu/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "", - "description": "", - "data": [ - { - "file": "base_vcpe_vbrgemu.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vcpe_vbrgemu.env", - "type": "HEAT_ENV" - } - ] - } - ] -} diff --git a/robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.env b/robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.env deleted file mode 100644 index ea8bc823..00000000 --- a/robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.env +++ /dev/null @@ -1,27 +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 - vbrgemu_bng_private_net_id: zdfw1bngin01_private - vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private - vbrgemu_bng_private_net_cidr: 10.3.0.0/24 - vbrgemu_private_net_id: zdfw1vbrgemu01_private - vbrgemu_private_net_cidr: 192.168.1.0/24 - vbrgemu_private_ip_0: 10.3.0.4 - vbrgemu_private_ip_1: 192.168.1.1 - sdnc_ip: 10.0.7.1 - vbrgemu_name_0: zdcpe1cpe01brgemu01 - vnf_id: vCPE_Infrastructure_BGREMU_demo_app - vf_module_id: vCPE_Customer_BRGEMU - 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: vbrgemu_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) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_branch: stable/1704 - hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_branch: stable/1704 - 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 diff --git a/robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.yaml b/robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.yaml deleted file mode 100644 index a9eb8726..00000000 --- a/robot/assets/asdc/base_vcpe_vbrgemu/base_vcpe_vbrgemu.yaml +++ /dev/null @@ -1,248 +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 vBRG Emulator (vBRGEMU) - -####################################################################### -# # -# PARAMETERS # -# # -# 0_port should get IP address from DHCP discover through vBNG # -# DCAE is not monitoring the BRGEMULATOR # -####################################################################### - -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 - vbrgemu_bng_private_net_id: - type: string - label: vBNG private network name or ID - description: Private network that connects vBRGEMU to vBNG - vbrgemu_bng_private_subnet_id: - type: string - label: vBNG private sub-network name or ID - description: vBNG private sub-network name or ID - vbrgemu_bng_private_net_cidr: - type: string - label: vBNG IN private network CIDR - description: The CIDR of the input side of vBNG private network - vbrgemu_private_net_id: - type: string - label: vBRGEMU Home private network name or ID - description: Private network that connects vBRGEMU to local devices - vbrgemu_private_net_cidr: - type: string - label: vBRGEMU Home private network CIDR - description: The CIDR of the input side of vBRGEMU Home private network - vbrgemu_private_ip_0: - type: string - label: vGW private IP address - description: Private IP address towards the BRGEMU-BNG network - vbrgemu_private_ip_1: - type: string - label: vGW private IP address - description: Private IP address towards the BRGEMU private network - vbrgemu_name_0: - type: string - label: vGW name - description: Name of the vGW - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE Module ID is provided by ONAP - 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) - vpp_source_repo_url: - type: string - label: VPP Source Git Repo - description: URL for VPP source codes - vpp_source_repo_branch: - type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes - hc2vpp_source_repo_url: - type: string - label: Honeycomb Source Git Repo - description: URL for Honeycomb source codes - hc2vpp_source_repo_branch: - type: string - label: Honeycomb Source Git Branch - description: Git Branch for the Honeycomb source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vBRG Emulator - sdnc_ip: - type: string - label: SDNC ip address - description: SDNC ip address uesd to set NAT - -############# -# # -# 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 - - vbrgemu_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: vbrgemu_private_net_id } - - vbrgemu_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: vbrgemu_private_net_id } - network_id: { get_resource: vbrgemu_private_network } - cidr: { get_param: vbrgemu_private_net_cidr } - - # Virtual BRG Emulator Instantiation - # 0_port should get IP address from DHCP discover through vBNG once the VNF is running - vbrgemu_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: vbrgemu_bng_private_net_id } - fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}] - - vbrgemu_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_resource: vbrgemu_private_network } - fixed_ips: [{"subnet": { get_resource: vbrgemu_private_subnet }, "ip_address": { get_param: vbrgemu_private_ip_1 }}] - - vbrgemu_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vbrgemu_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vbrgemu_private_0_port } - - port: { get_resource: vbrgemu_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: - __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 } - __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr } - __brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_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 } - __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } - __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } - __vpp_patch_url__ : { get_param: vpp_patch_url } - __sdnc_ip__ : { get_param: sdnc_ip } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__brgemu_net_ipaddr__" > /opt/config/brgemu_net_ipaddr.txt - echo "__brgemu_cidr__" > /opt/config/brgemu_net_cidr.txt - echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_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 - echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt - echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt - echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt - echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt - echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh - cd /opt - chmod +x v_brgemu_install.sh - ./v_brgemu_install.sh diff --git a/robot/assets/asdc/base_vcpe_vgmux/MANIFEST.json b/robot/assets/asdc/base_vcpe_vgmux/MANIFEST.json deleted file mode 100644 index 62d1ef97..00000000 --- a/robot/assets/asdc/base_vcpe_vgmux/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "", - "description": "", - "data": [ - { - "file": "base_vcpe_vgmux.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vcpe_vgmux.env", - "type": "HEAT_ENV" - } - ] - } - ] -} diff --git a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env b/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env deleted file mode 100644 index e81afa70..00000000 --- a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.env +++ /dev/null @@ -1,35 +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 - bng_gmux_private_net_id: zdfw1bngmux01_private - bng_gmux_private_subnet_id: zdfw1bngmux01_sub_private - mux_gw_private_net_id: zdfw1muxgw01_private - mux_gw_private_subnet_id: zdfw1muxgw01_sub_private - 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 - bng_gmux_private_net_cidr: 10.1.0.0/24 - mux_gw_private_net_cidr: 10.5.0.0/24 - vgmux_private_ip_0: 10.1.0.20 - vgmux_private_ip_1: 10.0.101.20 - vgmux_private_ip_2: 10.5.0.20 - vgmux_name_0: zdcpe1cpe01mux01 - vnf_id: vCPE_Infrastructure_vGMUX_demo_app - vf_module_id: vCPE_Intrastructure_Metro_vGMUX - 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: vgmux_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) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_branch: stable/1704 - hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_branch: stable/1704 - 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 - 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 - libevel_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch diff --git a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml b/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml deleted file mode 100644 index ecdb1b1b..00000000 --- a/robot/assets/asdc/base_vcpe_vgmux/base_vcpe_vgmux.yaml +++ /dev/null @@ -1,281 +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 Metro vGMUX - -############## -# # -# 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 - bng_gmux_private_net_id: - type: string - label: vBNG vGMUX private network name or ID - description: Private network that connects vBNG to vGMUX - bng_gmux_private_subnet_id: - type: string - label: vBNG vGMUX private sub-network name or ID - description: vBNG vGMUX private sub-network name or ID - bng_gmux_private_net_cidr: - type: string - label: vBNG vGMUX private network CIDR - description: The CIDR of the vBNG-vGMUX private network - mux_gw_private_net_id: - type: string - label: vGMUX vGWs network name or ID - description: Private network that connects vGMUX to vGWs - mux_gw_private_subnet_id: - type: string - label: vGMUX vGWs sub-network name or ID - description: vGMUX vGWs sub-network name or ID - mux_gw_private_net_cidr: - type: string - label: vGMUX private network CIDR - description: The CIDR of the vGMUX private network - 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 - vgmux_private_ip_0: - type: string - label: vGMUX private IP address towards the vBNG-vGMUX private network - description: Private IP address that is assigned to the vGMUX to communicate with the vBNG - vgmux_private_ip_1: - type: string - label: vGMUX private IP address towards the ONAP management network - description: Private IP address that is assigned to the vGMUX to communicate with ONAP components - vgmux_private_ip_2: - type: string - label: vGMUX private IP address towards the vGMUX-vGW private network - description: Private IP address that is assigned to the vGMUX to communicate with vGWs - vgmux_name_0: - type: string - label: vGMUX name - description: Name of the vGMUX - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE 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 - 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) - vpp_source_repo_url: - type: string - label: VPP Source Git Repo - description: URL for VPP source codes - vpp_source_repo_branch: - type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes - hc2vpp_source_repo_url: - type: string - label: Honeycomb Source Git Repo - description: URL for Honeycomb source codes - hc2vpp_source_repo_branch: - type: string - label: Honeycomb Source Git Branch - description: Git Branch for the Honeycomb source codes - vpp_patch_url: - type: string - label: VPP Patch URL - description: URL for VPP patch for vG-MUX - hc2vpp_patch_url: - type: string - label: Honeycomb Patch URL - description: URL for Honeycomb patch for vG-MUX - libevel_patch_url: - type: string - label: libevel Patch URL - description: URL for libevel patch for vG-MUX - -############# -# # -# 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 GMUX Instantiation - vgmux_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: bng_gmux_private_net_id } - fixed_ips: [{"subnet": { get_param: bng_gmux_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_0 }}] - - vgmux_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: vgmux_private_ip_1 }}] - - vgmux_private_2_port: - type: OS::Neutron::Port - properties: - network: { get_param: mux_gw_private_net_id } - fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}] - - vgmux_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vgmux_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vgmux_private_0_port } - - port: { get_resource: vgmux_private_1_port } - - port: { get_resource: vgmux_private_2_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: - __bng_mux_net_ipaddr__ : { get_param: vgmux_private_ip_0 } - __oam_ipaddr__ : { get_param: vgmux_private_ip_1 } - __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 } - __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr } - __oam_cidr__ : { get_param: onap_private_net_cidr } - __mux_gw_net_cidr__ : { get_param: mux_gw_private_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 } - __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } - __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } - __vpp_patch_url__ : { get_param: vpp_patch_url } - __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url } - __libevel_patch_url__ : { get_param: libevel_patch_url } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__bng_mux_net_ipaddr__" > /opt/config/bng_mux_net_ipaddr.txt - echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt - echo "__mux_gw_net_ipaddr__" > /opt/config/mux_gw_net_ipaddr.txt - echo "__bng_mux_net_cidr__" > /opt/config/bng_mux_net_cidr.txt - echo "__oam_cidr__" > /opt/config/oam_cidr.txt - echo "__mux_gw_net_cidr__" > /opt/config/mux_gw_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 - echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt - echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt - echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt - echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt - echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt - echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh - cd /opt - chmod +x v_gmux_install.sh - ./v_gmux_install.sh diff --git a/robot/assets/asdc/base_vcpe_vgw/MANIFEST.json b/robot/assets/asdc/base_vcpe_vgw/MANIFEST.json deleted file mode 100644 index f99303e4..00000000 --- a/robot/assets/asdc/base_vcpe_vgw/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "", - "description": "", - "data": [ - { - "file": "base_vcpe_vgw.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vcpe_vgw.env", - "type": "HEAT_ENV" - } - ] - } - ] -} diff --git a/robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.env b/robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.env deleted file mode 100644 index f1cadb83..00000000 --- a/robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.env +++ /dev/null @@ -1,32 +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 - mux_gw_private_net_id: zdfw1muxgw01_private - mux_gw_private_subnet_id: zdfw1muxgw01_sub_private - mux_gw_private_net_cidr: 10.5.0.0/24 - cpe_public_net_id: zdfw1cpe01_public - cpe_public_subnet_id: zdfw1cpe01_sub_public - cpe_public_net_cidr: 10.2.0.0/24 - 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 - vgw_private_ip_0: 10.5.0.21 - vgw_private_ip_1: 10.0.101.30 - vgw_private_ip_2: 10.2.0.3 - vgw_name_0: zdcpe1cpe01gw01 - vnf_id: vCPE_Infrastructure_GW_demo_app - vf_module_id: vCPE_Customer_GW - 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: vgw_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) - vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_branch: stable/1704 - hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_branch: stable/1704 diff --git a/robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.yaml b/robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.yaml deleted file mode 100644 index 173ba6dd..00000000 --- a/robot/assets/asdc/base_vcpe_vgw/base_vcpe_vgw.yaml +++ /dev/null @@ -1,261 +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 vGateway (vG) - -############## -# # -# 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 - mux_gw_private_net_id: - type: string - label: vGMUX private network name or ID - description: Private network that connects vGMUX to vGWs - mux_gw_private_subnet_id: - type: string - label: vGMUX private sub-network name or ID - description: vGMUX private sub-network name or ID - mux_gw_private_net_cidr: - type: string - label: vGMUX private network CIDR - description: The CIDR of the vGMUX private network - 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_public_net_id: - type: string - label: vCPE network that emulates internetmanagement name or ID - description: Private network that connects vGW to emulated internet - cpe_public_subnet_id: - type: string - label: vCPE Public subnet - description: vCPE Public subnet - cpe_public_net_cidr: - type: string - label: vCPE public network CIDR - description: The CIDR of the vCPE public - vgw_private_ip_0: - type: string - label: vGW private IP address towards the vGMUX - description: Private IP address that is assigned to the vGW to communicate with vGMUX - vgw_private_ip_1: - type: string - label: vGW private IP address towards the ONAP management network - description: Private IP address that is assigned to the vGW to communicate with ONAP components - vgw_private_ip_2: - type: string - label: vGW private IP address towards the vCPE public network - description: Private IP address that is assigned to the vGW to communicate with vCPE public network - vgw_name_0: - type: string - label: vGW name - description: Name of the vGW - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: vCPE module ID - description: The vCPE 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 - 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) - vpp_source_repo_url: - type: string - label: VPP Source Git Repo - description: URL for VPP source codes - vpp_source_repo_branch: - type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes - hc2vpp_source_repo_url: - type: string - label: Honeycomb Source Git Repo - description: URL for Honeycomb source codes - hc2vpp_source_repo_branch: - type: string - label: Honeycomb Source Git Branch - description: Git Branch for the Honeycomb source codes - -############# -# # -# 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 GW Instantiation - vgw_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: mux_gw_private_net_id } - fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgw_private_ip_0 }}] - - vgw_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: vgw_private_ip_1 }}] - - vgw_private_2_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: vgw_private_ip_2 }}] - - vgw_0: - type: OS::Nova::Server - properties: - image: { get_param: vcpe_image_name } - flavor: { get_param: vcpe_flavor_name } - name: { get_param: vgw_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vgw_private_0_port } - - port: { get_resource: vgw_private_1_port } - - port: { get_resource: vgw_private_2_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: - __mux_gw_private_net_ipaddr__ : { get_param: vgw_private_ip_0 } - __oam_ipaddr__ : { get_param: vgw_private_ip_1 } - __oam_cidr__ : { get_param: onap_private_net_cidr } - __cpe_public_net_cidr__ : { get_param: cpe_public_net_cidr } - __mux_gw_private_net_cidr__ : { get_param: mux_gw_private_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 } - __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } - __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt - echo "__oam_cidr__" > /opt/config/oam_cidr.txt - echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt - echo "__mux_gw_private_net_ipaddr__" > /opt/config/mux_gw_private_net_ipaddr.txt - echo "__mux_gw_private_net_cidr__" > /opt/config/mux_gw_private_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 - echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt - echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt - echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gw_install.sh -o /opt/v_gw_install.sh - cd /opt - chmod +x v_gw_install.sh - ./v_gw_install.sh - diff --git a/robot/assets/asdc/base_vfw/MANIFEST.json b/robot/assets/asdc/base_vfw/MANIFEST.json deleted file mode 100644 index a4e5cfd0..00000000 --- a/robot/assets/asdc/base_vfw/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "virtualFireWall", - "description": "robot ete manifest", - "data": [ - { - "file": "base_vfw.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vfw.env", - "type": "HEAT_ENV" - } - ] - } - ] -} \ No newline at end of file diff --git a/robot/assets/asdc/base_vfw/base_vfw.env b/robot/assets/asdc/base_vfw/base_vfw.env deleted file mode 100644 index f7d2c803..00000000 --- a/robot/assets/asdc/base_vfw/base_vfw.env +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - vfw_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - vfw_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 \ No newline at end of file diff --git a/robot/assets/asdc/base_vfw/base_vfw.yaml b/robot/assets/asdc/base_vfw/base_vfw.yaml deleted file mode 100644 index a0a23094..00000000 --- a/robot/assets/asdc/base_vfw/base_vfw.yaml +++ /dev/null @@ -1,387 +0,0 @@ -########################################################################## -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template that deploys vFirewall demo app for ONAP - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vfw_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vfw_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 - unprotected_private_net_id: - type: string - label: Unprotected private network name or ID - description: Private network that connects vPacketGenerator with vFirewall - protected_private_net_id: - type: string - label: Protected private network name or ID - description: Private network that connects vFirewall with vSink - 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 - unprotected_private_net_cidr: - type: string - label: Unprotected private network CIDR - description: The CIDR of the unprotected private network - protected_private_net_cidr: - type: string - label: Protected private network CIDR - description: The CIDR of the protected private network - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vfw_private_ip_0: - type: string - label: vFirewall private IP address towards the unprotected network - description: Private IP address that is assigned to the vFirewall to communicate with the vPacketGenerator - vfw_private_ip_1: - type: string - label: vFirewall private IP address towards the protected network - description: Private IP address that is assigned to the vFirewall to communicate with the vSink - vfw_private_ip_2: - type: string - label: vFirewall private IP address towards the ONAP management network - description: Private IP address that is assigned to the vFirewall to communicate with ONAP components - vpg_private_ip_0: - type: string - label: vPacketGenerator private IP address towards the unprotected network - description: Private IP address that is assigned to the vPacketGenerator to communicate with the vFirewall - vpg_private_ip_1: - type: string - label: vPacketGenerator private IP address towards the ONAP management network - description: Private IP address that is assigned to the vPacketGenerator to communicate with ONAP components - vsn_private_ip_0: - type: string - label: vSink private IP address towards the protected network - description: Private IP address that is assigned to the vSink to communicate with the vFirewall - vsn_private_ip_1: - type: string - label: vSink private IP address towards the ONAP management network - description: Private IP address that is assigned to the vSink to communicate with ONAP components - vfw_name_0: - type: string - label: vFirewall name - description: Name of the vFirewall - vpg_name_0: - type: string - label: vPacketGenerator name - description: Name of the vPacketGenerator - vsn_name_0: - type: string - label: vSink name - description: Name of the vSink - 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 vFirewall 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 - 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 - - unprotected_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: unprotected_private_net_id } - - protected_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: protected_private_net_id } - - unprotected_private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: unprotected_private_network } - cidr: { get_param: unprotected_private_net_cidr } - - protected_private_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: protected_private_network } - cidr: { get_param: protected_private_net_cidr } - - # Virtual Firewall instantiation - vfw_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: unprotected_private_network } - fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vfw_private_ip_0 }}] - - vfw_private_1_port: - type: OS::Neutron::Port - properties: - allowed_address_pairs: [{ "ip_address": { get_param: vpg_private_ip_0 }}] - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}] - - vfw_private_2_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: vfw_private_ip_2 }}] - - vfw_0: - type: OS::Nova::Server - properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } - name: { get_param: vfw_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vfw_private_0_port } - - port: { get_resource: vfw_private_1_port } - - port: { get_resource: vfw_private_2_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 } - __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 } - __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 } - __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 } - __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 } - __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } - __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } - __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } - __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 "__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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt - echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt - echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt - echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt - echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh - cd /opt - chmod +x v_firewall_install.sh - ./v_firewall_install.sh - - - # Virtual Packet Generator instantiation - vpg_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: unprotected_private_network } - fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] - - vpg_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: vpg_private_ip_1 }}] - - vpg_0: - type: OS::Nova::Server - properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } - name: { get_param: vpg_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vpg_private_0_port } - - port: { get_resource: vpg_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: - __fw_ipaddr__: { get_param: vfw_private_ip_0 } - __protected_net_cidr__: { get_param: protected_private_net_cidr } - __sink_ipaddr__: { get_param: vsn_private_ip_0 } - __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 } - __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } - __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 } - __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } - __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } - __cloud_env__ : { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt - echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt - echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.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 "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt - echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt - echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh - cd /opt - chmod +x v_packetgen_install.sh - ./v_packetgen_install.sh - - - # Virtual Sink instantiation - vsn_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}] - - vsn_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: vsn_private_ip_1 }}] - - vsn_0: - type: OS::Nova::Server - properties: - image: { get_param: vfw_image_name } - flavor: { get_param: vfw_flavor_name } - name: { get_param: vsn_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vsn_private_0_port } - - port: { get_resource: vsn_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: - __protected_net_gw__: { get_param: vfw_private_ip_1 } - __unprotected_net__: { get_param: unprotected_private_net_cidr } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } - __install_script_version__ : { get_param: install_script_version } - __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 } - __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 } - __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } - __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } - __cloud_env__ : { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt - echo "__unprotected_net__" > /opt/config/unprotected_net.txt - echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt - echo "__install_script_version__" > /opt/config/install_script_version.txt - echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt - echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt - echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh - cd /opt - chmod +x v_sink_install.sh - ./v_sink_install.sh \ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/MANIFEST.json b/robot/assets/asdc/base_vlb/MANIFEST.json deleted file mode 100644 index bb8d70a1..00000000 --- a/robot/assets/asdc/base_vlb/MANIFEST.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "virtualLoadBalancer", - "description": "robot ete manifest", - "data": [ - { - "file": "base_vlb.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vlb.env", - "type": "HEAT_ENV" - } - ] - }, - { - "file": "dnsscaling.yaml", - "type": "HEAT", - "isBase": "false", - "data": [ - { - "file": "dnsscaling.env", - "type": "HEAT_ENV" - } - ] - } - ] -} \ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/base_vlb.env b/robot/assets/asdc/base_vlb/base_vlb.env deleted file mode 100644 index f18b0011..00000000 --- a/robot/assets/asdc/base_vlb/base_vlb.env +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - vlb_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - vlb_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 \ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/base_vlb.yaml b/robot/assets/asdc/base_vlb/base_vlb.yaml deleted file mode 100644 index cbf0d4d4..00000000 --- a/robot/assets/asdc/base_vlb/base_vlb.yaml +++ /dev/null @@ -1,408 +0,0 @@ -########################################################################## -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template to deploy vLoadBalancer/vDNS demo app for ONAP - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vlb_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vlb_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 - vlb_private_net_id: - type: string - label: vLoadBalancer private network name or ID - description: Private network that connects vLoadBalancer with vDNSs - pktgen_private_net_id: - type: string - label: vPacketGen private network name or ID - description: Private network that connects vLoadBalancer with vPacketGen - onap_private_net_id: - type: string - label: ECOMP management network name or ID - description: Private network that connects ONAP component and the VNF - onap_private_subnet_id: - type: string - label: ECOMP management sub-network name or ID - description: Private sub-network that connects ONAP component and the VNF - vlb_private_net_cidr: - type: string - label: vLoadBalancer private network CIDR - description: The CIDR of the vLoadBalancer private network - pktgen_private_net_cidr: - type: string - label: vPacketGen private network CIDR - description: The CIDR of the vPacketGen private network - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vlb_private_ip_0: - type: string - label: vLoadBalancer private IP address towards the private network - description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs - vlb_private_ip_1: - type: string - label: vLoadBalancer private IP address towards the ONAP management network - description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components - vlb_private_ip_2: - type: string - label: vLoadBalancer private IP address towards the vPacketGen network - description: Private IP address that is assigned to the vLoadBalancer to communicate with vPacketGen - vdns_private_ip_0: - type: string - label: vDNS private IP address towards the private network - description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer - 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 - vpg_private_ip_0: - type: string - label: vPacketGen private IP address towards the vPacketGen private network - description: Private IP address that is assigned to the vPacketGen to communicate with the vLoadBalancer - vpg_private_ip_1: - type: string - label: vPacketGen private IP address towards the ONAP management network - description: Private IP address that is assigned to the vPacketGen to communicate with ONAP components - vip: - type: string - label: Virtual Private IP of the vLoadBalancer - description: Virtual Private IP that is assigned to the vLoadBalancer's VPP layer - gre_ipaddr: - type: string - label: IP Address of the GRE tunnel - description: IP address assigned to the GRE tunnel on the vLoadBalancer - pg_int: - type: string - label: IP Address of the output vPacketGen interface - description: IP address assigned to the output interface of the vPacketGen's VPP layer - vlb_name_0: - type: string - label: vLoadBalancer name - description: Name of the vLoadBalancer - vdns_name_0: - type: string - label: vDNS name - description: Name of the vDNS - vpg_name_0: - type: string - label: vPKTGEN name - description: Name of the vPKTGEN - 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 vLoadBalancer 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 - 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 - demo_artifacts_version: - type: string - label: Artifacts version used in demo vnfs - description: Artifacts (jar, tar.gz) version used in demo vnfs - install_script_version: - type: string - label: Installation script version number - description: Version number of the scripts that install the vFW demo app - 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 - - vlb_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: vlb_private_net_id } - - vlb_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: vlb_private_net_id } - network_id: { get_resource: vlb_private_network } - cidr: { get_param: vlb_private_net_cidr } - - pktgen_private_network: - type: OS::Neutron::Net - properties: - name: { get_param: pktgen_private_net_id } - - pktgen_private_subnet: - type: OS::Neutron::Subnet - properties: - name: { get_param: pktgen_private_net_id } - network_id: { get_resource: pktgen_private_network } - cidr: { get_param: pktgen_private_net_cidr } - - vlb_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: vlb_private_network } - fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}] - - vlb_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: vlb_private_ip_1 }}] - - vlb_private_2_port: - type: OS::Neutron::Port - properties: - network: { get_resource: pktgen_private_network } - fixed_ips: [{"subnet": { get_resource: pktgen_private_subnet }, "ip_address": { get_param: vlb_private_ip_2 }}] - - vlb_0: - type: OS::Nova::Server - properties: - image: { get_param: vlb_image_name } - flavor: { get_param: vlb_flavor_name } - name: { get_param: vlb_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vlb_private_0_port } - - port: { get_resource: vlb_private_1_port } - - port: { get_resource: vlb_private_2_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 } - __ip_to_dns_net__: { get_param: vlb_private_ip_0 } - __ip_to_pktgen_net__: { get_param: vlb_private_ip_2 } - __vip__: { get_param: vip } - __gre_ipaddr__: { get_param: gre_ipaddr } - __pktgen_ipaddr__: { get_param: vpg_private_ip_0 } - __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } - __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 } - __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } - __onap_private_net_cidr__: { get_param: onap_private_net_cidr } - __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } - __pktgen_mac__: { get_attr: [vpg_private_0_port, mac_address] } - __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 "__ip_to_dns_net__" > /opt/config/ip_to_dns_net.txt - echo "__ip_to_pktgen_net__" > /opt/config/ip_to_pktgen_net.txt - echo "__vip__" > /opt/config/vip.txt - echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt - echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt - echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.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 "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt - echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__pktgen_mac__" > /opt/config/pktgen_mac.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh - cd /opt - chmod +x v_lb_install.sh - ./v_lb_install.sh - - - vdns_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: vlb_private_network } - fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "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: vlb_image_name } - flavor: { get_param: vlb_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: - __lb_oam_int__: { get_param: vlb_private_ip_1 } - __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } - __local_private_ipaddr__: { get_param: vdns_private_ip_0 } - __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __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 } - __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } - __onap_private_net_cidr__: { get_param: onap_private_net_cidr } - __cloud_env__: { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt - echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt - echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt - echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.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 "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__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 - - - vpg_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_resource: pktgen_private_network } - fixed_ips: [{"subnet": { get_resource: pktgen_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] - - vpg_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: vpg_private_ip_1 }}] - - vpg_0: - type: OS::Nova::Server - properties: - image: { get_param: vlb_image_name } - flavor: { get_param: vlb_flavor_name } - name: { get_param: vpg_name_0 } - key_name: { get_resource: my_keypair } - networks: - - network: { get_param: public_net_id } - - port: { get_resource: vpg_private_0_port } - - port: { get_resource: vpg_private_1_port } - user_data_format: RAW - user_data: - str_replace: - params: - __repo_url_blob__: { get_param: repo_url_blob } - __repo_url_artifacts__: { get_param: repo_url_artifacts } - __local_private_ipaddr__: { get_param: vpg_private_ip_0 } - __oam_private_ipaddr__: { get_param: vpg_private_ip_1 } - __onap_private_net_cidr__: { get_param: onap_private_net_cidr } - __pktgen_private_net_cidr__: { get_param: pktgen_private_net_cidr } - __vlb_ipaddr__: { get_param: vlb_private_ip_2 } - __demo_artifacts_version__: { get_param: demo_artifacts_version } - __install_script_version__: { get_param: install_script_version } - __pg_int__: { get_param: pg_int } - __vlb_mac__: { get_attr: [vlb_private_2_port, mac_address] } - __cloud_env__: { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt - echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt - echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.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 "__pg_int__" > /opt/config/pg_int.txt - echo "__vlb_mac__" > /opt/config/vlb_mac.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh - cd /opt - chmod +x v_packetgen_install.sh - ./v_packetgen_install.sh \ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/dnsscaling.env b/robot/assets/asdc/base_vlb/dnsscaling.env deleted file mode 100644 index f18b0011..00000000 --- a/robot/assets/asdc/base_vlb/dnsscaling.env +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - vlb_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) - vlb_flavor_name: 4 GB General Purpose v1 - public_net_id: 00000000-0000-0000-0000-000000000000 \ No newline at end of file diff --git a/robot/assets/asdc/base_vlb/dnsscaling.yaml b/robot/assets/asdc/base_vlb/dnsscaling.yaml deleted file mode 100644 index 125eb583..00000000 --- a/robot/assets/asdc/base_vlb/dnsscaling.yaml +++ /dev/null @@ -1,190 +0,0 @@ -########################################################################## -# -########################################################################## - -heat_template_version: 2013-05-23 - -description: Heat template to deploy a vDNS for ONAP (scaling-up scenario) - -############## -# # -# PARAMETERS # -# # -############## - -parameters: - vlb_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - vlb_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 - vlb_private_net_id: - type: string - label: vLoadBalancer private network name or ID - description: Private network that connects vLoadBalancer with vDNSs - onap_private_net_id: - type: string - label: ONAP management network name or ID - description: Private network that connects ONAP component and the VNF - onap_private_subnet_id: - type: string - label: ONAP management sub-network name or ID - description: Private sub-network that connects ONAP component and the VNF - vlb_private_net_cidr: - type: string - label: vLoadBalancer private network CIDR - description: The CIDR of the vLoadBalancer private network - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network - vlb_private_ip_0: - type: string - label: vLoadBalancer private IP address towards the private network - description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs - vlb_private_ip_1: - type: string - label: vLoadBalancer private IP address towards the ONAP management network - description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components - vdns_private_ip_0: - type: string - label: vDNS private IP address towards the private network - description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer - 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 - vdns_name_0: - type: string - label: vDNS name - description: Name of the vDNS - 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 vLoadBalancer Module ID is provided by ONAP - 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 - - vdns_2_private_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: vlb_private_net_id } - fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] - - vdns_2_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_2: - type: OS::Nova::Server - properties: - image: { get_param: vlb_image_name } - flavor: { get_param: vlb_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_2_private_0_port } - - port: { get_resource: vdns_2_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: - __lb_oam_int__: { get_param: vlb_private_ip_1 } - __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } - __local_private_ipaddr__: { get_param: vdns_private_ip_0 } - __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __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 } - __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } - __onap_private_net_cidr__: { get_param: onap_private_net_cidr } - __cloud_env__: { get_param: cloud_env } - template: | - #!/bin/bash - - # Create configuration files - mkdir /opt/config - echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt - echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt - echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt - echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.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 "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt - echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt - echo "__cloud_env__" > /opt/config/cloud_env.txt - - # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__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 \ No newline at end of file diff --git a/robot/assets/asdc/base_vvg/MANIFEST.json b/robot/assets/asdc/base_vvg/MANIFEST.json deleted file mode 100644 index 67312f23..00000000 --- a/robot/assets/asdc/base_vvg/MANIFEST.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "volumeGroup.yaml", - "description": "robot ete manifest", - "data": [ - { - "file": "base_vvg.yaml", - "type": "HEAT", - "isBase": "true", - "data": [ - { - "file": "base_vvg.env", - "type": "HEAT_ENV" - } - ] - } - ] -} \ No newline at end of file diff --git a/robot/assets/asdc/base_vvg/base_vvg.env b/robot/assets/asdc/base_vvg/base_vvg.env deleted file mode 100644 index 2b4e72b8..00000000 --- a/robot/assets/asdc/base_vvg/base_vvg.env +++ /dev/null @@ -1,3 +0,0 @@ -parameters: - volume_size: 100 - nova_instance: 1234456 \ No newline at end of file diff --git a/robot/assets/asdc/base_vvg/base_vvg.yaml b/robot/assets/asdc/base_vvg/base_vvg.yaml deleted file mode 100644 index c20d4e48..00000000 --- a/robot/assets/asdc/base_vvg/base_vvg.yaml +++ /dev/null @@ -1,22 +0,0 @@ -heat_template_version: 2013-05-23 -description: create a Nova instance, a Cinder volume and attach the volume to the instance. - -parameters: - nova_instance: - type: string - label: Instance name or ID - description: ID of the vm to use for the disk to be attached too - volume_size: - type: number - label: GB - description: Size of the volume to be created. -resources: - cinder_volume: - type: OS::Cinder::Volume - properties: - size: { get_param: volume_size } - volume_attachment: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_resource: cinder_volume } - instance_uuid: { get_param: nova_instance } \ No newline at end of file -- cgit 1.2.3-korg