Merge "Fix rekeying volume with legacy encryption provider"
This commit is contained in:
commit
52a08881e5
|
@ -1175,6 +1175,7 @@ class VolumeUtilsTestCase(test.TestCase):
|
||||||
volume,
|
volume,
|
||||||
mock.sentinel.context)
|
mock.sentinel.context)
|
||||||
self.assertEqual('aes-xts-plain64', ret['cipher'])
|
self.assertEqual('aes-xts-plain64', ret['cipher'])
|
||||||
|
self.assertEqual('luks', ret['provider'])
|
||||||
|
|
||||||
def test_check_encryption_provider_invalid(self):
|
def test_check_encryption_provider_invalid(self):
|
||||||
encryption_metadata = {'cipher': 'aes-xts-plain64',
|
encryption_metadata = {'cipher': 'aes-xts-plain64',
|
||||||
|
|
|
@ -1191,6 +1191,7 @@ def check_encryption_provider(db, volume, context):
|
||||||
provider = encryption['provider']
|
provider = encryption['provider']
|
||||||
if provider in encryptors.LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP:
|
if provider in encryptors.LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP:
|
||||||
provider = encryptors.LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP[provider]
|
provider = encryptors.LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP[provider]
|
||||||
|
encryption['provider'] = provider
|
||||||
if provider != encryptors.LUKS:
|
if provider != encryptors.LUKS:
|
||||||
message = _("Provider %s not supported.") % provider
|
message = _("Provider %s not supported.") % provider
|
||||||
raise exception.VolumeDriverException(message=message)
|
raise exception.VolumeDriverException(message=message)
|
||||||
|
|
Loading…
Reference in New Issue