From: Ryota Mibu <r-mibu@cq.jp.nec.com>
Date: Wed, 27 Jul 2016 13:16:51 +0000 (+0000)
Subject: Merge "Delete $VM_NAME and alrms with doctor user creds"
X-Git-Tag: colorado.1.0~39
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1e490b1d4f9003471d64ea0b433a80122924cff3;hp=caa8d5ecd481fcd39aa97c7a8a61bbac41c0893d;p=doctor.git

Merge "Delete $VM_NAME and alrms with doctor user creds"
---

diff --git a/tests/run.sh b/tests/run.sh
index 767a726a..ae030e22 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -266,11 +266,11 @@ cleanup() {
     ssh $ssh_opts_cpu "$COMPUTE_USER@$COMPUTE_IP" \
         "[ -e disable_network.log ] && cat disable_network.log"
 
-    openstack $as_doctor_user server list | grep -q " $VM_NAME " && openstack server delete "$VM_NAME"
+    openstack $as_doctor_user server list | grep -q " $VM_NAME " && openstack $as_doctor_user server delete "$VM_NAME"
     sleep 1
-    alarm_id=$(ceilometer alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
+    alarm_id=$(ceilometer $as_doctor_user alarm-list | grep " $ALARM_NAME " | awk '{print $2}')
     sleep 1
-    [ -n "$alarm_id" ] && ceilometer alarm-delete "$alarm_id"
+    [ -n "$alarm_id" ] && ceilometer $as_doctor_user alarm-delete "$alarm_id"
     sleep 1
 
     image_id=$(openstack image list | grep " $IMAGE_NAME " | awk '{print $2}')