From b04b102984fa16f4837f63e322baf472c1c76609 Mon Sep 17 00:00:00 2001 From: whoami-rajat Date: Mon, 27 Feb 2023 09:41:22 +0000 Subject: [PATCH] Update multiattach tests Multiattach tests use legacy format to create multiattach volumes i.e. provide "multiattach=True" in request body of a create volume operation. This patch updates the multiattach tests to use multiattach volume type, which is the standard and only way[1], to create multiattach volumes. Note that the old functionality will be changed by patch[2] and passing multiattach=True in volume create request body will error out with BadRequest. Devstack will create the multiattach volume type, like an operator will create in a real deployment, and set it as a tempest config option (see depends on patch). We are adding a new config option `volume_type_multiattach` which is used as the multiattach volume type to create multiattach volumes. [1] https://docs.openstack.org/cinder/latest/admin/volume-multiattach.html#how-to-create-a-multiattach-volume [2] https://review.opendev.org/c/openstack/cinder/+/874865 Depends-On: https://review.opendev.org/c/openstack/devstack/+/877337 Depends-On: https://review.opendev.org/c/openstack/devstack/+/877497 Depends-On: https://review.opendev.org/c/openstack/devstack/+/877548 Depends-On: https://review.opendev.org/c/openstack/devstack/+/877498 Depends-On: https://review.opendev.org/c/openstack/devstack/+/877499 Change-Id: I5f68ef56fcc55dfc636936dabb5e6ad761579519 --- tempest/api/compute/admin/test_volume_swap.py | 5 +++-- tempest/api/compute/admin/test_volumes_negative.py | 6 ++++-- tempest/api/compute/volumes/test_attach_volume.py | 4 +++- tempest/config.py | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tempest/api/compute/admin/test_volume_swap.py b/tempest/api/compute/admin/test_volume_swap.py index 7da87c76f4..36148c5f91 100644 --- a/tempest/api/compute/admin/test_volume_swap.py +++ b/tempest/api/compute/admin/test_volume_swap.py @@ -199,11 +199,12 @@ class TestMultiAttachVolumeSwap(TestVolumeSwapBase): "server1" 8. Check "volume2" is attached to "server1". """ + multiattach_vol_type = CONF.volume.volume_type_multiattach # Create two volumes. # NOTE(gmann): Volumes are created before server creation so that # volumes cleanup can happen successfully irrespective of which volume # is attached to server. - volume1 = self.create_volume(multiattach=True) + volume1 = self.create_volume(volume_type=multiattach_vol_type) # Make volume1 read-only since you can't swap from a volume with # multiple read/write attachments, and you can't change the readonly # flag on an in-use volume so we have to do this before attaching @@ -211,7 +212,7 @@ class TestMultiAttachVolumeSwap(TestVolumeSwapBase): # attach modes, then we can handle this differently. self.admin_volumes_client.update_volume_readonly( volume1['id'], readonly=True) - volume2 = self.create_volume(multiattach=True) + volume2 = self.create_volume(volume_type=multiattach_vol_type) # Create two servers and wait for them to be ACTIVE. validation_resources = self.get_class_validation_resources( diff --git a/tempest/api/compute/admin/test_volumes_negative.py b/tempest/api/compute/admin/test_volumes_negative.py index 91ab09e79f..55c842fee4 100644 --- a/tempest/api/compute/admin/test_volumes_negative.py +++ b/tempest/api/compute/admin/test_volumes_negative.py @@ -115,9 +115,11 @@ class UpdateMultiattachVolumeNegativeTest(base.BaseV2ComputeAdminTest): 5. Check "vol1" is still attached to both servers 6. Check "vol2" is not attached to any server """ + multiattach_vol_type = CONF.volume.volume_type_multiattach + # Create two multiattach capable volumes. - vol1 = self.create_volume(multiattach=True) - vol2 = self.create_volume(multiattach=True) + vol1 = self.create_volume(volume_type=multiattach_vol_type) + vol2 = self.create_volume(volume_type=multiattach_vol_type) # Create two instances. validation_resources = self.get_class_validation_resources( diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py index 5380c67326..7ea8f0968e 100644 --- a/tempest/api/compute/volumes/test_attach_volume.py +++ b/tempest/api/compute/volumes/test_attach_volume.py @@ -369,7 +369,9 @@ class AttachVolumeMultiAttachTest(BaseAttachVolumeTest): kwargs = {} if bootable: kwargs['image_ref'] = CONF.compute.image_ref - return self.create_volume(multiattach=True, **kwargs) + multiattach_vol_type = CONF.volume.volume_type_multiattach + return self.create_volume(volume_type=multiattach_vol_type, + **kwargs) def _create_and_multiattach(self): """Creates two server instances and a volume and attaches to both. diff --git a/tempest/config.py b/tempest/config.py index dfc0a8eb3f..551578ee4a 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -1015,6 +1015,10 @@ VolumeGroup = [ cfg.StrOpt('volume_type', default='', help='Volume type to be used while creating volume.'), + cfg.StrOpt('volume_type_multiattach', + default='', + help='Multiattach volume type used while creating multiattach ' + 'volume.'), cfg.StrOpt('storage_protocol', default='iSCSI', help='Backend protocol to target when creating volume types'),