From e2fbd41c32481560dcef46d856312be643e1e14b Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Tue, 4 Apr 2017 12:58:53 +0100 Subject: [PATCH] Use new encryption provider constants These constants of 'luks' and 'plain' were introduced to Nova and os-brick during Ocata in the following changes : Ic155bd29d46059832cce970bf60375e7e472eca6 The direct use of the encryptor classes using their implementation class path or name was deprecated in Ocata and will be blocked by os-brick in Queens via the following change : I3eec91e221692177833909e0378116cea4966807 Change-Id: Id221414d74af8413084c7935b762f93b7ce43c42 --- tempest/scenario/test_encrypted_cinder_volumes.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tempest/scenario/test_encrypted_cinder_volumes.py b/tempest/scenario/test_encrypted_cinder_volumes.py index b5220e9a4c..8c210d598c 100644 --- a/tempest/scenario/test_encrypted_cinder_volumes.py +++ b/tempest/scenario/test_encrypted_cinder_volumes.py @@ -57,8 +57,7 @@ class TestEncryptedCinderVolumes(manager.EncryptionScenarioTest): @utils.services('compute', 'volume', 'image') def test_encrypted_cinder_volumes_luks(self): server = self.launch_instance() - volume = self.create_encrypted_volume('nova.volume.encryptors.' - 'luks.LuksEncryptor', + volume = self.create_encrypted_volume('luks', volume_type='luks') self.attach_detach_volume(server, volume) @@ -67,7 +66,6 @@ class TestEncryptedCinderVolumes(manager.EncryptionScenarioTest): @utils.services('compute', 'volume', 'image') def test_encrypted_cinder_volumes_cryptsetup(self): server = self.launch_instance() - volume = self.create_encrypted_volume('nova.volume.encryptors.' - 'cryptsetup.CryptsetupEncryptor', + volume = self.create_encrypted_volume('plain', volume_type='cryptsetup') self.attach_detach_volume(server, volume)