openstack/osc-lib
Code Issues Proposed changes

Merge "Enables retrieval of project's parents and subtree"

Browse Source
This commit is contained in:
Jenkins
2015-06-25 21:51:04 +00:00
committed by Gerrit Code Review
parent 3a4b6713b7 8629d288bc
commit 74a713dcc8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/common/utils.py
View File

@@ -51,7 +51,7 @@ def find_resource(manager, name_or_id, **kwargs):
# Try to get entity as integer id # Try to get entity as integer id
try: try:
if isinstance(name_or_id, int) or name_or_id.isdigit(): if isinstance(name_or_id, int) or name_or_id.isdigit():
return manager.get(int(name_or_id)) return manager.get(int(name_or_id), **kwargs)
# FIXME(dtroyer): The exception to catch here is dependent on which # FIXME(dtroyer): The exception to catch here is dependent on which
# client library the manager passed in belongs to. # client library the manager passed in belongs to.
# Eventually this should be pulled from a common set # Eventually this should be pulled from a common set
@@ -64,7 +64,7 @@ def find_resource(manager, name_or_id, **kwargs):
# Try directly using the passed value # Try directly using the passed value
try: try:
return manager.get(name_or_id) return manager.get(name_or_id, **kwargs)
except Exception: except Exception:
pass pass