commit cba2c8bf0214070277faa38b97a8b85fb2f70b9b
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:26 2025 +0000
tree b033ee3d1c568b8e3fb8d2b5dad2de4b2ceaaa77
parent 2d4204774bc4635418e992593914528911b4e7ff

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 62b2823..1afb940 100644
--- a/tempest/scenario/test_encrypted_cinder_volumes.py
+++ b/tempest/scenario/test_encrypted_cinder_volumes.py
@@ -80,9 +80,10 @@
     @utils.services('compute', 'volume', 'image')
     def test_encrypted_cinder_volumes_luksv2(self):
         """LUKs v2 decrypts volume through os-brick."""
-        volume = self.create_encrypted_volume('luks2',
-                                              volume_type='luksv2',
-                                              wait_until=None)
+        volume = self.create_encrypted_volume(
+            'luks2',
+            volume_type=CONF.volume.volume_type_luks_v2,
+            wait_until=None)
         server = self.launch_instance()
         waiters.wait_for_volume_resource_status(self.volumes_client,
                                                 volume['id'], 'available')

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 1c3c8bf..28d8ff8 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -288,10 +288,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)
 
@@ -315,6 +315,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
         )
 
@@ -330,5 +331,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
         )