From b334879f5bae32da0c1a274db81a416581f7dda6 Mon Sep 17 00:00:00 2001 From: lkuchlan Date: Thu, 29 Sep 2016 10:42:21 +0300 Subject: [PATCH] Remove a redundant image_id variable Instead of creating a new variable for image_id, we can simply do image['id'] Change-Id: I7ea5eaa0d460b50019d3e5f39a327ba0419b7c69 --- tempest/api/image/admin/v2/test_images.py | 25 +++--- tempest/api/image/base.py | 8 +- tempest/api/image/v1/test_images.py | 51 +++++------- tempest/api/image/v2/test_images.py | 83 +++++++++---------- tempest/api/image/v2/test_images_negative.py | 16 ++-- tempest/api/image/v2/test_images_tags.py | 17 ++-- .../api/image/v2/test_images_tags_negative.py | 13 ++- 7 files changed, 99 insertions(+), 114 deletions(-) diff --git a/tempest/api/image/admin/v2/test_images.py b/tempest/api/image/admin/v2/test_images.py index c719b7aa8f..9844a67822 100644 --- a/tempest/api/image/admin/v2/test_images.py +++ b/tempest/api/image/admin/v2/test_images.py @@ -34,27 +34,26 @@ class BasicAdminOperationsImagesTest(base.BaseV2ImageAdminTest): def test_admin_deactivate_reactivate_image(self): # Create image by non-admin tenant image_name = data_utils.rand_name('image') - body = self.client.create_image(name=image_name, - container_format='bare', - disk_format='raw', - visibility='private') - image_id = body['id'] - self.addCleanup(self.client.delete_image, image_id) + image = self.client.create_image(name=image_name, + container_format='bare', + disk_format='raw', + visibility='private') + self.addCleanup(self.client.delete_image, image['id']) # upload an image file content = data_utils.random_bytes() image_file = six.BytesIO(content) - self.client.store_image_file(image_id, image_file) + self.client.store_image_file(image['id'], image_file) # deactivate image - self.admin_client.deactivate_image(image_id) - body = self.client.show_image(image_id) + self.admin_client.deactivate_image(image['id']) + body = self.client.show_image(image['id']) self.assertEqual("deactivated", body['status']) # non-admin user unable to download deactivated image self.assertRaises(lib_exc.Forbidden, self.client.show_image_file, - image_id) + image['id']) # reactivate image - self.admin_client.reactivate_image(image_id) - body = self.client.show_image(image_id) + self.admin_client.reactivate_image(image['id']) + body = self.client.show_image(image['id']) self.assertEqual("active", body['status']) # non-admin user able to download image after reactivation by admin - body = self.client.show_image_file(image_id) + body = self.client.show_image_file(image['id']) self.assertEqual(content, body.data) diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py index f74f97beb5..26b88b014b 100644 --- a/tempest/api/image/base.py +++ b/tempest/api/image/base.py @@ -123,8 +123,7 @@ class BaseV1ImageMembersTest(BaseV1ImageTest): disk_format='raw', is_public=False, data=image_file) - image_id = image['id'] - return image_id + return image['id'] class BaseV2ImageTest(BaseImageTest): @@ -183,9 +182,8 @@ class BaseV2MemberImageTest(BaseV2ImageTest): image = self.client.create_image(name=name, container_format='bare', disk_format='raw') - image_id = image['id'] - self.addCleanup(self.client.delete_image, image_id) - return image_id + self.addCleanup(self.client.delete_image, image['id']) + return image['id'] class BaseV1ImageAdminTest(BaseImageTest): diff --git a/tempest/api/image/v1/test_images.py b/tempest/api/image/v1/test_images.py index 712b34bdfa..695efb5d0d 100644 --- a/tempest/api/image/v1/test_images.py +++ b/tempest/api/image/v1/test_images.py @@ -49,22 +49,21 @@ class CreateRegisterImagesTest(base.BaseV1ImageTest): # Register, then upload an image properties = {'prop1': 'val1'} container_format, disk_format = get_container_and_disk_format() - body = self.create_image(name='New Name', - container_format=container_format, - disk_format=disk_format, - is_public=False, - properties=properties) - self.assertIn('id', body) - image_id = body.get('id') - self.assertEqual('New Name', body.get('name')) - self.assertFalse(body.get('is_public')) - self.assertEqual('queued', body.get('status')) + image = self.create_image(name='New Name', + container_format=container_format, + disk_format=disk_format, + is_public=False, + properties=properties) + self.assertIn('id', image) + self.assertEqual('New Name', image.get('name')) + self.assertFalse(image.get('is_public')) + self.assertEqual('queued', image.get('status')) for key, val in properties.items(): - self.assertEqual(val, body.get('properties')[key]) + self.assertEqual(val, image.get('properties')[key]) # Now try uploading an image file image_file = six.BytesIO(data_utils.random_bytes()) - body = self.client.update_image(image_id, data=image_file)['image'] + body = self.client.update_image(image['id'], data=image_file)['image'] self.assertIn('size', body) self.assertEqual(1024, body.get('size')) @@ -89,16 +88,15 @@ class CreateRegisterImagesTest(base.BaseV1ImageTest): @test.idempotent_id('6d0e13a7-515b-460c-b91f-9f4793f09816') def test_register_http_image(self): container_format, disk_format = get_container_and_disk_format() - body = self.create_image(name='New Http Image', - container_format=container_format, - disk_format=disk_format, is_public=False, - copy_from=CONF.image.http_image) - self.assertIn('id', body) - image_id = body.get('id') - self.assertEqual('New Http Image', body.get('name')) - self.assertFalse(body.get('is_public')) - waiters.wait_for_image_status(self.client, image_id, 'active') - self.client.show_image(image_id) + image = self.create_image(name='New Http Image', + container_format=container_format, + disk_format=disk_format, is_public=False, + copy_from=CONF.image.http_image) + self.assertIn('id', image) + self.assertEqual('New Http Image', image.get('name')) + self.assertFalse(image.get('is_public')) + waiters.wait_for_image_status(self.client, image['id'], 'active') + self.client.show_image(image['id']) @test.idempotent_id('05b19d55-140c-40d0-b36b-fafd774d421b') def test_register_image_with_min_ram(self): @@ -188,8 +186,7 @@ class ListImagesTest(base.BaseV1ImageTest): disk_format=disk_format, is_public=False, location=location) - image_id = image['id'] - return image_id + return image['id'] @classmethod def _create_standard_image(cls, name, container_format, @@ -205,8 +202,7 @@ class ListImagesTest(base.BaseV1ImageTest): container_format=container_format, disk_format=disk_format, is_public=False, data=image_file) - image_id = image['id'] - return image_id + return image['id'] @test.idempotent_id('246178ab-3b33-4212-9a4b-a7fe8261794d') def test_index_no_params(self): @@ -301,8 +297,7 @@ class UpdateImageMetaTest(base.BaseV1ImageTest): disk_format=disk_format, is_public=False, data=image_file, properties={'key1': 'value1'}) - image_id = image['id'] - return image_id + return image['id'] @test.idempotent_id('01752c1c-0275-4de3-9e5b-876e44541928') def test_list_image_metadata(self): diff --git a/tempest/api/image/v2/test_images.py b/tempest/api/image/v2/test_images.py index f363d34e31..aff8a78869 100644 --- a/tempest/api/image/v2/test_images.py +++ b/tempest/api/image/v2/test_images.py @@ -44,35 +44,34 @@ class BasicOperationsImagesTest(base.BaseV2ImageTest): image_name = data_utils.rand_name('image') container_format = CONF.image.container_formats[0] disk_format = CONF.image.disk_formats[0] - body = self.create_image(name=image_name, - container_format=container_format, - disk_format=disk_format, - visibility='private', - ramdisk_id=uuid) - self.assertIn('id', body) - image_id = body.get('id') - self.assertIn('name', body) - self.assertEqual(image_name, body['name']) - self.assertIn('visibility', body) - self.assertEqual('private', body['visibility']) - self.assertIn('status', body) - self.assertEqual('queued', body['status']) + image = self.create_image(name=image_name, + container_format=container_format, + disk_format=disk_format, + visibility='private', + ramdisk_id=uuid) + self.assertIn('id', image) + self.assertIn('name', image) + self.assertEqual(image_name, image['name']) + self.assertIn('visibility', image) + self.assertEqual('private', image['visibility']) + self.assertIn('status', image) + self.assertEqual('queued', image['status']) # Now try uploading an image file file_content = data_utils.random_bytes() image_file = six.BytesIO(file_content) - self.client.store_image_file(image_id, image_file) + self.client.store_image_file(image['id'], image_file) # Now try to get image details - body = self.client.show_image(image_id) - self.assertEqual(image_id, body['id']) + body = self.client.show_image(image['id']) + self.assertEqual(image['id'], body['id']) self.assertEqual(image_name, body['name']) self.assertEqual(uuid, body['ramdisk_id']) self.assertIn('size', body) self.assertEqual(1024, body.get('size')) # Now try get image file - body = self.client.show_image_file(image_id) + body = self.client.show_image_file(image['id']) self.assertEqual(file_content, body.data) @test.attr(type='smoke') @@ -84,20 +83,18 @@ class BasicOperationsImagesTest(base.BaseV2ImageTest): image_name = data_utils.rand_name('image') container_format = CONF.image.container_formats[0] disk_format = CONF.image.disk_formats[0] - body = self.client.create_image(name=image_name, - container_format=container_format, - disk_format=disk_format, - visibility='private') - image_id = body['id'] - + image = self.client.create_image(name=image_name, + container_format=container_format, + disk_format=disk_format, + visibility='private') # Delete Image - self.client.delete_image(image_id) - self.client.wait_for_resource_deletion(image_id) + self.client.delete_image(image['id']) + self.client.wait_for_resource_deletion(image['id']) # Verifying deletion images = self.client.list_images()['images'] images_id = [item['id'] for item in images] - self.assertNotIn(image_id, images_id) + self.assertNotIn(image['id'], images_id) @test.attr(type='smoke') @test.idempotent_id('f66891a7-a35c-41a8-b590-a065c2a1caa6') @@ -108,27 +105,26 @@ class BasicOperationsImagesTest(base.BaseV2ImageTest): image_name = data_utils.rand_name('image') container_format = CONF.image.container_formats[0] disk_format = CONF.image.disk_formats[0] - body = self.client.create_image(name=image_name, - container_format=container_format, - disk_format=disk_format, - visibility='private') - self.addCleanup(self.client.delete_image, body['id']) - self.assertEqual('queued', body['status']) - image_id = body['id'] + image = self.client.create_image(name=image_name, + container_format=container_format, + disk_format=disk_format, + visibility='private') + self.addCleanup(self.client.delete_image, image['id']) + self.assertEqual('queued', image['status']) # Now try uploading an image file image_file = six.BytesIO(data_utils.random_bytes()) - self.client.store_image_file(image_id, image_file) + self.client.store_image_file(image['id'], image_file) # Update Image new_image_name = data_utils.rand_name('new-image') - body = self.client.update_image(image_id, [ + body = self.client.update_image(image['id'], [ dict(replace='/name', value=new_image_name)]) # Verifying updating - body = self.client.show_image(image_id) - self.assertEqual(image_id, body['id']) + body = self.client.show_image(image['id']) + self.assertEqual(image['id'], body['id']) self.assertEqual(new_image_name, body['name']) @@ -162,14 +158,13 @@ class ListImagesTest(base.BaseV2ImageTest): size = random.randint(1024, 4096) image_file = six.BytesIO(data_utils.random_bytes(size)) name = data_utils.rand_name('image') - body = cls.create_image(name=name, - container_format=container_format, - disk_format=disk_format, - visibility='private') - image_id = body['id'] - cls.client.store_image_file(image_id, data=image_file) + image = cls.create_image(name=name, + container_format=container_format, + disk_format=disk_format, + visibility='private') + cls.client.store_image_file(image['id'], data=image_file) - return image_id + return image['id'] def _list_by_param_value_and_assert(self, params): """Perform list action with given params and validates result.""" diff --git a/tempest/api/image/v2/test_images_negative.py b/tempest/api/image/v2/test_images_negative.py index f60fb0cb88..cd1bca002d 100644 --- a/tempest/api/image/v2/test_images_negative.py +++ b/tempest/api/image/v2/test_images_negative.py @@ -53,19 +53,19 @@ class ImagesNegativeTest(base.BaseV2ImageTest): def test_get_delete_deleted_image(self): # get and delete the deleted image # create and delete image - body = self.client.create_image(name='test', - container_format='bare', - disk_format='raw') - image_id = body['id'] - self.client.delete_image(image_id) - self.client.wait_for_resource_deletion(image_id) + image = self.client.create_image(name='test', + container_format='bare', + disk_format='raw') + self.client.delete_image(image['id']) + self.client.wait_for_resource_deletion(image['id']) # get the deleted image - self.assertRaises(lib_exc.NotFound, self.client.show_image, image_id) + self.assertRaises(lib_exc.NotFound, + self.client.show_image, image['id']) # delete the deleted image self.assertRaises(lib_exc.NotFound, self.client.delete_image, - image_id) + image['id']) @test.attr(type=['negative']) @test.idempotent_id('6fe40f1c-57bd-4918-89cc-8500f850f3de') diff --git a/tempest/api/image/v2/test_images_tags.py b/tempest/api/image/v2/test_images_tags.py index 42a4b871b9..03f29bde77 100644 --- a/tempest/api/image/v2/test_images_tags.py +++ b/tempest/api/image/v2/test_images_tags.py @@ -21,19 +21,18 @@ class ImagesTagsTest(base.BaseV2ImageTest): @test.idempotent_id('10407036-6059-4f95-a2cd-cbbbee7ed329') def test_update_delete_tags_for_image(self): - body = self.create_image(container_format='bare', - disk_format='raw', - visibility='private') - image_id = body['id'] + image = self.create_image(container_format='bare', + disk_format='raw', + visibility='private') tag = data_utils.rand_name('tag') - self.addCleanup(self.client.delete_image, image_id) + self.addCleanup(self.client.delete_image, image['id']) # Creating image tag and verify it. - self.client.add_image_tag(image_id, tag) - body = self.client.show_image(image_id) + self.client.add_image_tag(image['id'], tag) + body = self.client.show_image(image['id']) self.assertIn(tag, body['tags']) # Deleting image tag and verify it. - self.client.delete_image_tag(image_id, tag) - body = self.client.show_image(image_id) + self.client.delete_image_tag(image['id'], tag) + body = self.client.show_image(image['id']) self.assertNotIn(tag, body['tags']) diff --git a/tempest/api/image/v2/test_images_tags_negative.py b/tempest/api/image/v2/test_images_tags_negative.py index dd5650f1aa..af4ffcf1d7 100644 --- a/tempest/api/image/v2/test_images_tags_negative.py +++ b/tempest/api/image/v2/test_images_tags_negative.py @@ -33,12 +33,11 @@ class ImagesTagsNegativeTest(base.BaseV2ImageTest): @test.idempotent_id('39c023a2-325a-433a-9eea-649bf1414b19') def test_delete_non_existing_tag(self): # Delete non existing tag. - body = self.create_image(container_format='bare', - disk_format='raw', - visibility='private' - ) - image_id = body['id'] + image = self.create_image(container_format='bare', + disk_format='raw', + visibility='private' + ) tag = data_utils.rand_name('non-exist-tag') - self.addCleanup(self.client.delete_image, image_id) + self.addCleanup(self.client.delete_image, image['id']) self.assertRaises(lib_exc.NotFound, self.client.delete_image_tag, - image_id, tag) + image['id'], tag)