internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

meraki_mx_l3_firewall - Fix idempotency for default rule logging (#42649)

Browse Source 
* Fix idempotency and default syslog bugs

* Fix idempotency check for syslog_default_rule

* Syntax errors
This commit is contained in:
Kevin Breit
2018-07-12 09:47:17 -05:00
committed by Dag Wieers
parent 9105149595
commit 2038ff5569
2 changed files with 74 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/modules/network/meraki/meraki_mx_l3_firewall.py
View File

@@ -301,20 +301,24 @@ def main():
else:
payload = dict()
update = False
if meraki.params['syslog_default_rule']:
if meraki.params['syslog_default_rule'] is not None:
payload['syslogDefaultRule'] = meraki.params['syslog_default_rule']
# meraki.fail_json(msg='Payload', payload=payload)
try:
if len(rules) - 1 != len(payload['rules']): # Quick and simple check to avoid more processing
update = True
if meraki.params['syslog_default_rule']:
if meraki.params['syslog_default_rule'] is not None:
if rules[len(rules) - 1]['syslogEnabled'] != meraki.params['syslog_default_rule']:
update = True
if update is False:
del rules[len(rules) - 1] # Remove default rule for comparison
for r in range(len(rules) - 1):
if meraki.is_update_required(rules[r], payload[r]) is True:
if meraki.is_update_required(rules[r], payload['rules'][r]) is True:
update = True
except KeyError:
pass
# if meraki.params['syslog_default_rule']:
# meraki.fail_json(msg='Compare', original=rules, proposed=payload)
if update is True:
response = meraki.request(path, method='PUT', payload=json.dumps(payload))
if meraki.status == 200: