openstack/tempest
Code Issues Proposed changes

Merge "Add qcow2 format to upload image test"

Browse Source
This commit is contained in:
Zuul 2025-03-26 17:30:54 +00:00 committed by Gerrit Code Review
commit d12ddc31cb
3 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
releasenotes/notes/change-default-disk-format-0d5230cbb19e3d44.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The default value for ``[volume] disk_format``, which specifies the
disk format of the image in a copy a volume to image operation,
is changed from ``raw`` to ``[raw, qcow2]`` for which the type of
the config option also needed to change from ``string`` type to
``list`` type i.e. it accepts multiple values now.

52
tempest/api/volume/test_volumes_actions.py
View File

@ -109,29 +109,37 @@ class VolumesActionsTest(base.BaseVolumeTest):
# it is shared with the other tests. After it is uploaded in Glance,
# there is no way to delete it from Cinder, so we delete it from Glance
# using the Glance images_client and from Cinder via tearDownClass.
image_name = data_utils.rand_name(self.__class__.__name__ + '-Image',
prefix=CONF.resource_name_prefix)
body = self.volumes_client.upload_volume(
self.volume['id'], image_name=image_name,
disk_format=CONF.volume.disk_format)['os-volume_upload_image']
image_id = body["image_id"]
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.images_client.delete_image,
image_id)
waiters.wait_for_image_status(self.images_client, image_id, 'active')
# This is required for the optimized upload volume path.
# New location APIs are async so we need to wait for the location
# import task to complete.
# This should work with old location API since we don't fail if there
# are no tasks for the image
waiters.wait_for_image_tasks_status(self.images_client,
image_id, 'success')
waiters.wait_for_volume_resource_status(self.volumes_client,
self.volume['id'], 'available')
# NOTE: This looks really strange to loop through the disk formats
# but similar implementation is done in test_volume_bootable test.
# Also there is no trace of ddt usage in tempest so this looks like
# the only way.
for disk_format in CONF.volume.disk_format:
image_name = data_utils.rand_name(
self.__class__.__name__ + '-Image',
prefix=CONF.resource_name_prefix)
body = self.volumes_client.upload_volume(
self.volume['id'], image_name=image_name,
disk_format=disk_format)['os-volume_upload_image']
image_id = body["image_id"]
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.images_client.delete_image,
image_id)
waiters.wait_for_image_status(self.images_client, image_id,
'active')
# This is required for the optimized upload volume path.
# New location APIs are async so we need to wait for the location
# import task to complete.
# This should work with old location API since we don't fail if
# there are no tasks for the image
waiters.wait_for_image_tasks_status(self.images_client,
image_id, 'success')
waiters.wait_for_volume_resource_status(self.volumes_client,
self.volume['id'],
'available')
image_info = self.images_client.show_image(image_id)
self.assertEqual(image_name, image_info['name'])
self.assertEqual(CONF.volume.disk_format, image_info['disk_format'])
image_info = self.images_client.show_image(image_id)
self.assertEqual(image_name, image_info['name'])
self.assertEqual(disk_format, image_info['disk_format'])
@decorators.idempotent_id('92c4ef64-51b2-40c0-9f7e-4749fbaaba33')
def test_reserve_unreserve_volume(self):

6
tempest/config.py
View File

@ -1025,9 +1025,9 @@ VolumeGroup = [
cfg.StrOpt('vendor_name',
default='Open Source',
help='Backend vendor to target when creating volume types'),
cfg.StrOpt('disk_format',
default='raw',
help='Disk format to use when copying a volume to image'),
cfg.ListOpt('disk_format',
default=['raw', 'qcow2'],
help='Disk format to use when copying a volume to image'),
cfg.IntOpt('volume_size',
default=1,
help='Default size in GB for volumes created by volumes tests'),