Run 'ip' with sudo

[doctor.git] / tests / run.sh

diff --git a/tests/run.sh b/tests/run.sh
index ffb349a..bbe093a 100755 (executable)
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -18,39 +18,54 @@ ALARM_NAME=doctor_alarm1
 INSPECTOR_PORT=12345
 CONSUMER_PORT=12346
 
+SUPPORTED_INSTALLER_TYPES="apex local"
 INSTALLER_TYPE=${INSTALLER_TYPE:-apex}
 INSTALLER_IP=${INSTALLER_IP:-none}
 COMPUTE_HOST=${COMPUTE_HOST:-overcloud-novacompute-0}
 COMPUTE_IP=${COMPUTE_IP:-none}
+COMPUTE_USER=${COMPUTE_USER:-heat-admin}
 ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
-if [[ "$INSTALLER_TYPE" != "apex" ]] ; then
+if [[ ! "$SUPPORTED_INSTALLER_TYPES" =~ "$INSTALLER_TYPE" ]] ; then
     echo "ERROR: INSTALLER_TYPE=$INSTALLER_TYPE is not supported."
     exit 1
 fi
 
-if [[ "$INSTALLER_IP" == "none" ]] ; then
-    instack_mac=$(sudo virsh domiflist instack | awk '/default/{print $5}')
-    INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
-fi
-
-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() {
-    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
+    ssh_opts_cpu="$ssh_opts"
+
+    if [[ "$INSTALLER_TYPE" == "apex" ]] ; then
+        if [[ "$INSTALLER_IP" == "none" ]] ; then
+            instack_mac=$(sudo virsh domiflist instack | awk '/default/{print $5}')
+            INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
+        fi
+
+        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
+
+        # 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+=" -i instack_key"
+    elif [[ "$INSTALLER_TYPE" == "local" ]] ; then
+        if [[ "$COMPUTE_IP" == "none" ]] ; then
+            COMPUTE_IP=$(getent hosts "$COMPUTE_HOST" | awk '{ print $1 }')
+            if [[ -z "$COMPUTE_IP" ]]; then
+                echo "ERROR: Could not resolve $COMPUTE_HOST. Either manually set COMPUTE_IP or enable DNS resolution."
+                exit 1
+            fi
+        fi
+
+        echo "INSTALLER_TYPE set to 'local'. Assuming SSH keys already exchanged with $COMPUTE_HOST"
     fi
-    chmod 400 instack_key
-    ssh_opts_cpu="$ssh_opts -i instack_key -l heat-admin"
+
+    # verify connectivity to target compute host
+    ping -c 1 "$COMPUTE_IP"
 }
 
 download_image() {
@@ -133,27 +148,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 "$COMPUTE_USER@$COMPUTE_IP:"
+    ssh $ssh_opts_cpu "$COMPUTE_USER@$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 +176,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 +191,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 "$COMPUTE_USER@$COMPUTE_IP" \
+        "[ -e disable_network.log ] && cat disable_network.log"
 }
 
 
@@ -186,7 +200,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 +223,4 @@ sleep 10
 
 calculate_notification_time
 
-cleanup
-
 echo "done"