tower_username to controller_username, etc

awx_collection/tests/integration/targets/job_template/tasks/main.yml

@@ -18,7 +18,7 @@
     group_name1: "AWX-Collection-tests-instance_group-group1-{{ test_id }}"
 
 - name: "Create a new organization"
-  tower_organization:
+  organization:
     name: "{{ org_name }}"
     galaxy_credentials:
       - Ansible Galaxy
@@ -53,7 +53,7 @@
     kind: ssh
 
 - name: Create Labels
-  tower_label:
+  label:
     name: "{{ lab1 }}"
     organization: "{{ item }}"
   loop:
@@ -423,7 +423,7 @@
     state: absent
 
 - name: "Remove the organization"
-  tower_organization:
+  organization:
     name: "{{ org_name }}"
     state: absent
   register: result

awx_collection/tests/integration/targets/token/tasks/main.yml

@@ -5,7 +5,7 @@
 
 - name: Try to use a token as a dict which is missing the token parameter
   job_list:
-    tower_oauthtoken:
+    controller_oauthtoken:
       not_token: "This has no token entry"
   register: results
   ignore_errors: true
@@ -13,11 +13,11 @@
 - assert:
     that:
       - results is failed
-      - '"The provided dict in tower_oauthtoken did not properly contain the token entry" == results.msg'
+      - '"The provided dict in controller_oauthtoken did not properly contain the token entry" == results.msg'
 
 - name: Try to use a token as a list
   job_list:
-    tower_oauthtoken:
+    controller_oauthtoken:
       - dummy_token
   register: results
   ignore_errors: true
@@ -25,7 +25,7 @@
 - assert:
     that:
       - results is failed
-      - '"The provided tower_oauthtoken type was not valid (list). Valid options are str or dict." == results.msg'
+      - '"The provided controller_oauthtoken type was not valid (list). Valid options are str or dict." == results.msg'
 
 - name: Try to delete a token with no existing_token or existing_token_id
   token:
@@ -63,21 +63,21 @@
 
     - name: Validate our token works by token
       job_list:
-        tower_oauthtoken: "{{ tower_token.token }}"
+        oauthtoken: "{{ token.token }}"
       register: job_list
 
     - name: Validate out token works by object
       job_list:
-        tower_oauthtoken: "{{ tower_token }}"
+        oauthtoken: "{{ token }}"
       register: job_list
 
   always:
     - name: Delete our Token with our own token
       token:
-        existing_token: "{{ tower_token }}"
-        tower_oauthtoken: "{{ tower_token }}"
+        existing_token: "{{ token }}"
+        oauthtoken: "{{ token }}"
         state: absent
-      when: tower_token is defined
+      when: token is defined
       register: results
 
     - assert:
@@ -99,10 +99,10 @@
   always:
     - name: Delete the second Token with our own token
       token:
-        existing_token_id: "{{ tower_token['id'] }}"
-        tower_oauthtoken: "{{ tower_token }}"
+        existing_token_id: "{{ token['id'] }}"
+        oauthtoken: "{{ token }}"
         state: absent
-      when: tower_token is defined
+      when: token is defined
       register: results
 
     - assert:

awx_collection/tests/integration/targets/user/tasks/main.yml

@@ -110,11 +110,11 @@
     email: joe@example.org
     state: present
     validate_certs: true
-    tower_host: http://foo.invalid
+    controller_host: http://foo.invalid
   ignore_errors: true
   register: result
 
 - assert:
     that:
-      - "'Unable to resolve tower_host' in result.msg or
+      - "'Unable to resolve controller_host' in result.msg or
         'Can not verify ssl with non-https protocol' in result.exception"

awx_collection/tests/integration/targets/workflow_job_template/tasks/main.yml

@@ -19,7 +19,7 @@
     project_inv_source: "AWX-Collection-tests-inventory_source-inv-source-project-{{ lookup('password', '/dev/null chars=ascii_letters length=16') }}"
 
 - name: "Create a new organization"
-  tower_organization:
+  organization:
     name: "{{ org_name }}"
     galaxy_credentials:
       - Ansible Galaxy
@@ -64,7 +64,7 @@
   register: result
 
 - name: Create Labels
-  tower_label:
+  label:
     name: "{{ lab1 }}"
     organization: "{{ item }}"
   loop:
@@ -667,7 +667,7 @@
     state: absent
 
 - name: "Remove the organization"
-  tower_organization:
+  organization:
     name: "{{ org_name }}"
     state: absent
   register: result