From cf8e84fc6289f0d1a9ec07b91f1e7f1b2716028c Mon Sep 17 00:00:00 2001
From: chkp-orso <47325598+chkp-orso@users.noreply.github.com>
Date: Wed, 18 Sep 2019 17:08:31 +0200
Subject: [PATCH] fix session_uid (#62523)

---
 .../module_utils/network/checkpoint/checkpoint.py        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/ansible/module_utils/network/checkpoint/checkpoint.py b/lib/ansible/module_utils/network/checkpoint/checkpoint.py
index 4582c4e5869..2d5419c8e03 100644
--- a/lib/ansible/module_utils/network/checkpoint/checkpoint.py
+++ b/lib/ansible/module_utils/network/checkpoint/checkpoint.py
@@ -186,7 +186,7 @@ def api_call(module, api_call_object):
     payload = get_payload_from_parameters(module.params)
     connection = Connection(module._socket_path)
 
-    result = {'changed': False, 'checkpoint_session_uid': connection.get_session_uid()}
+    result = {'changed': False}
     if module.check_mode:
         return result
 
@@ -196,6 +196,8 @@ def api_call(module, api_call_object):
     payload_for_equals = {'type': api_call_object, 'params': payload}
     equals_code, equals_response = send_request(connection, version, 'equals', payload_for_equals)
 
+    result['checkpoint_session_uid'] = connection.get_session_uid()
+
     # if code is 400 (bad request) or 500 (internal error) - fail
     if equals_code == 400 or equals_code == 500:
         module.fail_json(msg=equals_response)
@@ -343,7 +345,7 @@ def api_call_for_rule(module, api_call_object):
     payload = get_payload_from_parameters(module.params)
     connection = Connection(module._socket_path)
 
-    result = {'changed': False, 'checkpoint_session_uid': connection.get_session_uid()}
+    result = {'changed': False}
     if module.check_mode:
         return result
 
@@ -356,6 +358,9 @@ def api_call_for_rule(module, api_call_object):
         copy_payload_without_some_params = get_copy_payload_without_some_params(payload, ['position'])
     payload_for_equals = {'type': api_call_object, 'params': copy_payload_without_some_params}
     equals_code, equals_response = send_request(connection, version, 'equals', payload_for_equals)
+
+    result['checkpoint_session_uid'] = connection.get_session_uid()
+
     # if code is 400 (bad request) or 500 (internal error) - fail
     if equals_code == 400 or equals_code == 500:
         module.fail_json(msg=equals_response)