diff options
| author | Takashi NATSUME <natsume.takashi@lab.ntt.co.jp> | 2017-04-10 16:07:04 +0900 |
|---|---|---|
| committer | Takashi NATSUME <natsume.takashi@lab.ntt.co.jp> | 2017-04-11 13:09:41 +0900 |
| commit | ad22c586a4d04197a40454f75670b498a8194c8d (patch) | |
| tree | 92e6b3c71bc77de9f52bfe18984122af26f22bce | |
| parent | 02fea08dd656d64ca74862732410b7133c4f4fe4 (diff) | |
| download | python-novaclient-ad22c586a4d04197a40454f75670b498a8194c8d.tar.gz | |
Fix cinder volume leakage
A cinder volume remains after
the 'test_boot_server_with_legacy_bdm_volume_id_only'
functional test.
It is resource leakage. So fix it.
Change-Id: I3cacbac6468b5fad1c9666892fc57906af24b169
Partial-Bug: #1613105
(cherry-picked from commit 4d956d06f8c2bd3971cd46fb7ccdab33aaa5709c)
| -rw-r--r-- | novaclient/tests/functional/v2/legacy/test_servers.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/novaclient/tests/functional/v2/legacy/test_servers.py b/novaclient/tests/functional/v2/legacy/test_servers.py index ad773f1a..d2922c9d 100644 --- a/novaclient/tests/functional/v2/legacy/test_servers.py +++ b/novaclient/tests/functional/v2/legacy/test_servers.py @@ -31,6 +31,11 @@ class TestServersBootNovaClient(base.ClientTestBase): imageRef=self.image.id) 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) if bdm_params: bdm_params = ''.join((':', bdm_params)) @@ -51,6 +56,10 @@ class TestServersBootNovaClient(base.ClientTestBase): self.client.servers.delete(server_id) 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): # bdm v1 format # <id>:<type>:<size(GB)>:<delete-on-terminate> |