Various small fixes to MSC modules and tests (#48417)

lib/ansible/modules/network/aci/msc_tenant.py

@@ -23,22 +23,28 @@ options:
   tenant_id:
     description:
     - The ID of the tenant.
+    type: str
     required: yes
   tenant:
     description:
     - The name of the tenant.
+    type: str
     required: yes
     aliases: [ name, tenant_name ]
   display_name:
     description:
     - The name of the tenant to be displayed in the web UI.
+    type: str
+    required: yes
   description:
     description:
     - The description for this tenant.
+    type: str
   state:
     description:
     - Use C(present) or C(absent) for adding or removing.
     - Use C(query) for listing an object or multiple objects.
+    type: str
     choices: [ absent, present, query ]
     default: present
 extends_documentation_fragment: msc
@@ -52,7 +58,8 @@ EXAMPLES = r'''
     password: SomeSecretPassword
     tenant: north_europe
     tenant_id: 101
-    description: North European Datacenter
+    display_name: North European Datacenter
+    description: This tenant manages the NEDC environment.
     state: present
   delegate_to: localhost
 
@@ -161,7 +168,7 @@ def main():
             displayName=display_name,
             siteAssociations=[],
             userAssociations=[dict(userId="0000ffff0000000000000020")],
-        ))
+        ), collate=True)
 
         if msc.existing:
             if not issubset(msc.sent, msc.existing):