wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Document descriptions updated to match UCS Manager online help. (#34534)

Browse source 
Property checking variable argument setup simplified.
This commit is contained in:
David Soper 2018-01-07 13:32:34 -06:00 committed by Dag Wieers
parent 2039366380
commit 06cbc422c1
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/ansible/modules/remote_management/ucs/ucs_san_connectivity.py
View file

@ -27,24 +27,39 @@ options:
default: present default: present
name: name:
description: description:
- Name of the SAN Connectivity Policy - The name of the SAN Connectivity Policy.
- This name can be between 1 and 16 alphanumeric characters.
- "You cannot use spaces or any special characters other than - (hyphen), \"_\" (underscore), : (colon), and . (period)."
- You cannot change this name after the policy is created.
required: yes required: yes
description: description:
description: description:
- Description for the SAN Connectivity Policy - A description of the policy.
- Cisco recommends including information about where and when to use the policy.
- Enter up to 256 characters.
- "You can use any characters or spaces except the following:"
- "` (accent mark), \ (backslash), ^ (carat), \" (double quote), = (equal sign), > (greater than), < (less than), or ' (single quote)."
aliases: [ descr ] aliases: [ descr ]
wwnn_pool: wwnn_pool:
description: description:
- WWNN Pool name - Name of the WWNN pool to use for WWNN assignment.
default: default default: default
vhba_list: vhba_list:
description: description:
- List of vHBAs contained in the SAN Connectivity Policy - List of vHBAs used by the SAN Connectivity Policy.
- Each list element has the following suboptions - vHBAs used by the SAN Connectivity Policy must be created from a vHBA template.
- name (Name of the vHBA (required)) - "Each list element has the following suboptions:"
- vhba_template (vHBA template (required)) - "= name"
- adapter_policy ('' (default), Linux, Solaris, VMware, Windows, WindowsBoot, or default) - " The name of the virtual HBA (required)."
- order (string specifying vHBA assignment order (unspecified (default), '1', '2', etc.) - "= vhba_template"
- " The name of the virtual HBA template (required)."
- "- adapter_policy"
- " The name of the Fibre Channel adapter policy."
- " A user defined policy can be used, or one of the system defined policies (default, Linux, Solaris, VMware, Windows, WindowsBoot)"
- " [Default: default]"
- "- order"
- " String specifying the vHBA assignment order (e.g., '1', '2')."
- " [Default: unspecified]"
org_dn: org_dn:
description: description:
- Org dn (distinguished name) - Org dn (distinguished name)
@ -157,16 +172,14 @@ def main():
if mo: if mo:
mo_exists = True mo_exists = True
# check top-level mo props # check top-level mo props
kwargs = {} kwargs = dict(descr=san_connectivity['descr'])
kwargs['descr'] = san_connectivity['descr']
if (mo.check_prop_match(**kwargs)): if (mo.check_prop_match(**kwargs)):
# top-level props match, check next level mo/props # top-level props match, check next level mo/props
# vnicFcNode object # vnicFcNode object
child_dn = dn + '/fc-node' child_dn = dn + '/fc-node'
mo_1 = ucs.login_handle.query_dn(child_dn) mo_1 = ucs.login_handle.query_dn(child_dn)
if mo_1: if mo_1:
kwargs = {} kwargs = dict(ident_pool_name=san_connectivity['wwnn_pool'])
kwargs['ident_pool_name'] = san_connectivity['wwnn_pool']
if (mo_1.check_prop_match(**kwargs)): if (mo_1.check_prop_match(**kwargs)):
if not san_connectivity.get('vhba_list'): if not san_connectivity.get('vhba_list'):
props_match = True props_match = True