openstack/cinder
Code Issues Proposed changes

Merge "Fix UsedLimitsController's authorizer to soft"

Browse Source
This commit is contained in:
Jenkins 2015-11-08 18:13:31 +00:00 committed by Gerrit Code Review
commit 5bc425235b
2 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cinder/api/contrib/used_limits.py
View File

@ -18,7 +18,7 @@ from cinder import quota
QUOTAS = quota.QUOTAS
authorize = extensions.extension_authorizer('limits', 'used_limits')
authorize = extensions.soft_extension_authorizer('limits', 'used_limits')
class UsedLimitsController(wsgi.Controller):
@ -26,25 +26,24 @@ class UsedLimitsController(wsgi.Controller):
@wsgi.extends
def index(self, req, resp_obj):
context = req.environ['cinder.context']
authorize(context)
if authorize(context):
quotas = QUOTAS.get_project_quotas(context, context.project_id,
usages=True)
quotas = QUOTAS.get_project_quotas(context, context.project_id,
usages=True)
quota_map = {
'totalVolumesUsed': 'volumes',
'totalGigabytesUsed': 'gigabytes',
'totalSnapshotsUsed': 'snapshots',
'totalBackupsUsed': 'backups',
'totalBackupGigabytesUsed': 'backup_gigabytes'
}
quota_map = {
'totalVolumesUsed': 'volumes',
'totalGigabytesUsed': 'gigabytes',
'totalSnapshotsUsed': 'snapshots',
'totalBackupsUsed': 'backups',
'totalBackupGigabytesUsed': 'backup_gigabytes'
}
used_limits = {}
for display_name, single_quota in quota_map.items():
if single_quota in quotas:
used_limits[display_name] = quotas[single_quota]['in_use']
used_limits = {}
for display_name, single_quota in quota_map.items():
if single_quota in quotas:
used_limits[display_name] = quotas[single_quota]['in_use']
resp_obj.obj['limits']['absolute'].update(used_limits)
resp_obj.obj['limits']['absolute'].update(used_limits)
class Used_limits(extensions.ExtensionDescriptor):

35
cinder/tests/unit/api/contrib/test_used_limits.py
View File

@ -13,9 +13,11 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from cinder.api.contrib import used_limits
from cinder.api.openstack import wsgi
from cinder import quota
from cinder import exception
from cinder import test
from cinder.tests.unit.api import fakes
@ -31,7 +33,9 @@ class UsedLimitsTestCase(test.TestCase):
super(UsedLimitsTestCase, self).setUp()
self.controller = used_limits.UsedLimitsController()
def test_used_limits(self):
@mock.patch('cinder.quota.QUOTAS.get_project_quotas')
@mock.patch('cinder.policy.enforce')
def test_used_limits(self, _mock_policy_enforce, _mock_get_project_quotas):
fake_req = FakeRequest(fakes.FakeRequestContext('fake', 'fake'))
obj = {
"limits": {
@ -50,17 +54,30 @@ class UsedLimitsTestCase(test.TestCase):
for display_name, q in quota_map.items():
limits[q] = {'limit': 2,
'in_use': 1}
_mock_get_project_quotas.return_value = limits
def stub_get_project_quotas(context, project_id, usages=True):
return limits
self.stubs.Set(quota.QUOTAS, "get_project_quotas",
stub_get_project_quotas)
self.mox.ReplayAll()
# allow user to access used limits
_mock_policy_enforce.return_value = None
self.controller.index(fake_req, res)
abs_limits = res.obj['limits']['absolute']
for used_limit, value in abs_limits.items():
self.assertEqual(value,
limits[quota_map[used_limit]]['in_use'])
obj = {
"limits": {
"rate": [],
"absolute": {},
},
}
res = wsgi.ResponseObject(obj)
# unallow user to access used limits
_mock_policy_enforce.side_effect = exception.NotAuthorized
self.controller.index(fake_req, res)
abs_limits = res.obj['limits']['absolute']
self.assertNotIn('totalVolumesUsed', abs_limits)
self.assertNotIn('totalGigabytesUsed', abs_limits)
self.assertNotIn('totalSnapshotsUsed', abs_limits)