Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Delete $VM_NAME and alrms with doctor user creds
[doctor.git]
/
tests
/
run.sh
diff --git
a/tests/run.sh
b/tests/run.sh
index
767a726
..
ae030e2
100755
(executable)
--- 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"
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
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
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}')
sleep 1
image_id=$(openstack image list | grep " $IMAGE_NAME " | awk '{print $2}')