Make volumes_extensions_client use **kwargs
As we discussed on http://lists.openstack.org/pipermail/openstack-dev/2015-July/068864.html All http POST/PUT methods need to contain **kwargs as their arguments. This patch makes volumes_extensions_client use **kwargs. Partially implements blueprint consistent-service-method-names Change-Id: Ie7f61741d54a629a15b1e2b8fce178ebc06176d3
This commit is contained in:
parent
e74590cb62
commit
c492178580
|
@ -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')
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue