openstack/oslo.context
Code Issues Proposed changes

Revert "Fix X-User and X-Tenant deprecated headers in from_environ"

Browse Source 
This reverts commit fd224586199f99affc5d37993907024bbf3cd00f.

Currently causing nova periodic jobs to fail.

Change-Id: Ifef9b232aeaded19bca3741dfdd3841006409422
This commit is contained in:
Joshua Harlow 2016-11-08 15:30:43 -08:00
parent a6f104109d
commit 2cd47bc2ef
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oslo_context/context.py
View File

@ -39,16 +39,16 @@ _request_store = threading.local()
# header to support backwards compatibility.
_ENVIRON_HEADERS = {'auth_token': ['HTTP_X_AUTH_TOKEN',
'HTTP_X_STORAGE_TOKEN'],
'user': ['HTTP_X_USER_ID'],
'user': ['HTTP_X_USER_ID',
'HTTP_X_USER'],
'tenant': ['HTTP_X_PROJECT_ID',
'HTTP_X_TENANT_ID'],
'HTTP_X_TENANT_ID',
'HTTP_X_TENANT'],
'user_domain': ['HTTP_X_USER_DOMAIN_ID'],
'project_domain': ['HTTP_X_PROJECT_DOMAIN_ID'],
'user_name': ['HTTP_X_USER_NAME',
'HTTP_X_USER'],
'user_name': ['HTTP_X_USER_NAME'],
'project_name': ['HTTP_X_PROJECT_NAME',
'HTTP_X_TENANT_NAME',
'HTTP_X_TENANT'],
'HTTP_X_TENANT_NAME'],
'user_domain_name': ['HTTP_X_USER_DOMAIN_NAME'],
'project_domain_name': ['HTTP_X_PROJECT_DOMAIN_NAME'],
'request_id': ['openstack.request_id'],

4
oslo_context/tests/test_context.py
View File

@ -233,7 +233,7 @@ class ContextTest(test_base.BaseTestCase):
environ = {'HTTP_X_USER': value}
ctx = context.RequestContext.from_environ(environ=environ)
self.assertEqual(value, ctx.user_name)
self.assertEqual(value, ctx.user)
environ = {'HTTP_X_TENANT_ID': value}
ctx = context.RequestContext.from_environ(environ=environ)
@ -245,7 +245,7 @@ class ContextTest(test_base.BaseTestCase):
environ = {'HTTP_X_TENANT': value}
ctx = context.RequestContext.from_environ(environ=environ)
self.assertEqual(value, ctx.project_name)
self.assertEqual(value, ctx.tenant)
environ = {'HTTP_X_ROLE': value}
ctx = context.RequestContext.from_environ(environ=environ)