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

Migrated path creation to custom parameters (#54278)

Browse source
This commit is contained in:
Kevin Breit 2019-04-24 15:14:58 -05:00 committed by Adam Miller
parent 56da3825c6
commit 34e9c0f3a5
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/network/meraki/meraki_mr_l3_firewall.py
View file

@ -157,8 +157,7 @@ def assemble_payload(meraki):
def get_rules(meraki, net_id, number):
path = meraki.construct_path('get_all', net_id=net_id)
path = path + number + '/l3FirewallRules'
path = meraki.construct_path('get_all', net_id=net_id, custom={'number': number})
response = meraki.request(path, method='GET')
if meraki.status == 200:
return response
@ -216,8 +215,8 @@ def main():
meraki.params['follow_redirects'] = 'all'
query_urls = {'mr_l3_firewall': '/networks/{net_id}/ssids/'}
update_urls = {'mr_l3_firewall': '/networks/{net_id}/ssids/'}
query_urls = {'mr_l3_firewall': '/networks/{net_id}/ssids/{number}/l3FirewallRules'}
update_urls = {'mr_l3_firewall': '/networks/{net_id}/ssids/{number}/l3FirewallRules'}
meraki.url_catalog['get_all'].update(query_urls)
meraki.url_catalog['update'] = update_urls
@ -256,8 +255,7 @@ def main():
meraki.result['data'] = get_rules(meraki, net_id, number)
elif meraki.params['state'] == 'present':
rules = get_rules(meraki, net_id, number)
path = meraki.construct_path('get_all', net_id=net_id)
path = path + number + '/l3FirewallRules'
path = meraki.construct_path('get_all', net_id=net_id, custom={'number': number})
if meraki.params['rules']:
payload = assemble_payload(meraki)
else: