diff --git a/tempest/api/compute/servers/test_delete_server.py b/tempest/api/compute/servers/test_delete_server.py index 81639da335..cf0cf97453 100644 --- a/tempest/api/compute/servers/test_delete_server.py +++ b/tempest/api/compute/servers/test_delete_server.py @@ -117,7 +117,7 @@ class DeleteServersTestJSON(base.BaseV2ComputeTest): device = '/dev/%s' % CONF.compute.volume_device_name server = self.create_test_server(wait_until='ACTIVE') - volume = volumes_client.create_volume() + volume = volumes_client.create_volume(size=CONF.volume.volume_size) self.addCleanup(volumes_client.delete_volume, volume['id']) waiters.wait_for_volume_status(volumes_client, volume['id'], 'available') diff --git a/tempest/api/compute/servers/test_server_rescue_negative.py b/tempest/api/compute/servers/test_server_rescue_negative.py index 81417d24a9..9d061881fd 100644 --- a/tempest/api/compute/servers/test_server_rescue_negative.py +++ b/tempest/api/compute/servers/test_server_rescue_negative.py @@ -61,7 +61,7 @@ class ServerRescueNegativeTestJSON(base.BaseV2ComputeTest): def _create_volume(self): volume = self.volumes_extensions_client.create_volume( - CONF.volume.volume_size, display_name=data_utils.rand_name( + size=CONF.volume.volume_size, display_name=data_utils.rand_name( self.__class__.__name__ + '_volume')) self.addCleanup(self.delete_volume, volume['id']) waiters.wait_for_volume_status(self.volumes_extensions_client, diff --git a/tempest/api/compute/volumes/test_volumes_get.py b/tempest/api/compute/volumes/test_volumes_get.py index 44339a31f0..f05a5a3027 100644 --- a/tempest/api/compute/volumes/test_volumes_get.py +++ b/tempest/api/compute/volumes/test_volumes_get.py @@ -46,7 +46,8 @@ class VolumesGetTestJSON(base.BaseV2ComputeTest): v_name = data_utils.rand_name('Volume') metadata = {'Type': 'work'} # Create volume - volume = self.client.create_volume(display_name=v_name, + volume = self.client.create_volume(size=CONF.volume.volume_size, + display_name=v_name, metadata=metadata) self.addCleanup(self.delete_volume, volume['id']) self.assertIn('id', volume) diff --git a/tempest/api/compute/volumes/test_volumes_list.py b/tempest/api/compute/volumes/test_volumes_list.py index 22b3d13c21..421d96f136 100644 --- a/tempest/api/compute/volumes/test_volumes_list.py +++ b/tempest/api/compute/volumes/test_volumes_list.py @@ -54,7 +54,8 @@ class VolumesTestJSON(base.BaseV2ComputeTest): v_name = data_utils.rand_name('volume') metadata = {'Type': 'work'} try: - volume = cls.client.create_volume(display_name=v_name, + volume = cls.client.create_volume(size=CONF.volume.volume_size, + display_name=v_name, metadata=metadata) waiters.wait_for_volume_status(cls.client, volume['id'], 'available') diff --git a/tempest/clients.py b/tempest/clients.py index 7cb4347b55..b9f7991bc7 100644 --- a/tempest/clients.py +++ b/tempest/clients.py @@ -321,8 +321,7 @@ class Manager(manager.Manager): 'build_timeout': CONF.volume.build_timeout }) self.volumes_extensions_client = VolumesExtensionsClient( - self.auth_provider, default_volume_size=CONF.volume.volume_size, - **params_volume) + self.auth_provider, **params_volume) def _set_database_clients(self): self.database_flavors_client = DatabaseFlavorsClient( diff --git a/tempest/services/compute/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_extensions_client.py index ac55049ea6..c86aaff9fe 100644 --- a/tempest/services/compute/json/volumes_extensions_client.py +++ b/tempest/services/compute/json/volumes_extensions_client.py @@ -23,12 +23,6 @@ from tempest.common import service_client class VolumesExtensionsClient(service_client.ServiceClient): - def __init__(self, auth_provider, service, region, - default_volume_size=1, **kwargs): - super(VolumesExtensionsClient, self).__init__( - auth_provider, service, region, **kwargs) - self.default_volume_size = default_volume_size - def list_volumes(self, detail=False, **params): """List all the volumes created.""" url = 'os-volumes' @@ -51,7 +45,7 @@ class VolumesExtensionsClient(service_client.ServiceClient): self.validate_response(schema.create_get_volume, resp, body) return service_client.ResponseBody(resp, body['volume']) - def create_volume(self, size=None, **kwargs): + def create_volume(self, **kwargs): """ Creates a new Volume. size(Required): Size of volume in GB. @@ -59,14 +53,7 @@ class VolumesExtensionsClient(service_client.ServiceClient): display_name: Optional Volume Name. metadata: A dictionary of values to be used as metadata. """ - if size is None: - size = self.default_volume_size - post_body = { - 'size': size - } - post_body.update(kwargs) - - post_body = json.dumps({'volume': post_body}) + post_body = json.dumps({'volume': kwargs}) resp, body = self.post('os-volumes', post_body) body = json.loads(body) self.validate_response(schema.create_get_volume, resp, body)