From c8bd42748ea4844cdba35dda7dec2d156f3acc8d Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Thu, 19 Oct 2017 13:43:43 -0400 Subject: Update HEAT templates and add data to robot page Issue: TEST-66 Change-Id: I9f8ce858d0e78791e84ca93be3576de0e3d8e850 Signed-off-by: Jerry Flood --- robot/assets/asdc/base_vfw/base_vfw.yaml | 352 +++++++++++++++---------------- 1 file changed, 168 insertions(+), 184 deletions(-) (limited to 'robot/assets/asdc/base_vfw') diff --git a/robot/assets/asdc/base_vfw/base_vfw.yaml b/robot/assets/asdc/base_vfw/base_vfw.yaml index a7df854a..1c22c9b7 100644 --- a/robot/assets/asdc/base_vfw/base_vfw.yaml +++ b/robot/assets/asdc/base_vfw/base_vfw.yaml @@ -1,6 +1,36 @@ +########################################################################## +# +#==================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 vFirewall demo app for OpenECOMP +description: Heat template that deploys vFirewall demo app for ONAP + +############## +# # +# PARAMETERS # +# # +############## parameters: vfw_image_name: @@ -23,14 +53,14 @@ parameters: type: string label: Protected private network name or ID description: Private network that connects vFirewall with vSink - ecomp_private_net_id: + onap_private_net_id: type: string - label: ECOMP management network name or ID - description: Private network that connects ECOMP component and the VNF - ecomp_private_subnet_id: + label: ONAP management network name or ID + description: Private network that connects ONAP components and the VNF + onap_private_subnet_id: type: string - label: ECOMP management sub-network name or ID - description: Private sub-network that connects ECOMP component and the VNF + 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 @@ -39,9 +69,9 @@ parameters: type: string label: Protected private network CIDR description: The CIDR of the protected private network - ecomp_private_net_cidr: + onap_private_net_cidr: type: string - label: ECOMP private network CIDR + label: ONAP private network CIDR description: The CIDR of the protected private network vfw_private_ip_0: type: string @@ -53,24 +83,24 @@ parameters: 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 ECOMP management network - description: Private IP address that is assigned to the vFirewall to communicate with ECOMP components + 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 ECOMP management network - description: Private IP address that is assigned to the vPacketGenerator to communicate with ECOMP components + 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 ECOMP management network - description: Private IP address that is assigned to the vSink to communicate with ECOMP components + 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 @@ -86,11 +116,11 @@ parameters: vnf_id: type: string label: VNF ID - description: The VNF ID is provided by ECOMP + 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 ECOMP + description: The vFirewall Module ID is provided by ONAP dcae_collector_ip: type: string label: DCAE collector IP address @@ -115,13 +145,26 @@ parameters: 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: @@ -130,12 +173,12 @@ resources: my_keypair: type: OS::Nova::KeyPair properties: - name: + name: str_replace: template: base_rand params: base: { get_param: key_name } - rand: { get_resource: random-str } + rand: { get_resource: random-str } public_key: { get_param: pub_key } save_private_key: false @@ -161,6 +204,26 @@ resources: 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: @@ -183,87 +246,52 @@ resources: __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 - DCAE_COLLECTOR_IP=__dcae_collector_ip__ - DCAE_COLLECTOR_PORT=__dcae_collector_port__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates - apt-get install -y maven - pip install jsonschema - - # Download vFirewall code for virtual firewall + # Create configuration files mkdir /opt/config - mkdir /opt/honeycomb + 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 - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_firewall_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vfirewall.sh + chmod +x v_firewall_install.sh + ./v_firewall_install.sh - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf:sample-distribution:$DEMO_ARTIFACTS_VERSION:tar.gz:hc -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.ves:ves_vfw_reporting:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. - - tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv ves-$DEMO_ARTIFACTS_VERSION VES - tar -zxvf ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vFW - tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz - mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb - sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json - mv VESreporting_vFW /opt/VES/code/evel_training/VESreporting - rm *.tar.gz - chmod +x v_firewall_init.sh - chmod +x vfirewall.sh - echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt - echo $DCAE_COLLECTOR_PORT > config/dcae_collector_port.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - - # Install VPP - export UBUNTU="trusty" - export RELEASE=".stable.1609" - rm /etc/apt/sources.list.d/99fd.io.list - echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list - apt-get update - apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev - sleep 1 - - # Install VES - cd /opt/VES/bldjobs/ - make clean - make - sleep 1 - - # Run instantiation script - cd /opt - mv vfirewall.sh /etc/init.d - update-rc.d vfirewall.sh defaults - ./v_firewall_init.sh - - vfw_private_0_port: + # 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: vfw_private_ip_0 }}] - - vfw_private_1_port: - type: OS::Neutron::Port - properties: - network: { get_resource: protected_private_network } - fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vfw_private_ip_1 }}] + fixed_ips: [{"subnet": { get_resource: unprotected_private_subnet }, "ip_address": { get_param: vpg_private_ip_0 }}] - vfw_private_2_port: + vpg_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}] + 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 @@ -287,75 +315,49 @@ resources: __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 - FW_IPADDR=__fw_ipaddr__ - PROTECTED_NET_CIDR=__protected_net_cidr__ - SINK_IPADDR=__sink_ipaddr__ - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates - apt-get install -y maven - pip install jsonschema - - # Download vFirewall demo code for packet generator + # Create configuration files mkdir /opt/config - mkdir /opt/honeycomb + 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 - - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_packetgen_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vpacketgen.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/run_traffic_fw_demo.sh - - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf:sample-distribution:$DEMO_ARTIFACTS_VERSION:tar.gz:hc -Dtransitive=false -Ddest=. - mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vfw:vfw_pg_streams:$DEMO_ARTIFACTS_VERSION:tar.gz:demo -Dtransitive=false -Ddest=. + chmod +x v_packetgen_install.sh + ./v_packetgen_install.sh - tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz - tar -zxvf vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz - mv vfw_pg_streams-$DEMO_ARTIFACTS_VERSION pg_streams - mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb - sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json - rm *.tar.gz - chmod +x v_packetgen_init.sh - chmod +x vpacketgen.sh - echo $FW_IPADDR > config/fw_ipaddr.txt - echo $PROTECTED_NET_CIDR > config/protected_net_cidr.txt - echo $SINK_IPADDR > config/sink_ipaddr.txt - echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - - # Install VPP - export UBUNTU="trusty" - export RELEASE=".stable.1609" - rm /etc/apt/sources.list.d/99fd.io.list - echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io$RELEASE.ubuntu.$UBUNTU.main/ ./" | sudo tee -a /etc/apt/sources.list.d/99fd.io.list - apt-get update - apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev - sleep 1 - - # Run instantiation script - cd /opt - mv vpacketgen.sh /etc/init.d - update-rc.d vpacketgen.sh defaults - ./v_packetgen_init.sh - - vpg_private_0_port: + # Virtual Sink instantiation + vsn_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 }}] + network: { get_resource: protected_private_network } + fixed_ips: [{"subnet": { get_resource: protected_private_subnet }, "ip_address": { get_param: vsn_private_ip_0 }}] - vpg_private_1_port: + vsn_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_1 }}] + 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 @@ -377,47 +379,29 @@ resources: __unprotected_net__: { get_param: unprotected_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 } + __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 - PROTECTED_NET_GW=__protected_net_gw__ - UNPROTECTED_NET=__unprotected_net__ - UNPROTECTED_NET=$(echo $UNPROTECTED_NET | cut -d'/' -f1) - REPO_URL_BLOB=__repo_url_blob__ - REPO_URL_ARTIFACTS=__repo_url_artifacts__ - DEMO_ARTIFACTS_VERSION=__demo_artifacts_version__ - - # Download required dependencies - add-apt-repository -y ppa:openjdk-r/ppa - apt-get update - apt-get install -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat - - # Configure and run darkstat - sed -i "s/START_DARKSTAT=.*/START_DARKSTAT=yes/g" /etc/darkstat/init.cfg - sed -i "s/INTERFACE=.*/INTERFACE=\"-i eth1\"/g" /etc/darkstat/init.cfg - /etc/init.d/darkstat start - + # 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 - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/v_sink_init.sh - wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$DEMO_ARTIFACTS_VERSION/vsink.sh - chmod +x v_sink_init.sh - chmod +x vsink.sh - echo $PROTECTED_NET_GW > config/protected_net_gw.txt - echo $UNPROTECTED_NET > config/unprotected_net.txt - mv vsink.sh /etc/init.d - update-rc.d vsink.sh defaults - ./v_sink_init.sh - - 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: ecomp_private_net_id } - fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}] + chmod +x v_sink_install.sh + ./v_sink_install.sh \ No newline at end of file -- cgit 1.2.3-korg