Fix module issues (#52209)

This commit is contained in:
Dag Wieers 2019-02-15 12:57:20 +01:00 committed by GitHub
parent cedd9d9926
commit 203caf2570
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 290 additions and 238 deletions

View file

@ -114,20 +114,20 @@ class ElementSWCluster(object):
def __init__(self):
self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec.update(dict(
management_virtual_ip=dict(required=True, type='str'),
storage_virtual_ip=dict(required=True, type='str'),
replica_count=dict(required=False, type='str', default='2'),
cluster_admin_username=dict(required=False, type='str'),
cluster_admin_password=dict(required=False, type='str', no_log=True),
accept_eula=dict(required=True, type='bool'),
nodes=dict(required=False, type=list, default=None),
attributes=dict(required=False, type=list, default=None)
))
self.argument_spec.update(
management_virtual_ip=dict(type='str', required=True),
storage_virtual_ip=dict(type='str', required=True),
replica_count=dict(type='str', default='2'),
cluster_admin_username=dict(type='str'),
cluster_admin_password=dict(type='str', no_log=True),
accept_eula=dict(type='bool', required=True),
nodes=dict(type='list'),
attributes=dict(type='list'),
)
self.module = AnsibleModule(
argument_spec=self.argument_spec,
supports_check_mode=True
supports_check_mode=True,
)
input_params = self.module.params

View file

@ -116,23 +116,23 @@ class NetappElementLdap(object):
def __init__(self):
self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=True, choices=['present', 'absent']),
authType=dict(required=False, choices=['DirectBind', 'SearchAndBind']),
groupSearchBaseDn=dict(required=False, type=str),
groupSearchType=dict(required=False, choices=['NoGroup', 'ActiveDirectory', 'MemberDN']),
serverURIs=dict(required=False, type=str),
userSearchBaseDN=dict(required=False, type=str),
searchBindDN=dict(required=False, type=str),
searchBindPassword=dict(required=False, type=str, no_log=True),
userSearchFilter=dict(required=False, type=str),
userDNTemplate=dict(required=False, type=str),
groupSearchCustomFilter=dict(required=False, type=str)
))
self.argument_spec.update(
state=dict(type='str', required=True, choices=['absent', 'present']),
authType=dict(type='str', choices=['DirectBind', 'SearchAndBind']),
groupSearchBaseDn=dict(type='str'),
groupSearchType=dict(type='str', choices=['NoGroup', 'ActiveDirectory', 'MemberDN']),
serverURIs=dict(type='str'),
userSearchBaseDN=dict(type='str'),
searchBindDN=dict(type='str'),
searchBindPassword=dict(type='str', no_log=True),
userSearchFilter=dict(type='str'),
userDNTemplate=dict(type='str'),
groupSearchCustomFilter=dict(type='str'),
)
self.module = AnsibleModule(
argument_spec=self.argument_spec,
supports_check_mode=True
supports_check_mode=True,
)
param = self.module.params

View file

@ -176,28 +176,28 @@ class ElementSWNetworkInterfaces(object):
def __init__(self):
self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec.update(dict(
method=dict(required=True, type='str', choices=['loopback', 'manual', 'dhcp', 'static']),
ip_address_1g=dict(required=True, type='str'),
ip_address_10g=dict(required=True, type='str'),
subnet_1g=dict(required=True, type='str'),
subnet_10g=dict(required=True, type='str'),
gateway_address_1g=dict(required=True, type='str'),
gateway_address_10g=dict(required=True, type='str'),
mtu_1g=dict(required=False, type='str', default='1500'),
mtu_10g=dict(required=False, type='str', default='1500'),
dns_nameservers=dict(required=False, type=list),
dns_search_domains=dict(required=False, type=list),
bond_mode_1g=dict(required=False, type='str', choices=['ActivePassive', 'ALB', 'LACP'], default='ActivePassive'),
bond_mode_10g=dict(required=False, type='str', choices=['ActivePassive', 'ALB', 'LACP'], default='ActivePassive'),
lacp_1g=dict(required=False, type='str', choices=['Fast', 'Slow'], default='Slow'),
lacp_10g=dict(required=False, type='str', choices=['Fast', 'Slow'], default='Slow'),
virtual_network_tag=dict(required=False, type='str')
))
self.argument_spec.update(
method=dict(type='str', required=True, choices=['loopback', 'manual', 'dhcp', 'static']),
ip_address_1g=dict(type='str', required=True),
ip_address_10g=dict(type='str', required=True),
subnet_1g=dict(type='str', required=True),
subnet_10g=dict(type='str', required=True),
gateway_address_1g=dict(type='str', required=True),
gateway_address_10g=dict(type='str', required=True),
mtu_1g=dict(type='str', default='1500'),
mtu_10g=dict(type='str', default='1500'),
dns_nameservers=dict(type='list'),
dns_search_domains=dict(type='list'),
bond_mode_1g=dict(type='str', default='ActivePassive', choices=['ActivePassive', 'ALB', 'LACP']),
bond_mode_10g=dict(type='str', default='ActivePassive', choices=['ActivePassive', 'ALB', 'LACP']),
lacp_1g=dict(type='str', default='Slow', choices=['Fast', 'Slow']),
lacp_10g=dict(type='str', default='Slow', choices=['Fast', 'Slow']),
virtual_network_tag=dict(type='str'),
)
self.module = AnsibleModule(
argument_spec=self.argument_spec,
supports_check_mode=True
supports_check_mode=True,
)
input_params = self.module.params

View file

@ -155,27 +155,26 @@ class NetAppOntapInterface(object):
def __init__(self):
self.argument_spec = netapp_utils.na_ontap_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=False, choices=[
'present', 'absent'], default='present'),
interface_name=dict(required=True, type='str'),
home_node=dict(required=False, type='str', default=None),
home_port=dict(required=False, type='str'),
role=dict(required=False, type='str'),
address=dict(required=False, type='str'),
netmask=dict(required=False, type='str'),
vserver=dict(required=True, type='str'),
firewall_policy=dict(required=False, type='str', default=None),
failover_policy=dict(required=False, type='str', default=None),
admin_status=dict(required=False, choices=['up', 'down']),
subnet_name=dict(required=False, type='str'),
is_auto_revert=dict(required=False, type=bool, default=None),
protocols=dict(required=False, type='list')
))
self.argument_spec.update(
state=dict(type='str', default='present', choices=['absent', 'present']),
interface_name=dict(type='str', required=True),
home_node=dict(type='str'),
home_port=dict(type='str'),
role=dict(type='str'),
address=dict(type='str'),
netmask=dict(type='str'),
vserver=dict(type='str', required=True),
firewall_policy=dict(type='str'),
failover_policy=dict(type='str'),
admin_status=dict(type='str', choices=['up', 'down']),
subnet_name=dict(type='str'),
is_auto_revert=dict(type='bool'),
protocols=dict(type='list'),
)
self.module = AnsibleModule(
argument_spec=self.argument_spec,
supports_check_mode=True
supports_check_mode=True,
)
self.na_helper = NetAppModule()
self.parameters = self.na_helper.set_parameters(self.module.params)

View file

@ -54,7 +54,7 @@ options:
permissions:
description:
- The list of permission(s) to delegate (required if C(state) is C(present)).
type: str
type: list
choices: [ allow, clone, create, destroy, mount, promote, readonly, receive, rename, rollback, send, share, snapshot, unallow ]
local:
description: