Merge "add request_id and global_request_id to cadf notifications"

keystone/notifications.py

@@ -103,6 +103,11 @@ def build_audit_initiator():
     if oslo_context.domain_id:
         initiator.domain_id = oslo_context.domain_id
 
+    initiator.request_id = oslo_context.request_id
+
+    if oslo_context.global_request_id:
+        initiator.global_request_id = oslo_context.global_request_id
+
     return initiator
 
 

keystone/tests/unit/common/test_notifications.py

@@ -340,6 +340,7 @@ class BaseNotificationTest(test_v3.RestfulTestCase):
         self.assertEqual(self.user_id, payload['initiator']['id'])
         self.assertEqual(self.project_id, payload['initiator']['project_id'])
         self.assertEqual(typeURI, payload['target']['typeURI'])
+        self.assertIn('request_id', payload['initiator'])
         action = '%s.%s' % (operation, resource_type)
         self.assertEqual(action, payload['action'])
 
@@ -900,6 +901,27 @@ class CADFNotificationsForEntities(NotificationsForEntities):
                                            'domain',
                                            cadftaxonomy.SECURITY_DOMAIN)
 
+    def test_initiator_request_and_global_request_id(self):
+        global_request_id = 'req-%s' % uuid.uuid4()
+
+        user_id = self.user_id
+        password = self.user['password']
+        data = self.build_authentication_request(user_id=user_id,
+                                                 password=password)
+        self.post(
+            '/auth/tokens', body=data,
+            headers={'X-OpenStack-Request-Id': global_request_id})
+        audit = self._audits[-1]
+        initiator = audit['payload']['initiator']
+        self.assertEqual(
+            initiator['global_request_id'], global_request_id)
+        self.assertIn('request_id', initiator)
+
+        self.post('/auth/tokens', body=data)
+        audit = self._audits[-1]
+        initiator = audit['payload']['initiator']
+        self.assertNotIn('global_request_id', initiator)
+
 
 class TestEventCallbacks(test_v3.RestfulTestCase):
 

releasenotes/notes/bug-1801095-6e28d7a86719da74.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - >
+    [`bug 1801095 <https://bugs.launchpad.net/keystone/+bug/1801095>`_]
+    Request ID and global request ID have been added to CADF notifications.