Add request-id to log messages

request-id needs to be stored in thread local store to allow
openstack.common.log use request-id.
tenant_name and user_name are added to the context so that
they can be logged by customizing the log format.

Also replaces 'cxt' with 'ctx' in test_neutron_context.py.
Previously both 'ctx' and 'cxt' are used mixed in one file.

Change-Id: Ib921585e648e92491c1366bc0ad26a6ae71e2fc9
Partial-Bug: #1239923

diff --git a/neutron/auth.py b/neutron/auth.py
index c434337048ebfa1fa80c837ed5dd4b66759ffdd7..220bf3e2a6ff789beaa8583ac2b30423beedf976 100644 (file)
--- a/neutron/auth.py
+++ b/neutron/auth.py
@@ -42,8 +42,13 @@ class NeutronKeystoneContext(wsgi.Middleware):
         # Suck out the roles
         roles = [r.strip() for r in req.headers.get('X_ROLES', '').split(',')]
 
+        # Human-friendly names
+        tenant_name = req.headers.get('X_PROJECT_NAME')
+        user_name = req.headers.get('X_USER_NAME')
+
         # Create a context with the authentication data
-        ctx = context.Context(user_id, tenant_id, roles=roles)
+        ctx = context.Context(user_id, tenant_id, roles=roles,
+                              user_name=user_name, tenant_name=tenant_name)
 
         # Inject the context...
         req.environ['neutron.context'] = ctx

diff --git a/neutron/context.py b/neutron/context.py
index f55022079299c4a74962ceeca9119549a546fe96..6cd9311e4b14266585eaf165bc650e5130127a09 100644 (file)
--- a/neutron/context.py
+++ b/neutron/context.py
@@ -23,6 +23,7 @@ from datetime import datetime
 
 from neutron.db import api as db_api
 from neutron.openstack.common import context as common_context
+from neutron.openstack.common import local
 from neutron.openstack.common import log as logging
 from neutron import policy
 
@@ -38,18 +39,31 @@ class ContextBase(common_context.RequestContext):
     """
 
     def __init__(self, user_id, tenant_id, is_admin=None, read_deleted="no",
-                 roles=None, timestamp=None, load_admin_roles=True, **kwargs):
+                 roles=None, timestamp=None, load_admin_roles=True,
+                 request_id=None, tenant_name=None, user_name=None,
+                 overwrite=True, **kwargs):
         """Object initialization.
 
         :param read_deleted: 'no' indicates deleted records are hidden, 'yes'
             indicates deleted records are visible, 'only' indicates that
             *only* deleted records are visible.
