Sanity fixes in various modules (#50080)

lib/ansible/modules/cloud/azure/azure_rm_rediscache.py

@@ -285,7 +285,7 @@ class AzureRMRedisCaches(AzureRMModuleBase):
                 type='int'
             ),
             shard_count=dict(
-                type='ints'
+                type='int'
             ),
             static_ip=dict(
                 type='str'

lib/ansible/modules/cloud/scaleway/scaleway_security_group.py

@@ -24,26 +24,27 @@ version_added: "2.8"
 author: Antoine Barbare (@abarbare)
 description:
     - This module manages Security Group on Scaleway account
-      U(https://developer.scaleway.com)
+      U(https://developer.scaleway.com).
 extends_documentation_fragment: scaleway
 
 options:
   state:
     description:
       - Indicate desired state of the Security Group.
+    type: str
+    choices: [ absent, present ]
     default: present
-    choices:
-      - present
-      - absent
 
   organization:
     description:
-      - Organization identifier
+      - Organization identifier.
+    type: str
     required: true
 
   region:
     description:
       - Scaleway region to use (for example C(par1)).
+    type: str
     required: true
     choices:
       - ams1
@@ -53,37 +54,37 @@ options:
 
   name:
     description:
-      - Name of the Security Group
+      - Name of the Security Group.
+    type: str
     required: true
 
   description:
     description:
-      - Description of the Security Group
+      - Description of the Security Group.
+    type: str
 
   stateful:
     description:
-      - Create a stateful security group which allows established connections in and out
-    required: true
+      - Create a stateful security group which allows established connections in and out.
     type: bool
+    required: true
 
   inbound_default_policy:
     description:
-      - Default policy for incoming trafic
-    choices:
-      - accept
-      - drop
+      - Default policy for incoming trafic.
+    type: str
+    choices: [ accept, drop ]
 
   outbound_default_policy:
     description:
-      - Default policy for outcoming trafic
-    choices:
-      - accept
-      - drop
+      - Default policy for outcoming trafic.
+    type: str
+    choices: [ accept, drop ]
 
   organization_default:
-    type: bool
     description:
-      - Create security group to be the default one
+      - Create security group to be the default one.
+    type: bool
 '''
 
 EXAMPLES = '''
@@ -215,15 +216,15 @@ def core(module):
 def main():
     argument_spec = scaleway_argument_spec()
     argument_spec.update(dict(
-        state=dict(default='present', choices=['absent', 'present']),
-        organization=dict(required=True),
-        name=dict(required=True),
-        description=dict(),
-        region=dict(required=True, choices=SCALEWAY_LOCATION.keys()),
-        stateful=dict(required=True, type=bool),
-        inbound_default_policy=dict(choices=['accept', 'drop']),
-        outbound_default_policy=dict(choices=['accept', 'drop']),
-        organization_default=dict(type=bool),
+        state=dict(type='str', default='present', choices=['absent', 'present']),
+        organization=dict(type='str', required=True),
+        name=dict(type='str', required=True),
+        description=dict(type='str'),
+        region=dict(type='str', required=True, choices=SCALEWAY_LOCATION.keys()),
+        stateful=dict(type='bool', required=True),
+        inbound_default_policy=dict(type='str', choices=['accept', 'drop']),
+        outbound_default_policy=dict(type='str', choices=['accept', 'drop']),
+        organization_default=dict(type='bool'),
     ))
     module = AnsibleModule(
         argument_spec=argument_spec,

lib/ansible/modules/cloud/vmware/vmware_host_snmp.py

@@ -36,8 +36,8 @@ options:
     description:
         - Enable, disable, or reset the SNMP agent.
     type: str
-    choices: [ enabled, disabled, reset ]
-    default: 'disabled'
+    choices: [ disabled, enabled, reset ]
+    default: disabled
   community:
     description:
         - List of SNMP community strings.
@@ -54,10 +54,10 @@ options:
     default: []
   trap_filter:
     description:
-        - Comma separated list of trap oids for traps not to be sent by agent.
-        - E.g. [ 1.3.6.1.4.1.6876.4.1.1.0, 1.3.6.1.4.1.6876.4.1.1.1 ]
+        - A list of trap oids for traps not to be sent by agent,
+          e.g. [ 1.3.6.1.4.1.6876.4.1.1.0, 1.3.6.1.4.1.6876.4.1.1.1 ]
         - Use value C(reset) to clear settings.
-    type: str
+    type: list
   send_trap:
     description:
         - Send a test trap to validate the configuration.
@@ -69,13 +69,13 @@ options:
         - The embedded SNMP agent receives hardware events either from IPMI sensors C(sensors) or CIM indications C(indications).
     type: str
     choices: [ indications, sensors ]
-    default: 'indications'
+    default: indications
   log_level:
     description:
         - Syslog logging level.
     type: str
     choices: [ debug, info, warning, error ]
-    default: 'info'
+    default: info
 extends_documentation_fragment: vmware.documentation
 '''
 
@@ -468,13 +468,13 @@ def main():
     """Main"""
     argument_spec = vmware_argument_spec()
     argument_spec.update(
-        state=dict(default='disabled', choices=['enabled', 'disabled', 'reset']),
+        state=dict(type='str', default='disabled', choices=['enabled', 'disabled', 'reset']),
         snmp_port=dict(type='int', default=161),
         community=dict(type='list', default=[]),
-        trap_targets=dict(type='list', default=list(), required=False),
-        trap_filter=dict(type='list', required=False),
-        hw_source=dict(default='indications', choices=['indications', 'sensors']),
-        log_level=dict(default='info', choices=['debug', 'info', 'warning', 'error']),
+        trap_targets=dict(type='list', default=list()),
+        trap_filter=dict(type='list'),
+        hw_source=dict(type='str', default='indications', choices=['indications', 'sensors']),
+        log_level=dict(type='str', default='info', choices=['debug', 'info', 'warning', 'error']),
         send_trap=dict(type='bool', default=False),
     )