openstack/tempest
Code Issues Proposed changes

Merge "Report original request ID on failed shelve"

Browse Source
This commit is contained in:
Zuul
2023-11-22 19:26:28 +00:00
committed by Gerrit Code Review
parent 4e49975c9f 3f233b24dd
commit 8def25cbb5
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tempest/common/compute.py
View File

@@ -375,19 +375,22 @@ def shelve_server(servers_client, server_id, force_shelve_offload=False):
is configured not to offload server is configured not to offload server
automatically after offload time. automatically after offload time.
""" """
servers_client.shelve_server(server_id) body = servers_client.shelve_server(server_id)
request_id = body.response['x-openstack-request-id']
offload_time = CONF.compute.shelved_offload_time offload_time = CONF.compute.shelved_offload_time
if offload_time >= 0: if offload_time >= 0:
waiters.wait_for_server_status(servers_client, server_id, waiters.wait_for_server_status(servers_client, server_id,
'SHELVED_OFFLOADED', 'SHELVED_OFFLOADED',
extra_timeout=offload_time) extra_timeout=offload_time,
request_id=request_id)
else: else:
waiters.wait_for_server_status(servers_client, server_id, 'SHELVED') waiters.wait_for_server_status(servers_client, server_id, 'SHELVED')
if force_shelve_offload: if force_shelve_offload:
servers_client.shelve_offload_server(server_id) servers_client.shelve_offload_server(server_id)
waiters.wait_for_server_status(servers_client, server_id, waiters.wait_for_server_status(servers_client, server_id,
'SHELVED_OFFLOADED') 'SHELVED_OFFLOADED',
request_id=request_id)
def create_websocket(url): def create_websocket(url):