Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meraki_admin - Added recently added return fields for query #51876

Merged
merged 2 commits into from
Feb 19, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 28 additions & 1 deletion lib/ansible/modules/network/meraki/meraki_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,18 @@
description:
- Name of the dashboard administrator.
- Required when creating a new administrator.
type: str
email:
description:
- Email address for the dashboard administrator.
- Email cannot be updated.
- Required when creating or editing an administrator.
type: str
orgAccess:
description:
- Privileges assigned to the administrator in the organization.
choices: [ full, none, read-only ]
type: str
tags:
description:
- Tags the administrator has privileges on.
Expand All @@ -49,15 +52,18 @@
- If C(state) is C(absent), name takes priority over email if both are specified.
choices: [ absent, present, query ]
required: true
type: str
org_name:
description:
- Name of organization.
- Used when C(name) should refer to another object.
- When creating a new administrator, C(org_name), C(network), or C(tags) must be specified.
aliases: ['organization']
type: str
org_id:
description:
- ID of organization.
type: str
author:
- Kevin Breit (@kbreit)
extends_documentation_fragment: meraki
Expand Down Expand Up @@ -141,6 +147,26 @@
returned: success
type: str
sample: John Doe
accountStatus:
description: Status of account.
returned: success
type: str
sample: ok
twoFactorAuthEnabled:
description: Enabled state of two-factor authentication for administrator.
returned: success
type: bool
sample: false
hasApiKey:
description: Defines whether administrator has an API assigned to their account.
returned: success
type: bool
sample: false
lastActive:
description: Date and time of time the administrator was active within Dashboard.
returned: success
type: str
sample: 2019-01-28 14:58:56 -0800
networks:
description: List of networks administrator has access on.
returned: success
Expand Down Expand Up @@ -176,6 +202,7 @@
returned: success
type: str
sample: full

'''

import os
Expand Down Expand Up @@ -306,7 +333,7 @@ def main():
tags=dict(type='json'),
networks=dict(type='json'),
org_name=dict(type='str', aliases=['organization']),
org_id=dict(type='int'),
org_id=dict(type='str'),
)

# seed the result dict in the object
Expand Down