+
+        :param overwrite: Set to False to ensure that the greenthread local
+            copy of the index is not overwritten.
+
+        :param kwargs: Extra arguments that might be present, but we ignore
+            because they possibly came in from older rpc messages.
         """
         if kwargs:
             LOG.warn(_('Arguments dropped when creating '
                        'context: %s'), kwargs)
+
         super(ContextBase, self).__init__(user=user_id, tenant=tenant_id,
-                                          is_admin=is_admin)
+                                          is_admin=is_admin,
+                                          request_id=request_id)
+        self.user_name = user_name
+        self.tenant_name = tenant_name
+
         self.read_deleted = read_deleted
         if not timestamp:
             timestamp = datetime.utcnow()
@@ -63,6 +77,9 @@ class ContextBase(common_context.RequestContext):
             admin_roles = policy.get_admin_roles()
             if admin_roles:
                 self.roles = list(set(self.roles) | set(admin_roles))
+        # Allow openstack.common.log to access the context
+        if overwrite or not hasattr(local.store, 'context'):
+            local.store.context = self
 
     @property
     def project_id(self):
@@ -106,7 +123,13 @@ class ContextBase(common_context.RequestContext):
                 'is_admin': self.is_admin,
                 'read_deleted': self.read_deleted,
                 'roles': self.roles,
-                'timestamp': str(self.timestamp)}
+                'timestamp': str(self.timestamp),
+                'request_id': self.request_id,
+                'tenant': self.tenant,
+                'user': self.user,
+                'tenant_name': self.tenant_name,
+                'user_name': self.user_name,
+                }
 
     @classmethod
     def from_dict(cls, values):
@@ -139,7 +162,8 @@ def get_admin_context(read_deleted="no", load_admin_roles=True):
                    tenant_id=None,
                    is_admin=True,
                    read_deleted=read_deleted,
-                   load_admin_roles=load_admin_roles)
+                   load_admin_roles=load_admin_roles,
+                   overwrite=False)
 
 
 def get_admin_context_without_session(read_deleted="no"):

diff --git a/neutron/tests/unit/test_auth.py b/neutron/tests/unit/test_auth.py
index fc262ec7d8e4b615efc9d4c946598f405cbbd519..f650baa190e0605e3d5067e0ef52f60af3c63d67 100644 (file)
--- a/neutron/tests/unit/test_auth.py
+++ b/neutron/tests/unit/test_auth.py
@@ -35,7 +35,7 @@ class NeutronKeystoneContextTestCase(base.BaseTestCase):
         self.request = webob.Request.blank('/')
         self.request.headers['X_AUTH_TOKEN'] = 'testauthtoken'
 
-    def test_no_user_no_user_id(self):
+    def test_no_user_id(self):
         self.request.headers['X_PROJECT_ID'] = 'testtenantid'
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status, '401 Unauthorized')
@@ -46,6 +46,7 @@ class NeutronKeystoneContextTestCase(base.BaseTestCase):
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(self.context.user_id, 'testuserid')
+        self.assertEqual(self.context.user, 'testuserid')
 
     def test_with_tenant_id(self):
         self.request.headers['X_PROJECT_ID'] = 'testtenantid'
@@ -53,6 +54,7 @@ class NeutronKeystoneContextTestCase(base.BaseTestCase):
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(self.context.tenant_id, 'testtenantid')
+        self.assertEqual(self.context.tenant, 'testtenantid')
 
     def test_roles_no_admin(self):
         self.request.headers['X_PROJECT_ID'] = 'testtenantid'
@@ -74,3 +76,15 @@ class NeutronKeystoneContextTestCase(base.BaseTestCase):
         self.assertEqual(self.context.roles, ['role1', 'role2', 'role3',
                                               'role4', 'role5', 'AdMiN'])
         self.assertEqual(self.context.is_admin, True)
+
+    def test_with_user_tenant_name(self):
+        self.request.headers['X_PROJECT_ID'] = 'testtenantid'
+        self.request.headers['X_USER_ID'] = 'testuserid'
+        self.request.headers['X_PROJECT_NAME'] = 'testtenantname'
+        self.request.headers['X_USER_NAME'] = 'testusername'
+        response = self.request.get_response(self.middleware)
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(self.context.user_id, 'testuserid')
+        self.assertEqual(self.context.user_name, 'testusername')
+        self.assertEqual(self.context.tenant_id, 'testtenantid')
+        self.assertEqual(self.context.tenant_name, 'testtenantname')

diff --git a/neutron/tests/unit/test_neutron_context.py b/neutron/tests/unit/test_neutron_context.py
index 24b257b0ef588e8253e2477d1d04bfbe56a3d0de..58a26ea9d9b0ab463c98f0220ad06f31f838df1a 100644 (file)
--- a/neutron/tests/unit/test_neutron_context.py
+++ b/neutron/tests/unit/test_neutron_context.py
@@ -16,8 +16,10 @@
 #    under the License.
 
 import mock
+from testtools import matchers
 
 from neutron import context
+from neutron.openstack.common import local
 from neutron.tests import base
 
 
@@ -31,37 +33,63 @@ class TestNeutronContext(base.BaseTestCase):
         self.addCleanup(self._db_api_session_patcher.stop)
 
     def test_neutron_context_create(self):
-        cxt = context.Context('user_id', 'tenant_id')
-        self.assertEqual('user_id', cxt.user_id)
-        self.assertEqual('tenant_id', cxt.project_id)
+        ctx = context.Context('user_id', 'tenant_id')
+        self.assertEqual('user_id', ctx.user_id)
+        self.assertEqual('tenant_id', ctx.project_id)
+        self.assertEqual('tenant_id', ctx.tenant_id)
+        self.assertThat(ctx.request_id, matchers.StartsWith('req-'))
+        self.assertEqual('user_id', ctx.user)
+        self.assertEqual('tenant_id', ctx.tenant)
+        self.assertIsNone(ctx.user_name)
+        self.assertIsNone(ctx.tenant_name)
+
+    def test_neutron_context_create_with_name(self):
+        ctx = context.Context('user_id', 'tenant_id',
+                              tenant_name='tenant_name', user_name='user_name')
+        # Check name is set
+        self.assertEqual('user_name', ctx.user_name)
+        self.assertEqual('tenant_name', ctx.tenant_name)
+        # Check user/tenant contains its ID even if user/tenant_name is passed
+        self.assertEqual('user_id', ctx.user)
+        self.assertEqual('tenant_id', ctx.tenant)
+
+    def test_neutron_context_create_with_request_id(self):
+        ctx = context.Context('user_id', 'tenant_id', request_id='req_id_xxx')
+        self.assertEqual('req_id_xxx', ctx.request_id)
 
     def test_neutron_context_to_dict(self):
-        cxt = context.Context('user_id', 'tenant_id')
-        cxt_dict = cxt.to_dict()
-        self.assertEqual('user_id', cxt_dict['user_id'])
-        self.assertEqual('tenant_id', cxt_dict['project_id'])
+        ctx = context.Context('user_id', 'tenant_id')
+        ctx_dict = ctx.to_dict()
+        self.assertEqual('user_id', ctx_dict['user_id'])
+        self.assertEqual('tenant_id', ctx_dict['project_id'])
+        self.assertEqual(ctx.request_id, ctx_dict['request_id'])
+        self.assertEqual('user_id', ctx_dict['user'])
+        self.assertEqual('tenant_id', ctx_dict['tenant'])
+        self.assertIsNone(ctx_dict['user_name'])
+        self.assertIsNone(ctx_dict['tenant_name'])
+
+    def test_neutron_context_to_dict_with_name(self):
+        ctx = context.Context('user_id', 'tenant_id',
+                              tenant_name='tenant_name', user_name='user_name')
+        ctx_dict = ctx.to_dict()
+        self.assertEqual('user_name', ctx_dict['user_name'])
+        self.assertEqual('tenant_name', ctx_dict['tenant_name'])
 
     def test_neutron_context_admin_to_dict(self):
         self.db_api_session.return_value = 'fakesession'
-        cxt = context.get_admin_context()
-        cxt_dict = cxt.to_dict()
-        self.assertIsNone(cxt_dict['user_id'])
-        self.assertIsNone(cxt_dict['tenant_id'])
-        self.assertIsNotNone(cxt.session)
-        self.assertNotIn('session', cxt_dict)
+        ctx = context.get_admin_context()
+        ctx_dict = ctx.to_dict()
+        self.assertIsNone(ctx_dict['user_id'])
+        self.assertIsNone(ctx_dict['tenant_id'])
+        self.assertIsNotNone(ctx.session)
+        self.assertNotIn('session', ctx_dict)
 
     def test_neutron_context_admin_without_session_to_dict(self):
-        cxt = context.get_admin_context_without_session()
-        cxt_dict = cxt.to_dict()
-        self.assertIsNone(cxt_dict['user_id'])
-        self.assertIsNone(cxt_dict['tenant_id'])
-        try:
-            cxt.session
-        except Exception:
-            pass
-        else:
-            self.assertFalse(True, 'without_session admin context'
-                                   'should has no session property!')
+        ctx = context.get_admin_context_without_session()
+        ctx_dict = ctx.to_dict()
+        self.assertIsNone(ctx_dict['user_id'])
+        self.assertIsNone(ctx_dict['tenant_id'])
+        self.assertFalse(hasattr(ctx, 'session'))
 
     def test_neutron_context_with_load_roles_true(self):
         ctx = context.get_admin_context()
@@ -70,3 +98,35 @@ class TestNeutronContext(base.BaseTestCase):
     def test_neutron_context_with_load_roles_false(self):
         ctx = context.get_admin_context(load_admin_roles=False)
         self.assertFalse(ctx.roles)
+
+    def test_neutron_context_elevated_retains_request_id(self):
+        ctx = context.Context('user_id', 'tenant_id')
+        self.assertFalse(ctx.is_admin)
+        req_id_before = ctx.request_id
+
+        elevated_ctx = ctx.elevated()
+        self.assertTrue(elevated_ctx.is_admin)
+        self.assertEqual(req_id_before, elevated_ctx.request_id)
+
+    def test_neutron_context_overwrite(self):
+        ctx1 = context.Context('user_id', 'tenant_id')
+        self.assertEqual(ctx1.request_id, local.store.context.request_id)
+
+        # If overwrite is not specified, request_id should be updated.
+        ctx2 = context.Context('user_id', 'tenant_id')
+        self.assertNotEqual(ctx2.request_id, ctx1.request_id)
+        self.assertEqual(ctx2.request_id, local.store.context.request_id)
+
+        # If overwrite is specified, request_id should be kept.
+        ctx3 = context.Context('user_id', 'tenant_id', overwrite=False)
+        self.assertNotEqual(ctx3.request_id, ctx2.request_id)
+        self.assertEqual(ctx2.request_id, local.store.context.request_id)
+
+    def test_neutron_context_get_admin_context_not_update_local_store(self):
+        ctx = context.Context('user_id', 'tenant_id')
+        req_id_before = local.store.context.request_id
+        self.assertEqual(ctx.request_id, req_id_before)
+
+        ctx_admin = context.get_admin_context()
+        self.assertEqual(req_id_before, local.store.context.request_id)
+        self.assertNotEqual(req_id_before, ctx_admin.request_id)