Fix module issues (#52209)

2025-07-30 08:31:28 -07:00 · 2019-02-15 12:57:20 +01:00 · 2019-02-15 12:57:20 +01:00 · 203caf2570
commit 203caf2570
parent cedd9d9926
54 changed files with 290 additions and 238 deletions
--- a/lib/ansible/modules/network/aci/mso_schema_template_anp.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_anp.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  anp:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_anp_epg.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_anp_epg.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template to change.
-    type: list
+    type: str
    required: yes
  anp:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_anp_epg_contract.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_anp_epg_contract.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template to change.
-    type: list
+    type: str
    required: yes
  anp:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_anp_epg_subnet.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_anp_epg_subnet.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template to change.
-    type: list
+    type: str
    required: yes
  anp:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_bd.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_bd.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  bd:
    description:
@ -43,7 +43,7 @@ options:
  vrf:
    description:
    - The VRF associated to this BD.
-    type: str
+    type: dict
  subnets:
    description:
    - The subnets associated to this BD.
--- a/lib/ansible/modules/network/aci/mso_schema_template_bd_subnet.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_bd_subnet.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template to change.
-    type: list
+    type: str
    required: yes
  bd:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_contract_filter.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_contract_filter.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  contract:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_externalepg.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_externalepg.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  externalepg:
    description:
@ -43,7 +43,7 @@ options:
  vrf:
    description:
    - The VRF associated to this ANP.
-    type: str
+    type: dict
  state:
    description:
    - Use C(present) or C(absent) for adding or removing.
--- a/lib/ansible/modules/network/aci/mso_schema_template_filter_entry.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_filter_entry.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  filter:
    description:
--- a/lib/ansible/modules/network/aci/mso_schema_template_l3out.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_l3out.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  l3out:
    description:
@ -43,7 +43,7 @@ options:
  vrf:
    description:
    - The VRF associated to this L3out.
-    type: str
+    type: dict
  state:
    description:
    - Use C(present) or C(absent) for adding or removing.
--- a/lib/ansible/modules/network/aci/mso_schema_template_vrf.py
+++ b/lib/ansible/modules/network/aci/mso_schema_template_vrf.py
@ -29,7 +29,7 @@ options:
  template:
    description:
    - The name of the template.
-    type: list
+    type: str
    required: yes
  vrf:
    description:
--- a/lib/ansible/modules/network/checkpoint/checkpoint_access_rule.py
+++ b/lib/ansible/modules/network/checkpoint/checkpoint_access_rule.py
@ -86,7 +86,7 @@ options:
  policy_package:
    description:
      - Package policy name to be installed.
-    type: bool
+    type: str
    default: 'standard'
  targets:
    description:
--- a/lib/ansible/modules/network/checkpoint/checkpoint_host.py
+++ b/lib/ansible/modules/network/checkpoint/checkpoint_host.py
@ -64,7 +64,7 @@ options:
  policy_package:
    description:
      - Package policy name to be installed.
-    type: bool
+    type: str
    default: 'standard'
  targets:
    description:
--- a/lib/ansible/modules/network/meraki/meraki_ssid.py
+++ b/lib/ansible/modules/network/meraki/meraki_ssid.py
@ -26,27 +26,34 @@ options:
    state:
        description:
        - Specifies whether SNMP information should be queried or modified.
-        choices: ['absent', 'query', 'present']
+        type: str
+        choices: [ absent, query, present ]
        default: present
    number:
        description:
        - SSID number within network.
+        type: int
        aliases: [ssid_number]
    name:
        description:
        - Name of SSID.
+        type: str
    org_name:
        description:
        - Name of organization.
+        type: str
    org_id:
        description:
        - ID of organization.
+        type: int
    net_name:
        description:
        - Name of network.
+        type: str
    net_id:
        description:
        - ID of network.
+        type: str
    enabled:
        description:
        - Enable or disable SSID network.
@ -54,22 +61,27 @@ options:
    auth_mode:
        description:
        - Set authentication mode of network.
+        type: str
        choices: [open, psk, open-with-radius, 8021x-meraki, 8021x-radius]
    encryption_mode:
        description:
        - Set encryption mode of network.
+        type: str
        choices: [wpa, eap, wpa-eap]
    psk:
        description:
        - Password for wireless network.
        - Requires auth_mode to be set to psk.
+        type: str
    wpa_encryption_mode:
        description:
        - Encryption mode within WPA2 specification.
+        type: str
        choices: [WPA1 and WPA2, WPA2 only]
    splash_page:
        description:
        - Set to enable splash page and specify type of splash.
+        type: str
        choices: ['None',
                  'Click-through splash page',
                  'Billing',
@ -85,16 +97,20 @@ options:
    radius_servers:
        description:
        - List of RADIUS servers.
+        type: list
        suboptions:
            host:
                description:
                - IP address or hostname of RADIUS server.
+                type: str
            port:
                description:
                - Port number RADIUS server is listening to.
+                type: int
            secret:
                description:
                - RADIUS password.
+                type: str
    radius_coa_enabled:
        description:
        - Enable or disable RADIUS CoA (Change of Authorization) on SSID.
@ -102,10 +118,12 @@ options:
    radius_failover_policy:
        description:
        - Set client access policy in case RADIUS servers aren't available.
+        type: str
        choices: [Deny access, Allow access]
    radius_load_balancing_policy:
        description:
        - Set load balancing policy when multiple RADIUS servers are specified.
+        type: str
        choices: [Strict priority order, Round robin]
    radius_accounting_enabled:
        description:
@ -114,19 +132,24 @@ options:
    radius_accounting_servers:
        description:
        - List of RADIUS servers for RADIUS accounting.
+        type: list
        suboptions:
            host:
                description:
                - IP address or hostname of RADIUS server.
+                type: str
            port:
                description:
                - Port number RADIUS server is listening to.
+                type: int
            secret:
                description:
                - RADIUS password.
+                type: str
    ip_assignment_mode:
        description:
        - Method of which SSID uses to assign IP addresses.
+        type: str
        choices: ['NAT mode',
                  'Bridge mode',
                  'Layer 3 roaming',
@ -139,19 +162,24 @@ options:
    default_vlan_id:
        description:
        - Default VLAN ID.
+        type: str
    vlan_id:
        description:
        - ID number of VLAN on SSID.
+        type: int
    ap_tags_vlan_ids:
        description:
        - List of VLAN tags.
+        type: list
        suboptions:
            tags:
                description:
                - List of AP tags.
+                type: list
            vlan_id:
                description:
                - Numerical identifier that is assigned to the VLAN.
+                type: int
    walled_garden_enabled:
        description:
        - Enable or disable walled garden functionality.
@ -159,23 +187,29 @@ options:
    walled_garden_ranges:
        description:
        - List of walled garden ranges.
+        type: list
    min_bitrate:
        description:
        - Minimum bitrate (Mbps) allowed on SSID.
+        type: float
        choices: [1, 2, 5.5, 6, 9, 11, 12, 18, 24, 36, 48, 54]
    band_selection:
        description:
        - Set band selection mode.
+        type: str
        choices: ['Dual band operation', '5 GHz band only', 'Dual band operation with Band Steering']
    per_client_bandwidth_limit_up:
        description:
        - Maximum bandwidth in Mbps devices on SSID can upload.
+        type: int
    per_client_bandwidth_limit_down:
        description:
        - Maximum bandwidth in Mbps devices on SSID can download.
+        type: int
    concentrator_network_id:
        description:
        - The concentrator to use for 'Layer 3 roaming with a concentrator' or 'VPN'.
+        type: str
 author:
 - Kevin Breit (@kbreit)
 extends_documentation_fragment: meraki
--- a/lib/ansible/modules/network/nxos/nxos_vpc.py
+++ b/lib/ansible/modules/network/nxos/nxos_vpc.py
@ -73,7 +73,7 @@ options:
  delay_restore:
    description:
      - manages delay restore command and config value in seconds
-    type: bool
+    type: str
  state:
    description:
      - Manages desired state of the resource
--- a/lib/ansible/modules/network/nxos/nxos_vrf.py
+++ b/lib/ansible/modules/network/nxos/nxos_vrf.py
@ -461,15 +461,15 @@ def main():
    """ main entry point for module execution
    """
    element_spec = dict(
-        name=dict(aliases=['vrf']),
-        description=dict(),
-        vni=dict(type=str),
-        rd=dict(type=str),
-        admin_state=dict(default='up', choices=['up', 'down']),
+        name=dict(type='str', aliases=['vrf']),
+        description=dict(type='str'),
+        vni=dict(type='str'),
+        rd=dict(type='str'),
+        admin_state=dict(type='str', default='up', choices=['up', 'down']),
        interfaces=dict(type='list'),
        associated_interfaces=dict(type='list'),
-        delay=dict(default=10, type='int'),
-        state=dict(default='present', choices=['present', 'absent'])
+        delay=dict(type='int', default=10),
+        state=dict(type='str', default='present', choices=['present', 'absent']),
    )

    aggregate_spec = deepcopy(element_spec)
@ -479,7 +479,7 @@ def main():

    argument_spec = dict(
        aggregate=dict(type='list', elements='dict', options=aggregate_spec),
-        purge=dict(default=False, type='bool')
+        purge=dict(type='bool', default=False),
    )

    argument_spec.update(element_spec)