openstack
/
cinder
Code Issues Proposed changes

Merge "Fix rekeying volume with legacy encryption provider"

This commit is contained in:
Zuul 2020-07-30 18:59:48 +00:00 committed by Gerrit Code Review
parent 2124f39f9d 1788a9a715
commit 52a08881e5
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/test_volume_utils.py
View File

@ -1175,6 +1175,7 @@ class VolumeUtilsTestCase(test.TestCase):
volume,
mock.sentinel.context)
self.assertEqual('aes-xts-plain64', ret['cipher'])
self.assertEqual('luks', ret['provider'])
def test_check_encryption_provider_invalid(self):
encryption_metadata = {'cipher': 'aes-xts-plain64',

1
cinder/volume/volume_utils.py
View File

@ -1191,6 +1191,7 @@ def check_encryption_provider(db, volume, context):
provider = encryption['provider']
if provider in encryptors.LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP:
provider = encryptors.LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP[provider]
encryption['provider'] = provider
if provider != encryptors.LUKS:
message = _("Provider %s not supported.") % provider
raise exception.VolumeDriverException(message=message)