mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-24 05:40:23 -07:00
Meraki utility now loads() JSON (#40856)
* Changed request() to run json.loads() instead of module doing it - Removed json.loads() from modules - Removed some unreliable integration tests - Removed self.function setting in construct_path() - * PEP8 changes * Remove debug line for push
This commit is contained in:
parent
ba848e018c
commit
2be2a572d6
8 changed files with 45 additions and 42 deletions
|
@ -84,7 +84,7 @@ EXAMPLES = r'''
|
|||
state: query
|
||||
email: jane@doe.com
|
||||
|
||||
- name: Create a new administrator with organization access
|
||||
- name: new administrator with organization access
|
||||
meraki_admin:
|
||||
auth_key: abc12345
|
||||
state: present
|
||||
|
@ -168,7 +168,7 @@ def get_admins(meraki, org_id):
|
|||
),
|
||||
method='GET'
|
||||
)
|
||||
return json.loads(admins)
|
||||
return admins
|
||||
|
||||
|
||||
def get_admin_id(meraki, org_name, data, name=None, email=None):
|
||||
|
@ -224,8 +224,8 @@ def network_factory(meraki, networks, nets):
|
|||
|
||||
|
||||
def get_nets_temp(meraki, org_id): # Function won't be needed when get_nets is added to util
|
||||
path = meraki.construct_path('get_all', function='networks', org_id=org_id)
|
||||
return json.loads(meraki.request(path, method='GET'))
|
||||
path = meraki.construct_path('get_all', function='network', org_id=org_id)
|
||||
return meraki.request(path, method='GET')
|
||||
|
||||
|
||||
def create_admin(meraki, org_id, name, email):
|
||||
|
@ -251,7 +251,7 @@ def create_admin(meraki, org_id, name, email):
|
|||
payload=json.dumps(payload)
|
||||
)
|
||||
meraki.result['changed'] = True
|
||||
return json.loads(r)
|
||||
return r
|
||||
elif is_admin_existing is not None: # Update existing admin
|
||||
if not meraki.params['tags']:
|
||||
payload['tags'] = []
|
||||
|
@ -265,7 +265,7 @@ def create_admin(meraki, org_id, name, email):
|
|||
payload=json.dumps(payload)
|
||||
)
|
||||
meraki.result['changed'] = True
|
||||
return json.loads(r)
|
||||
return r
|
||||
else:
|
||||
# meraki.fail_json(msg='No update is required!!!')
|
||||
return -1
|
||||
|
|
|
@ -227,7 +227,7 @@ def main():
|
|||
method='POST',
|
||||
payload=json.dumps(payload)
|
||||
)
|
||||
meraki.result['data'] = json.loads(r)
|
||||
meraki.result['data'] = r
|
||||
meraki.result['changed'] = True
|
||||
else:
|
||||
net = meraki.get_net(meraki.params['org_name'], meraki.params['net_name'], data=nets)
|
||||
|
@ -238,7 +238,7 @@ def main():
|
|||
r = meraki.request(path,
|
||||
method='PUT',
|
||||
payload=json.dumps(payload))
|
||||
meraki.result['data'] = json.loads(r)
|
||||
meraki.result['data'] = r
|
||||
meraki.result['changed'] = True
|
||||
elif meraki.params['state'] == 'absent':
|
||||
if is_net_valid(meraki, meraki.params['net_name'], nets) is True:
|
||||
|
|
|
@ -177,22 +177,17 @@ def main():
|
|||
elif meraki.params['state'] == 'present':
|
||||
if meraki.params['clone']: # Cloning
|
||||
payload = {'name': meraki.params['org_name']}
|
||||
meraki.result['data'] = json.loads(
|
||||
meraki.request(
|
||||
meraki.construct_path(
|
||||
'clone',
|
||||
org_name=meraki.params['clone']
|
||||
),
|
||||
payload=json.dumps(payload),
|
||||
method='POST'))
|
||||
meraki.result['data'] = meraki.request(meraki.construct_path('clone',
|
||||
org_name=meraki.params['clone']
|
||||
),
|
||||
payload=json.dumps(payload),
|
||||
method='POST')
|
||||
meraki.result['changed'] = True
|
||||
elif not meraki.params['org_id'] and meraki.params['org_name']: # Create new organization
|
||||
payload = {'name': meraki.params['org_name']}
|
||||
meraki.result['data'] = json.loads(
|
||||
meraki.request(
|
||||
meraki.construct_path('create'),
|
||||
method='POST',
|
||||
payload=json.dumps(payload)))
|
||||
meraki.result['data'] = meraki.request(meraki.construct_path('create'),
|
||||
method='POST',
|
||||
payload=json.dumps(payload))
|
||||
meraki.result['changed'] = True
|
||||
elif meraki.params['org_id'] and meraki.params['org_name']: # Update an existing organization
|
||||
payload = {'name': meraki.params['org_name'],
|
||||
|
@ -204,14 +199,11 @@ def main():
|
|||
meraki.params['org_id'],
|
||||
orgs),
|
||||
payload):
|
||||
meraki.result['data'] = json.loads(
|
||||
meraki.request(
|
||||
meraki.construct_path(
|
||||
'update',
|
||||
org_id=meraki.params['org_id']
|
||||
),
|
||||
method='PUT',
|
||||
payload=json.dumps(payload)))
|
||||
meraki.result['data'] = meraki.request(meraki.construct_path('update',
|
||||
org_id=meraki.params['org_id']
|
||||
),
|
||||
method='PUT',
|
||||
payload=json.dumps(payload))
|
||||
meraki.result['changed'] = True
|
||||
# in the event of a successful module execution, you will want to
|
||||
# simple AnsibleModule.exit_json(), passing the key/value results
|
||||
|
|
|
@ -99,7 +99,7 @@ def get_snmp(meraki, org_id):
|
|||
r = meraki.request(path,
|
||||
method='GET',
|
||||
)
|
||||
return json.loads(r)
|
||||
return r
|
||||
|
||||
|
||||
def set_snmp(meraki, org_id):
|
||||
|
@ -144,7 +144,7 @@ def set_snmp(meraki, org_id):
|
|||
method='PUT',
|
||||
payload=json.dumps(payload))
|
||||
meraki.result['changed'] = True
|
||||
return json.loads(r)
|
||||
return r
|
||||
return -1
|
||||
|
||||
|
||||
|
@ -207,7 +207,7 @@ def main():
|
|||
# part where your module will do what it needs to do)
|
||||
org_id = meraki.params['org_id']
|
||||
|
||||
if org_id:
|
||||
if org_id is None:
|
||||
org_id = meraki.get_org_id(meraki.params['org_name'])
|
||||
|
||||
if meraki.params['state'] == 'query':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue