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

openstack · Oct 27, 2016 · e52b6f7 · e52b6f7
2 parents 2bf8f2a + fd22458
commit e52b6f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/oslo_context/context.py b/oslo_context/context.py
@@ -39,16 +39,16 @@
 # header to support backwards compatibility.
 _ENVIRON_HEADERS = {'auth_token': ['HTTP_X_AUTH_TOKEN',
                                    'HTTP_X_STORAGE_TOKEN'],
-                    'user': ['HTTP_X_USER_ID',
-                             'HTTP_X_USER'],
+                    'user': ['HTTP_X_USER_ID'],
                     'tenant': ['HTTP_X_PROJECT_ID',
-                               'HTTP_X_TENANT_ID',
-                               'HTTP_X_TENANT'],
+                               'HTTP_X_TENANT_ID'],
                     'user_domain': ['HTTP_X_USER_DOMAIN_ID'],
                     'project_domain': ['HTTP_X_PROJECT_DOMAIN_ID'],
-                    'user_name': ['HTTP_X_USER_NAME'],
+                    'user_name': ['HTTP_X_USER_NAME',
+                                  'HTTP_X_USER'],
                     'project_name': ['HTTP_X_PROJECT_NAME',
-                                     'HTTP_X_TENANT_NAME'],
+                                     'HTTP_X_TENANT_NAME',
+                                     'HTTP_X_TENANT'],
                     '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
@@ -233,7 +233,7 @@ def test_from_environ_deprecated_variables(self):
 
         environ = {'HTTP_X_USER': value}
         ctx = context.RequestContext.from_environ(environ=environ)
-        self.assertEqual(value, ctx.user)
+        self.assertEqual(value, ctx.user_name)
 
         environ = {'HTTP_X_TENANT_ID': value}
         ctx = context.RequestContext.from_environ(environ=environ)
@@ -245,7 +245,7 @@ def test_from_environ_deprecated_variables(self):
 
         environ = {'HTTP_X_TENANT': value}
         ctx = context.RequestContext.from_environ(environ=environ)
-        self.assertEqual(value, ctx.tenant)
+        self.assertEqual(value, ctx.project_name)
 
         environ = {'HTTP_X_ROLE': value}
         ctx = context.RequestContext.from_environ(environ=environ)