commit 32bd7e014b5302aff7092d1326008237a4507f91
author Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> Fri Feb 14 16:50:43 2025 +0200
committer Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> Fri Feb 14 17:16:16 2025 +0000
tree f79bf910d4d7572e04ba18f61a23c50fe45f53f7
parent eb8ebd855aed7af442d92b3e4e3392ba25f1b217

Followup to I1ceb26e5a45f1140f6908250d9950594e2561de3

Pass both encryption provider and volume type explicitly,
in our setup they are not necessarily named the same.

Change-Id: Id13b1589b230d6383863bf147c007d774e61671a
Related-Issue: PRODX-37481

tempest/scenario/test_encrypted_cinder_volumes.py

diff --git a/tempest/scenario/test_encrypted_cinder_volumes.py b/tempest/scenario/test_encrypted_cinder_volumes.py
index cc9fb28..ccdfe45 100644
--- a/tempest/scenario/test_encrypted_cinder_volumes.py
+++ b/tempest/scenario/test_encrypted_cinder_volumes.py
@@ -74,8 +74,9 @@
     def test_encrypted_cinder_volumes_luksv2(self):
         """LUKs v2 decrypts volume through os-brick."""
         server = self.launch_instance()
-        volume = self.create_encrypted_volume('luks2',
-                                              volume_type='luksv2')
+        volume = self.create_encrypted_volume(
+            'luks2',
+            volume_type=CONF.volume.volume_type_luks_v2)
         self.attach_detach_volume(server, volume)
 
     @decorators.idempotent_id('cbc752ed-b716-4717-910f-956cce965722')

tempest/scenario/test_volume_boot_pattern.py

diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index 2d66a95..2ca5a8e 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -278,10 +278,10 @@
         # Assert that the underlying volume is gone.
         self.volumes_client.wait_for_resource_deletion(volume_origin['id'])
 
-    def _do_test_boot_server_from_encrypted_volume_luks(self, provider):
+    def _do_test_boot_server_from_encrypted_volume_luks(self, provider, vtype):
         # Create an encrypted volume
         volume = self.create_encrypted_volume(provider,
-                                              volume_type=provider)
+                                              volume_type=vtype)
 
         self.volumes_client.set_bootable_volume(volume['id'], bootable=True)
 
@@ -305,6 +305,7 @@
     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",
             CONF.volume.volume_type_luks
         )
 
@@ -320,5 +321,6 @@
     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",
             CONF.volume.volume_type_luks_v2
         )