womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fup: Move _wait_for_volume_{attach,detach} to os-volume_attachments"

Browse Source
This commit is contained in:
Zuul
2021-11-04 13:24:55 +00:00
committed by Gerrit Code Review
parent 858b700ba5 9a1cac7110
commit 658d544611
1 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/tests/functional/integrated_helpers.py
+20 -27
View File
@@ -202,43 +202,36 @@ class InstanceHelperMixin:
'actions: %s. Events in the last matching action: %s'
% (event_name, actions, events))
# TODO(lyarwood): Rewrite this waiter to use os-volume_attachments
def _wait_for_volume_attach(self, server_id, volume_id):
timeout = 0.0
server = self.api.get_server(server_id)
attached_vols = [vol['id'] for vol in
server['os-extended-volumes:volumes_attached']]
while timeout < 10.0:
try:
self.api.get_server_volume(server_id, volume_id)
return
except api_client.OpenStackApiNotFoundException:
time.sleep(.1)
timeout += .1
while volume_id not in attached_vols and timeout < 10.0:
time.sleep(.1)
timeout += .1
server = self.api.get_server(server_id)
attached_vols = [vol['id'] for vol in
server['os-extended-volumes:volumes_attached']]
if volume_id not in attached_vols:
self.fail('Timed out waiting for volume %s to be attached to '
attached_vols = self.api.get_server_volumes(server_id)
self.fail('Timed out waiting for volume %s to be attached to '
'server %s. Currently attached volumes: %s' %
(volume_id, server_id, attached_vols))
# TODO(lyarwood): Rewrite this waiter to use os-volume_attachments
def _wait_for_volume_detach(self, server_id, volume_id):
timeout = 0.0
server = self.api.get_server(server_id)
attached_vols = [vol['id'] for vol in
server['os-extended-volumes:volumes_attached']]
while volume_id in attached_vols and timeout < 10.0:
time.sleep(.1)
timeout += .1
server = self.api.get_server(server_id)
attached_vols = [vol['id'] for vol in
server['os-extended-volumes:volumes_attached']]
while timeout < 10.0:
try:
self.api.get_server_volume(server_id, volume_id)
time.sleep(.1)
timeout += .1
except api_client.OpenStackApiNotFoundException:
return
if volume_id in attached_vols:
self.fail('Timed out waiting for volume %s to be detached from '
'server %s. Currently attached volumes: %s' %
(volume_id, server_id, attached_vols))
attached_vols = self.api.get_server_volumes(server_id)
self.fail('Timed out waiting for volume %s to be detached from '
'server %s. Currently attached volumes: %s' %
(volume_id, server_id, attached_vols))
def _assert_resize_migrate_action_fail(self, server, action, error_in_tb):
"""Waits for the conductor_migrate_server action event to fail for