commit 1b58d3124e42d020faccb2e7d1e7419d3b924b43
author Jenkins <jenkins@review.openstack.org> Tue Sep 30 19:11:59 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Sep 30 19:11:59 2014 +0000
tree bfe9834bd4a4f22683fd27f1ce9a1d76369ef433
parent 3e2aeb4562b43f1ab6c3fcab11568d9d02bfd9ae
parent 5ebc27bf3433c763a307497cc5785606362b8b7d

Merge "javelin: Detach the volume before destruction"

tempest/cmd/javelin.py

diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index bf0cc70..27e388d 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -525,7 +525,8 @@
     for volume in volumes:
         client = client_for_user(volume['owner'])
         volume_id = _get_volume_by_name(client, volume['name'])['id']
-        r, body = client.volumes.delete_volume(volume_id)
+        client.volumes.detach_volume(volume_id)
+        client.volumes.delete_volume(volume_id)
 
 
 def attach_volumes(volumes):