diff options
Diffstat (limited to 'robot/assets/asdc/base_vlb')
| -rw-r--r-- | robot/assets/asdc/base_vlb/base_vlb.yaml | 413 | ||||
| -rw-r--r-- | robot/assets/asdc/base_vlb/dnsscaling.yaml | 190 |
2 files changed, 249 insertions, 354 deletions
diff --git a/robot/assets/asdc/base_vlb/base_vlb.yaml b/robot/assets/asdc/base_vlb/base_vlb.yaml index fa4fea0a..c292f295 100644 --- a/robot/assets/asdc/base_vlb/base_vlb.yaml +++ b/robot/assets/asdc/base_vlb/base_vlb.yaml @@ -1,36 +1,6 @@ -########################################################################## -# -#==================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 vLoadBalancer/vDNS demo app for ONAP - -############## -# # -# PARAMETERS # -# # -############## +description: Heat template to deploy vLoadBalancer/vDNS demo app for OpenECOMP parameters: vlb_image_name: @@ -49,29 +19,21 @@ parameters: 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: + ecomp_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: + description: Private network that connects ECOMP component and the VNF + ecomp_private_subnet_id: type: string label: ECOMP management sub-network name or ID - description: Private sub-network that connects ONAP component and the VNF + description: Private sub-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 - pktgen_private_net_cidr: + ecomp_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 + label: ECOMP private network CIDR description: The CIDR of the protected private network vlb_private_ip_0: type: string @@ -79,40 +41,16 @@ parameters: 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 + 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 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 + 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 @@ -121,18 +59,14 @@ parameters: 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 + 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 ONAP + description: The vLoadBalancer Module ID is provided by ECOMP dcae_collector_ip: type: string label: DCAE collector IP address @@ -161,20 +95,6 @@ parameters: 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: @@ -182,7 +102,7 @@ resources: type: OS::Heat::RandomString properties: length: 4 - + my_keypair: type: OS::Nova::KeyPair properties: @@ -207,36 +127,6 @@ resources: 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: @@ -248,7 +138,6 @@ resources: - 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: @@ -256,62 +145,100 @@ resources: 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 } + __local_private_ipaddr__: { get_param: vlb_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 } template: | #!/bin/bash - # Create configuration files + DCAE_COLLECTOR_IP=__dcae_collector_ip__ + DCAE_COLLECTOR_PORT=__dcae_collector_port__ + LOCAL_PRIVATE_IPADDR=__local_private_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 gcc wget openjdk-8-jdk bridge-utils libcurl4-openssl-dev apt-transport-https ca-certificates + apt-get install -y maven + sleep 1 + + # Download vLB demo code for load balancer 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 + mkdir /opt/FDserver cd /opt - chmod +x v_lb_install.sh - ./v_lb_install.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/v_lb_init.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/vlb.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/dnsmembership.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/add_dns.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/remove_dns.sh - vdns_private_0_port: + mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vlb:dns-manager:$DEMO_ARTIFACTS_VERSION:jar -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_vlb_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_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz + mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB + + mv VESreporting_vLB /opt/VES/code/evel_training/VESreporting + mv dns-manager-$DEMO_ARTIFACTS_VERSION.jar /opt/FDserver/dns-manager-$DEMO_ARTIFACTS_VERSION.jar + mv dnsmembership.sh /opt/FDserver/dnsmembership.sh + mv add_dns.sh /opt/FDserver/add_dns.sh + mv remove_dns.sh /opt/FDserver/remove_dns.sh + rm *.tar.gz + + chmod +x v_lb_init.sh + chmod +x vlb.sh + chmod +x /opt/VES/code/evel_training/VESreporting/go-client.sh + chmod +x /opt/FDserver/dnsmembership.sh + chmod +x /opt/FDserver/add_dns.sh + chmod +x /opt/FDserver/remove_dns.sh + + echo $DCAE_COLLECTOR_IP > config/dcae_collector_ip.txt + echo $DCAE_COLLECTOR_PORT > config/dcae_collector_port.txt + echo $LOCAL_PRIVATE_IPADDR > config/local_private_ipaddr.txt + LOCAL_PUBLIC_IPADDR=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) + echo $LOCAL_PUBLIC_IPADDR > config/local_public_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 + + # Install VES + cd /opt/VES/bldjobs/ + make clean + make + sleep 1 + + # Run instantiation script + cd /opt + mv vlb.sh /etc/init.d + update-rc.d vlb.sh defaults + ./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: vdns_private_ip_0 }}] + fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}] - vdns_private_1_port: + 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: vdns_private_ip_1 }}] + network: { get_param: ecomp_private_net_id } + fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}] vdns_0: type: OS::Nova::Server @@ -329,100 +256,84 @@ resources: user_data: str_replace: params: - __lb_oam_int__: { get_param: vlb_private_ip_1 } + __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 } + __repo_url_blob__ : { get_param: repo_url_blob } + __repo_url_artifacts__ : { get_param: repo_url_artifacts } + __demo_artifacts_version__ : { get_param: demo_artifacts_version } template: | #!/bin/bash - # Create configuration files + LB_OAM_INT=__lb_oam_int__ + LB_PRIVATE_IPADDR=__lb_private_ipaddr__ + LOCAL_PRIVATE_IPADDR=__local_private_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 wget openjdk-8-jdk bind9 bind9utils bind9-doc apt-transport-https ca-certificates + apt-get install -y maven + sleep 1 + + # Download vDNS demo code for DNS Server 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 + mkdir /opt/FDclient cd /opt - chmod +x v_dns_install.sh - ./v_dns_install.sh + + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/v_dns_init.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/vdns.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/dnsclient.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/set_gre_tunnel.sh + + mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vlb:dns-client:$DEMO_ARTIFACTS_VERSION:jar -Dtransitive=false -Ddest=. + mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/ + mv dnsclient.sh /opt/FDclient/ + mv set_gre_tunnel.sh /opt/FDclient/ - 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 }}] + chmod +x v_dns_init.sh + chmod +x vdns.sh + chmod +x /opt/FDclient/dnsclient.sh + chmod +x /opt/FDclient/set_gre_tunnel.sh + + echo $LB_OAM_INT > config/lb_oam_int.txt + echo $LB_PRIVATE_IPADDR > config/lb_private_ipaddr.txt + echo $LOCAL_PRIVATE_IPADDR > config/local_private_ipaddr.txt + echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt - vpg_private_1_port: + # Download Bind config files + cd /opt/config + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/db_dnsdemo_openecomp_org + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.options + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.local + + # Configure Bind + modprobe ip_gre + mkdir /etc/bind/zones + sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9 + mv db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org + mv named.conf.options /etc/bind/ + mv named.conf.local /etc/bind/ + sleep 1 + + # Run instantiation script + cd /opt + mv vdns.sh /etc/init.d + update-rc.d vdns.sh defaults + ./v_dns_init.sh + + vdns_private_0_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 }}] + network: { get_resource: vlb_private_network } + fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}] - vpg_0: - type: OS::Nova::Server + vdns_private_1_port: + type: OS::Neutron::Port 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 + network: { get_param: ecomp_private_net_id } + fixed_ips: [{"subnet": { get_param: ecomp_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] diff --git a/robot/assets/asdc/base_vlb/dnsscaling.yaml b/robot/assets/asdc/base_vlb/dnsscaling.yaml index 20718276..003deb91 100644 --- a/robot/assets/asdc/base_vlb/dnsscaling.yaml +++ b/robot/assets/asdc/base_vlb/dnsscaling.yaml @@ -1,36 +1,6 @@ -########################################################################## -# -#==================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 a vDNS for ONAP (scaling-up scenario) - -############## -# # -# PARAMETERS # -# # -############## +description: Heat template to deploy a vDNS for OpenECOMP (scaling-up scenario) parameters: vlb_image_name: @@ -49,38 +19,30 @@ parameters: 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: + ecomp_private_net_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: + label: ECOMP management network name or ID + description: Private network that connects ECOMP component and the VNF + ecomp_private_subnet_id: 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 + label: ECOMP management sub-network name or ID + description: Private sub-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 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 + 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 ONAP management network - description: Private IP address that is assigned to the vDNS to communicate with ONAP components + 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 vdns_name_0: type: string label: vDNS name @@ -88,11 +50,11 @@ parameters: vnf_id: type: string label: VNF ID - description: The VNF ID is provided by ONAP + 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 ONAP + description: The vLoadBalancer Module ID is provided by ECOMP key_name: type: string label: Key pair name @@ -109,24 +71,10 @@ 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: @@ -147,18 +95,6 @@ resources: public_key: { get_param: pub_key } save_private_key: false - 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: 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: @@ -175,36 +111,84 @@ resources: user_data: str_replace: params: - __lb_oam_int__: { get_param: vlb_private_ip_1 } + __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 } + __repo_url_blob__ : { get_param: repo_url_blob } + __repo_url_artifacts__ : { get_param: repo_url_artifacts } + __demo_artifacts_version__ : { get_param: demo_artifacts_version } template: | #!/bin/bash - # Create configuration files + LB_OAM_INT=__lb_oam_int__ + LB_PRIVATE_IPADDR=__lb_private_ipaddr__ + LOCAL_PRIVATE_IPADDR=__local_private_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 wget openjdk-8-jdk bind9 bind9utils bind9-doc apt-transport-https ca-certificates + apt-get install -y maven + sleep 1 + + # Download vDNS demo code for DNS Server 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 + mkdir /opt/FDclient cd /opt - chmod +x v_dns_install.sh - ./v_dns_install.sh
\ No newline at end of file + + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/v_dns_init.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/vdns.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/dnsclient.sh + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/set_gre_tunnel.sh + + mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DremoteRepositories=$REPO_URL_ARTIFACTS -Dartifact=org.openecomp.demo.vnf.vlb:dns-client:$DEMO_ARTIFACTS_VERSION:jar -Dtransitive=false -Ddest=. + + mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/ + mv dnsclient.sh /opt/FDclient/ + mv set_gre_tunnel.sh /opt/FDclient/ + + chmod +x v_dns_init.sh + chmod +x vdns.sh + chmod +x /opt/FDclient/dnsclient.sh + chmod +x /opt/FDclient/set_gre_tunnel.sh + + echo $LB_OAM_INT > config/lb_oam_int.txt + echo $LB_PRIVATE_IPADDR > config/lb_private_ipaddr.txt + echo $LOCAL_PRIVATE_IPADDR > config/local_private_ipaddr.txt + echo $DEMO_ARTIFACTS_VERSION > config/artifacts_version.txt + + # Download Bind config files + cd /opt/config + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/db_dnsdemo_openecomp_org + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.options + wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$DEMO_ARTIFACTS_VERSION/named.conf.local + + # Configure Bind + modprobe ip_gre + mkdir /etc/bind/zones + sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9 + mv db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org + mv named.conf.options /etc/bind/ + mv named.conf.local /etc/bind/ + sleep 1 + + # Run instantiation script + cd /opt + mv vdns.sh /etc/init.d + update-rc.d vdns.sh defaults + ./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_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] |