openstack
/
tempest
Code Issues Proposed changes

Merge "Allow kwargs in create_volume_from_image"

This commit is contained in:
Zuul 2020-12-04 11:11:10 +00:00 committed by Gerrit Code Review
parent 400459c7d7 0216b37684
commit 44869eddc0
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tempest/scenario/manager.py
View File

@ -956,12 +956,21 @@ class ScenarioTest(tempest.test.BaseTestCase):
return self.create_server(**create_kwargs)
def create_volume_from_image(self):
"""Create volume from image"""
img_uuid = CONF.compute.image_ref
vol_name = data_utils.rand_name(
self.__class__.__name__ + '-volume-origin')
return self.create_volume(name=vol_name, imageRef=img_uuid)
def create_volume_from_image(self, **kwargs):
"""Create volume from image.
:param image_id: ID of the image to create volume from,
CONF.compute.image_ref by default
:param name: name of the volume,
'$classname-volume-origin' by default
:param **kwargs: additional parameters
"""
image_id = kwargs.pop('image_id', CONF.compute.image_ref)
name = kwargs.pop('name', None)
if not name:
namestart = self.__class__.__name__ + '-volume-origin'
name = data_utils.rand_name(namestart)
return self.create_volume(name=name, imageRef=image_id, **kwargs)
class NetworkScenarioTest(ScenarioTest):