From ab5fe081aa0fed3d5244321608f47e241bebf7aa Mon Sep 17 00:00:00 2001 From: Artem Vasilyev Date: Wed, 6 Feb 2019 10:02:51 +0300 Subject: [PATCH] Seperated CADF notifications tests for request_id Change-Id: I6843ce4f17c8a15a70d65ed55581fe9c9c9c7cb8 Related-Bug: #1801095 --- .../tests/unit/common/test_notifications.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/keystone/tests/unit/common/test_notifications.py b/keystone/tests/unit/common/test_notifications.py index ebcb65b7fb..0793986feb 100644 --- a/keystone/tests/unit/common/test_notifications.py +++ b/keystone/tests/unit/common/test_notifications.py @@ -901,13 +901,20 @@ class CADFNotificationsForEntities(NotificationsForEntities): 'domain', cadftaxonomy.SECURITY_DOMAIN) - def test_initiator_request_and_global_request_id(self): - global_request_id = 'req-%s' % uuid.uuid4() + def test_initiator_request_id(self): + data = self.build_authentication_request( + user_id=self.user_id, + password=self.user['password']) + self.post('/auth/tokens', body=data) + audit = self._audits[-1] + initiator = audit['payload']['initiator'] + self.assertIn('request_id', initiator) - user_id = self.user_id - password = self.user['password'] - data = self.build_authentication_request(user_id=user_id, - password=password) + def test_initiator_global_request_id(self): + global_request_id = 'req-%s' % uuid.uuid4() + data = self.build_authentication_request( + user_id=self.user_id, + password=self.user['password']) self.post( '/auth/tokens', body=data, headers={'X-OpenStack-Request-Id': global_request_id}) @@ -915,8 +922,11 @@ class CADFNotificationsForEntities(NotificationsForEntities): initiator = audit['payload']['initiator'] self.assertEqual( initiator['global_request_id'], global_request_id) - self.assertIn('request_id', initiator) + def test_initiator_global_request_id_not_set(self): + data = self.build_authentication_request( + user_id=self.user_id, + password=self.user['password']) self.post('/auth/tokens', body=data) audit = self._audits[-1] initiator = audit['payload']['initiator']