openstack/cinder
Code Issues Proposed changes

Merge "Tests: Fix type error in volume encryption unit tests" into stable/2024.2

Browse Source
This commit is contained in:
Zuul 2024-12-06 18:43:37 +00:00 committed by Gerrit Code Review
commit 2c13eeb323
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cinder/tests/unit/volume/test_volume.py
View File

@ -1722,15 +1722,15 @@ class VolumeTestCase(base.BaseVolumeTestCase):
@ddt.data({'connector_class':
os_brick.initiator.connectors.iscsi.ISCSIConnector,
'rekey_supported': True,
'already_encrypted': 'yes'},
'already_encrypted': True},
{'connector_class':
os_brick.initiator.connectors.iscsi.ISCSIConnector,
'rekey_supported': True,
'already_encrypted': 'no'},
'already_encrypted': False},
{'connector_class':
os_brick.initiator.connectors.rbd.RBDConnector,
'rekey_supported': False,
'already_encrypted': 'no'})
'already_encrypted': False})
@ddt.unpack
@mock.patch('cinder.volume.volume_utils.delete_encryption_key')
@mock.patch('cinder.volume.flows.manager.create_volume.'
@ -1748,9 +1748,11 @@ class VolumeTestCase(base.BaseVolumeTestCase):
already_encrypted=None):
# create source volume
mock_execute.return_value = ('', '')
mock_enc_metadata_get.return_value = {'cipher': 'aes-xts-plain64',
'key_size': 256,
'provider': 'luks'}
mock_enc_metadata_get.return_value = {
'cipher': 'aes-xts-plain64',
'key_size': 256,
'provider': 'luks',
'encryption_key_id': fake.ENCRYPTION_KEY_ID}
mock_setup_enc_keys.return_value = (
'qwert',
'asdfg',
@ -1802,7 +1804,8 @@ class VolumeTestCase(base.BaseVolumeTestCase):
src_vol,
{'key_size': 256,
'provider': 'luks',
'cipher': 'aes-xts-plain64'}
'cipher': 'aes-xts-plain64',
'encryption_key_id': fake.ENCRYPTION_KEY_ID}
)
if already_encrypted:
mock_execute.assert_called_once_with(
@ -1816,6 +1819,7 @@ class VolumeTestCase(base.BaseVolumeTestCase):
else:
mock_execute.assert_called_once_with(
'cryptsetup', '--batch-mode', 'luksFormat',
'--force-password',
'--type', 'luks1',
'--cipher', 'aes-xts-plain64', '--key-size', '256',
'--key-file=-', '/some/device/thing',

7
cinder/volume/flows/manager/create_volume.py
View File

@ -596,17 +596,18 @@ class CreateVolumeFromSpecTask(flow_utils.CinderTask):
# and is detected as another format.
raise exception.Invalid()
if encryption['provider'] == 'luks':
encryption_provider = encryption['provider']
if encryption_provider == 'luks':
# Force ambiguous "luks" provider to luks1 for
# compatibility with new versions of cryptsetup.
encryption['provider'] = 'luks1'
encryption_provider = 'luks1'
(out, err) = utils.execute(
'cryptsetup',
'--batch-mode',
'luksFormat',
'--force-password',
'--type', encryption['provider'],
'--type', encryption_provider,
'--cipher', encryption['cipher'],
'--key-size', str(encryption['key_size']),
'--key-file=-',