Unhardcode encrypted volume types names
Introduce the foolowing options that allows to change volume type names:
* volume_type_cryptsetup
* volume_type_luks
* volume_type_luks_v2
Related-Prod: PRODX-25629
Change-Id: I1ceb26e5a45f1140f6908250d9950594e2561de3
(cherry picked from commit 445330607cea2de0758985db41540e128fe7a6d7)
(cherry picked from commit 829808cf645c7f8509c9f0ee05c45b7029625435)
diff --git a/tempest/config.py b/tempest/config.py
index d032657..d294fa1 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1113,6 +1113,21 @@
"If both values are not specified, Tempest avoids tests "
"which require a microversion. Valid values are string "
"with format 'X.Y' or string 'latest'",),
+ 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_luks_v2',
+ default='luks2',
+ help="The name of volume type used by tests to create"
+ "volumes with luks v2 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 cb5e673..62b2823 100644
--- a/tempest/scenario/test_encrypted_cinder_volumes.py
+++ b/tempest/scenario/test_encrypted_cinder_volumes.py
@@ -60,9 +60,10 @@
@utils.services('compute', 'volume', 'image')
def test_encrypted_cinder_volumes_luks(self):
"""LUKs v1 decrypts volume through libvirt."""
- volume = self.create_encrypted_volume('luks',
- volume_type='luks',
- wait_until=None)
+ volume = self.create_encrypted_volume(
+ 'luks',
+ volume_type=CONF.volume.volume_type_luks,
+ wait_until=None)
server = self.launch_instance()
waiters.wait_for_volume_resource_status(self.volumes_client,
volume['id'], 'available')
@@ -100,9 +101,10 @@
'plain cryptoprovider is not supported.')
@utils.services('compute', 'volume', 'image')
def test_encrypted_cinder_volumes_cryptsetup(self):
- volume = self.create_encrypted_volume('plain',
- volume_type='cryptsetup',
- wait_until=None)
+ volume = self.create_encrypted_volume(
+ 'plain',
+ volume_type=CONF.volume.volume_type_cryptsetup,
+ wait_until=None)
server = self.launch_instance()
waiters.wait_for_volume_resource_status(self.volumes_client,
volume['id'], 'available')
diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index bab2582..c6ac6b6 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -348,7 +348,9 @@
@utils.services('compute', 'volume')
def test_boot_server_from_encrypted_volume_luks(self):
"""LUKs v1 decrypts volume through libvirt."""
- self._do_test_boot_server_from_encrypted_volume_luks('luks')
+ self._do_test_boot_server_from_encrypted_volume_luks(
+ CONF.volume.volume_type_luks
+ )
@decorators.idempotent_id('5ab6100f-1b31-4dd0-a774-68cfd837ef77')
@testtools.skipIf(CONF.volume.storage_protocol == 'ceph',
@@ -361,4 +363,6 @@
@utils.services('compute', 'volume')
def test_boot_server_from_encrypted_volume_luksv2(self):
"""LUKs v2 decrypts volume through os-brick."""
- self._do_test_boot_server_from_encrypted_volume_luks('luks2')
+ self._do_test_boot_server_from_encrypted_volume_luks(
+ CONF.volume.volume_type_luks_v2
+ )