openstack/tempest
Code Issues Proposed changes

Merge "Use volume_type option in tempest.conf in compute api test"

Browse Source
This commit is contained in:
Zuul 2021-06-17 01:39:20 +00:00 committed by Gerrit Code Review
commit 98405eb0a6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/compute/base.py
View File

@ -515,6 +515,12 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
kwargs['display_name'] = vol_name kwargs['display_name'] = vol_name
if image_ref is not None: if image_ref is not None:
kwargs['imageRef'] = image_ref kwargs['imageRef'] = image_ref
if CONF.volume.volume_type and 'volume_type' not in kwargs:
# If volume_type is not provided in config then no need to
# add a volume type and
# if volume_type has already been added by child class then
# no need to override.
kwargs['volume_type'] = CONF.volume.volume_type
if CONF.compute.compute_volume_common_az: if CONF.compute.compute_volume_common_az:
kwargs.setdefault('availability_zone', kwargs.setdefault('availability_zone',
CONF.compute.compute_volume_common_az) CONF.compute.compute_volume_common_az)