Merge pull request #7963 from john-westcott-iv/tools

Collections Completeness Tests

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx_collection/plugins/modules/tower_notification_template.py

@@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 ---
-module: tower_notification
+module: tower_notification_template
 author: "Samuel Carpentier (@samcarpentier)"
 short_description: create, update, or destroy Ansible Tower notification.
 description:
@@ -203,7 +203,7 @@ extends_documentation_fragment: awx.awx.auth
 
 EXAMPLES = '''
 - name: Add Slack notification with custom messages
-  tower_notification:
+  tower_notification_template:
     name: slack notification
     organization: Default
     notification_type: slack
@@ -222,7 +222,7 @@ EXAMPLES = '''
     tower_config_file: "~/tower_cli.cfg"
 
 - name: Add webhook notification
-  tower_notification:
+  tower_notification_template:
     name: webhook notification
     notification_type: webhook
     notification_configuration:
@@ -233,7 +233,7 @@ EXAMPLES = '''
     tower_config_file: "~/tower_cli.cfg"
 
 - name: Add email notification
-  tower_notification:
+  tower_notification_template:
     name: email notification
     notification_type: email
     notification_configuration:
@@ -250,7 +250,7 @@ EXAMPLES = '''
     tower_config_file: "~/tower_cli.cfg"
 
 - name: Add twilio notification
-  tower_notification:
+  tower_notification_template:
     name: twilio notification
     notification_type: twilio
     notification_configuration:
@@ -263,7 +263,7 @@ EXAMPLES = '''
     tower_config_file: "~/tower_cli.cfg"
 
 - name: Add PagerDuty notification
-  tower_notification:
+  tower_notification_template:
     name: pagerduty notification
     notification_type: pagerduty
     notification_configuration:
@@ -275,7 +275,7 @@ EXAMPLES = '''
     tower_config_file: "~/tower_cli.cfg"
 
 - name: Add IRC notification
-  tower_notification:
+  tower_notification_template:
     name: irc notification
     notification_type: irc
     notification_configuration:
@@ -290,7 +290,7 @@ EXAMPLES = '''
     tower_config_file: "~/tower_cli.cfg"
 
 - name: Delete notification
-  tower_notification:
+  tower_notification_template:
     name: old notification
     state: absent
     tower_config_file: "~/tower_cli.cfg"

awx_collection/plugins/modules/tower_project.py

@@ -55,10 +55,12 @@ options:
         - The refspec to use for the SCM resource.
       type: str
       default: ''
-    scm_credential:
+    credential:
       description:
         - Name of the credential to use with this SCM resource.
       type: str
+      aliases:
+        - scm_credential
     scm_clean:
       description:
         - Remove local modifications before updating.
@@ -86,11 +88,13 @@ options:
       type: bool
       aliases:
         - scm_allow_override
-    job_timeout:
+    timeout:
       description:
         - The amount of time (in seconds) to run before the SCM Update is canceled. A value of 0 means no timeout.
       default: 0
       type: int
+      aliases:
+        - job_timeout
     custom_virtualenv:
       description:
         - Local absolute file path containing a custom Python virtualenv to use
@@ -188,13 +192,13 @@ def main():
         local_path=dict(),
         scm_branch=dict(default=''),
         scm_refspec=dict(default=''),
-        scm_credential=dict(),
+        credential=dict(aliases=['scm_credential']),
         scm_clean=dict(type='bool', default=False),
         scm_delete_on_update=dict(type='bool', default=False),
         scm_update_on_launch=dict(type='bool', default=False),
         scm_update_cache_timeout=dict(type='int', default=0),
         allow_override=dict(type='bool', aliases=['scm_allow_override']),
-        job_timeout=dict(type='int', default=0),
+        timeout=dict(type='int', default=0, aliases=['job_timeout']),
         custom_virtualenv=dict(),
         organization=dict(required=True),
         notification_templates_started=dict(type="list", elements='str'),
@@ -217,13 +221,13 @@ def main():
     local_path = module.params.get('local_path')
     scm_branch = module.params.get('scm_branch')
     scm_refspec = module.params.get('scm_refspec')
-    scm_credential = module.params.get('scm_credential')
+    credential = module.params.get('credential')
     scm_clean = module.params.get('scm_clean')
     scm_delete_on_update = module.params.get('scm_delete_on_update')
     scm_update_on_launch = module.params.get('scm_update_on_launch')
     scm_update_cache_timeout = module.params.get('scm_update_cache_timeout')
     allow_override = module.params.get('allow_override')
-    job_timeout = module.params.get('job_timeout')
+    timeout = module.params.get('timeout')
     custom_virtualenv = module.params.get('custom_virtualenv')
     organization = module.params.get('organization')
     state = module.params.get('state')
@@ -231,8 +235,8 @@ def main():
 
     # Attempt to look up the related items the user specified (these will fail the module if not found)
     org_id = module.resolve_name_to_id('organizations', organization)
-    if scm_credential is not None:
-        scm_credential_id = module.resolve_name_to_id('credentials', scm_credential)
+    if credential is not None:
+        credential = module.resolve_name_to_id('credentials', credential)
 
     # Attempt to look up project based on the provided name and org ID
     project = module.get_one('projects', **{
@@ -276,7 +280,7 @@ def main():
         'scm_refspec': scm_refspec,
         'scm_clean': scm_clean,
         'scm_delete_on_update': scm_delete_on_update,
-        'timeout': job_timeout,
+        'timeout': timeout,
         'organization': org_id,
         'scm_update_on_launch': scm_update_on_launch,
         'scm_update_cache_timeout': scm_update_cache_timeout,
@@ -284,8 +288,8 @@ def main():
     }
     if description is not None:
         project_fields['description'] = description
-    if scm_credential is not None:
-        project_fields['credential'] = scm_credential_id
+    if credential is not None:
+        project_fields['credential'] = credential
     if allow_override is not None:
         project_fields['allow_override'] = allow_override
     if scm_type == '':