openstack
/
oslo.context
Code Issues Proposed changes

Handle openstack.request_id in from_environ 

The oslo.middleware request_id middleware that is used by most services
sets the request_id into the environment at 'openstack.request_id'. Pick
this value up into the context object if it is present in the
environment.

Change-Id: Iae3799f4c5ad799961a4a6b01d2b77fd97e72be3
This commit is contained in:
Jamie Lennox 2016-06-29 13:56:07 +10:00
parent ae6f152447
commit 740b81784b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oslo_context/context.py
View File

@ -48,7 +48,9 @@ _ENVIRON_HEADERS = {'auth_token': ['HTTP_X_AUTH_TOKEN',
'user_name': ['HTTP_X_USER_NAME'],
'project_name': ['HTTP_X_PROJECT_NAME'],
'user_domain_name': ['HTTP_X_USER_DOMAIN_NAME'],
'project_domain_name': ['HTTP_X_PROJECT_DOMAIN_NAME']}
'project_domain_name': ['HTTP_X_PROJECT_DOMAIN_NAME'],
'request_id': ['openstack.request_id'],
}
def generate_request_id():

5
oslo_context/tests/test_context.py
View File

@ -156,6 +156,7 @@ class ContextTest(test_base.BaseTestCase):
project_domain_name = uuid.uuid4().hex
project_domain_id = generate_id(project_domain_name)
roles = [uuid.uuid4().hex, uuid.uuid4().hex, uuid.uuid4().hex]
request_id = uuid.uuid4().hex
environ = {'HTTP_X_AUTH_TOKEN': auth_token,
'HTTP_X_USER_ID': user_id,
@ -166,7 +167,8 @@ class ContextTest(test_base.BaseTestCase):
'HTTP_X_USER_NAME': user_name,
'HTTP_X_PROJECT_NAME': project_name,
'HTTP_X_USER_DOMAIN_NAME': user_domain_name,
'HTTP_X_PROJECT_DOMAIN_NAME': project_domain_name}
'HTTP_X_PROJECT_DOMAIN_NAME': project_domain_name,
'openstack.request_id': request_id}
ctx = context.RequestContext.from_environ(environ)
@ -180,6 +182,7 @@ class ContextTest(test_base.BaseTestCase):
self.assertEqual(project_domain_id, ctx.project_domain)
self.assertEqual(project_domain_name, ctx.project_domain_name)
self.assertEqual(roles, ctx.roles)
self.assertEqual(request_id, ctx.request_id)
def test_from_environ_no_roles(self):
ctx = context.RequestContext.from_environ(environ={})