Error message is not correct when list/show non-exist lease
The error message always print out a lease resource in the error message for a non-exist lease, update the error message to make the message is clear and easy to understand. Change-Id: I3c91a74cfa5117b18251966540fa8a20efe1f2d2 Closes-Bug: #1316941
This commit is contained in:
parent
aca95d5fc3
commit
aad72944f1
@ -112,8 +112,8 @@ def find_resource_id_by_name_or_id(client, resource, name_or_id):
|
|||||||
for resource in resources:
|
for resource in resources:
|
||||||
if resource['id'] == name_or_id:
|
if resource['id'] == name_or_id:
|
||||||
return name_or_id
|
return name_or_id
|
||||||
raise exception.ClimateClientException('No %s found with ID %s' %
|
raise exception.ClimateClientException('No resource found with ID %s' %
|
||||||
(resource, name_or_id))
|
name_or_id)
|
||||||
return _find_resource_id_by_name(client, resource, name_or_id)
|
return _find_resource_id_by_name(client, resource, name_or_id)
|
||||||
|
|
||||||
|
|
||||||
@ -134,7 +134,7 @@ def _find_resource_id_by_name(client, resource, name):
|
|||||||
elif named_resources:
|
elif named_resources:
|
||||||
return named_resources[0]
|
return named_resources[0]
|
||||||
else:
|
else:
|
||||||
message = "Unable to find %s with name '%s'" % (resource, name)
|
message = "Unable to find resource with name '%s'" % name
|
||||||
raise exception.ClimateClientException(message=message,
|
raise exception.ClimateClientException(message=message,
|
||||||
status_code=404)
|
status_code=404)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user