Scenario/manager.py: always wait when delete a cinder vol
The `wait_on_delete` argument defaulted to True and was never called
with `False`. So remove the complicated call to `addCleanup_with_wait`
to make that explicit.
Change-Id: I8afb089617f82359475a867ae76b8022a58b4af5
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index eb29176..e4a4d92 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -261,7 +261,7 @@
return server
def create_volume(self, size=None, name=None, snapshot_id=None,
- imageRef=None, volume_type=None, wait_on_delete=True):
+ imageRef=None, volume_type=None):
if name is None:
name = data_utils.rand_name(self.__class__.__name__)
kwargs = {'display_name': name,
@@ -272,17 +272,10 @@
kwargs.update({'size': size})
volume = self.volumes_client.create_volume(**kwargs)['volume']
- if wait_on_delete:
- self.addCleanup(self.volumes_client.wait_for_resource_deletion,
- volume['id'])
- self.addCleanup(self.delete_wrapper,
- self.volumes_client.delete_volume, volume['id'])
- else:
- self.addCleanup_with_wait(
- waiter_callable=self.volumes_client.wait_for_resource_deletion,
- thing_id=volume['id'], thing_id_param='id',
- cleanup_callable=self.delete_wrapper,
- cleanup_args=[self.volumes_client.delete_volume, volume['id']])
+ self.addCleanup(self.volumes_client.wait_for_resource_deletion,
+ volume['id'])
+ self.addCleanup(self.delete_wrapper,
+ self.volumes_client.delete_volume, volume['id'])
# NOTE(e0ne): Cinder API v2 uses name instead of display_name
if 'display_name' in volume: