openstack/cinder
Code Issues Proposed changes

Merge "Fix missing encryption params in Quobyte driver"

Browse Source
This commit is contained in:
Zuul
2026-01-29 21:55:44 +00:00
committed by Gerrit Code Review
parent a0c22c68c1 85bc28f155
commit b908de7ced
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cinder/tests/unit/volume/drivers/test_quobyte.py
View File

@@ -1029,7 +1029,9 @@ class QuobyteDriverTestCase(test.TestCase):
self.mock_object(image_utils, 'qemu_img_info', return_value=img_info)
drv._set_rw_permissions = mock.Mock()
drv._copy_volume_from_snapshot(snapshot, dest_volume, size)
drv._copy_volume_from_snapshot(snapshot, dest_volume, size,
src_encryption_key_id=None,
new_encryption_key_id=None)
drv._read_info_file.assert_called_once_with(info_path)
image_utils.qemu_img_info.assert_called_once_with(
@@ -1083,14 +1085,17 @@ class QuobyteDriverTestCase(test.TestCase):
# mocking and testing starts here
mock_convert = self.mock_object(image_utils, 'convert_image')
drv._read_info_file = mock.Mock(return_value=
{'active': snap_file,
snapshot['id']: snap_file})
drv._read_info_file = mock.Mock(return_value={
'active': snap_file,
snapshot['id']: snap_file
})
self.mock_object(image_utils, 'qemu_img_info', return_value=img_info)
drv._set_rw_permissions = mock.Mock()
shutil.copyfile = mock.Mock()
drv._copy_volume_from_snapshot(snapshot, dest_volume, size)
drv._copy_volume_from_snapshot(snapshot, dest_volume, size,
src_encryption_key_id=None,
new_encryption_key_id=None)
drv._read_info_file.assert_called_once_with(info_path)
image_utils.qemu_img_info.assert_called_once_with(
@@ -1148,14 +1153,17 @@ class QuobyteDriverTestCase(test.TestCase):
# mocking and testing starts here
mock_convert = self.mock_object(image_utils, 'convert_image')
drv._read_info_file = mock.Mock(return_value=
{'active': snap_file,
snapshot['id']: snap_file})
drv._read_info_file = mock.Mock(return_value={
'active': snap_file,
snapshot['id']: snap_file
})
self.mock_object(image_utils, 'qemu_img_info', return_value=img_info)
drv._set_rw_permissions = mock.Mock()
drv._create_overlay_volume_from_snapshot = mock.Mock()
drv._copy_volume_from_snapshot(snapshot, dest_volume, size)
drv._copy_volume_from_snapshot(snapshot, dest_volume, size,
src_encryption_key_id=None,
new_encryption_key_id=None)
drv._read_info_file.assert_called_once_with(info_path)
os_ac_mock.assert_called_once_with(
@@ -1223,7 +1231,9 @@ class QuobyteDriverTestCase(test.TestCase):
drv._set_rw_permissions = mock.Mock()
self.mock_object(shutil, 'copyfile')
drv._copy_volume_from_snapshot(snapshot, dest_volume, size)
drv._copy_volume_from_snapshot(snapshot, dest_volume, size,
src_encryption_key_id=None,
new_encryption_key_id=None)
drv._read_info_file.assert_called_once_with(info_path)
image_utils.qemu_img_info.assert_called_once_with(
@@ -1241,6 +1251,25 @@ class QuobyteDriverTestCase(test.TestCase):
shutil.copyfile.assert_called_once_with(cache_path, dest_vol_path)
drv._set_rw_permissions.assert_called_once_with(dest_vol_path)
def test_copy_volume_from_snapshot_with_encr(self):
# setup vars
drv = self._driver
src_volume = self._simple_volume()
snapshot = self._get_fake_snapshot(src_volume)
dest_volume = self._simple_volume(
id='c1073000-0000-0000-0000-0000000c1073')
size = dest_volume['size']
# run test
self.assertRaises(exception.NotSupportedOperation,
drv._copy_volume_from_snapshot,
snapshot,
dest_volume,
size,
src_encryption_key_id=mock.sentinel.src_key,
new_encryption_key_id=mock.sentinel.dest_key
)
@ddt.data(['available', True], ['backing-up', True],
['creating', False], ['deleting', False])
@ddt.unpack

13
cinder/volume/drivers/quobyte.py
View File

@@ -38,7 +38,7 @@ from cinder import utils
from cinder.volume import configuration
from cinder.volume.drivers import remotefs as remotefs_drv
VERSION = '1.1.13'
VERSION = '1.1.14'
LOG = logging.getLogger(__name__)
@@ -119,6 +119,7 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
1.1.11 - NAS secure ownership & permissions are now False by default
1.1.12 - Ensure the currently configured volume url is always used
1.1.13 - Allow creating volumes from snapshots in state 'backing-up'
1.1.14 - Fixes regression from encryption being added in parent class
"""
@@ -383,7 +384,9 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
return self._create_volume_from_snapshot(volume, snapshot)
@coordination.synchronized('{self.driver_prefix}-{volume.id}')
def _copy_volume_from_snapshot(self, snapshot, volume, volume_size):
def _copy_volume_from_snapshot(self, snapshot, volume, volume_size,
src_encryption_key_id=None,
new_encryption_key_id=None):
"""Copy data from snapshot to destination volume.
This is done with a qemu-img convert to raw/qcow2 from the snapshot
@@ -392,6 +395,12 @@ class QuobyteDriver(remotefs_drv.RemoteFSSnapDriverDistributed):
snapshot id are created directly from the cache.
"""
if new_encryption_key_id:
msg = _("Encryption key %s was requested. Volume "
"encryption is not supported.")
raise exception.NotSupportedOperation(
message=msg % new_encryption_key_id)
LOG.debug("snapshot: %(snap)s, volume: %(vol)s, ",
{'snap': snapshot.id,
'vol': volume.id,