X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Frun.sh;h=3e2fbab55c1cfb6ac5e1843e8a9d285f661e89d2;hb=5a189baf2f99032a0c28992fa47e372d5291c2d2;hp=b383a02a932dd9f3b0cbd101bf2a7f54a7424c6f;hpb=cf0c61eb31b65760a36cb0856f9fad58e471f5a6;p=doctor.git diff --git a/tests/run.sh b/tests/run.sh index b383a02a..3e2fbab5 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -269,8 +269,14 @@ cleanup() { stop_inspector stop_consumer + echo "waiting disabled compute host back to be enabled..." python ./nova_force_down.py "$COMPUTE_HOST" --unset + sleep 180 + check_host_status "UP" + ssh $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP" \ + "[ -e disable_network.log ] && cat disable_network.log" sleep 1 + ( change_to_doctor_user openstack server list | grep -q " $VM_NAME " && openstack server delete "$VM_NAME" @@ -287,12 +293,6 @@ cleanup() { --project "$DOCTOR_PROJECT" openstack project delete "$DOCTOR_PROJECT" openstack user delete "$DOCTOR_USER" - - echo "waiting disabled compute host back to be enabled..." - sleep 180 - check_host_status "UP" - ssh $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP" \ - "[ -e disable_network.log ] && cat disable_network.log" }