openstack/python-saharaclient
Code Issues Proposed changes

Merge "Fix _get_by_id_or_name method"

Browse Source
This commit is contained in:
Jenkins
2015-07-21 11:18:33 +00:00
committed by Gerrit Code Review
parent 9725500872 80cc460701
commit 2ba5ca3ed9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
saharaclient/api/shell.py
View File

@@ -116,7 +116,7 @@ def _get_by_id_or_name(manager, id=None, name=None, **kwargs):
raise exceptions.CommandError("either NAME or ID is required")
if id:
return manager.get(id, **kwargs)
ls = manager.find(name=name, **kwargs)
ls = manager.find(name=name)
if len(ls) == 0:
raise exceptions.CommandError("%s '%s' not found" %
(manager.resource_class.resource_name,
@@ -125,7 +125,7 @@ def _get_by_id_or_name(manager, id=None, name=None, **kwargs):
raise exceptions.CommandError("%s '%s' not unique, try by ID" %
(manager.resource_class.resource_name,
name))
return ls[0]
return manager.get(ls[0].id, **kwargs)
#