X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Frun.sh;h=5e1eb375e01d4c1ee5bd2edcc60a10a80b1c0a26;hb=b4cd1a4f59d52b6a56fb58bef11624e1cea6c0ef;hp=ffb349a415419c100c3fbedf73ac6b3f5bf228a8;hpb=9171d14463ae1172a91125a49d8f8a53a36433e9;p=doctor.git

diff --git a/tests/run.sh b/tests/run.sh
index ffb349a4..5e1eb375 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -42,15 +42,14 @@ if [[ "$COMPUTE_IP" == "none" ]] ; then
 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 /home/stack/.ssh/id_rsa instack_key
-    if [ ! -r instack_key ]; then
-        sudo chown $(whoami):$(whoami) instack_key
-    fi
+    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 -l heat-admin"
+    ssh_opts_cpu="$ssh_opts -i instack_key"
 }
 
 download_image() {
@@ -139,13 +138,13 @@ inject_failure() {
 dev=$(/usr/sbin/ip route | awk '/^default/{print $5}')
 sleep 1
 echo sudo ip link set $dev down
-sleep 120
+sleep 180
 echo sudo ip link set $dev up
 sleep 1
 END_TXT
     chmod +x disable_network.sh
-    scp $ssh_opts_cpu disable_network.sh "$COMPUTE_IP:"
-    ssh $ssh_opts_cpu "$COMPUTE_IP:" 'nohup ./disable_network.sh > disable_network.log 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() {
@@ -162,10 +161,8 @@ cleanup() {
     stop_monitor
     stop_inspector
     stop_consumer
-    ssh $ssh_opts_cpu $COMPUTE_IP \
-        "[ -e disable_network.log ] && cat disable_network.log"
 
-    nova service-force-down --unset "$COMPUTE_HOST" nova-compute
+    python ./nova_force_down.py "$COMPUTE_HOST" --unset
     sleep 1
     nova delete "$VM_NAME"
     sleep 1
@@ -179,6 +176,8 @@ cleanup() {
     #TODO: add host status check via nova admin api
     echo "waiting disabled compute host back to be enabled..."
     sleep 180
+    ssh $ssh_opts_cpu "heat-admin@$COMPUTE_IP" \
+        "[ -e disable_network.log ] && cat disable_network.log"
 }
 
 
@@ -186,7 +185,7 @@ echo "Note: doctor/tests/run.sh has been executed."
 
 prepare_compute_ssh
 
-trap cleanup ERR
+trap cleanup EXIT
 
 echo "preparing VM image..."
 download_image
@@ -209,6 +208,4 @@ sleep 10
 
 calculate_notification_time
 
-cleanup
-
 echo "done"