cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolves handling of error and failure scenarios from Checkpoint module end (#54890)

Browse source 
* handle failure case

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* handle failure case

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>

* handle failure case

Signed-off-by: Sumit Jaiswal <sjaiswal@redhat.com>
This commit is contained in:
Sumit Jaiswal 2019-04-08 21:37:52 +05:30 committed by GitHub
parent 56ae8ebd60
commit 0ff689a315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/network/checkpoint/checkpoint_access_rule.py
View file

@ -228,6 +228,8 @@ def main():
if code == 200:
if needs_update(module, response):
code, response = update_access_rule(module, connection)
if code != 200:
module.fail_json(msg=response)
if module.params['auto_publish_session']:
publish(connection)
@ -240,7 +242,8 @@ def main():
pass
elif code == 404:
code, response = create_access_rule(module, connection)
if code != 200:
module.fail_json(msg=response)
if module.params['auto_publish_session']:
publish(connection)
@ -252,7 +255,8 @@ def main():
else:
if code == 200:
code, response = delete_access_rule(module, connection)
if code != 200:
module.fail_json(msg=response)
if module.params['auto_publish_session']:
publish(connection)
@ -260,6 +264,7 @@ def main():
install_policy(connection, module.params['policy_package'], module.params['targets'])
result['changed'] = True
result['checkpoint_access_rules'] = response
elif code == 404:
pass

11
lib/ansible/modules/network/checkpoint/checkpoint_host.py
View file

@ -134,7 +134,6 @@ def update_host(module, connection):
def delete_host(module, connection):
name = module.params['name']
ip_address = module.params['ip_address']
payload = {'name': name}
@ -170,7 +169,8 @@ def main():
if code == 200:
if needs_update(module, response):
code, response = update_host(module, connection)
if code != 200:
module.fail_json(msg=response)
if module.params['auto_publish_session']:
publish(connection)
@ -183,7 +183,8 @@ def main():
pass
elif code == 404:
code, response = create_host(module, connection)
if code != 200:
module.fail_json(msg=response)
if module.params['auto_publish_session']:
publish(connection)
@ -196,7 +197,8 @@ def main():
if code == 200:
# Handle deletion
code, response = delete_host(module, connection)
if code != 200:
module.fail_json(msg=response)
if module.params['auto_publish_session']:
publish(connection)
@ -204,6 +206,7 @@ def main():
install_policy(connection, module.params['policy_package'], module.params['targets'])
result['changed'] = True
result['checkpoint_hosts'] = response
elif code == 404:
pass

3
lib/ansible/modules/network/checkpoint/checkpoint_session.py
View file

@ -104,7 +104,8 @@ def main():
code, response = connection.send_request('/web_api/publish', payload)
else:
code, response = connection.send_request('/web_api/discard', payload)
if code != 200:
module.fail_json(msg=response)
result['checkpoint_session'] = response
else:
module.fail_json(msg='Check Point device returned error {0} with message {1}'.format(code, response))