Update vHello_3Node_Tacker test for Danube

JIRA: MODELS-23

blueprint.yaml:
Add vHello key injection into blueprint for debug.
Fix URL for favicon.
Fix docker install pre-reqs.

vHello_3Node_Tacker.sh:
Fix tests in say_hello.
Correct path to blueprint in copy_blueprint.
Create and inject nova keypair.
Use actual $FLOATING_NETWORK_NAME in floating ip allocation.
Fix use of array variables vdu_ip/id/etc.

Change-Id: Id4a04ecf86d3715d11c65298c22c586e20f78d4c
Signed-off-by: bryan <bryan.sullivan@att.com>

1 files changed, 29 insertions, 15 deletions

diff --git a/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml b/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml
index f6198f1..2210a28 100644
--- a/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml
+++ b/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml
@@ -12,7 +12,7 @@ topology_template:
       artifacts:
         VNFImage:
           type: tosca.artifacts.Deployment.Image.VM
-          file: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+          file: http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
       capabilities:
         nfv_compute:
           properties:
@@ -29,6 +29,10 @@ topology_template:
           set -x
           mkdir /home/ubuntu
           chown -R ubuntu /home/ubuntu
+          mkdir /home/ubuntu/.ssh
+          cat << EOM >/home/ubuntu/.ssh/authorized_keys
+          <pubkey>
+          EOM
           sudo mount /dev/sr0 /mnt/
           mkdir ~/www
           mkdir ~/www/html
@@ -60,13 +64,13 @@ topology_template:
           </div>
           </body></html>
           EOM
-          wget https://git.opnfv.org/cgit/models/plain/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico -O  ~/www/html/favicon.ico
-          sudo apt-get install apt-transport-https ca-certificates
-          sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-          echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
+          wget https://git.opnfv.org/models/plain/tests/blueprints/tosca-vnfd-3node-tacker/favicon.ico -O ~/www/html/favicon.ico
+          sudo apt-get install apt-transport-https ca-certificates curl software-properties-common
+          curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add -
+          sudo apt-key update
+          echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee -a /etc/apt/sources.list.d/docker.list
+          sudo add-apt-repository "deb https://apt.dockerproject.org/repo/ ubuntu-$(lsb_release -cs) main"
           sudo apt-get update
-          sudo apt-get purge lxc-docker
-          sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
           sudo apt-get install -y docker-engine
           sudo docker pull nginx
           cd ~/www
@@ -102,7 +106,7 @@ topology_template:
       artifacts:
         VNFImage:
           type: tosca.artifacts.Deployment.Image.VM
-          file: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+          file: http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
       capabilities:
         nfv_compute:
           properties:
@@ -119,6 +123,10 @@ topology_template:
           set -x
           mkdir /home/ubuntu
           chown -R ubuntu /home/ubuntu
+          mkdir /home/ubuntu/.ssh
+          cat << EOM >/home/ubuntu/.ssh/authorized_keys
+          <pubkey>
+          EOM
           sudo mount /dev/sr0 /mnt/
           mkdir ~/www
           mkdir ~/www/html
@@ -150,13 +158,13 @@ topology_template:
           </div>
           </body></html>
           EOM
-          wget https://git.opnfv.org/cgit/models/plain/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico -O  ~/www/html/favicon.ico
-          sudo apt-get install apt-transport-https ca-certificates
-          sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-          echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
+          wget https://git.opnfv.org/models/plain/tests/blueprints/tosca-vnfd-3node-tacker/favicon.ico -O ~/www/html/favicon.ico
+          sudo apt-get install apt-transport-https ca-certificates curl software-properties-common
+          curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add -
+          sudo apt-key update
+          echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee -a /etc/apt/sources.list.d/docker.list
+          sudo add-apt-repository "deb https://apt.dockerproject.org/repo/ ubuntu-$(lsb_release -cs) main"
           sudo apt-get update
-          sudo apt-get purge lxc-docker
-          sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
           sudo apt-get install -y docker-engine
           sudo docker pull nginx
           cd ~/www
@@ -192,7 +200,7 @@ topology_template:
       artifacts:
         VNFImage:
           type: tosca.artifacts.Deployment.Image.VM
-          file: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
+          file: http://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
       capabilities:
         nfv_compute:
           properties:
@@ -206,6 +214,12 @@ topology_template:
         user_data: |
           #!/bin/bash
           set -x
+          mkdir /home/ubuntu
+          chown -R ubuntu /home/ubuntu
+          mkdir /home/ubuntu/.ssh
+          cat << EOM >/home/ubuntu/.ssh/authorized_keys
+          <pubkey>
+          EOM
           echo "1" | sudo tee /proc/sys/net/ipv4/ip_forward
           sudo sysctl net.ipv4.ip_forward=1
           sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -m state --state NEW -m statistic --mode nth --every 2 --packet 0 -j DNAT --to-destination <vdu1_ip>:80