openstack/tempest
Code Issues Proposed changes

Merge "Allow glance support for GPT images"

Browse Source
This commit is contained in:
Zuul
2025-01-11 00:18:13 +00:00
committed by Gerrit Code Review
parent 48b67dfca9 88c3d48cec
commit 21fbdc06b7
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tempest/api/image/v2/test_images_formats.py
View File

@@ -90,14 +90,18 @@ class ImagesFormatTest(base.BaseV2ImageTest,
@decorators.idempotent_id('a245fcbe-63ce-4dc1-a1d0-c16d76d9e6df') @decorators.idempotent_id('a245fcbe-63ce-4dc1-a1d0-c16d76d9e6df')
def test_accept_usable_formats(self): def test_accept_usable_formats(self):
if self.imgdef['usable']: if self.imgdef['usable']:
if self.imgdef['format'] in CONF.image.disk_formats: try:
# These are expected to work
self._test_image(self.imgdef) self._test_image(self.imgdef)
else: except lib_exc.BadRequest:
# If this is not configured to be supported, we should get format = self.imgdef['format']
# a BadRequest from glance if format == 'gpt' and format not in CONF.image.disk_formats:
self.assertRaises(lib_exc.BadRequest, # If we don't have gpt defined, we don't expect this to
self._test_image, self.imgdef) # work because glance has not been updated for GPT
# FIXME(danms): Remove this once glance support for GPT is
# landed on master
self.skipTest('GPT not configured and glance is too '
'old to support it')
raise
else: else:
self.skipTest( self.skipTest(
'Glance does not currently reject unusable images on upload') 'Glance does not currently reject unusable images on upload')
@@ -134,15 +138,23 @@ class ImagesFormatTest(base.BaseV2ImageTest,
# the import even starts until glance has it in its API # the import even starts until glance has it in its API
# schema as a valid value. Other formats expected to fail # schema as a valid value. Other formats expected to fail
# do so during import and return to queued state. # do so during import and return to queued state.
if self.imgdef['format'] not in CONF.image.disk_formats: try:
self.assertRaises(lib_exc.BadRequest,
self._test_image,
self.imgdef, asimport=True)
else:
image = self._test_image(self.imgdef, asimport=True) image = self._test_image(self.imgdef, asimport=True)
waiters.wait_for_image_status(self.client, image['id'], waiters.wait_for_image_status(self.client, image['id'],
'queued') ['queued', 'active'])
self.client.delete_image(image['id']) self.client.delete_image(image['id'])
except lib_exc.BadRequest:
format = self.imgdef['format']
if format == 'gpt' and format not in CONF.image.disk_formats:
# If we don't have gpt defined, we don't expect this to
# work because glance has not been updated for GPT
# FIXME(danms): Remove this once glance support for GPT is
# landed on master
self.skipTest('GPT not configured and glance is too '
'old to support it')
elif format in CONF.image.disk_formats:
# This is in our config so it's supposed to work, fail
raise
if self.imgdef['format'] == 'iso': if self.imgdef['format'] == 'iso':
# NOTE(danms): Glance has a special case to not convert ISO images # NOTE(danms): Glance has a special case to not convert ISO images