Add more verbose info for wait_for_..._status methods
If this method failed because the resource will not reach desired
status, you just know expected status, not actual status at time of
timeout. It can help with debugging.
Change-Id: I583f0739bf771dd587acd13c1453ae6a440a9e87
diff --git a/tempest/common/waiters.py b/tempest/common/waiters.py
index 52568cb..93f02c9 100644
--- a/tempest/common/waiters.py
+++ b/tempest/common/waiters.py
@@ -111,22 +111,24 @@
while image['status'] != status:
time.sleep(client.build_interval)
resp, image = client.get_image(image_id)
- if image['status'] == 'ERROR':
+ status_curr = image['status']
+ if status_curr == 'ERROR':
raise exceptions.AddImageException(image_id=image_id)
# check the status again to avoid a false negative where we hit
# the timeout at the same time that the image reached the expected
# status
- if image['status'] == status:
+ if status_curr == status:
return
if int(time.time()) - start >= client.build_timeout:
- message = ('Image %(image_id)s failed to reach %(status)s '
- 'status within the required time (%(timeout)s s).' %
+ message = ('Image %(image_id)s failed to reach %(status)s state'
+ '(current state %(status_curr)s) '
+ 'within the required time (%(timeout)s s).' %
{'image_id': image_id,
'status': status,
+ 'status_curr': status_curr,
'timeout': client.build_timeout})
- message += ' Current status: %s.' % image['status']
caller = misc_utils.find_test_caller()
if caller:
message = '(%s) %s' % (caller, message)
@@ -144,7 +146,8 @@
while node[attr] != status:
time.sleep(client.build_interval)
_, node = client.show_node(node_id)
- if node[attr] == status:
+ status_curr = node[attr]
+ if status_curr == status:
return
if int(time.time()) - start >= client.build_timeout:
@@ -154,7 +157,7 @@
'attr': attr,
'status': status,
'timeout': client.build_timeout})
- message += ' Current state of %s: %s.' % (attr, node[attr])
+ message += ' Current state of %s: %s.' % (attr, status_curr)
caller = misc_utils.find_test_caller()
if caller:
message = '(%s) %s' % (caller, message)
diff --git a/tempest/services/compute/json/interfaces_client.py b/tempest/services/compute/json/interfaces_client.py
index 83c253a..620ed68 100644
--- a/tempest/services/compute/json/interfaces_client.py
+++ b/tempest/services/compute/json/interfaces_client.py
@@ -79,9 +79,10 @@
timed_out = int(time.time()) - start >= self.build_timeout
if interface_status != status and timed_out:
- message = ('Interface %s failed to reach %s status within '
- 'the required time (%s s).' %
- (port_id, status, self.build_timeout))
+ message = ('Interface %s failed to reach %s status '
+ '(current %s) within the required time (%s s).' %
+ (port_id, status, interface_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
return resp, body
diff --git a/tempest/services/compute/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_extensions_client.py
index b23b20b..afa6937 100644
--- a/tempest/services/compute/json/volumes_extensions_client.py
+++ b/tempest/services/compute/json/volumes_extensions_client.py
@@ -103,9 +103,10 @@
raise exceptions.VolumeBuildErrorException(volume_id=volume_id)
if int(time.time()) - start >= self.build_timeout:
- message = ('Volume %s failed to reach %s status within '
- 'the required time (%s s).' %
- (volume_id, status, self.build_timeout))
+ message = ('Volume %s failed to reach %s status (current %s) '
+ 'within the required time (%s s).' %
+ (volume_id, status, volume_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
def is_resource_deleted(self, id):
diff --git a/tempest/services/compute/v3/json/interfaces_client.py b/tempest/services/compute/v3/json/interfaces_client.py
index e99c124..ccc20c8 100644
--- a/tempest/services/compute/v3/json/interfaces_client.py
+++ b/tempest/services/compute/v3/json/interfaces_client.py
@@ -80,9 +80,10 @@
timed_out = int(time.time()) - start >= self.build_timeout
if interface_status != status and timed_out:
- message = ('Interface %s failed to reach %s status within '
- 'the required time (%s s).' %
- (port_id, status, self.build_timeout))
+ message = ('Interface %s failed to reach %s status '
+ '(current %s) within the required time (%s s).' %
+ (port_id, status, interface_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
return resp, body
diff --git a/tempest/services/network/network_client_base.py b/tempest/services/network/network_client_base.py
index 5ad5f37..2c767d9 100644
--- a/tempest/services/network/network_client_base.py
+++ b/tempest/services/network/network_client_base.py
@@ -259,6 +259,7 @@
# At this point, the wait has timed out
message = 'Resource %s' % (str(resource))
message += ' failed to reach status %s' % status
+ message += ' (current: %s)' % resource['status']
message += ' within the required time %s' % timeout
caller = misc.find_test_caller()
if caller:
diff --git a/tempest/services/orchestration/json/orchestration_client.py b/tempest/services/orchestration/json/orchestration_client.py
index 15306a0..9b4700a 100644
--- a/tempest/services/orchestration/json/orchestration_client.py
+++ b/tempest/services/orchestration/json/orchestration_client.py
@@ -185,9 +185,12 @@
resource_status_reason=body['resource_status_reason'])
if int(time.time()) - start >= self.build_timeout:
- message = ('Resource %s failed to reach %s status within '
- 'the required time (%s s).' %
- (resource_name, status, self.build_timeout))
+ message = ('Resource %s failed to reach %s status '
+ '(current %s) within the required time (%s s).' %
+ (resource_name,
+ status,
+ resource_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
time.sleep(self.build_interval)
@@ -214,9 +217,10 @@
stack_status_reason=body['stack_status_reason'])
if int(time.time()) - start >= self.build_timeout:
- message = ('Stack %s failed to reach %s status within '
- 'the required time (%s s).' %
- (stack_name, status, self.build_timeout))
+ message = ('Stack %s failed to reach %s status (current: %s) '
+ 'within the required time (%s s).' %
+ (stack_name, status, stack_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
time.sleep(self.build_interval)
diff --git a/tempest/services/volume/json/backups_client.py b/tempest/services/volume/json/backups_client.py
index da47639..51a017e 100644
--- a/tempest/services/volume/json/backups_client.py
+++ b/tempest/services/volume/json/backups_client.py
@@ -95,9 +95,10 @@
raise exceptions.VolumeBackupException(backup_id=backup_id)
if int(time.time()) - start >= self.build_timeout:
- message = ('Volume backup %s failed to reach %s status within '
- 'the required time (%s s).' %
- (backup_id, status, self.build_timeout))
+ message = ('Volume backup %s failed to reach %s status '
+ '(current %s) within the required time (%s s).' %
+ (backup_id, status, backup_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
diff --git a/tempest/services/volume/json/volumes_client.py b/tempest/services/volume/json/volumes_client.py
index cf2837b..1e49e5a 100644
--- a/tempest/services/volume/json/volumes_client.py
+++ b/tempest/services/volume/json/volumes_client.py
@@ -174,10 +174,12 @@
raise exceptions.VolumeBuildErrorException(volume_id=volume_id)
if int(time.time()) - start >= self.build_timeout:
- message = 'Volume %s failed to reach %s status within '\
- 'the required time (%s s).' % (volume_id,
- status,
- self.build_timeout)
+ message = ('Volume %s failed to reach %s status (current: %s) '
+ 'within the required time '
+ '(%s s).' % (volume_id,
+ status,
+ volume_status,
+ self.build_timeout))
raise exceptions.TimeoutException(message)
def is_resource_deleted(self, id):