New HEAT and preload templates

Change-Id: I6314b502e03a9e7ad6693dbf3c3edd9b25590183
Signed-off-by: jf9860 <jf9860@att.com>

2 files changed, 151 insertions, 129 deletions

diff --git a/robot/assets/asdc/base_vlb/base_vlb.yaml b/robot/assets/asdc/base_vlb/base_vlb.yaml
index 5dfc4322..d65846fc 100644
--- a/robot/assets/asdc/base_vlb/base_vlb.yaml
+++ b/robot/assets/asdc/base_vlb/base_vlb.yaml
@@ -67,10 +67,6 @@ parameters:
     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
@@ -87,24 +83,35 @@ parameters:
     type: string
     label: Public key
     description: Public key to be installed on the compute instance
-  repo_user:
-    type: string
-    label: Repository username
-    description: Username to access the repository that hosts the demo packages
-  repo_passwd:
+  repo_url_blob:
     type: string
-    label: Repository password
-    description: Password to access the repository that hosts the demo packages
-  repo_url:
+    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
 
 resources:
+
+  random-str:
+    type: OS::Heat::RandomString
+    properties:
+      length: 4
+  
   my_keypair:
     type: OS::Nova::KeyPair
     properties:
-      name: { get_param: key_name }
+      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
 
@@ -136,77 +143,81 @@ resources:
       user_data:
         str_replace:
           params:
-            __webserver__: { get_param: webserver_ip }
             __dcae_collector_ip__: { get_param: dcae_collector_ip }
             __dcae_collector_port__: { get_param: dcae_collector_port }
             __local_private_ipaddr__: { get_param: vlb_private_ip_0 }
-            __repo_url__ : { get_param: repo_url }
-            __repo_user__ : { get_param: repo_user }
-            __repo_passwd__ : { get_param: repo_passwd }
+            __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
 
-            WEBSERVER_IP=__webserver__
             DCAE_COLLECTOR_IP=__dcae_collector_ip__
             DCAE_COLLECTOR_PORT=__dcae_collector_port__
             LOCAL_PRIVATE_IPADDR=__local_private_ipaddr__
-            REPO_URL=__repo_url__
-            REPO_USER=__repo_user__
-            REPO_PASSWD=__repo_passwd__
+            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
 
-            # Install Nexus certificate
-            echo "$WEBSERVER_IP ecomp-nexus" >> /etc/hosts
-            keytool -printcert -sslserver $WEBSERVER_IP:8443 -rfc > nexus.crt
-            cp nexus.crt /usr/local/share/ca-certificates/
-            update-ca-certificates
-
             # Download vLB demo code for load balancer
             mkdir /opt/config
+            mkdir /opt/FDserver
             cd /opt
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/v_lb_init.sh
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/vlb.sh 
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/vpp.tar.gz
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/DNSManager.tar.gz
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/VESvLB.tar.gz
-            tar -zxvf vpp.tar.gz
-            tar -zxvf DNSManager.tar.gz
-            tar -zxvf VESvLB.tar.gz
+
+            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
+
+            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
-            cd /opt/vpp/build-root/
-            dpkg -i vpp-lib_16.09-3~gc021053_amd64.deb
-            dpkg -i vpp_16.09-3~gc021053_amd64.deb
-            dpkg -i vpp-dbg_16.09-3~gc021053_amd64.deb
-            dpkg -i vpp-dev_16.09-3~gc021053_amd64.deb
-            dpkg -i vpp-dpdk-dev_16.09-3~gc021053_amd64.deb
-            dpkg -i vpp-plugins_16.09-3~gc021053_amd64.deb
-            sleep 1
-
-            # Install Failure Detector
-            cd /opt/DNSManager/src
-            javac -d ../bin/ *.java
-            cd /opt/DNSManager/bin
-            chmod +x dnsmembership.sh
-            chmod +x add_dns.sh
-            chmod +x remove_dns.sh
+            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/VES1.1/bldjobs/
+            cd /opt/VES/bldjobs/
             make clean
             make
             sleep 1
@@ -239,76 +250,75 @@ resources:
       networks:
         - network: { get_param: public_net_id }
         - port: { get_resource: vdns_private_0_port }
+        - 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 }
             __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__ : { get_param: repo_url }
-            __repo_user__ : { get_param: repo_user }
-            __repo_passwd__ : { get_param: repo_passwd }
+            __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
 
