From 89b72e36dc8876c11b8fc34c86f4b4dfacc98264 Mon Sep 17 00:00:00 2001 From: Hai Shi Date: Mon, 27 Mar 2017 00:51:41 +0800 Subject: [PATCH] [Service] Fix some details in image_service 1) image_name can not be transmitted in kwargs. 2) Remove redundant parent classes in glance_image. Change-Id: Ifeafec19adddaa443691ea9d23f97e49fa28aee3 --- rally/plugins/openstack/scenarios/glance/images.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rally/plugins/openstack/scenarios/glance/images.py b/rally/plugins/openstack/scenarios/glance/images.py index af15c212..fa84a664 100644 --- a/rally/plugins/openstack/scenarios/glance/images.py +++ b/rally/plugins/openstack/scenarios/glance/images.py @@ -39,13 +39,14 @@ class GlanceBasic(scenario.OpenStackScenario): atomic_inst=self.atomic_actions()) +@validation.restricted_parameters(["image_name", "name"]) @types.convert(image_location={"type": "path_or_url"}, kwargs={"type": "glance_image_args"}) @validation.required_services(consts.Service.GLANCE) @validation.required_openstack(users=True) @scenario.configure(context={"cleanup": ["glance"]}, name="GlanceImages.create_and_list_image") -class CreateAndListImage(GlanceBasic, nova_utils.NovaScenario): +class CreateAndListImage(GlanceBasic): def run(self, container_format, image_location, disk_format, **kwargs): """Create an image and then list all images. @@ -79,7 +80,7 @@ class CreateAndListImage(GlanceBasic, nova_utils.NovaScenario): @validation.required_openstack(users=True) @scenario.configure(context={"cleanup": ["glance"]}, name="GlanceImages.list_images") -class ListImages(GlanceBasic, nova_utils.NovaScenario): +class ListImages(GlanceBasic): def run(self): """List all images. @@ -94,13 +95,14 @@ class ListImages(GlanceBasic, nova_utils.NovaScenario): self.glance.list_images() +@validation.restricted_parameters(["image_name", "name"]) @types.convert(image_location={"type": "path_or_url"}, kwargs={"type": "glance_image_args"}) @validation.required_services(consts.Service.GLANCE) @validation.required_openstack(users=True) @scenario.configure(context={"cleanup": ["glance"]}, name="GlanceImages.create_and_delete_image") -class CreateAndDeleteImage(GlanceBasic, nova_utils.NovaScenario): +class CreateAndDeleteImage(GlanceBasic): def run(self, container_format, image_location, disk_format, **kwargs): """Create and then delete an image. @@ -120,6 +122,7 @@ class CreateAndDeleteImage(GlanceBasic, nova_utils.NovaScenario): self.glance.delete_image(image.id) +@validation.restricted_parameters(["image_name", "name"]) @types.convert(flavor={"type": "nova_flavor"}, image_location={"type": "path_or_url"}, kwargs={"type": "glance_image_args"})