test: fix bugs (ssh args and force-down in cleanup)

[doctor.git] / tests / run.sh

diff --git a/tests/run.sh b/tests/run.sh
index d6cc3cb..9bd6573 100755 (executable)
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -20,7 +20,8 @@ CONSUMER_PORT=12346
 
 INSTALLER_TYPE=${INSTALLER_TYPE:-apex}
 INSTALLER_IP=${INSTALLER_IP:-none}
-COMPUTE_HOST=${COMPUTE_HOST:-none}
+COMPUTE_HOST=${COMPUTE_HOST:-overcloud-novacompute-0}
+COMPUTE_IP=${COMPUTE_IP:-none}
 ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 if [[ "$INSTALLER_TYPE" != "apex" ]] ; then
@@ -33,13 +34,24 @@ if [[ "$INSTALLER_IP" == "none" ]] ; then
     INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
 fi
 
-if [[ "$COMPUTE_HOST" == "none" ]] ; then
-    COMPUTE_HOST=$(sudo ssh $ssh_opts $INSTALLER_IP \
-                   "source stackrc; \
-                    nova show overcloud-novacompute-0 \
-                    | awk '/ ctlplane network /{print \$5}'")
+if [[ "$COMPUTE_IP" == "none" ]] ; then
+    COMPUTE_IP=$(sudo ssh $ssh_opts $INSTALLER_IP \
+                 "source stackrc; \
+                  nova show $COMPUTE_HOST \
+                  | awk '/ ctlplane network /{print \$5}'")
 fi
 
+prepare_compute_ssh() {
+    # verify connectivity to target compute host
+    ping -c 1 "$COMPUTE_IP"
+
+    # get ssh key from installer node
+    sudo scp $ssh_opts root@"$INSTALLER_IP":/home/stack/.ssh/id_rsa instack_key
+    sudo chown $(whoami):$(whoami) instack_key
+    chmod 400 instack_key
+    ssh_opts_cpu="$ssh_opts -i instack_key"
+}
+
 download_image() {
     [ -e "$IMAGE_FILE" ] && return 0
     wget "$IMAGE_URL" -o "$IMAGE_FILE"
@@ -77,8 +89,8 @@ create_alarm() {
 
 start_monitor() {
     pgrep -f "python monitor.py" && return 0
-    sudo python monitor.py "$COMPUTE_HOST" "http://127.0.0.1:$INSPECTOR_PORT/events" > monitor.log 2>&1 &
-    MONITOR_PID=$!
+    sudo python monitor.py "$COMPUTE_HOST" "$COMPUTE_IP" \
+        "http://127.0.0.1:$INSPECTOR_PORT/events" > monitor.log 2>&1 &
 }
 
 stop_monitor() {
@@ -131,11 +143,8 @@ echo sudo ip link set $dev up
 sleep 1
 END_TXT
     chmod +x disable_network.sh
-    sudo scp $ssh_opts disable_network.sh $INSTALLER_IP:
-    ssh_opts_cpu="$ssh_opts -i /home/stack/.ssh/id_rsa"
-    sudo ssh $ssh_opts $INSTALLER_IP \
-        "scp $ssh_opts_cpu disable_network.sh heat-admin@$COMPUTE_HOST: && \
-         ssh $ssh_opts_cpu 'nohup ./disable_network.sh > c 2>&1 &'"
+    scp $ssh_opts_cpu disable_network.sh "heat-admin@$COMPUTE_IP:"
+    ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" 'nohup ./disable_network.sh > disable_network.log 2>&1 &'
 }
 
 calculate_notification_time() {
@@ -146,21 +155,54 @@ calculate_notification_time() {
         awk '{d = $1 - $2; if (d < 1 ) print d " OK"; else print d " NG"}'
 }
 
+cleanup() {
+    set +e
+    echo "cleanup..."
+    stop_monitor
+    stop_inspector
+    stop_consumer
+    ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" \
+        "[ -e disable_network.log ] && cat disable_network.log"
+
+    python ./clean.py
+    sleep 1
+    nova delete "$VM_NAME"
+    sleep 1
+    alarm_id=$(ceilometer alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
+    sleep 1
+    [ -n "$alarm_id" ] && ceilometer alarm-delete "$alarm_id"
+    sleep 1
+    image_id=$(glance image-list | grep " $IMAGE_NAME " | awk '{print $2}')
+    sleep 1
+    [ -n "$image_id" ] && glance image-delete "$image_id"
+    #TODO: add host status check via nova admin api
+    echo "waiting disabled compute host back to be enabled..."
+    sleep 180
+}
+
+
 echo "Note: doctor/tests/run.sh has been executed."
-exit 0
 
+prepare_compute_ssh
+
+trap cleanup EXIT
+
+echo "preparing VM image..."
 download_image
 register_image
 
+echo "starting doctor sample components..."
 start_monitor
 start_inspector
 start_consumer
 
+echo "creating VM and alarm..."
 boot_vm
 create_alarm
 wait_for_vm_launch
 
 sleep 60
+echo "injecting host failure..."
 inject_failure
 sleep 10