Fix vmdk_allowed_types checking
This restores the vmdk_allowed_types checking in create_image()
that was unintentionally lost by tightening the
qemu-type-matches-glance code in the fetch patch recently. Since we
are still detecting the format of base images without metadata, we
would have treated a vmdk file that claims to be raw as raw in fetch,
but then read it like a vmdk once it was used as a base image for
something else.
Change-Id: I07b332a7edb814f6a91661651d9d24bfd6651ae7
Related-Bug: #2059809
(cherry picked from commit 08be7b2a0d
)
This commit is contained in:
parent
8a0d5f2afa
commit
11301e7e3f
@ -119,9 +119,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,
|
||||
@ -144,7 +146,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}',
|
||||
]
|
||||
|
||||
@ -221,6 +223,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'}}
|
||||
)
|
||||
|
||||
def test_create_image_encryption(self):
|
||||
encryption = {
|
||||
'secret': 'a_secret',
|
||||
|
@ -168,6 +168,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(
|
||||
|
Loading…
Reference in New Issue
Block a user