openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Ignore more exceptions in quota list"

This commit is contained in:
Jenkins 2017-05-11 19:18:36 +00:00 committed by Gerrit Code Review
parent 96a3bae3c1 e8f3103cc1
commit 8770b6ed5c
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstackclient/common/quota.py
View File

@ -135,7 +135,10 @@ class ListQuota(command.Lister):
try:
data = compute_client.quotas.get(p)
except Exception as ex:
if type(ex).__name__ == 'NotFound':
if (
type(ex).__name__ == 'NotFound' or
ex.http_status >= 400 and ex.http_status <= 499
):
# Project not found, move on to next one
LOG.warning("Project %s not found: %s" % (p, ex))
continue

49
openstackclient/tests/unit/common/test_quota.py
View File

@ -242,7 +242,7 @@ class TestQuotaList(TestQuota):
self.assertEqual(self.compute_reference_data, ret_quotas[0])
self.assertEqual(1, len(ret_quotas))
def test_quota_list_compute_no_project(self):
def test_quota_list_compute_no_project_not_found(self):
# Make one of the projects disappear
self.compute.quotas.get = mock.Mock(
side_effect=[
@ -266,6 +266,53 @@ class TestQuotaList(TestQuota):
self.assertEqual(self.compute_reference_data, ret_quotas[0])
self.assertEqual(1, len(ret_quotas))
def test_quota_list_compute_no_project_4xx(self):
# Make one of the projects disappear
self.compute.quotas.get = mock.Mock(
side_effect=[
self.compute_quotas[0],
exceptions.BadRequest("Bad request"),
],
)
arglist = [
'--compute',
]
verifylist = [
('compute', True),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
ret_quotas = list(data)
self.assertEqual(self.compute_column_header, columns)
self.assertEqual(self.compute_reference_data, ret_quotas[0])
self.assertEqual(1, len(ret_quotas))
def test_quota_list_compute_no_project_5xx(self):
# Make one of the projects disappear
self.compute.quotas.get = mock.Mock(
side_effect=[
self.compute_quotas[0],
exceptions.HTTPNotImplemented("Not implemented??"),
],
)
arglist = [
'--compute',
]
verifylist = [
('compute', True),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(
exceptions.HTTPNotImplemented,
self.cmd.take_action,
parsed_args,
)
def test_quota_list_network(self):
# Two projects with non-default quotas
self.network.get_quota = mock.Mock(