Skip some tests which use volumes with multiattach property
Related-prod: PRODX-22962
Change-Id: I43b834c79647ae677d0b5a2bc2e6be2786367f12
(cherry picked from commit c2356a41bde988d31034a96a830d41a4eeab5feb)
diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py
index 7ea8f09..f7432d0 100644
--- a/tempest/api/compute/volumes/test_attach_volume.py
+++ b/tempest/api/compute/volumes/test_attach_volume.py
@@ -267,6 +267,12 @@
"""
server, validation_resources = self._create_server()
volume = self.create_volume()
+
+ if volume['multiattach']:
+ raise self.skipException(
+ "Attaching multiattach volumes is not supported "
+ "for shelved-offloaded instances.")
+
num_vol = self._count_volumes(server, validation_resources)
self._shelve_server(server, validation_resources)
attachment = self.attach_volume(server, volume)
@@ -277,8 +283,7 @@
# Get volume attachment of the server
volume_attachment = self.servers_client.show_volume_attachment(
- server['id'],
- attachment['id'])['volumeAttachment']
+ server['id'], attachment['id'])['volumeAttachment']
self.assertEqual(server['id'], volume_attachment['serverId'])
self.assertEqual(attachment['id'], volume_attachment['id'])
# Check the mountpoint is not None after unshelve server even in
@@ -298,6 +303,12 @@
"""
server, validation_resources = self._create_server()
volume = self.create_volume()
+
+ if volume['multiattach']:
+ raise self.skipException(
+ "Attaching multiattach volumes is not supported for "
+ "shelved-offloaded instances.")
+
num_vol = self._count_volumes(server, validation_resources)
self._shelve_server(server, validation_resources)
@@ -307,8 +318,8 @@
waiters.wait_for_volume_resource_status(self.volumes_client,
volume['id'], 'available')
- # Unshelve the instance and check that we have the expected number of
- # volume(s)
+ # Unshelve the instance and check that we have
+ # the expected number of volume(s)
self._unshelve_server_and_check_volumes(
server, validation_resources, num_vol)
diff --git a/tempest/api/volume/test_volumes_negative.py b/tempest/api/volume/test_volumes_negative.py
index d8480df..7c319db 100644
--- a/tempest/api/volume/test_volumes_negative.py
+++ b/tempest/api/volume/test_volumes_negative.py
@@ -264,6 +264,13 @@
@decorators.idempotent_id('449c4ed2-ecdd-47bb-98dc-072aeccf158c')
def test_reserve_volume_with_negative_volume_status(self):
"""Test reserving already reserved volume should fail"""
+
+ # Skip test if the volume has "multiattach" property
+ volume = self.volumes_client.show_volume(self.volume['id'])
+ if volume['multiattach']:
+ raise self.skipException('Reserving multiattach volumes is not'
+ ' supported.')
+
# Mark volume as reserved.
self.volumes_client.reserve_volume(self.volume['id'])
# Mark volume which is marked as reserved before