summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-25 21:51:04 +0000
committerGerrit Code Review <review@openstack.org>2015-06-25 21:51:04 +0000
commitec31a2a12efe54b9b1149e198560a0164f070485 (patch)
tree270d1f144fd15a25eb2f9fe38fdd9776133eb966 /openstackclient/common
parent2cc679ed9f855c8dcb40ef2eeaf5f81e447772f6 (diff)
parent4fab60634983f9327295cc68edf89824557728f9 (diff)
downloadpython-openstackclient-ec31a2a12efe54b9b1149e198560a0164f070485.tar.gz
Merge "Enables retrieval of project's parents and subtree"
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
index aad0519c..c824678e 100644
--- a/openstackclient/common/utils.py
+++ b/openstackclient/common/utils.py
@@ -51,7 +51,7 @@ def find_resource(manager, name_or_id, **kwargs):
# Try to get entity as integer id
try:
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
# client library the manager passed in belongs to.
# 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:
- return manager.get(name_or_id)
+ return manager.get(name_or_id, **kwargs)
except Exception:
pass