openstack/python-openstackclient
Code Issues Proposed changes

Merge "utils.find_resource does not catch right exception"

Browse Source
This commit is contained in:
Jenkins 2014-09-28 07:39:19 +00:00 committed by Gerrit Code Review
commit 48bb39f299
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstackclient/common/utils.py
View File

@ -33,8 +33,15 @@ def find_resource(manager, name_or_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))
except exceptions.NotFound: # FIXME(dtroyer): The exception to catch here is dependent on which
pass # client library the manager passed in belongs to.
# Eventually this should be pulled from a common set
# of client exceptions.
except Exception as ex:
if type(ex).__name__ == 'NotFound':
pass
else:
raise
# Try directly using the passed value # Try directly using the passed value
try: try: