Support proper image import ISO format testing
This makes the image import format test not skip ISO and assert that the import conversion process does not change it from iso to something else. Depends-On: https://review.opendev.org/c/openstack/glance/+/923676 Change-Id: I2e88b0a086838d68055ac9a5808b84c8dc1efc2e
This commit is contained in:
parent
32da46943e
commit
f6bb9d1e4b
@ -110,12 +110,6 @@ class ImagesFormatTest(base.BaseV2ImageTest,
|
|||||||
if not CONF.image_feature_enabled.image_conversion:
|
if not CONF.image_feature_enabled.image_conversion:
|
||||||
self.skipTest('Import image_conversion not enabled')
|
self.skipTest('Import image_conversion not enabled')
|
||||||
|
|
||||||
if self.imgdef['format'] == 'iso':
|
|
||||||
# TODO(danms): Glance does not properly handle ISO conversions
|
|
||||||
# today and this is being fixed currently. Remove when this
|
|
||||||
# is stable and able to be tested.
|
|
||||||
self.skipTest('Glance ISO conversion is not testable')
|
|
||||||
|
|
||||||
glance_noconvert = [
|
glance_noconvert = [
|
||||||
# Glance does not support vmdk-sparse-with-footer with the
|
# Glance does not support vmdk-sparse-with-footer with the
|
||||||
# in-tree format_inspector
|
# in-tree format_inspector
|
||||||
@ -147,6 +141,12 @@ class ImagesFormatTest(base.BaseV2ImageTest,
|
|||||||
'queued')
|
'queued')
|
||||||
self.client.delete_image(image['id'])
|
self.client.delete_image(image['id'])
|
||||||
|
|
||||||
|
if self.imgdef['format'] == 'iso':
|
||||||
|
# NOTE(danms): Glance has a special case to not convert ISO images
|
||||||
|
# because they are special and must remain as ISOs in order to be
|
||||||
|
# properly used for CD-based rescue and boot.
|
||||||
|
self.assertEqual('iso', image['disk_format'])
|
||||||
|
|
||||||
def _create_server_with_image_def(self, image_def, **overrides):
|
def _create_server_with_image_def(self, image_def, **overrides):
|
||||||
image_def = dict(image_def, **overrides)
|
image_def = dict(image_def, **overrides)
|
||||||
image = self._test_image(image_def)
|
image = self._test_image(image_def)
|
||||||
|
Loading…
Reference in New Issue
Block a user