diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-11 23:00:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-11 23:00:35 +0000 |
| commit | 6a9bc57a9bc4c74534565bdf7301ace85d8bda90 (patch) | |
| tree | 6a2cfcc0fa1ac66b1479cce5d23111f5d61bdc39 /oslo_context | |
| parent | 9feb9db8d667bc5bc9ca43e2073227c1e8e44bbb (diff) | |
| parent | 51180406766ac606e08bc35cc51b1005518b37fa (diff) | |
| download | oslo-context-6a9bc57a9bc4c74534565bdf7301ace85d8bda90.tar.gz | |
Merge "Allow deprecated X-Tenant-Name in from_environ"
Diffstat (limited to 'oslo_context')
| -rw-r--r-- | oslo_context/context.py | 3 | ||||
| -rw-r--r-- | oslo_context/tests/test_context.py | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/oslo_context/context.py b/oslo_context/context.py index 0238533..d0d79c0 100644 --- a/oslo_context/context.py +++ b/oslo_context/context.py @@ -46,7 +46,8 @@ _ENVIRON_HEADERS = {'auth_token': ['HTTP_X_AUTH_TOKEN', 'user_domain': ['HTTP_X_USER_DOMAIN_ID'], 'project_domain': ['HTTP_X_PROJECT_DOMAIN_ID'], 'user_name': ['HTTP_X_USER_NAME'], - 'project_name': ['HTTP_X_PROJECT_NAME'], + 'project_name': ['HTTP_X_PROJECT_NAME', + '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 e50b99c..54046cb 100644 --- a/oslo_context/tests/test_context.py +++ b/oslo_context/tests/test_context.py @@ -214,6 +214,10 @@ class ContextTest(test_base.BaseTestCase): ctx = context.RequestContext.from_environ(environ=environ) self.assertEqual([value], ctx.roles) + environ = {'HTTP_X_TENANT_NAME': value} + ctx = context.RequestContext.from_environ(environ=environ) + self.assertEqual(value, ctx.project_name) + def test_from_environ_deprecated_precendence(self): old = uuid.uuid4().hex new = uuid.uuid4().hex @@ -239,6 +243,12 @@ class ContextTest(test_base.BaseTestCase): tenant=override) self.assertEqual(ctx.tenant, override) + environ = {'HTTP_X_TENANT_NAME': old, + 'HTTP_X_PROJECT_NAME': new} + + ctx = context.RequestContext.from_environ(environ=environ) + self.assertEqual(ctx.project_name, new) + def test_from_environ_strip_roles(self): environ = {'HTTP_X_ROLES': ' abc\t,\ndef\n,ghi\n\n'} ctx = context.RequestContext.from_environ(environ=environ) |