diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-10 18:36:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-10 18:36:26 +0000 |
| commit | b788a184a05edef5b3d8a6f9ee84ea366c847196 (patch) | |
| tree | 29a598a66aa7cb2a003745f47819d49118bacb59 /oslo_context | |
| parent | e4c9c1d6976c7b8304298df4286480338e24a3ae (diff) | |
| parent | 2cd47bc2ef6496c0f1d9bfcc19f620ea38a59894 (diff) | |
| download | oslo-context-b788a184a05edef5b3d8a6f9ee84ea366c847196.tar.gz | |
Merge "Revert "Fix X-User and X-Tenant deprecated headers in from_environ""2.11.0
Diffstat (limited to 'oslo_context')
| -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 350271e..481b18c 100644 --- a/oslo_context/context.py +++ b/oslo_context/context.py @@ -41,16 +41,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 0ba3a69..9a32fac 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) |