X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Frun.sh;h=2c0a76ce455813b316392d9e106de83b0805835e;hb=refs%2Fheads%2Fstable%2Fbrahmaputra;hp=ffb349a415419c100c3fbedf73ac6b3f5bf228a8;hpb=c6324521cc892add33af5543df60ab615f5c8088;p=doctor.git

diff --git a/tests/run.sh b/tests/run.sh
index ffb349a4..2c0a76ce 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() {
@@ -133,27 +132,26 @@ wait_for_vm_launch() {
 }
 
 inject_failure() {
-    echo "disabling network of comupte host [$COMPUTE_HOST] for 3 mins..."
+    echo "disabling network of compute host [$COMPUTE_HOST] for 3 mins..."
     cat > disable_network.sh << 'END_TXT'
 #!/bin/bash -x
-dev=$(/usr/sbin/ip route | awk '/^default/{print $5}')
+dev=$(sudo ip route | awk '/^default/{print $5}')
 sleep 1
-echo sudo ip link set $dev down
-sleep 120
-echo sudo ip link set $dev up
+sudo ip link set $dev down
+sleep 180
+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() {
-    detect=$(grep "doctor monitor detected at" monitor.log | awk '{print $5}')
+    detected=$(grep "doctor monitor detected at" monitor.log | awk '{print $5}')
     notified=$(grep "doctor consumer notified at" consumer.log | awk '{print $5}')
-    duration=$(echo "$notified $detect" | awk '{print $1 - $2 }')
-    echo "$notified $detect" | \
-        awk '{d = $1 - $2; if (d < 1 ) print d " OK"; else print d " NG"}'
+    echo "$notified $detected" | \
+        awk '{d = $1 - $2; if (d < 1 && d > 0) print d " OK"; else print d " NG"}'
 }
 
 cleanup() {
@@ -162,10 +160,10 @@ cleanup() {
     stop_monitor
     stop_inspector
     stop_consumer
-    ssh $ssh_opts_cpu $COMPUTE_IP \
+    ssh $ssh_opts_cpu "heat-admin@$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
@@ -186,7 +184,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 +207,4 @@ sleep 10
 
 calculate_notification_time
 
-cleanup
-
 echo "done"