diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py index c538e60ca3..89f9850474 100644 --- a/tempest/api/volume/base.py +++ b/tempest/api/volume/base.py @@ -129,6 +129,13 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest, name = data_utils.rand_name(cls.__name__ + '-Volume') kwargs['name'] = name + 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: kwargs.setdefault('availability_zone', CONF.compute.compute_volume_common_az) diff --git a/tempest/config.py b/tempest/config.py index 956b593d4d..4d6577bbe1 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -965,6 +965,9 @@ VolumeGroup = [ default=['BACKEND_1', 'BACKEND_2'], help='A list of backend names separated by comma. ' 'The backend name must be declared in cinder.conf'), + cfg.StrOpt('volume_type', + default='', + help='Volume type to be used while creating volume.'), cfg.StrOpt('storage_protocol', default='iSCSI', help='Backend protocol to target when creating volume types'),