From b9a4fb80d10465e75880efb3160e80146c7d6f47 Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Mon, 28 Nov 2016 21:46:21 -0800 Subject: Add verification of config drive setup. Get key key from ~/vHello/pem. JIRA: MODELS-23 Signed-off-by: Bryan Sullivan The key is not saved in the repo due to security recommendations. This is a kludge that will be removed for Newton (Tacker supports key injection as of Newton). Change-Id: I6a21b189fc7b2b5a960a7acdd4b640148797d738 Signed-off-by: Bryan Sullivan --- tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml | 11 ++++++++++- tests/vHello_Tacker.sh | 7 ++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml b/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml index c70fd25..99b8d9d 100755 --- a/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml +++ b/tests/blueprints/tosca-vnfd-hello-world-tacker/blueprint.yaml @@ -27,8 +27,11 @@ topology_template: config_drive: true user_data_format: RAW user_data: | - #!/bin/sh + #!/bin/bash + set -x + sudo mount /dev/sr0 /mnt/ cd /tmp + id=$(cut -d ',' -f 3 /mnt/openstack/latest/meta_data.json) cat << EOM | sudo tee index.html @@ -42,6 +45,12 @@ topology_template: Hello World!
+
+

Instance ID fom config drive file /mnt/openstack/latest/meta_data.json>

+ 
+          $id
+
+
EOM sudo python3 -m http.server 80 diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh index 41d868d..9643130 100644 --- a/tests/vHello_Tacker.sh +++ b/tests/vHello_Tacker.sh @@ -132,7 +132,7 @@ setup () { if [ ! -f /tmp/xenial-server-cloudimg-amd64-disk1.img ]; then wget -O /tmp/xenial-server-cloudimg-amd64-disk1.img http://artifacts.opnfv.org/models/images/xenial-server-cloudimg-amd64-disk1.img fi - cp blueprints/tosca-vnfd-hello-world-tacker/vHello.pem /tmp/tacker + cp ~/vHello.pem /tmp/tacker chmod 600 /tmp/tacker/vHello.pem echo "$0: setup OpenStack CLI environment" @@ -207,6 +207,11 @@ start() { echo "$0: verify vHello server is running" apt-get install -y curl if [[ $(curl $SERVER_URL | grep -c "Hello World") == 0 ]]; then fail; fi + + echo "$0: verify contents of config drive are included in web page" + id=$(curl $SERVER_URL | awk "/uuid/ { print \$2 }") + if [[ -z "$id" ]]; then fail; fi + } stop() { -- cgit 1.2.3-korg