openstack/python-novaclient
Code Issues Proposed changes

Merge "Fix cinder volume leakage"

Browse Source
This commit is contained in:
Jenkins 2017-04-10 17:40:49 +00:00 committed by Gerrit Code Review
commit 6448215bba
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
novaclient/tests/functional/v2/legacy/test_servers.py
View File

@ -31,6 +31,11 @@ class TestServersBootNovaClient(base.ClientTestBase):
imageRef=self.image.id) imageRef=self.image.id)
self.wait_for_volume_status(volume, "available") self.wait_for_volume_status(volume, "available")
if (len(bdm_params) >= 3 and bdm_params[2] == '1'):
delete_volume = False
else:
delete_volume = True
bdm_params = ':'.join(bdm_params) bdm_params = ':'.join(bdm_params)
if bdm_params: if bdm_params:
bdm_params = ''.join((':', bdm_params)) bdm_params = ''.join((':', bdm_params))
@ -51,6 +56,10 @@ class TestServersBootNovaClient(base.ClientTestBase):
self.client.servers.delete(server_id) self.client.servers.delete(server_id)
self.wait_for_resource_delete(server_id, self.client.servers) self.wait_for_resource_delete(server_id, self.client.servers)
if delete_volume:
self.cinder.volumes.delete(volume.id)
self.wait_for_resource_delete(volume.id, self.cinder.volumes)
def test_boot_server_with_legacy_bdm(self): def test_boot_server_with_legacy_bdm(self):
# bdm v1 format # bdm v1 format
# <id>:<type>:<size(GB)>:<delete-on-terminate> # <id>:<type>:<size(GB)>:<delete-on-terminate>