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

MSO: Clarify the site-local modules in the index #53301

Merged
merged 1 commit into from
Mar 4, 2019
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_anp.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_anp
short_description: Manage site Application Network Profiles (ANPs) in schema template
short_description: Manage site-local Application Network Profiles (ANPs) in schema template
description:
- Manage site ANPs in schema template on Cisco ACI Multi-Site.
- Manage site-local ANPs in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_anp_epg.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_anp_epg
short_description: Manage site Endpoint Groups (EPGs) in schema template
short_description: Manage site-local Endpoint Groups (EPGs) in schema template
description:
- Manage site EPGs in schema template on Cisco ACI Multi-Site.
- Manage site-local EPGs in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_anp_epg_staticleaf
short_description: Manage site EPG static leafs in schema template
short_description: Manage site-local EPG static leafs in schema template
description:
- Manage site EPG static leafs in schema template on Cisco ACI Multi-Site.
- Manage site-local EPG static leafs in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_anp_epg_staticport
short_description: Manage site EPG static ports in schema template
short_description: Manage site-local EPG static ports in schema template
description:
- Manage site EPG static ports in schema template on Cisco ACI Multi-Site.
- Manage site-local EPG static ports in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down Expand Up @@ -66,7 +66,7 @@
description:
- The port encap VLAN id of the static port.
type: int
immediacy:
deployment_immediacy:
description:
- The deployment immediacy of the static port.
- C(immediate) means B(Deploy immediate).
Expand Down Expand Up @@ -110,7 +110,7 @@
leaf: 101
path: eth1/1
vlan: 126
immediacy: immediate
deployment_immediacy: immediate
state: present
delegate_to: localhost

Expand Down Expand Up @@ -183,7 +183,7 @@ def main():
leaf=dict(type='str'), # This parameter is not required for querying all objects
path=dict(type='str'), # This parameter is not required for querying all objects
vlan=dict(type='int'), # This parameter is not required for querying all objects
immediacy=dict(type='str', choices=['immediate', 'lazy']),
deployment_immediacy=dict(type='str', choices=['immediate', 'lazy']),
mode=dict(type='str', choices=['native', 'regular', 'untagged']),
state=dict(type='str', default='present', choices=['absent', 'present', 'query']),
)
Expand All @@ -207,7 +207,7 @@ def main():
leaf = module.params['leaf']
path = module.params['path']
vlan = module.params['vlan']
immediacy = module.params['immediacy']
deployment_immediacy = module.params['deployment_immediacy']
mode = module.params['mode']
state = module.params['state']

Expand Down Expand Up @@ -266,7 +266,7 @@ def main():
mso.fail_json(msg="Static port '{portpath}' not found".format(portpath=portpath))
mso.exit_json()

ports_path = '/sites/{0}/anps/{1}/epgs/{2}/staticports'.format(site_template, anp_idx, epg_idx)
ports_path = '/sites/{0}/anps/{1}/epgs/{2}/staticPorts'.format(site_template, anp_idx, epg_idx)
ops = []

mso.previous = mso.existing
Expand All @@ -277,13 +277,13 @@ def main():

elif state == 'present':
if not mso.existing:
if immediacy is None:
immediacy = 'lazy'
if deployment_immediacy is None:
deployment_immediacy = 'lazy'
if mode is None:
mode = 'untagged'

payload = dict(
deploymentImmediacy=immediacy,
deploymentImmediacy=deployment_immediacy,
mode=mode,
path=portpath,
portEncapVlan=vlan,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_anp_epg_subnet
short_description: Manage site EPG subnets in schema template
short_description: Manage site-local EPG subnets in schema template
description:
- Manage site EPG subnets in schema template on Cisco ACI Multi-Site.
- Manage site-local EPG subnets in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_bd.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_bd
short_description: Manage site Bridge Domains (BDs) in schema template
short_description: Manage site-local Bridge Domains (BDs) in schema template
description:
- Manage site BDs in schema template on Cisco ACI Multi-Site.
- Manage site-local BDs in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_bd_l3out.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_bd_l3out
short_description: Manage site BD l3out's in schema template
short_description: Manage site-local BD l3out's in schema template
description:
- Manage site BDs l3out's in schema template on Cisco ACI Multi-Site.
- Manage site-local BDs l3out's in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_bd_subnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_bd_subnet
short_description: Manage site BD subnets in schema template
short_description: Manage site-local BD subnets in schema template
description:
- Manage site BD subnets in schema template on Cisco ACI Multi-Site.
- Manage site-local BD subnets in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_vrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_vrf
short_description: Manage site VRFs in schema template
short_description: Manage site-local VRFs in schema template
description:
- Manage site VRFs in schema template on Cisco ACI Multi-Site.
- Manage site-local VRFs in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/modules/network/aci/mso_schema_site_vrf_region.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_vrf_region
short_description: Manage site VRF regions in schema template
short_description: Manage site-local VRF regions in schema template
description:
- Manage site VRF regions in schema template on Cisco ACI Multi-Site.
- Manage site-local VRF regions in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_vrf_region_cidr
short_description: Manage site VRF region CIDRs in schema template
short_description: Manage site-local VRF region CIDRs in schema template
description:
- Manage site VRF region CIDRs in schema template on Cisco ACI Multi-Site.
- Manage site-local VRF region CIDRs in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
DOCUMENTATION = r'''
---
module: mso_schema_site_vrf_region_cidr_subnet
short_description: Manage site VRF regions in schema template
short_description: Manage site-local VRF regions in schema template
description:
- Manage site VRF regions in schema template on Cisco ACI Multi-Site.
- Manage site-local VRF regions in schema template on Cisco ACI Multi-Site.
author:
- Dag Wieers (@dagwieers)
version_added: '2.8'
Expand Down