ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-11 03:31:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

meraki_network - Restructure execution logic (#56818)

Browse source 
* Restructure meraki_network to be simpler and work for all int tests

* Enable all integration tests and enhance error reports

* Slight tweaks to integration tests
This commit is contained in:
Kevin Breit 2019-06-05 09:33:55 -05:00 • committed by Nathaniel Case
parent 091bebcbf7
commit 8bcf9b5734
3 changed files with 64 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/module_utils/network/meraki/meraki.py
View file

@ -232,20 +232,19 @@ class MerakiModule(object):
self.nets.append(t)
return self.nets
# def get_net(self, org_name, net_name, data=None):
# path = self.construct_path('get_all', function='network', org_id=org_id)
# r = self.request(path, method='GET')
# return r
def get_net(self, org_name, net_name, org_id=None, data=None):
def get_net(self, org_name, net_name=None, org_id=None, data=None, net_id=None):
''' Return network information '''
if not data:
if not org_id:
org_id = self.get_org_id(org_name)
data = self.get_nets(org_id=org_id)
for n in data:
if n['name'] == net_name:
return n
if net_id:
if n['id'] == net_id:
return n
elif net_name:
if n['name'] == net_name:
return n
return False
def get_net_id(self, org_name=None, net_name=None, data=None):