openstack/rally-openstack
Code Issues Proposed changes

Merge "[Service] Fix some details in image_service"

Browse Source
This commit is contained in:
Jenkins 2017-03-29 02:10:47 +00:00 committed by Gerrit Code Review
commit fda20969ca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rally/plugins/openstack/scenarios/glance/images.py
View File

@ -39,13 +39,14 @@ class GlanceBasic(scenario.OpenStackScenario):
atomic_inst=self.atomic_actions()) atomic_inst=self.atomic_actions())
@validation.restricted_parameters(["image_name", "name"])
@types.convert(image_location={"type": "path_or_url"}, @types.convert(image_location={"type": "path_or_url"},
kwargs={"type": "glance_image_args"}) kwargs={"type": "glance_image_args"})
@validation.required_services(consts.Service.GLANCE) @validation.required_services(consts.Service.GLANCE)
@validation.required_openstack(users=True) @validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["glance"]}, @scenario.configure(context={"cleanup": ["glance"]},
name="GlanceImages.create_and_list_image") 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): def run(self, container_format, image_location, disk_format, **kwargs):
"""Create an image and then list all images. """Create an image and then list all images.
@ -79,7 +80,7 @@ class CreateAndListImage(GlanceBasic, nova_utils.NovaScenario):
@validation.required_openstack(users=True) @validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["glance"]}, @scenario.configure(context={"cleanup": ["glance"]},
name="GlanceImages.list_images") name="GlanceImages.list_images")
class ListImages(GlanceBasic, nova_utils.NovaScenario): class ListImages(GlanceBasic):
def run(self): def run(self):
"""List all images. """List all images.
@ -94,13 +95,14 @@ class ListImages(GlanceBasic, nova_utils.NovaScenario):
self.glance.list_images() self.glance.list_images()
@validation.restricted_parameters(["image_name", "name"])
@types.convert(image_location={"type": "path_or_url"}, @types.convert(image_location={"type": "path_or_url"},
kwargs={"type": "glance_image_args"}) kwargs={"type": "glance_image_args"})
@validation.required_services(consts.Service.GLANCE) @validation.required_services(consts.Service.GLANCE)
@validation.required_openstack(users=True) @validation.required_openstack(users=True)
@scenario.configure(context={"cleanup": ["glance"]}, @scenario.configure(context={"cleanup": ["glance"]},
name="GlanceImages.create_and_delete_image") 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): def run(self, container_format, image_location, disk_format, **kwargs):
"""Create and then delete an image. """Create and then delete an image.
@ -120,6 +122,7 @@ class CreateAndDeleteImage(GlanceBasic, nova_utils.NovaScenario):
self.glance.delete_image(image.id) self.glance.delete_image(image.id)
@validation.restricted_parameters(["image_name", "name"])
@types.convert(flavor={"type": "nova_flavor"}, @types.convert(flavor={"type": "nova_flavor"},
image_location={"type": "path_or_url"}, image_location={"type": "path_or_url"},
kwargs={"type": "glance_image_args"}) kwargs={"type": "glance_image_args"})