openstack/solum
Code Issues Proposed changes

Add auth_token_info to the context

Browse Source 
Change-Id: I60f517e233c498518a8237486004fb13b93ade7b
This commit is contained in:
Angus Salkeld
2014-06-10 11:53:24 +10:00
parent 950a9b2fd1
commit e3457becff
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solum/common/context.py
View File

@@ -21,7 +21,7 @@ class RequestContext(context.RequestContext):
def __init__(self, auth_token=None, user=None, tenant=None, domain=None,
user_domain=None, project_domain=None, is_admin=False,
read_only=False, request_id=None, user_name=None, roles=None,
auth_url=None, trust_id=None):
auth_url=None, trust_id=None, auth_token_info=None):
super(RequestContext, self).__init__(auth_token=auth_token,
user=user, tenant=tenant,
domain=domain,
@@ -35,11 +35,13 @@ class RequestContext(context.RequestContext):
self.user_name = user_name
self.auth_url = auth_url
self.trust_id = trust_id
self.auth_token_info = auth_token_info
def to_dict(self):
data = super(RequestContext, self).to_dict()
data.update(roles=self.roles, user_name=self.user_name,
auth_url=self.auth_url,
auth_token_info=self.auth_token_info,
trust_id=self.trust_id)
return data

6
solum/tests/common/test_trace_data.py
View File

@@ -23,7 +23,8 @@ solum.TLS.trace = trace_data.TraceData()
CONTEXT = context.RequestContext(
'_auth_token_', '_user_', '_tenant_', '_domain_', '_user_domain_',
'_project_domain_', '_is_admin_', '_read_only_', '_request_id_',
'_user_name_', '_roles_', '_auth_url_')
'_user_name_', '_roles_', '_auth_url_',
auth_token_info='_auth_token_info_')
class TestTraceData(base.BaseTestCase):
@@ -58,7 +59,8 @@ class TestTraceData(base.BaseTestCase):
'user_identity': '_user_ _tenant_ _domain_ '
'_user_domain_ _project_domain_',
'user_name': '_user_name_',
'auth_url': '_auth_url_'
'auth_url': '_auth_url_',
'auth_token_info': '_auth_token_info_'
}), solum.TLS.trace._support_data)
def test_info_commands(self):