Skip to content

Commit d656a5d

Browse files
authored
Merge pull request #26 from chkp-ameera/master
remove enum declaration
2 parents 4766db2 + e301613 commit d656a5d

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

CHANGELOG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Check_Point.gaia Release Notes
44

55
.. contents:: Topics
66

7+
v4.1.1
8+
======
9+
10+
Bugfixes
11+
---------------
12+
13+
- improve infrastructure for idempotency check.
14+
- fix some modules which didn't work as expected (Scheduled Job, Role, Proxy, physical interface, users, ntp, banner message, static route)
15+
716
v4.1.0
817
======
918

plugins/module_utils/checkpoint.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@
3333
import time
3434

3535
from ansible.module_utils.connection import Connection
36-
from enum import Enum
3736

38-
# class syntax
39-
class RequestType(Enum):
40-
BEFORE_REQUEST = 1
41-
AFTER_REQUEST = 2
37+
BEFORE_REQUEST = 1
38+
AFTER_REQUEST = 2
4239

4340
checkpoint_argument_spec_for_async = dict(
4441
wait_for_task=dict(type='bool', default=True)
@@ -79,7 +76,6 @@ def get_version(module):
7976
return res
8077

8178

82-
8379
# send the request to checkpoint
8480
def send_request(connection, version, url, payload=None):
8581
code, response = connection.send_request('/gaia_api/' + version + url, payload)
@@ -99,14 +95,14 @@ def replace_chkp_params(params, request_type):
9995
payload = {}
10096
old = ""
10197
new = ""
102-
if request_type == RequestType.BEFORE_REQUEST:
98+
if request_type == BEFORE_REQUEST:
10399
old = "_"
104100
new = "-"
105101
# we used a dedicated 'msg' parametr because we can not use 'message' parameter
106102
# as 'message' is used internally in Ansible Core engine
107103
if "msg" in params:
108104
params["message"] = params.pop("msg")
109-
elif request_type == RequestType.AFTER_REQUEST:
105+
elif request_type == AFTER_REQUEST:
110106
old = "-"
111107
new = "_"
112108
if "message" in params:
@@ -176,11 +172,11 @@ def wait_for_task(module, version, task_id):
176172

177173
# handle api call
178174
def api_call(module, target_version, api_call_object):
179-
payload = replace_chkp_params(module.params, RequestType.BEFORE_REQUEST)
175+
payload = replace_chkp_params(module.params, BEFORE_REQUEST)
180176
connection = Connection(module._socket_path)
181177
code, response = send_request(connection, target_version, api_call_object, payload)
182178

183-
response = replace_chkp_params(response, RequestType.AFTER_REQUEST)
179+
response = replace_chkp_params(response, AFTER_REQUEST)
184180
return code, response
185181

186182

@@ -256,7 +252,7 @@ def chkp_api_call(module, api_call_object, has_add_api, ignore=None, show_params
256252
[module.params.pop(key) for key in show_params if key not in add_params]
257253
module.params.update(add_params)
258254
code, res = api_call(module, target_version, api_call_object="add-{0}".format(api_call_object))
259-
else: # some requests like static-route don't have add, try set instead
255+
else: # some requests like static-route don't have add, try set instead
260256
code, res = api_call(module, target_version, api_call_object="set-{0}".format(api_call_object))
261257

262258
if code != 200:

0 commit comments

Comments
 (0)