diff options
| author | Joshua Harlow <jxharlow@godaddy.com> | 2016-11-08 15:30:43 -0800 |
|---|---|---|
| committer | Joshua Harlow <jxharlow@godaddy.com> | 2016-11-08 15:50:22 -0800 |
| commit | 2cd47bc2ef6496c0f1d9bfcc19f620ea38a59894 (patch) | |
| tree | 5fad409d4d1fe22839adae88698ed12764ad1095 | |
| parent | a6f104109d48d2b6f2fd45073c33ba8f4b2db71e (diff) | |
| download | oslo-context-2cd47bc2ef6496c0f1d9bfcc19f620ea38a59894.tar.gz | |
Revert "Fix X-User and X-Tenant deprecated headers in from_environ"
This reverts commit fd224586199f99affc5d37993907024bbf3cd00f.
Currently causing nova periodic jobs to fail.
Change-Id: Ifef9b232aeaded19bca3741dfdd3841006409422
| -rw-r--r-- | oslo_context/context.py | 12 | ||||
| -rw-r--r-- | oslo_context/tests/test_context.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/oslo_context/context.py b/oslo_context/context.py index 0961f3f..1a2ce21 100644 --- a/oslo_context/context.py +++ b/oslo_context/context.py @@ -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'], diff --git a/oslo_context/tests/test_context.py b/oslo_context/tests/test_context.py index 4e03dfe..956c1e5 100644 --- a/oslo_context/tests/test_context.py +++ b/oslo_context/tests/test_context.py @@ -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) |