From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Mon, 30 Jul 2018 15:56:09 -0400 Subject: Containerization feature of SO Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) --- .../asdc/demo-dns-V1/artifacts/base_vlb.env | 20 --- .../asdc/demo-dns-V1/artifacts/base_vlb.yaml | 188 --------------------- .../asdc/demo-dns-V1/artifacts/dnsscaling.env | 16 -- .../asdc/demo-dns-V1/artifacts/dnsscaling.yaml | 117 ------------- .../demo-dns-V1/artifacts/vnf-module-artifact.json | 30 ---- .../asdc/demo-dns-V1/notif-structure.json | 95 ----------- 6 files changed, 466 deletions(-) delete mode 100644 packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env delete mode 100644 packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml delete mode 100644 packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env delete mode 100644 packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml delete mode 100644 packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json delete mode 100644 packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json (limited to 'packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1') diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env deleted file mode 100644 index b8cb810167..0000000000 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.env +++ /dev/null @@ -1,20 +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 - vlb_private_net_id: zdfw1lb01_private - ecomp_private_net_id: oam_ecomp - vlb_private_net_cidr: 192.168.10.0/24 - ecomp_private_net_cidr: 192.168.9.0/24 - vlb_private_ip_0: 192.168.10.100 - vlb_private_ip_1: 192.168.20.100 - vdns_private_ip_0: 192.168.10.200 - vdns_private_ip_1: 192.168.9.200 - vlb_name_0: zdfw1lb01lb01 - vdns_name_0: zdfw1lb01dns01 - vnf_id: vLoadBalancer_demo_app - vf_module_id: vLoadBalancer - webserver_ip: 162.242.237.182 - dcae_collector_ip: 192.168.9.1 - key_name: vfw_key - pub_key: INSERT PUBLIC KEY HERE diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml deleted file mode 100644 index 089fceeb49..0000000000 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/base_vlb.yaml +++ /dev/null @@ -1,188 +0,0 @@ -heat_template_version: 2013-05-23 - -description: Heat template to deploy vLoadBalancer/vDNS demo app for OpenECOMP - -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 - ecomp_private_net_id: - type: string - label: ECOMP management network name or ID - description: Private network that connects ECOMP component and the VNF - vlb_private_net_cidr: - type: string - label: vLoadBalancer private network CIDR - description: The CIDR of the vLoadBalancer private network - ecomp_private_net_cidr: - type: string - label: ECOMP 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 ECOMP management network - description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP 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 ECOMP management network - description: Private IP address that is assigned to the vDNS to communicate with ECOMP components - vlb_name_0: - type: string - label: vLoadBalancer name - description: Name of the vLoadBalancer - vdsn_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 ECOMP - vf_module_id: - type: string - label: vFirewall module ID - description: The vLoadBalancer Module ID is provided by ECOMP - webserver_ip: - type: string - label: Webserver IP address - description: IP address of the webserver that hosts the source code and binaries - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address 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 - -resources: - my_keypair: - type: OS::Nova::KeyPair - properties: - name: { get_param: key_name } - 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: - network_id: { get_resource: vlb_private_network } - cidr: { get_param: vlb_private_net_cidr } - - 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 } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} - user_data_format: RAW - user_data: - str_replace: - params: - __webserver__: { get_param: webserver_ip } - __dcae_collector_ip__ : { get_param: dcae_collector_ip } - template: | - #!/bin/bash - - WEBSERVER_IP=__webserver__ - DCAE_COLLECTOR_IP=__dcae_collector_ip__ - - mkdir /opt/config - cd /opt - wget http://$WEBSERVER_IP/demo_repo/v_lb_init.sh - chmod +x v_lb_init.sh - echo $WEBSERVER_IP > config/webserver_ip.txt - echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt - ./v_lb_init.sh - - 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: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vlb_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: vdsn_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: - __webserver__: { get_param: webserver_ip } - __fw_ipaddr__: { get_param: vlb_private_ip_0 } - template: | - #!/bin/bash - - WEBSERVER_IP=__webserver__ - LB_IPADDR=__lb_ipaddr__ - - mkdir /opt/config - cd /opt - wget http://$WEBSERVER_IP/demo_repo/v_dns_init.sh - chmod +x v_dns_init.sh - echo $WEBSERVER_IP > config/webserver_ip.txt - echo $LB_IPADDR > config/lb_ipaddr.txt - ./v_dns_init.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: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vdns_private_ip_1 }}] diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env deleted file mode 100644 index 15895ac50d..0000000000 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.env +++ /dev/null @@ -1,16 +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 - vlb_private_net_id: zdfw1lb01_private - ecomp_private_net_id: oam_ecomp - vlb_private_ip_0: 192.168.10.100 - vdns_private_ip_0: 192.168.10.200 - vdns_private_ip_1: 192.168.9.200 - vdns_name_0: zdfw1lb01dns01 - vnf_id: vLoadBalancer_demo_app - vf_module_id: vLoadBalancer - webserver_ip: 162.242.237.182 - dcae_collector_ip: 192.168.9.1 - key_name: vfw_key - pub_key: INSERT PUBLIC KEY HERE \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml deleted file mode 100644 index 6ec4b0be07..0000000000 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/dnsscaling.yaml +++ /dev/null @@ -1,117 +0,0 @@ -heat_template_version: 2013-05-23 - -description: Heat template to deploy a vDNS for OpenECOMP (scaling-up scenario) - -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 - ecomp_private_net_id: - type: string - label: ECOMP management network name or ID - description: Private network that connects ECOMP component and the VNF - 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 - 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 ECOMP management network - description: Private IP address that is assigned to the vDNS to communicate with ECOMP components - vdsn_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 ECOMP - vf_module_id: - type: string - label: vFirewall module ID - description: The vLoadBalancer Module ID is provided by ECOMP - webserver_ip: - type: string - label: Webserver IP address - description: IP address of the webserver that hosts the source code and binaries - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address 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 - -resources: - my_keypair: - type: OS::Nova::KeyPair - properties: - name: { get_param: key_name } - public_key: { get_param: pub_key } - save_private_key: false - - vdns_0: - type: OS::Nova::Server - properties: - image: { get_param: vlb_image_name } - flavor: { get_param: vlb_flavor_name } - name: { get_param: vdsn_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: - __webserver__: { get_param: webserver_ip } - __fw_ipaddr__: { get_param: vlb_private_ip_0 } - template: | - #!/bin/bash - - WEBSERVER_IP=__webserver__ - LB_IPADDR=__lb_ipaddr__ - - mkdir /opt/config - cd /opt - wget http://$WEBSERVER_IP/demo_repo/v_dns_init.sh - chmod +x v_dns_init.sh - echo $WEBSERVER_IP > config/webserver_ip.txt - echo $LB_IPADDR > config/lb_ipaddr.txt - ./v_dns_init.sh - - vdns_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_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_net_id }, "ip_address": { get_param: vdns_private_ip_1 }}] diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json deleted file mode 100644 index 9f51e8314b..0000000000 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/artifacts/vnf-module-artifact.json +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "vfModuleModelName": "VF_RI1_DNS::module-1", - "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f132", - "vfModuleModelVersion": "1.0", - "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-1::module-1.group", - "vfModuleModelDescription": "vf Module Description", - "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f132", - "isBase": true, - "artifacts": [ - "Artifact-UUID1", - "EnvArtifact-UUID1" - ], - "properties": {"test":"test"} - }, - { - "vfModuleModelName": "VF_RI1_DNS::module-2", - "vfModuleModelInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f133", - "vfModuleModelVersion": "1.0", - "vfModuleModelUUID": "1e34774e-715e-4fd5-bd08-7b654622f33e.VF_RI1_DNS::module-2::module-1.group", - "vfModuleModelDescription": "vf Module Description", - "vfModuleModelCustomizationUUID": "585822c7-4027-4f84-ba50-e9248606f133", - "isBase": false, - "artifacts": [ - "Artifact-UUID2", - "EnvArtifact-UUID2" - ], - "properties": {"test":"test"} - } -] \ No newline at end of file diff --git a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json b/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json deleted file mode 100644 index ebda7b7aea..0000000000 --- a/packages/arquillian-unit-tests/src/test/resources/resource-examples/asdc/demo-dns-V1/notif-structure.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "serviceName": "dns-service", - "serviceInvariantUUID": "585822c8-4027-4f84-ba50-e9248606f111", - "serviceUUID": "1e34774e-715e-4fd6-bd09-7b654622f35i", - "serviceVersion": "1.0", - "serviceArtifacts": - [ - - ], - - "resources": - [ - { - "resourceInstanceName": "DNSResource-1", - "resourceInvariantUUID": "585822c7-4027-4f84-ba50-e9248606f112", - "resourceName": "DNSResource", - "resourceType": "VF", - "resourceUUID": "585822c7-4027-4f84-ba50-e9248606f131", - "resourceVersion": "1.0", - "category": "category", - "artifacts": - [ - { - "artifactChecksum": "CheckSum", - "artifactDescription": "Meta data for VFModule", - "artifactName": "vnf-module-artifact.json", - - "artifactType": "VF_MODULES_METADATA", - "artifactURL": "vnf-module-artifact.json", - "artifactUUID": "VfArtifact-UUID1", - "artifactVersion": "1.0" - - }, - { - "artifactChecksum": "CheckSum", - "artifactDescription": "Base VLB Heat", - "artifactName": "base_vlb.yaml", - "artifactTimeout": 300, - "artifactType": "HEAT", - "artifactURL": "base_vlb.yaml", - "artifactUUID": "Artifact-UUID1", - "artifactVersion": "1.0", - "generatedArtifact": "EnvArtifact-UUID1", - "relatedArtifact": - [ - - ] - }, - - { - "artifactChecksum": "CheckSum", - "artifactDescription": "BASE VLB ENV file", - "artifactName": "base_vlb.env", - - "artifactType": "HEAT_ENV", - "artifactURL": "base_vlb.env", - "artifactUUID": "EnvArtifact-UUID1", - "artifactVersion": "1.0" - - }, - { - "artifactChecksum": "CheckSum", - "artifactDescription": "DNS Scaling Heat", - "artifactName": "dnsscaling.yaml", - "artifactTimeout": 300, - "artifactType": "HEAT", - "artifactURL": "dnsscaling.yaml", - "artifactUUID": "Artifact-UUID2", - "artifactVersion": "1.0", - "generatedArtifact": "EnvArtifact-UUID2", - "relatedArtifact": - [ - - ] - }, - - { - "artifactChecksum": "CheckSum", - "artifactDescription": "DNS Scaling ENV file", - "artifactName": "dnsscaling.env", - - "artifactType": "HEAT_ENV", - "artifactURL": "dnsscaling.env", - "artifactUUID": "EnvArtifact-UUID2", - "artifactVersion": "1.0" - - } - - ] - } - ], - - "serviceDescription": "dns service for unit test", - "distributionID": "35120a87-1f83-4276-9735-f6de5a244d61" -} \ No newline at end of file -- cgit 1.2.3-korg