Unhardcode encrypted volume types names
Introduce the foolowing options that allows to change volume type names:
* volume_type_cryptsetup
* volume_type_luks
Related-Prod: PRODX-25629
Change-Id: I1ceb26e5a45f1140f6908250d9950594e2561de3
diff --git a/tempest/config.py b/tempest/config.py
index 518f838..340ffcd 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1084,6 +1084,14 @@
cfg.ListOpt('scheduler_default_filters',
default=[],
help="The list of enabled scheduler filters.",),
+ cfg.StrOpt('volume_type_luks',
+ default='luks',
+ help="The name of volume type used by tests to create"
+ "volumes with luks encryption.",),
+ cfg.StrOpt('volume_type_cryptsetup',
+ default='cryptsetup',
+ help="The name of volume type used by tests to create"
+ "volumes with cryptsetup encryption.",),
]
volume_feature_group = cfg.OptGroup(name='volume-feature-enabled',
diff --git a/tempest/scenario/test_encrypted_cinder_volumes.py b/tempest/scenario/test_encrypted_cinder_volumes.py
index 6ee9f28..fbfe701 100644
--- a/tempest/scenario/test_encrypted_cinder_volumes.py
+++ b/tempest/scenario/test_encrypted_cinder_volumes.py
@@ -56,8 +56,8 @@
@utils.services('compute', 'volume', 'image')
def test_encrypted_cinder_volumes_luks(self):
server = self.launch_instance()
- volume = self.create_encrypted_volume('luks',
- volume_type='luks')
+ volume = self.create_encrypted_volume(
+ 'luks', volume_type=CONF.volume.volume_type_luks)
self.attach_detach_volume(server, volume)
@decorators.idempotent_id('cbc752ed-b716-4717-910f-956cce965722')
@@ -65,6 +65,6 @@
@utils.services('compute', 'volume', 'image')
def test_encrypted_cinder_volumes_cryptsetup(self):
server = self.launch_instance()
- volume = self.create_encrypted_volume('plain',
- volume_type='cryptsetup')
+ volume = self.create_encrypted_volume(
+ 'plain', volume_type=CONF.volume.volume_type_cryptsetup)
self.attach_detach_volume(server, volume)
diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index 5a5cc27..d067ef7 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -252,8 +252,8 @@
@utils.services('compute', 'volume')
def test_boot_server_from_encrypted_volume_luks(self):
# Create an encrypted volume
- volume = self.create_encrypted_volume('luks',
- volume_type='luks')
+ volume = self.create_encrypted_volume(
+ 'luks', volume_type=CONF.volume.volume_type_luks)
self.volumes_client.set_bootable_volume(volume['id'], bootable=True)