openstack
/
magnum
Code Issues Proposed changes

Fix the incorrect initialization of context roles 

We should pass roles to oslo_context to initialize instead of
manually set it.

Change-Id: Ice05204d789bb1770ab6605f06d670c5fc7c6726
Closes-Bug: #1654813
This commit is contained in:
Hongbin Lu 2017-01-07 23:35:08 -06:00
parent c0091a4053
commit a60529cb11
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/common/context.py
View File

@ -44,7 +44,8 @@ class RequestContext(context.RequestContext):
is_admin=is_admin,
read_only=read_only,
show_deleted=show_deleted,
request_id=request_id)
request_id=request_id,
roles=roles)
self.user_name = user_name
self.user_id = user_id
@ -54,7 +55,6 @@ class RequestContext(context.RequestContext):
self.domain_name = domain_name
self.user_domain_id = user_domain_id
self.user_domain_name = user_domain_name
self.roles = roles
self.auth_url = auth_url
self.auth_token_info = auth_token_info
self.trust_id = trust_id

23
magnum/tests/unit/common/test_context.py
View File

@ -18,7 +18,7 @@ from magnum.tests import base
class ContextTestCase(base.TestCase):
def _create_context(self):
def _create_context(self, roles=None):
return magnum_context.RequestContext(auth_token='auth_token1',
auth_url='auth_url1',
domain_id='domain_id1',
@ -27,7 +27,7 @@ class ContextTestCase(base.TestCase):
user_id='user-id1',
project_name='tenant1',
project_id='tenant-id1',
roles=['admin', 'service'],
roles=roles,
is_admin=True,
read_only=True,
show_deleted=True,
@ -38,6 +38,25 @@ class ContextTestCase(base.TestCase):
def test_context(self):
ctx = self._create_context()
self.assertEqual("auth_token1", ctx.auth_token)
self.assertEqual("auth_url1", ctx.auth_url)
self.assertEqual("domain_id1", ctx.domain_id)
self.assertEqual("domain_name1", ctx.domain_name)
self.assertEqual("user1", ctx.user_name)
self.assertEqual("user-id1", ctx.user_id)
self.assertEqual("tenant1", ctx.project_name)
self.assertEqual("tenant-id1", ctx.project_id)
self.assertEqual([], ctx.roles)
self.assertTrue(ctx.is_admin)
self.assertTrue(ctx.read_only)
self.assertTrue(ctx.show_deleted)
self.assertEqual("request_id1", ctx.request_id)
self.assertEqual("trust_id1", ctx.trust_id)
self.assertEqual("token_info1", ctx.auth_token_info)
def test_context_with_roles(self):
ctx = self._create_context(roles=['admin', 'service'])
self.assertEqual("auth_token1", ctx.auth_token)
self.assertEqual("auth_url1", ctx.auth_url)
self.assertEqual("domain_id1", ctx.domain_id)