commit 418a674e2a9f7a9717a34250a240ef26035c3ecf
author Zuul <zuul@review.openstack.org> Tue May 22 13:20:28 2018 +0000
committer Gerrit Code Review <review@openstack.org> Tue May 22 13:20:28 2018 +0000
tree 66d0b2758fa2ea3249064a26494c91f52c27d316
parent dcd7a22f3aeec8f5a9eeb598d9d2e4c70b31d4c3
parent e2fbd41c32481560dcef46d856312be643e1e14b

Merge "Use new encryption provider constants"

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 b5220e9..8c210d5 100644
--- a/tempest/scenario/test_encrypted_cinder_volumes.py
+++ b/tempest/scenario/test_encrypted_cinder_volumes.py
@@ -57,8 +57,7 @@
     @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 @@
     @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)