Fix failing compute volume attachment tests.
This patch fixes the failing tests in compute's
test_server_volume_attachments_rbac, due to a recent change
in tempest.common.waiters.
Change-Id: I5e287844042df4b097c3e478576b17bc926c1cd3
diff --git a/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py b/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py
index 8f96110..4e85fbe 100644
--- a/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py
+++ b/patrole_tempest_plugin/tests/api/compute/test_server_volume_attachments_rbac.py
@@ -35,96 +35,77 @@
@classmethod
def skip_checks(cls):
super(ServerVolumeAttachmentRbacTest, cls).skip_checks()
- if not CONF.compute_feature_enabled.api_extensions:
- raise cls.skipException(
- '%s skipped as no compute extensions enabled' % cls.__name__)
+ if not CONF.service_available.cinder:
+ skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
+ raise cls.skipException(skip_msg)
@classmethod
def resource_setup(cls):
super(ServerVolumeAttachmentRbacTest, cls).resource_setup()
cls.server = cls.create_test_server(wait_until='ACTIVE')
-
- @classmethod
- def resource_cleanup(cls):
- test_utils.call_and_ignore_notfound_exc(cls.delete_server,
- cls.server['id'])
- super(ServerVolumeAttachmentRbacTest, cls).resource_cleanup()
+ cls.volume = cls.create_volume()
def tearDown(self):
self.rbac_utils.switch_role(self, switchToRbacRole=False)
super(ServerVolumeAttachmentRbacTest, self).tearDown()
- def _create_and_attach(self):
- self.volume = self.create_volume()
- self.attachment = self._attach(self.server, self.volume)
-
- def _attach(self, server, volume):
- attachment = self.client.attach_volume(
- server['id'],
- volumeId=volume['id'])['volumeAttachment']
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- self._detach, server['id'], volume['id'])
- waiters.wait_for_volume_status(self.volumes_client, volume['id'],
- 'in-use')
- return attachment
-
- def _detach(self, server_id, volume_id):
- # For test_update_volume_attachment, an addCleanup is called with
- # a stale volume, because a new volume is attached, so only detach
- # the new volume to avoid a bad request error.
- if hasattr(self, 'volume') and self.volume['id'] == volume_id:
- self.client.detach_volume(server_id, volume_id)
- waiters.wait_for_volume_status(self.volumes_client, volume_id,
- 'available')
-
@rbac_rule_validation.action(
service="nova",
rule="os_compute_api:os-volumes-attachments:index")
@decorators.idempotent_id('529b668b-6edb-41d5-8886-d7dbd0614678')
def test_list_volume_attachments(self):
self.rbac_utils.switch_role(self, switchToRbacRole=True)
- self.client.list_volume_attachments(self.server['id'])
- ['volumeAttachments']
+ self.client.list_volume_attachments(self.server['id'])[
+ 'volumeAttachments']
@rbac_rule_validation.action(
service="nova",
rule="os_compute_api:os-volumes-attachments:create")
@decorators.idempotent_id('21c2c3fd-fbe8-41b1-8ef8-115ec47d54c1')
def test_create_volume_attachment(self):
- self.volume = self.create_volume()
self.rbac_utils.switch_role(self, switchToRbacRole=True)
- self._attach(self.server, self.volume)
+ self.attach_volume(self.server, self.volume)
@rbac_rule_validation.action(
service="nova",
rule="os_compute_api:os-volumes-attachments:show")
@decorators.idempotent_id('997df9c2-6e54-47b6-ab74-e4fdb500f385')
def test_show_volume_attachment(self):
- self._create_and_attach()
+ attachment = self.attach_volume(self.server, self.volume)
self.rbac_utils.switch_role(self, switchToRbacRole=True)
self.client.show_volume_attachment(
- self.server['id'], self.attachment['id'])
+ self.server['id'], attachment['id'])
@rbac_rule_validation.action(
service="nova",
rule="os_compute_api:os-volumes-attachments:update")
@decorators.idempotent_id('bd667186-eca6-4b78-ab6a-3e2fabcb971f')
def test_update_volume_attachment(self):
- self._create_and_attach()
- self.volume = self.create_volume()
+ attachment = self.attach_volume(self.server, self.volume)
+ alt_volume = self.create_volume()
self.rbac_utils.switch_role(self, switchToRbacRole=True)
self.client.update_attached_volume(
- self.server['id'], self.attachment['id'],
- volumeId=self.volume['id'])
- self.addCleanup(self._detach, self.server['id'], self.volume['id'])
- waiters.wait_for_volume_status(self.volumes_client, self.volume['id'],
- 'in-use')
+ self.server['id'], attachment['id'], volumeId=alt_volume['id'])
+ waiters.wait_for_volume_resource_status(self.volumes_client,
+ alt_volume['id'], 'in-use')
+ # On teardown detach the volume and wait for it to be available. This
+ # is so we don't error out when trying to delete the volume during
+ # teardown.
+ self.addCleanup(waiters.wait_for_volume_resource_status,
+ self.volumes_client, alt_volume['id'], 'available')
+ # Ignore 404s on detach in case the server is deleted or the volume
+ # is already detached.
+ self.addCleanup(test_utils.call_and_ignore_notfound_exc,
+ self.servers_client.detach_volume,
+ self.server['id'], alt_volume['id'])
@rbac_rule_validation.action(
service="nova",
rule="os_compute_api:os-volumes-attachments:delete")
@decorators.idempotent_id('12b03e90-d087-46af-9c4d-507d021c4984')
def test_delete_volume_attachment(self):
- self._create_and_attach()
+ self.attach_volume(self.server, self.volume)
self.rbac_utils.switch_role(self, switchToRbacRole=True)
- self._detach(self.server['id'], self.volume['id'])
+ self.client.detach_volume(self.server['id'], self.volume['id'])
+ waiters.wait_for_volume_resource_status(self.volumes_client,
+ self.volume['id'], 'available')