openstack
/
zun
Code Issues Proposed changes

Remove unused auth_url from RequestContext 

Change-Id: I6bb258c97412bd4c6a7a90435294d7a10da70dab
(cherry picked from commit 0d36f682e8)
This commit is contained in:
Hongbin Lu 2018-06-30 20:59:51 +00:00
parent 89f063d388
commit 6313f9d4c3
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zun/api/hooks.py
View File

@ -58,11 +58,8 @@ class ContextHook(hooks.PecanHook):
roles = headers.get('X-Roles', '').split(',')
auth_token_info = state.request.environ.get('keystone.token_info')
auth_url = CONF.keystone_authtoken.www_authenticate_uri
state.request.context = context.make_context(
auth_token=auth_token,
auth_url=auth_url,
auth_token_info=auth_token_info,
user_name=user_name,
user_id=user_id,

4
zun/common/context.py
View File

@ -23,7 +23,7 @@ from zun.common import policy
class RequestContext(context.RequestContext):
"""Extends security contexts from the OpenStack common library."""
def __init__(self, auth_token=None, auth_url=None, domain_id=None,
def __init__(self, auth_token=None, domain_id=None,
domain_name=None, user_name=None, user_id=None,
user_domain_name=None, user_domain_id=None,
project_name=None, project_id=None, roles=None,
@ -57,7 +57,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.auth_url = auth_url
self.auth_token_info = auth_token_info
self.trust_id = trust_id
self.all_projects = all_projects
@ -76,7 +75,6 @@ class RequestContext(context.RequestContext):
def to_dict(self):
value = super(RequestContext, self).to_dict()
value.update({'auth_token': self.auth_token,
'auth_url': self.auth_url,
'domain_id': self.domain_id,
'domain_name': self.domain_name,
'user_domain_id': self.user_domain_id,

4
zun/tests/unit/common/test_context.py
View File

@ -18,7 +18,6 @@ class ContextTestCase(base.TestCase):
def _create_context(self, is_admin=True, roles=None):
return zun_context.RequestContext(auth_token='auth_token1',
auth_url='auth_url1',
domain_id='domain_id1',
domain_name='domain_name1',
user_name='user1',
@ -37,7 +36,6 @@ class ContextTestCase(base.TestCase):
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)
@ -56,7 +54,6 @@ class ContextTestCase(base.TestCase):
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)
self.assertEqual("domain_name1", ctx.domain_name)
self.assertEqual("user1", ctx.user_name)
@ -77,7 +74,6 @@ class ContextTestCase(base.TestCase):
ctx2 = zun_context.RequestContext.from_dict(ctx.to_dict())
self.assertEqual(ctx.auth_token, ctx2.auth_token)
self.assertEqual(ctx.auth_url, ctx2.auth_url)
self.assertEqual(ctx.domain_id, ctx2.domain_id)
self.assertEqual(ctx.domain_name, ctx2.domain_name)
self.assertEqual(ctx.user_name, ctx2.user_name)