wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

To fix delete to pass the right parameters wrt to Checkpoint modules (#62540)

Browse source 
* fix delete to pass the right parameters (#62525)


(cherry picked from commit 2232232b45)

* changelog
This commit is contained in:
Sumit Jaiswal 2019-09-19 01:49:05 +05:30 committed by Toshio Kuratomi
parent 45f573d2ed
commit bf5444ddae
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/62525-fix-delete-to-pass-right-param.yaml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- "Fix delete to pass the right parameters(https://github.com/ansible/ansible/pull/62525)"

8
lib/ansible/module_utils/network/checkpoint/checkpoint.py
View file

@ -48,6 +48,8 @@ checkpoint_argument_spec_for_commands = dict(
version=dict(type='str')
)
delete_params = ['name', 'uid', 'layer', 'exception-group-name', 'layer', 'rule-name']
# send the request to checkpoint
def send_request(connection, version, url, payload=None):
@ -229,7 +231,8 @@ def api_call(module, api_call_object):
result[api_call_object] = response
elif module.params['state'] == 'absent':
if equals_code == 200:
code, response = send_request(connection, version, 'delete-' + api_call_object, payload)
payload_for_delete = get_copy_payload_with_some_params(payload, delete_params)
code, response = send_request(connection, version, 'delete-' + api_call_object, payload_for_delete)
if code != 200:
module.fail_json(msg=response)
@ -399,7 +402,8 @@ def api_call_for_rule(module, api_call_object):
result[api_call_object] = response
elif module.params['state'] == 'absent':
if equals_code == 200:
code, response = send_request(connection, version, 'delete-' + api_call_object, payload)
payload_for_delete = get_copy_payload_with_some_params(payload, delete_params)
code, response = send_request(connection, version, 'delete-' + api_call_object, payload_for_delete)
if code != 200:
module.fail_json(msg=response)