openstack
/
magnum
Code Issues Proposed changes

Merge "Return default quota from API"

This commit is contained in:
Zuul 2019-10-07 22:36:31 +00:00 committed by Gerrit Code Review
parent 919bf541c8 6bb95dac2e
commit 0b6b17b3b7
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
magnum/api/controllers/v1/quota.py
View File

@ -25,10 +25,13 @@ from magnum.api import utils as api_utils
from magnum.api import validation
from magnum.common import exception
from magnum.common import policy
import magnum.conf
from magnum.i18n import _
from magnum import objects
from magnum.objects import fields
CONF = magnum.conf.CONF
class Quota(base.APIBase):
"""API representation of a project Quota.
@ -157,10 +160,16 @@ class QuotaController(base.Controller):
if not context.is_admin and project_id != context.project_id:
raise exception.NotAuthorized()
quota = objects.Quota.get_quota_by_project_id_resource(context,
project_id,
resource)
return Quota.convert(quota)
try:
quota = objects.Quota.get_quota_by_project_id_resource(context,
project_id,
resource)
quota = Quota.convert(quota)
except exception.QuotaNotFound:
# If explicit quota was not set for the project, use default limit
quota = Quota(project_id=project_id,
hard_limit=CONF.quotas.max_clusters_per_project)
return quota
@expose.expose(Quota, body=Quota, status_code=201)
@validation.enforce_valid_project_id_on_create()

33
magnum/tests/unit/api/controllers/v1/test_quota.py
View File

@ -16,11 +16,14 @@ from keystoneauth1 import exceptions as ka_exception
from magnum.api.controllers.v1 import quota as api_quota
from magnum.common import clients
import magnum.conf
from magnum.tests import base
from magnum.tests.unit.api import base as api_base
from magnum.tests.unit.api import utils as apiutils
from magnum.tests.unit.objects import utils as obj_utils
CONF = magnum.conf.CONF
class TestQuotaObject(base.TestCase):
def test_quota_init(self):
@ -60,14 +63,27 @@ class TestQuota(api_base.FunctionalTest):
self.assertEqual(quota.resource, response['resource'])
@mock.patch("magnum.common.policy.enforce")
def test_get_one_not_found(self, mock_policy):
def test_get_one_no_config_default(self, mock_policy):
mock_policy.return_value = True
response = self.get_json(
'/quotas/fake_project/invalid_res',
'/quotas/fake_project/Cluster',
expect_errors=True)
self.assertEqual(404, response.status_int)
self.assertEqual('application/json', response.content_type)
self.assertTrue(response.json['errors'])
self.assertEqual(200, response.status_int)
self.assertEqual('fake_project', response.json['project_id'])
self.assertEqual(CONF.quotas.max_clusters_per_project,
response.json['hard_limit'])
@mock.patch("magnum.common.policy.enforce")
def test_get_one_with_config_default(self, mock_policy):
mock_policy.return_value = True
quota = 15
CONF.set_override('max_clusters_per_project', quota, group='quotas')
response = self.get_json(
'/quotas/fake_project/Cluster',
expect_errors=True)
self.assertEqual(200, response.status_int)
self.assertEqual('fake_project', response.json['project_id'])
self.assertEqual(quota, response.json['hard_limit'])
def test_get_one_not_authorized(self):
obj_utils.create_test_quota(self.context)
@ -300,6 +316,7 @@ class TestQuota(api_base.FunctionalTest):
response = self.get_json(
'/quotas/%s/%s' % (project_id, resource),
expect_errors=True)
self.assertEqual(404, response.status_int)
self.assertEqual('application/json', response.content_type)
self.assertTrue(response.json['errors'])
self.assertEqual(200, response.status_int)
self.assertEqual('fake_project', response.json['project_id'])
self.assertEqual(CONF.quotas.max_clusters_per_project,
response.json['hard_limit'])