Merge "Remove redundant try/except statements in quotas.py"

This commit is contained in:
Zuul 2019-07-15 06:04:02 +00:00 committed by Gerrit Code Review
commit 82a23dcdba
2 changed files with 10 additions and 7 deletions

View File

@ -153,8 +153,6 @@ class QuotasController(wsgi.Controller):
db.quota_update(context, project_id, key, value) db.quota_update(context, project_id, key, value)
except exception.ProjectQuotaNotFound: except exception.ProjectQuotaNotFound:
db.quota_create(context, project_id, key, value) db.quota_create(context, project_id, key, value)
except exception.AdminRequired:
raise exc.HTTPForbidden()
LOG.info("Update quotas successfully.", LOG.info("Update quotas successfully.",
resource={'id': project_id}) resource={'id': project_id})
@ -184,11 +182,7 @@ class QuotasController(wsgi.Controller):
msg = _("Invalid project id provided.") msg = _("Invalid project id provided.")
raise exc.HTTPBadRequest(explanation=msg) raise exc.HTTPBadRequest(explanation=msg)
context.can(quota_policy.DELETE_POLICY) context.can(quota_policy.DELETE_POLICY)
try: QUOTAS.destroy_all_by_project(context, id)
db.authorize_project_context(context, id)
QUOTAS.destroy_all_by_project(context, id)
except exception.NotAuthorized:
raise exc.HTTPForbidden()
LOG.info("Delete quotas successfully.", LOG.info("Delete quotas successfully.",
resource={'id': id}) resource={'id': id})

View File

@ -67,6 +67,15 @@ class QuotaApiTest(base.TestCase):
self.assertRaises(exc.HTTPBadRequest, self.controller.update, self.assertRaises(exc.HTTPBadRequest, self.controller.update,
req, "73f74f90a1754bd7ad658afb3272323f", body=body) req, "73f74f90a1754bd7ad658afb3272323f", body=body)
def test_quota_update_with_not_admin_context(self):
body = {"quota": {"plans": 20}}
req = fakes.HTTPRequest.blank(
'/v1/quotas/73f74f90a1754bd7ad658afb3272323f',
use_admin_context=False)
self.assertRaises(
exception.PolicyNotAuthorized, self.controller.update,
req, "73f74f90a1754bd7ad658afb3272323f", body=body)
@mock.patch( @mock.patch(
'karbor.quota.DbQuotaDriver.get_defaults') 'karbor.quota.DbQuotaDriver.get_defaults')
def test_quota_defaults(self, mock_quota_get): def test_quota_defaults(self, mock_quota_get):