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

meraki_vlan - Remove unnecessary API calls when net_id is specified (#54939)

Browse source 
* Remove unnecessary API calls when net_id is specified

* Remove temp_get_nets commented out code

(cherry picked from commit fb3cc7f687)
This commit is contained in:
Kevin Breit 2019-04-15 13:53:19 -05:00 committed by Toshio Kuratomi
parent fc37aed6d9
commit e62f75192d
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/meraki_vlan_api_calls.yml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- "meraki_vlan - Module would make unnecessary API calls to Meraki when net_id is specified in task."

15
lib/ansible/modules/network/meraki/meraki_vlan.py
View file

@ -272,13 +272,6 @@ def fixed_ip_factory(meraki, data):
return fixed_ips return fixed_ips
def temp_get_nets(meraki, org_name):
org_id = meraki.get_org_id(org_name)
path = meraki.construct_path('get_all', function='network', org_id=org_id)
r = meraki.request(path, method='GET')
return r
def get_vlans(meraki, net_id): def get_vlans(meraki, net_id):
path = meraki.construct_path('get_all', net_id=net_id) path = meraki.construct_path('get_all', net_id=net_id)
return meraki.request(path, method='GET') return meraki.request(path, method='GET')
@ -361,12 +354,10 @@ def main():
org_id = meraki.params['org_id'] org_id = meraki.params['org_id']
if org_id is None: if org_id is None:
org_id = meraki.get_org_id(meraki.params['org_name']) org_id = meraki.get_org_id(meraki.params['org_name'])
nets = meraki.get_nets(org_id=org_id)
net_id = None
if meraki.params['net_name']:
net_id = meraki.get_net_id(net_name=meraki.params['net_name'], data=nets)
elif meraki.params['net_id']:
net_id = meraki.params['net_id'] net_id = meraki.params['net_id']
if net_id is None:
nets = meraki.get_nets(org_id=org_id)
net_id = meraki.get_net_id(net_name=meraki.params['net_name'], data=nets)
if meraki.params['state'] == 'query': if meraki.params['state'] == 'query':
if not meraki.params['vlan_id']: if not meraki.params['vlan_id']: