shaker-spot uptime add

This PS looks to add an 'uptime' against the shaker-spot VM after
execution finishes, so that further validation can be had on the
VM lasting through reboot tests.

Change-Id: I8e87c8d8daf12399bca7f0f363c1f6da6b4cd175

Author: Dejaeger, Darren (dd118r)

simple-shaker/Dockerfile

@@ -3,7 +3,7 @@ FROM bitnami/minideb:jessie
 LABEL maintainer "Oded Le'Sage <ol7435@att.com>"
 
 RUN apt update && install_packages python-dev wget gcc nano less \
-    iproute2 iperf3 iputils-ping bc jq
+    openssh-client iproute2 iperf3 iputils-ping bc jq
 
 RUN wget --no-check-certificate https://bootstrap.pypa.io/get-pip.py && \
     python get-pip.py

simple-shaker/shaker_spot.sh

@@ -54,17 +54,20 @@ eval "$traceset"
 # delete the stack first in case it exists
 delete_stack
 
+# create the keypair to be used for testing
+ssh-keygen -t rsa -N '' -f shaker_spot_key
+
 # create the stack to be used for testing
-openstack stack create --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
+openstack stack create --parameter "public_key=$(cat shaker_spot_key.pub)" --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
 
 # enable retrying delete/create
 while ! ./validate_spot_stack.sh $stack_name true; do
   delete_stack
-  openstack stack create --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
+  openstack stack create --parameter "public_key=$(cat shaker_spot_key.pub)" --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
 done
 
 # figure out the ip of the target vm
-vm_ip=$(openstack stack show "$stack_name" -f table -c outputs | awk '/output_value/ { print $4 }')
+vm_ip=$(openstack stack output show -f value -c output_value "$stack_name" shaker_spot_ip)
 local_ip="$(ip route get 1 | awk '{print $NF;exit}')"
 
 # clear server_endpoint if set, since this is spot it's not useful
@@ -77,3 +80,6 @@ sed -i 's|SPOT_IP|'"$vm_ip"'|g' "$input_file"
 export SHAKER_SERVER_ENDPOINT="$local_ip:8080"
 
 shaker --config-file "$input_file"
+
+ssh -i shaker_spot_key -o "StrictHostKeyChecking=no" ubuntu@$vm_ip uptime > vm-uptime.txt
+cat vm-uptime.txt || true

simple-shaker/shaker_spot_continuous.sh

@@ -113,17 +113,20 @@ eval "$traceset"
 # delete the stack first in case it exists
 delete_stack
 
+# create the keypair to be used for testing
+ssh-keygen -t rsa -N '' -f shaker_spot_key
+
 # create the stack to be used for testing
-openstack stack create --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
+openstack stack create --parameter "public_key=$(cat shaker_spot_key.pub)" --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
 
 # enable retrying delete/create
 while ! ./validate_spot_stack.sh $stack_name true; do
   delete_stack
-  openstack stack create --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
+  openstack stack create --parameter "public_key=$(cat shaker_spot_key.pub)" --parameter "external_network=$2" --parameter "external_subnet=$3" -t spot_vm.hot $stack_name
 done
 
 # figure out the ip of the target vm
-vm_ip=$(openstack stack show "$stack_name" -f table -c outputs | awk '/output_value/ { print $4 }')
+vm_ip=$(openstack stack output show -f value -c output_value "$stack_name" shaker_spot_ip)
 local_ip="$(ip route get 1 | awk '{print $NF;exit}')"
 
 # clear server_endpoint if set, since this is spot it's not useful
@@ -149,3 +152,6 @@ until [[ -f ./flag.done ]]; do
   shaker --config-file "$input_file" --output data/output-"$block".json --scenario data/ping"$block".yaml
   (( counter++ ))
 done
+
+ssh -i shaker_spot_key -o "StrictHostKeyChecking=no" ubuntu@$vm_ip uptime > vm-uptime.txt
+cat vm-uptime.txt || true

simple-shaker/spot_vm.hot

@@ -12,6 +12,9 @@ parameters:
     type: string
     description: Name of name of the public externally routable subnet
     default: routable-subnet
+  public_key:
+    type: string
+    description: Public key (e.g. ssh-rsa foo..bar)
 
 resources:
   shaker_spot:
@@ -24,6 +27,7 @@ resources:
       flavor: m1.small
       networks:
         - port: { get_resource: routable_port_int }
+      key_name: { get_resource: resiliency_key_pair }
       user_data:
         str_replace:
           template: |
@@ -64,6 +68,12 @@ resources:
       size: 20
       image: shaker-image
 
+  resiliency_key_pair:
+    type: OS::Nova::KeyPair
+    properties:
+      name: resil_key
+      public_key: { get_param: public_key }
+
 outputs:
   shaker_spot_ip:
     value: { get_attr: [ shaker_spot, first_address ] }