-            WEBSERVER_IP=__webserver__
             LB_OAM_INT=__lb_oam_int__
             LB_PRIVATE_IPADDR=__lb_private_ipaddr__
             LOCAL_PRIVATE_IPADDR=__local_private_ipaddr__
-            REPO_URL=__repo_url__
-            REPO_USER=__repo_user__
-            REPO_PASSWD=__repo_passwd__
+            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
 
-            # Install Nexus certificate
-            echo "$WEBSERVER_IP ecomp-nexus" >> /etc/hosts
-            keytool -printcert -sslserver $WEBSERVER_IP:8443 -rfc > nexus.crt
-            cp nexus.crt /usr/local/share/ca-certificates/
-            update-ca-certificates
-
             # Download vDNS demo code for DNS Server
             mkdir /opt/config
+            mkdir /opt/FDclient
             cd /opt
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/v_dns_init.sh
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/vdns.sh
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/DNSClient.tar.gz
-            tar -zxvf DNSClient.tar.gz
-            rm *.tar.gz
+            
+            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 --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/db_dnsdemo_openecomp_org
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/named.conf.options
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/named.conf.local
+            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
-            cp /opt/config/db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org
-            cp /opt/config/named.conf.local /etc/bind/
-            sleep 1
-
-            # Start Failure Detector
-            cd /opt/DNSClient/src
-            javac -d ../bin/ *.java
-            cd /opt/DNSClient/bin
-            chmod +x dnsclient.sh
-            chmod +x set_gre_tunnel.sh
+            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
diff --git a/robot/assets/asdc/base_vlb/dnsscaling.yaml b/robot/assets/asdc/base_vlb/dnsscaling.yaml
index 8f177231..003deb91 100644
--- a/robot/assets/asdc/base_vlb/dnsscaling.yaml
+++ b/robot/assets/asdc/base_vlb/dnsscaling.yaml
@@ -55,10 +55,6 @@ parameters:
     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
   key_name:
     type: string
     label: Key pair name
@@ -67,27 +63,45 @@ parameters:
     type: string
     label: Public key
     description: Public key to be installed on the compute instance
-  repo_user:
-    type: string
-    label: Repository username
-    description: Username to access the repository that hosts the demo packages
-  repo_passwd:
+  repo_url_blob:
     type: string
-    label: Repository password
-    description: Password to access the repository that hosts the demo packages
-  repo_url:
+    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
 
 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_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_param: key_name }
+      key_name: { get_resource: my_keypair }
       networks:
         - network: { get_param: public_net_id }
         - port: { get_resource: vdns_private_0_port }
@@ -97,70 +111,68 @@ resources:
       user_data:
         str_replace:
           params:
-            __webserver__: { get_param: webserver_ip }
             __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__ : { get_param: repo_url }
-            __repo_user__ : { get_param: repo_user }
-            __repo_passwd__ : { get_param: repo_passwd }
+            __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
 
-            WEBSERVER_IP=__webserver__
             LB_OAM_INT=__lb_oam_int__
             LB_PRIVATE_IPADDR=__lb_private_ipaddr__
             LOCAL_PRIVATE_IPADDR=__local_private_ipaddr__
-            REPO_URL=__repo_url__
-            REPO_USER=__repo_user__
-            REPO_PASSWD=__repo_passwd__
+            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
 
-            # Install Nexus certificate
-            echo "$WEBSERVER_IP ecomp-nexus" >> /etc/hosts
-            keytool -printcert -sslserver $WEBSERVER_IP:8443 -rfc > nexus.crt
-            cp nexus.crt /usr/local/share/ca-certificates/
-            update-ca-certificates
-
             # Download vDNS demo code for DNS Server
             mkdir /opt/config
+            mkdir /opt/FDclient
             cd /opt
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/v_dns_init.sh
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/vdns.sh
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/DNSClient.tar.gz
-            tar -zxvf DNSClient.tar.gz
-            rm *.tar.gz
+
+            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 --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/db_dnsdemo_openecomp_org
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/named.conf.options
-            wget --user=$REPO_USER --password=$REPO_PASSWD $REPO_URL/named.conf.local
+            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
-            cp /opt/config/db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org
-            cp /opt/config/named.conf.local /etc/bind/
-            sleep 1
-
-            # Start Failure Detector
-            cd /opt/DNSClient/src
-            javac -d ../bin/ *.java
-            cd /opt/DNSClient/bin
-            chmod +x dnsclient.sh
-            chmod +x set_gre_tunnel.sh
+            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