openstack/python-blazarclient
Code Issues Proposed changes

Fix exception message when there are leases with the same name

Browse Source 
The resource variable, originally containing the resource type, i.e.
'lease', was reassigned with a lease object before being used in the
exception message. As a result, the message displayed a dictionary of
lease values, instead of "type 'lease'".

Change-Id: If4cb03cfb4a895c11e3952f0f1b79e0c7d14de8c
Closes-Bug: #1786030
This commit is contained in:
Pierre Riteau 2018-08-08 15:00:48 +02:00
parent 1e31dcaeb5
commit 92e26f3417
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blazarclient/utils.py
View File

@ -102,9 +102,9 @@ def get_item_properties(item, fields, mixed_case_fields=None, formatters=None):
return tuple(row)
def find_resource_id_by_name_or_id(client, resource, name_or_id,
def find_resource_id_by_name_or_id(client, resource_type, name_or_id,
name_key, id_pattern):
resource_manager = getattr(client, resource)
resource_manager = getattr(client, resource_type)
is_id = re.match(id_pattern, name_or_id)
if is_id:
resources = resource_manager.list()
@ -113,11 +113,12 @@ def find_resource_id_by_name_or_id(client, resource, name_or_id,
return name_or_id
raise exception.BlazarClientException('No resource found with ID %s' %
name_or_id)
return _find_resource_id_by_name(client, resource, name_or_id, name_key)
return _find_resource_id_by_name(client, resource_type, name_or_id,
name_key)
def _find_resource_id_by_name(client, resource, name, name_key):
resource_manager = getattr(client, resource)
def _find_resource_id_by_name(client, resource_type, name, name_key):
resource_manager = getattr(client, resource_type)
resources = resource_manager.list()
named_resources = []
@ -130,7 +131,7 @@ def _find_resource_id_by_name(client, resource, name, name_key):
raise exception.NoUniqueMatch(message="There are more than one "
"appropriate resources for the "
"name '%s' and type '%s'" %
(name, resource))
(name, resource_type))
elif named_resources:
return named_resources[0]
else: