openstack/python-openstackclient
Code Issues Proposed changes

Don't mask authorization errors

Browse Source 
Project show with name argument returns 'Could not find resource'
error when the user is not authorized. It should report the
authorization error instead. This patch makes that change.

Change-Id: Iac3521f8a411060b0ec9ef46c8f0e1f3551e56ae
Closes-Bug: #1511625
This commit is contained in:
Hidekazu Nakamura 2015-11-06 00:47:38 +09:00 committed by Matthew Edmonds
parent 061037aaf1
commit 55b37d5e33
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openstackclient/common/utils.py
View File

@ -100,20 +100,13 @@ def find_resource(manager, name_or_id, **kwargs):
else:
pass
try:
for resource in manager.list():
# short circuit and return the first match
if (resource.get('id') == name_or_id or
resource.get('name') == name_or_id):
return resource
else:
# we found no match, keep going to bomb out
pass
except Exception:
# in case the list fails for some reason
pass
# if we hit here, we've failed, report back this error:
# we found no match, report back this error:
msg = "Could not find resource %s" % name_or_id
raise exceptions.CommandError(msg)

12
openstackclient/tests/common/test_utils.py
View File

@ -306,6 +306,18 @@ class TestFindResource(test_utils.TestCase):
self.manager.get.assert_called_with(self.name)
self.manager.find.assert_called_with(name=self.name)
def test_find_resource_list_forbidden(self):
self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
self.manager.find = mock.Mock(side_effect=Exception('Boom!'))
self.manager.list = mock.Mock(
side_effect=exceptions.Forbidden(403)
)
self.assertRaises(exceptions.Forbidden,
utils.find_resource,
self.manager,
self.name)
self.manager.list.assert_called_with()
def test_find_resource_find_no_unique(self):
self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
self.manager.find = mock.Mock(side_effect=NoUniqueMatch())