openstack/cinder
Code Issues Proposed changes

Merge "Define context.roles with base class"

Browse Source
This commit is contained in:
Jenkins 2016-06-17 03:34:18 +00:00 committed by Gerrit Code Review
commit 3a3aa5cb18
2 changed files with 14 additions and 3 deletions

5
cinder/context.py

@ -76,8 +76,8 @@ class RequestContext(context.RequestContext):
project_domain=project_domain,
is_admin=is_admin,
request_id=request_id,
overwrite=overwrite)
self.roles = roles or []
overwrite=overwrite,
roles=roles)
self.project_name = project_name
self.read_deleted = read_deleted
self.remote_address = remote_address
@ -128,7 +128,6 @@ class RequestContext(context.RequestContext):
result['project_name'] = self.project_name
result['domain'] = self.domain
result['read_deleted'] = self.read_deleted
result['roles'] = self.roles
result['remote_address'] = self.remote_address
result['timestamp'] = self.timestamp.isoformat()
result['quota_class'] = self.quota_class

12
cinder/tests/unit/test_context.py

@ -134,3 +134,15 @@ class ContextTestCase(test.TestCase):
mock_conf.cinder_internal_tenant_user_id = user_id
ctx = context.get_internal_tenant_context()
self.assertIsNone(ctx)
def test_request_context_no_roles(self):
ctxt = context.RequestContext('111',
'222')
self.assertEqual([], ctxt.roles)
def test_request_context_with_roles(self):
roles = ['alpha', 'beta']
ctxt = context.RequestContext('111',
'222',
roles=roles)
self.assertEqual(roles, ctxt.roles)