Update HEAT templates and add data to robot page
Issue: TEST-66
Change-Id: I9f8ce858d0e78791e84ca93be3576de0e3d8e850
Signed-off-by: Jerry Flood <jf9860@att.com>
diff --git a/robot/assets/asdc/base_vlb/dnsscaling.yaml b/robot/assets/asdc/base_vlb/dnsscaling.yaml
index 003deb9..856df1a 100644
--- a/robot/assets/asdc/base_vlb/dnsscaling.yaml
+++ b/robot/assets/asdc/base_vlb/dnsscaling.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 a vDNS for OpenECOMP (scaling-up scenario)
+description: Heat template to deploy a vDNS for ONAP (scaling-up scenario)
+
+##############
+# #
+# PARAMETERS #
+# #
+##############
parameters:
vlb_image_name:
@@ -19,30 +49,38 @@
type: string
label: vLoadBalancer private network name or ID
description: Private network that connects vLoadBalancer with vDNSs
- 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 component 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 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 ECOMP management network
- description: Private IP address that is assigned to the vLoadBalancer to communicate with ECOMP components
+ 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 ECOMP management network
- description: Private IP address that is assigned to the vDNS to communicate with ECOMP components
+ 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
@@ -50,11 +88,11 @@
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 vLoadBalancer Module ID is provided by ECOMP
+ description: The vLoadBalancer Module ID is provided by ONAP
key_name:
type: string
label: Key pair name
@@ -71,10 +109,24 @@
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:
@@ -95,7 +147,19 @@
public_key: { get_param: pub_key }
save_private_key: false
- vdns_0:
+ 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 }
@@ -104,91 +168,43 @@
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 }
+ - 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_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 }
- __repo_url_blob__ : { get_param: repo_url_blob }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
+ __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
- 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
+ # Create configuration files
mkdir /opt/config
- mkdir /opt/FDclient
+ 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
-
- 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 }}]
+ chmod +x v_dns_install.sh
+ ./v_dns_install.sh
\ No newline at end of file