diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-20 10:47:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-20 10:47:35 +0000 |
| commit | 7c73dd5b18d29f0f3f3be0088514121dade53c8f (patch) | |
| tree | b10de2b725c9144699a41d02ec4f390a79ae3bd4 /tempest/api/compute/base.py | |
| parent | 4857696ad79572c937ac132567b9fbc9b0be6a75 (diff) | |
| parent | a5299ebb742c76f9380cd2d639e6fa81bebf371d (diff) | |
| download | tempest-7c73dd5b18d29f0f3f3be0088514121dade53c8f.tar.gz | |
Merge "Change compute image client methods to return one value"
Diffstat (limited to 'tempest/api/compute/base.py')
| -rw-r--r-- | tempest/api/compute/base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py index 4f2715f48..6b6c8e7fb 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -293,20 +293,20 @@ class BaseComputeTest(tempest.test.BaseTestCase): if 'name' in kwargs: name = kwargs.pop('name') - resp, image = cls.images_client.create_image(server_id, name) - image_id = data_utils.parse_image_id(resp['location']) + image = cls.images_client.create_image(server_id, name) + image_id = data_utils.parse_image_id(image.response['location']) cls.images.append(image_id) if 'wait_until' in kwargs: cls.images_client.wait_for_image_status(image_id, kwargs['wait_until']) - resp, image = cls.images_client.get_image(image_id) + image = cls.images_client.get_image(image_id) if kwargs['wait_until'] == 'ACTIVE': if kwargs.get('wait_for_server', True): cls.servers_client.wait_for_server_status(server_id, 'ACTIVE') - return resp, image + return image @classmethod def rebuild_server(cls, server_id, **kwargs): |