X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Frun.sh;h=34a52878d5670b8fe455912b37f0dd17f447fc16;hb=6442090131eb020d3caba0ac26fedcf13fee9c9a;hp=965f978675a36570753801d7bcb320385ace3d38;hpb=1f2f6c3c33b74ca81eaeecba969720c85aad107d;p=doctor.git

diff --git a/tests/run.sh b/tests/run.sh
index 965f9786..34a52878 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -8,133 +8,94 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+# Configuration
+
 [[ "${CI_DEBUG:-true}" == [Tt]rue ]] && set -x
 
 IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img
-IMAGE_NAME=cirros
+#if an existing image name is provided in the enviroment, use that one
+IMAGE_NAME=${IMAGE_NAME:-cirros}
 IMAGE_FILE="${IMAGE_NAME}.img"
 IMAGE_FORMAT=qcow2
-VM_NAME=doctor_vm1
+VM_BASENAME=doctor_vm
 VM_FLAVOR=m1.tiny
-ALARM_NAME=doctor_alarm1
-INSPECTOR_PORT=12345
+#if VM_COUNT set, use that instead
+VM_COUNT=${VM_COUNT:-1}
+NET_NAME=doctor_net
+NET_CIDR=192.168.168.0/24
+ALARM_BASENAME=doctor_alarm
 CONSUMER_PORT=12346
 DOCTOR_USER=doctor
 DOCTOR_PW=doctor
 DOCTOR_PROJECT=doctor
-#TODO: change back to `_member_` when JIRA DOCTOR-55 is done
-DOCTOR_ROLE=admin
-
-SUPPORTED_INSTALLER_TYPES="apex fuel local"
-INSTALLER_TYPE=${INSTALLER_TYPE:-local}
-INSTALLER_IP=${INSTALLER_IP:-none}
+DOCTOR_ROLE=_member_
+PROFILER_TYPE=${PROFILER_TYPE:-none}
 
-SUPPORTED_INSPECTOR_TYPES="sample congress"
-INSPECTOR_TYPE=${INSPECTOR_TYPE:-sample}
+TOP_DIR=$(cd $(dirname "$0") && pwd)
 
-ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 as_doctor_user="--os-username $DOCTOR_USER --os-password $DOCTOR_PW
-                --os-tenant-name $DOCTOR_PROJECT"
+                --os-project-name $DOCTOR_PROJECT --os-tenant-name $DOCTOR_PROJECT"
+# NOTE: ceilometer command still requires '--os-tenant-name'.
+#ceilometer="ceilometer ${as_doctor_user/--os-project-name/--os-tenant-name}"
+ceilometer="ceilometer $as_doctor_user"
+as_admin_user="--os-username admin --os-project-name $DOCTOR_PROJECT
+               --os-tenant-name $DOCTOR_PROJECT"
 
-if [[ ! "$SUPPORTED_INSTALLER_TYPES" =~ "$INSTALLER_TYPE" ]] ; then
-    echo "ERROR: INSTALLER_TYPE=$INSTALLER_TYPE is not supported."
-    exit 1
-fi
 
-if [[ ! "$SUPPORTED_INSPECTOR_TYPES" =~ "$INSPECTOR_TYPE" ]] ; then
-    echo "ERROR: INSPECTOR_TYPE=$INSPECTOR_TYPE is not supported."
-    exit 1
-fi
+# Functions
 
 get_compute_host_info() {
-    # get computer host info which VM boot in
-    COMPUTE_HOST=$(openstack $as_doctor_user server show $VM_NAME |
+    # get computer host info which first VM boot in as admin user
+    COMPUTE_HOST=$(openstack $as_admin_user server show ${VM_BASENAME}1 |
                    grep "OS-EXT-SRV-ATTR:host" | awk '{ print $4 }')
     compute_host_in_undercloud=${COMPUTE_HOST%%.*}
-    if [[ -z "$COMPUTE_HOST" ]] ; then
-        echo "ERROR: failed to get compute hostname"
-        exit 1
-    fi
+    die_if_not_set $LINENO COMPUTE_HOST "Failed to get compute hostname"
 
-    if [[ "$INSTALLER_TYPE" == "apex" ]] ; then
-        COMPUTE_USER=${COMPUTE_USER:-heat-admin}
-        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
-        COMPUTE_IP=$(sudo ssh $ssh_opts $INSTALLER_IP \
-             "source stackrc; \
-             nova show $compute_host_in_undercloud \
-             | awk '/ ctlplane network /{print \$5}'")
-    elif [[ "$INSTALLER_TYPE" == "fuel" ]] ; then
-        COMPUTE_USER=${COMPUTE_USER:-root}
-        if [[ "$INSTALLER_IP" == "none" ]] ; then
-            instack_mac=$(sudo virsh domiflist fuel-opnfv | awk '/pxebr/{print $5}')
-            INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
-        fi
-        node_id=$(echo $compute_host_in_undercloud | cut -d "-" -f 2)
-        COMPUTE_IP=$(sshpass -p r00tme ssh 2>/dev/null $ssh_opts root@${INSTALLER_IP} \
-             "fuel node|awk -F '|' -v id=$node_id '{if (\$1 == id) print \$5}' |xargs")
-    elif [[ "$INSTALLER_TYPE" == "local" ]] ; then
-        COMPUTE_USER=${COMPUTE_USER:-$(whoami)}
-        COMPUTE_IP=$(getent hosts "$COMPUTE_HOST" | awk '{ print $1 }')
-    fi
+    get_compute_ip_from_hostname $COMPUTE_HOST
 
-    if [[ -z "$COMPUTE_IP" ]]; then
-        echo "ERROR: Could not resolve $COMPUTE_HOST. Either manually set COMPUTE_IP or enable DNS resolution."
-        exit 1
-    fi
     echo "COMPUTE_HOST=$COMPUTE_HOST"
     echo "COMPUTE_IP=$COMPUTE_IP"
 
     # verify connectivity to target compute host
     ping -c 1 "$COMPUTE_IP"
     if [[ $? -ne 0 ]] ; then
-        echo "ERROR: can not ping to computer host"
-        exit 1
-    fi
-}
-
-prepare_compute_ssh() {
-    ssh_opts_cpu="$ssh_opts"
-
-    # get ssh key from installer node
-    if [[ "$INSTALLER_TYPE" == "apex" ]] ; then
-        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" == "fuel" ]] ; then
-        sshpass -p r00tme scp $ssh_opts root@${INSTALLER_IP}:.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
-        echo "INSTALLER_TYPE set to 'local'. Assuming SSH keys already exchanged with $COMPUTE_HOST"
+        die $LINENO "Can not ping to computer host"
     fi
 
     # verify ssh to target compute host
     ssh $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP" 'exit'
     if [[ $? -ne 0 ]] ; then
-        echo "ERROR: can not ssh to computer host"
-        exit 1
+        die $LINENO "Can not ssh to computer host"
     fi
 }
 
-get_consumer_ip() {
-    CONSUMER_IP=$(sudo ssh $ssh_opts root@$INSTALLER_IP \
-                  "ip route get $COMPUTE_IP | awk '/ src /{print \$NF}'")
+# TODO(r-mibu): update this function to support consumer instance
+#               and migrate this function into installer lib
+get_consumer_ip___to_be_removed() {
+    local get_consumer_command="ip route get $COMPUTE_IP | awk '/ src /{print \$NF}'"
+    if is_installer apex; then
+        CONSUMER_IP=$(sudo ssh $ssh_opts root@$INSTALLER_IP \
+                      "$get_consumer_command")
+    elif is_installer fuel; then
+        CONSUMER_IP=$(sudo sshpass -p r00tme ssh $ssh_opts root@${INSTALLER_IP} \
+                      "$get_consumer_command")
+    elif is_installer local; then
+        CONSUMER_IP=`$get_consumer_command`
+    fi
     echo "CONSUMER_IP=$CONSUMER_IP"
 
-    if [[ -z "$CONSUMER_IP" ]]; then
-        echo "ERROR: Could not get CONSUMER_IP."
-        exit 1
-    fi
+    die_if_not_set $LINENO CONSUMER_IP "Could not get CONSUMER_IP."
 }
 
 download_image() {
-    [ -e "$IMAGE_FILE" ] && return 0
-    wget "$IMAGE_URL" -o "$IMAGE_FILE"
+    #if a different name was provided for the image in the enviroment there's no need to download the image
+    use_existing_image=false
+    openstack image list | grep -q " $IMAGE_NAME " && use_existing_image=true
+
+    if [[ "$use_existing_image" == false ]] ; then
+        [ -e "$IMAGE_FILE" ] && return 0
+        wget "$IMAGE_URL" -o "$IMAGE_FILE"
+    fi
 }
 
 register_image() {
@@ -148,132 +109,117 @@ register_image() {
 
 create_test_user() {
     openstack project list | grep -q " $DOCTOR_PROJECT " || {
-        openstack project create "$DOCTOR_PROJECT"
+        openstack project create --description "Doctor Project" \
+                                 "$DOCTOR_PROJECT"
     }
     openstack user list | grep -q " $DOCTOR_USER " || {
         openstack user create "$DOCTOR_USER" --password "$DOCTOR_PW" \
                               --project "$DOCTOR_PROJECT"
     }
-    openstack user role list "$DOCTOR_USER" --project "$DOCTOR_PROJECT" \
-    | grep -q " $DOCTOR_ROLE " || {
+    openstack role show "$DOCTOR_ROLE" | grep -q " $DOCTOR_ROLE " || {
+        openstack role create "$DOCTOR_ROLE"
+    }
+    openstack role assignment list --user "$DOCTOR_USER" \
+    --project "$DOCTOR_PROJECT" --names | grep -q " $DOCTOR_ROLE " || {
         openstack role add "$DOCTOR_ROLE" --user "$DOCTOR_USER" \
                            --project "$DOCTOR_PROJECT"
     }
+    openstack role assignment list --user admin --project "$DOCTOR_PROJECT" \
+    --names | grep -q " admin " || {
+        openstack role add admin --user admin --project "$DOCTOR_PROJECT"
+    }
+    # tojuvone: openstack quota show is broken and have to use nova
+    # https://bugs.launchpad.net/manila/+bug/1652118
+    # Note! while it is encouraged to use openstack client it has proven
+    # quite buggy.
+    # QUOTA=$(openstack quota show $DOCTOR_PROJECT)
+    DOCTOR_QUOTA=$(nova quota-show --tenant $DOCTOR_PROJECT)
+    # We make sure that quota allows number of instances and cores
+    OLD_INSTANCE_QUOTA=$(echo "${DOCTOR_QUOTA}" | grep " instances " | \
+                         awk '{print $4}')
+    if [ $OLD_INSTANCE_QUOTA -lt $VM_COUNT ]; then
+        openstack quota set --instances $VM_COUNT \
+                  $DOCTOR_USER
+    fi
+    OLD_CORES_QUOTA=$(echo "${DOCTOR_QUOTA}" | grep " cores " | \
+                      awk '{print $4}')
+    if [ $OLD_CORES_QUOTA -lt $VM_COUNT ]; then
+        openstack quota set --cores $VM_COUNT \
+                  $DOCTOR_USER
+    fi
+}
+
+remove_test_user() {
+    openstack project list | grep -q " $DOCTOR_PROJECT " && {
+        openstack role assignment list --user admin \
+        --project "$DOCTOR_PROJECT" --names | grep -q " admin " && {
+            openstack role remove admin --user admin --project "$DOCTOR_PROJECT"
+        }
+        openstack user list | grep -q " $DOCTOR_USER " && {
+            openstack role assignment list --user "$DOCTOR_USER" \
+            --project "$DOCTOR_PROJECT" --names | grep -q " $DOCTOR_ROLE " && {
+                openstack role remove "$DOCTOR_ROLE" --user "$DOCTOR_USER" \
+                --project "$DOCTOR_PROJECT"
+            }
+            openstack user delete "$DOCTOR_USER"
+        }
+        openstack project delete "$DOCTOR_PROJECT"
+    }
 }
 
 boot_vm() {
     # test VM done with test user, so can test non-admin
-    openstack $as_doctor_user server list | grep -q " $VM_NAME " && return 0
-    openstack $as_doctor_user server create --flavor "$VM_FLAVOR" \
-                            --image "$IMAGE_NAME" \
-                            "$VM_NAME"
+
+    if ! openstack $as_doctor_user network show $NET_NAME; then
+        openstack $as_doctor_user network create $NET_NAME
+    fi
+    if ! openstack $as_doctor_user subnet show $NET_NAME; then
+        openstack $as_doctor_user subnet create $NET_NAME \
+            --network $NET_NAME --subnet-range $NET_CIDR --no-dhcp
+    fi
+    net_id=$(openstack $as_doctor_user network show $NET_NAME -f value -c id)
+
+    servers=$(openstack $as_doctor_user server list)
+    for i in `seq $VM_COUNT`; do
+        echo "${servers}" | grep -q " $VM_BASENAME$i " && continue
+        openstack $as_doctor_user server create --flavor "$VM_FLAVOR" \
+            --image "$IMAGE_NAME" --nic net-id=$net_id "$VM_BASENAME$i"
+    done
     sleep 1
 }
 
 create_alarm() {
     # get vm_id as test user
-    ceilometer $as_doctor_user alarm-list | grep -q " $ALARM_NAME " && return 0
-    vm_id=$(openstack $as_doctor_user server list | grep " $VM_NAME " | awk '{print $2}')
-    # TODO(r-mibu): change notification endpoint from localhost to the consumer
-    # IP address (functest container).
-    ceilometer $as_doctor_user alarm-event-create --name "$ALARM_NAME" \
-        --alarm-action "http://localhost:$CONSUMER_PORT/failure" \
-        --description "VM failure" \
-        --enabled True \
-        --repeat-actions False \
-        --severity "moderate" \
-        --event-type compute.instance.update \
-        -q "traits.state=string::error; traits.instance_id=string::$vm_id"
-}
-
-print_log() {
-    log_file=$1
-    echo "$log_file:"
-    sed -e 's/^/    /' "$log_file"
+    alarm_list=$($ceilometer alarm-list)
+    vms=$(openstack $as_doctor_user server list)
+    for i in `seq $VM_COUNT`; do
+        echo "${alarm_list}" | grep -q " $ALARM_BASENAME$i " || {
+            vm_id=$(echo "${vms}" | grep " $VM_BASENAME$i " | awk '{print $2}')
+            # TODO(r-mibu): change notification endpoint from localhost to the
+            # consumer. IP address (functest container).
+            $ceilometer alarm-event-create \
+                       --name "$ALARM_BASENAME$i" \
+                       --alarm-action "http://localhost:$CONSUMER_PORT/failure" \
+                       --description "VM failure" \
+                       --enabled True \
+                       --repeat-actions False \
+                       --severity "moderate" \
+                       --event-type compute.instance.update \
+                       -q "traits.state=string::error; \
+                       traits.instance_id=string::$vm_id"
+            }
+     done
 }
 
 start_monitor() {
     pgrep -f "python monitor.py" && return 0
     sudo -E python monitor.py "$COMPUTE_HOST" "$COMPUTE_IP" "$INSPECTOR_TYPE" \
-        "http://127.0.0.1:$INSPECTOR_PORT/events" > monitor.log 2>&1 &
+        > monitor.log 2>&1 &
 }
 
 stop_monitor() {
     pgrep -f "python monitor.py" || return 0
     sudo kill $(pgrep -f "python monitor.py")
-    print_log monitor.log
-}
-
-congress_add_rule() {
-    name=$1
-    policy=$2
-    rule=$3
-
-    if ! openstack congress policy rule list $policy | grep -q -e "// Name: $name$" ; then
-        openstack congress policy rule create --name $name $policy "$rule"
-    fi
-}
-
-congress_del_rule() {
-    name=$1
-    policy=$2
-
-    if openstack congress policy rule list $policy | grep -q -e "^// Name: $name$" ; then
-        openstack congress policy rule delete $policy $name
-    fi
-}
-
-congress_setup_rules() {
-    congress_add_rule host_down classification \
-        'host_down(host) :-
-            doctor:events(hostname=host, type="compute.host.down", status="down")'
-
-    congress_add_rule active_instance_in_host classification \
-        'active_instance_in_host(vmid, host) :-
-            nova:servers(id=vmid, host_name=host, status="ACTIVE")'
-
-    congress_add_rule host_force_down classification \
-        'execute[nova:services.force_down(host, "nova-compute", "True")] :-
-            host_down(host)'
-
-    congress_add_rule error_vm_states classification \
-        'execute[nova:servers.reset_state(vmid, "error")] :-
-            host_down(host),
-            active_instance_in_host(vmid, host)'
-}
-
-start_inspector() {
-    if [[ "$INSPECTOR_TYPE" == "sample" ]] ; then
-        pgrep -f "python inspector.py" && return 0
-        python inspector.py "$INSPECTOR_PORT" > inspector.log 2>&1 &
-    elif [[ "$INSPECTOR_TYPE" == "congress" ]] ; then
-        nova_api_min_version="2.11"
-        nova_api_version=$(openstack congress datasource list | \
-                           grep nova | grep -Po "(?<='api_version': ')[^']*")
-        [[ -z $nova_api_version ]] && nova_api_version="2.0"
-        if [[ "$nova_api_version" < "$nova_api_min_version" ]]; then
-            echo "ERROR: Congress Nova datasource API version < $nova_api_min_version ($nova_api_version)"
-            exit 1
-        fi
-        openstack congress driver list | grep -q " doctor "
-        openstack congress datasource list | grep -q " doctor " || {
-            openstack congress datasource create doctor doctor
-        }
-        congress_setup_rules
-    fi
-}
-
-stop_inspector() {
-    if [[ "$INSPECTOR_TYPE" == "sample" ]] ; then
-        pgrep -f "python inspector.py" || return 0
-        kill $(pgrep -f "python inspector.py")
-        print_log inspector.log
-    elif [[ "$INSPECTOR_TYPE" == "congress" ]] ; then
-        congress_del_rule host_force_down classification
-        congress_del_rule error_vm_states classification
-        congress_del_rule active_instance_in_host classification
-        congress_del_rule host_down classification
-    fi
 }
 
 start_consumer() {
@@ -283,37 +229,29 @@ start_consumer() {
     # NOTE(r-mibu): create tunnel to the controller nodes, so that we can
     # avoid some network problems dpends on infra and installers.
     # This tunnel will be terminated by stop_consumer() or after 10 mins passed.
-    if [[ "$INSTALLER_TYPE" == "apex" ]] ; then
-        CONTROLLER_IPS=$(sudo ssh $ssh_opts $INSTALLER_IP \
-                         "source stackrc; \
-                         nova list | grep ' overcloud-controller-[0-9] ' \
-                         | sed -e 's/^.*ctlplane=//' -e 's/ *|\$//'")
-    fi
-    if [[ -z "$CONTROLLER_IPS" ]]; then
-        echo "ERROR: Could not get CONTROLLER_IPS."
-        exit 1
+    if ! is_installer local; then
+        for ip in $CONTROLLER_IPS
+        do
+            forward_rule="-R $CONSUMER_PORT:localhost:$CONSUMER_PORT"
+            tunnel_command="sudo ssh $ssh_opts_cpu $COMPUTE_USER@$ip $forward_rule sleep 600"
+            $tunnel_command > "ssh_tunnel.${ip}.log" 2>&1 < /dev/null &
+        done
     fi
-    for ip in $CONTROLLER_IPS
-    do
-        forward_rule="-R $CONSUMER_PORT:localhost:$CONSUMER_PORT"
-        tunnel_command="sudo ssh $ssh_opts_cpu $COMPUTE_USER@$ip $forward_rule sleep 600"
-        $tunnel_command > "ssh_tunnel.${ip}.log" 2>&1 < /dev/null &
-    done
 }
 
 stop_consumer() {
     pgrep -f "python consumer.py" || return 0
     kill $(pgrep -f "python consumer.py")
-    print_log consumer.log
 
     # NOTE(r-mibu): terminate tunnels to the controller nodes
-    for ip in $CONTROLLER_IPS
-    do
-        forward_rule="-R $CONSUMER_PORT:localhost:$CONSUMER_PORT"
-        tunnel_command="sudo ssh $ssh_opts_cpu $COMPUTE_USER@$ip $forward_rule sleep 600"
-        kill $(pgrep -f "$tunnel_command")
-        print_log "ssh_tunnel.${ip}.log"
-    done
+    if ! is_installer local; then
+        for ip in $CONTROLLER_IPS
+        do
+            forward_rule="-R $CONSUMER_PORT:localhost:$CONSUMER_PORT"
+            tunnel_command="sudo ssh $ssh_opts_cpu $COMPUTE_USER@$ip $forward_rule sleep 600"
+            kill $(pgrep -f "$tunnel_command")
+        done
+    fi
 }
 
 wait_for_vm_launch() {
@@ -322,23 +260,43 @@ wait_for_vm_launch() {
     count=0
     while [[ ${count} -lt 60 ]]
     do
-        state=$(openstack $as_doctor_user server list | grep " $VM_NAME " | awk '{print $6}')
-        [[ "$state" == "ACTIVE" ]] && return 0
-        [[ "$state" == "ERROR" ]] && echo "vm state is ERROR" && exit 1
+        active_count=0
+        vms=$(openstack $as_doctor_user server list)
+        for i in `seq $VM_COUNT`; do
+            state=$(echo "${vms}" | grep " $VM_BASENAME$i " | awk '{print $6}')
+            if [[ "$state" == "ACTIVE" ]]; then
+                active_count=$(($active_count+1))
+            elif [[ "$state" == "ERROR" ]]; then
+                die $LINENO "vm state $VM_BASENAME$i is ERROR"
+            else
+                #This VM not yet active
+                count=$(($count+1))
+                sleep 5
+                continue
+            fi
+        done
+        [[ $active_count -eq $VM_COUNT ]] && {
+            echo "get computer host info..."
+            get_compute_host_info
+            VMS_ON_FAILED_HOST=$(openstack $as_doctor_user server list --host \
+                         $COMPUTE_HOST | grep " ${VM_BASENAME}" |  wc -l)
+            return 0
+        }
+        #Not all VMs active
         count=$(($count+1))
-        sleep 1
+        sleep 5
     done
-    echo "ERROR: time out while waiting for vm launch"
-    exit 1
+    die $LINENO "Time out while waiting for VM launch"
 }
 
 inject_failure() {
     echo "disabling network of compute host [$COMPUTE_HOST] for 3 mins..."
     cat > disable_network.sh << 'END_TXT'
 #!/bin/bash -x
-dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $7}')
+dev=$(sudo ip a | awk '/ @COMPUTE_IP@\//{print $NF}')
 sleep 1
 sudo ip link set $dev down
+echo "doctor set link down at" $(date "+%s.%N")
 sleep 180
 sudo ip link set $dev up
 sleep 1
@@ -347,33 +305,125 @@ END_TXT
     chmod +x disable_network.sh
     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 &'
+    # use host time to get rid of potential time sync deviation between nodes
+    triggered=$(date "+%s.%N")
+}
+
+wait_consumer() {
+    local interval=1
+    local rounds=$(($1 / $interval))
+    for i in `seq $rounds`; do
+        notified_count=$(grep "doctor consumer notified at" consumer.log | wc -l)
+        if [[ $notified_count -eq  $VMS_ON_FAILED_HOST ]]; then
+            return 0
+        fi
+        sleep $interval
+    done
+    die $LINENO "Consumer hasn't received fault notification."
 }
 
 calculate_notification_time() {
-    detected=$(grep "doctor monitor detected at" monitor.log | awk '{print $5}')
-    notified=$(grep "doctor consumer notified at" consumer.log | awk '{print $5}')
-    if ! grep -q "doctor consumer notified at" consumer.log ; then
-        echo "ERROR: consumer hasn't received fault notification."
-        exit 1
-    fi
+    wait_consumer 60
+    #keep 'at' as the last keyword just before the value, and
+    #use regex to get value instead of the fixed column
+    detected=$(grep "doctor monitor detected at" monitor.log |\
+               sed -e "s/^.* at //")
+    notified=$(grep "doctor consumer notified at" consumer.log |\
+               sed -e "s/^.* at //" | tail -1)
+
     echo "$notified $detected" | \
-        awk '{d = $1 - $2; if (d < 1 && d > 0) print d " OK"; else print d " NG"}'
+        awk '{
+            d = $1 - $2;
+            if (d < 1 && d > 0) { print d " OK"; exit 0 }
+            else { print d " NG"; exit 1 }
+        }'
 }
 
 check_host_status() {
+    # Check host related to first Doctor VM is in wanted state
+    # $1    Expected state
+    # $2    Seconds to wait to have wanted state
     expected_state=$1
-
-    host_status_line=$(openstack $as_doctor_user --os-compute-api-version 2.16 \
-                       server show $VM_NAME | grep "host_status")
-    host_status=$(echo $host_status_line | awk '{print $4}')
-    if [ -z "$host_status" ] ; then
-        echo "ERROR: host_status not reported by: nova show $VM_NAME"
-        exit 1
-    elif [[ "$expected_state" =~ "$host_status" ]] ; then
-        echo "$VM_NAME showing host_status: $host_status"
+    local interval=5
+    local rounds=$(($2 / $interval))
+    for i in `seq $rounds`; do
+        host_status_line=$(openstack $as_doctor_user --os-compute-api-version \
+                           2.16 server show ${VM_BASENAME}1 | grep "host_status")
+        host_status=$(echo $host_status_line | awk '{print $4}')
+        die_if_not_set $LINENO host_status "host_status not reported by: nova show ${VM_BASENAME}1"
+        if [[ "$expected_state" =~ "$host_status" ]] ; then
+            echo "${VM_BASENAME}1 showing host_status: $host_status"
+            return 0
+        else
+            sleep $interval
+        fi
+    done
+    if [[ "$expected_state" =~ "$host_status" ]] ; then
+        echo "${VM_BASENAME}1 showing host_status: $host_status"
     else
-        echo "ERROR: host_status:$host_status not equal to expected_state: $expected_state"
-        exit 1
+        die $LINENO  "host_status:$host_status not equal to expected_state: $expected_state"
+    fi
+}
+
+unset_forced_down_hosts() {
+    # for debug
+    openstack compute service list --service nova-compute
+
+    downed_computes=$(openstack compute service list --service nova-compute \
+                      -f value -c Host -c State | grep ' down$' \
+                      | sed -e 's/ *down$//')
+    echo "downed_computes: $downed_computes"
+    for host in $downed_computes
+    do
+        # TODO(r-mibu): use openstack client
+        #openstack compute service set --up $host nova-compute
+        nova service-force-down --unset $host nova-compute
+    done
+
+    echo "waiting disabled compute host back to be enabled..."
+    wait_until 'openstack compute service list --service nova-compute
+                -f value -c State | grep -q down' 240 5
+
+    for host in $downed_computes
+    do
+        # TODO(r-mibu): improve 'get_compute_ip_from_hostname'
+        get_compute_ip_from_hostname $host
+        wait_until "! ping -c 1 $COMPUTE_IP" 120 5
+    done
+}
+
+collect_logs() {
+    if [[ -n "$COMPUTE_IP" ]];then
+        scp $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP:disable_network.log" .
+    fi
+
+    # TODO(yujunz) collect other logs, e.g. nova, aodh
+}
+
+run_profiler() {
+    if [[ "$PROFILER_TYPE" == "poc" ]]; then
+        linkdown=$(grep "doctor set link down at " disable_network.log |\
+                  sed -e "s/^.* at //")
+        vmdown=$(grep "doctor mark vm.* error at" inspector.log |tail -n 1 |\
+                 sed -e "s/^.* at //")
+        hostdown=$(grep "doctor mark host.* down at" inspector.log |\
+                 sed -e "s/^.* at //")
+
+        # TODO(yujunz) check the actual delay to verify time sync status
+        # expected ~1s delay from $trigger to $linkdown
+        relative_start=${linkdown}
+        export DOCTOR_PROFILER_T00=$(python -c \
+          "print(int(($linkdown-$relative_start)*1000))")
+        export DOCTOR_PROFILER_T01=$(python -c \
+          "print(int(($detected-$relative_start)*1000))")
+        export DOCTOR_PROFILER_T03=$(python -c \
+          "print(int(($vmdown-$relative_start)*1000))")
+        export DOCTOR_PROFILER_T04=$(python -c \
+          "print(int(($hostdown-$relative_start)*1000))")
+        export DOCTOR_PROFILER_T09=$(python -c \
+          "print(int(($notified-$relative_start)*1000))")
+
+        python profiler-poc.py >doctor_profiler.log 2>&1
     fi
 }
 
@@ -384,34 +434,62 @@ cleanup() {
     stop_inspector
     stop_consumer
 
-    echo "waiting disabled compute host back to be enabled..."
-    python ./nova_force_down.py "$COMPUTE_HOST" --unset
-    sleep 240
-    check_host_status "UP"
-    scp $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP:disable_network.log" .
-    print_log disable_network.log
+    unset_forced_down_hosts
+    collect_logs
 
-    openstack $as_doctor_user server list | grep -q " $VM_NAME " && openstack $as_doctor_user server delete "$VM_NAME"
-    sleep 1
-    alarm_id=$(ceilometer $as_doctor_user alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
+    vms=$(openstack $as_doctor_user server list)
+    vmstodel=""
+    for i in `seq $VM_COUNT`; do
+        $(echo "${vms}" | grep -q " $VM_BASENAME$i ") &&
+        vmstodel+=" $VM_BASENAME$i"
+    done
+    [[ $vmstodel ]] && openstack $as_doctor_user server delete $vmstodel
+    alarm_list=$($ceilometer alarm-list)
+    for i in `seq $VM_COUNT`; do
+        alarm_id=$(echo "${alarm_list}" | grep " $ALARM_BASENAME$i " |
+                   awk '{print $2}')
+        [ -n "$alarm_id" ] && $ceilometer alarm-delete "$alarm_id"
+    done
+    openstack $as_doctor_user subnet delete $NET_NAME
     sleep 1
-    [ -n "$alarm_id" ] && ceilometer $as_doctor_user alarm-delete "$alarm_id"
+    openstack $as_doctor_user network delete $NET_NAME
     sleep 1
 
     image_id=$(openstack image list | grep " $IMAGE_NAME " | awk '{print $2}')
     sleep 1
-    [ -n "$image_id" ] && openstack image delete "$image_id"
-    openstack role remove "$DOCTOR_ROLE" --user "$DOCTOR_USER" \
-                              --project "$DOCTOR_PROJECT"
-    openstack project delete "$DOCTOR_PROJECT"
-    openstack user delete "$DOCTOR_USER"
+    #if an existing image was used, there's no need to remove it here
+    if [[ "$use_existing_image" == false ]] ; then
+        [ -n "$image_id" ] && openstack image delete "$image_id"
+    fi
+
+    remove_test_user
+
+    cleanup_installer
+    cleanup_inspector
+
+    # NOTE: Temporal log printer.
+    for f in $(find . -name '*.log')
+    do
+        echo
+        echo "[$f]"
+        sed -e 's/^/ | /' $f
+        echo
+    done
 }
 
+# Main process
 
 echo "Note: doctor/tests/run.sh has been executed."
+git log --oneline -1 || true   # ignore even you don't have git installed
 
 trap cleanup EXIT
 
+source $TOP_DIR/functions-common
+source $TOP_DIR/lib/installer
+source $TOP_DIR/lib/inspector
+
+setup_installer
+
 echo "preparing VM image..."
 download_image
 register_image
@@ -422,14 +500,10 @@ create_test_user
 echo "creating VM..."
 boot_vm
 wait_for_vm_launch
-openstack $as_doctor_user server show $VM_NAME
-
-echo "get computer host info and prepare to ssh..."
-get_compute_host_info
-prepare_compute_ssh
 
 echo "creating alarm..."
-get_consumer_ip
+#TODO: change back to use, network problems depends on infra and installers
+#get_consumer_ip
 create_alarm
 
 echo "starting doctor sample components..."
@@ -440,9 +514,11 @@ start_consumer
 sleep 60
 echo "injecting host failure..."
 inject_failure
-sleep 60
 
-check_host_status "(DOWN|UNKNOWN)"
+check_host_status "(DOWN|UNKNOWN)" 60
 calculate_notification_time
+unset_forced_down_hosts
+collect_logs
+run_profiler
 
 echo "done"