openstack/nova
Code Issues Proposed changes

Merge "Fix vmdk_allowed_types checking" into unmaintained/zed

Browse Source
This commit is contained in:
Zuul 2024-07-11 00:58:54 +00:00 committed by Gerrit Code Review
commit 20e17e07b1
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nova/tests/unit/virt/libvirt/test_utils.py
View File

@ -117,9 +117,11 @@ class LibvirtUtilsTestCase(test.NoDBTestCase):
else:
backing_info = {}
backing_backing_file = backing_info.pop('backing_file', None)
backing_fmt = backing_info.pop('backing_fmt',
mock.sentinel.backing_fmt)
mock_info.return_value = mock.Mock(
file_format=mock.sentinel.backing_fmt,
file_format=backing_fmt,
cluster_size=mock.sentinel.cluster_size,
backing_file=backing_backing_file,
format_specific=backing_info,
@ -139,7 +141,7 @@ class LibvirtUtilsTestCase(test.NoDBTestCase):
cow_opts = [
'-o',
f'backing_file={backing_file},'
f'backing_fmt={mock.sentinel.backing_fmt},'
f'backing_fmt={backing_fmt},'
f'cluster_size={mock.sentinel.cluster_size}',
]
@ -193,6 +195,25 @@ class LibvirtUtilsTestCase(test.NoDBTestCase):
backing_file=mock.sentinel.backing_file,
)
def test_create_image_vmdk(self):
self._test_create_image(
'/some/vmdk', 'vmdk', '1234567891234',
backing_file={'file': mock.sentinel.backing_file,
'backing_fmt': 'vmdk',
'backing_file': None,
'data': {'create-type': 'monolithicSparse'}}
)
def test_create_image_vmdk_invalid_type(self):
self.assertRaises(exception.ImageUnacceptable,
self._test_create_image,
'/some/vmdk', 'vmdk', '1234567891234',
backing_file={'file': mock.sentinel.backing_file,
'backing_fmt': 'vmdk',
'backing_file': None,
'data': {'create-type': 'monolithicFlat'}}
)
@ddt.unpack
@ddt.data({'fs_type': 'some_fs_type',
'default_eph_format': None,

2
nova/virt/libvirt/utils.py
View File

@ -148,6 +148,8 @@ def create_image(
reason=_('Base image failed safety check'))
base_details = images.qemu_img_info(backing_file)
if base_details.file_format == 'vmdk':
images.check_vmdk_image('base', base_details)
if base_details.backing_file is not None:
LOG.warning('Base image %s failed safety check', backing_file)
raise exception.InvalidDiskInfo(