From f38c9e74787678c8868b530bf16b50cc3edd17e6 Mon Sep 17 00:00:00 2001
From: beeankha <beeankha@gmail.com>
Date: Fri, 26 Mar 2021 15:35:52 -0400
Subject: [PATCH] Update manual project Collection integration test to be
 compatible with EEs

---
 .../plugins/module_utils/tower_api.py         |  2 +-
 .../tasks/create_project_dir.yml              | 47 +++++++++++--------
 .../template_galaxy/templates/README.md.j2    |  2 +-
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py
index 2edba2b502..da56ad1d26 100644
--- a/awx_collection/plugins/module_utils/tower_api.py
+++ b/awx_collection/plugins/module_utils/tower_api.py
@@ -272,7 +272,7 @@ class TowerAPIModule(TowerModule):
             if self._COLLECTION_TYPE not in self.collection_to_version or self.collection_to_version[self._COLLECTION_TYPE] != tower_type:
                 self.warn("You are using the {0} version of this collection but connecting to {1}".format(self._COLLECTION_TYPE, tower_type))
             elif collection_compare_ver != tower_compare_ver:
-                self.warn("You are running collection version {0} but connecting to tower version {1}".format(self._COLLECTION_VERSION, tower_version))
+                self.warn("You are running collection version {0} but connecting to {2} version {1}".format(self._COLLECTION_VERSION, tower_version, tower_type))
 
             self.version_checked = True
 
diff --git a/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml b/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml
index d92dee8221..ef15df8c50 100644
--- a/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml
+++ b/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml
@@ -1,13 +1,9 @@
 ---
-- name: Fetch project_base_dir
-  uri:
-    url: "{{ host.stdout }}/api/v2/config/"
-    user: "{{ username.stdout }}"
-    password: "{{ password.stdout }}"
-    validate_certs: false
-    return_content: true
-    force_basic_auth: true
-  register: awx_config
+- name: Load the UI settings
+  set_fact:
+    project_base_dir: "{{ tower_settings.project_base_dir }}"
+  vars:
+    tower_settings: "{{ lookup('awx.awx.tower_api', 'config/') }}"
 
 - tower_inventory:
     name: localhost
@@ -31,16 +27,29 @@
       -----END EC PRIVATE KEY-----
     organization: Default
 
-- name: Disable process isolation
-  command: awx-cli setting modify AWX_PROOT_ENABLED false
-
 - block:
+    - name: Add a path to a setting
+      tower_settings:
+        name: AWX_ISOLATION_SHOW_PATHS
+        value: "[{{ project_base_dir }}]"
+
     - name: Create a directory for manual project
-      vars:
-        project_base_dir: "{{ awx_config.json.project_base_dir }}"
-      command: awx-cli ad_hoc launch --wait --inventory localhost
-        --credential dummy --module-name command
-        --module-args "mkdir -p {{ project_base_dir }}/{{ project_dir_name }}"
+      tower_ad_hoc_command:
+        credential: dummy
+        inventory: localhost
+        job_type: run
+        module_args: "mkdir -p {{ project_base_dir }}/{{ project_dir_name }}"
+        module_name: command
+        wait: True
+
   always:
-    - name: enable process isolation
-      command: awx-cli setting modify AWX_PROOT_ENABLED true
+    - name: Delete path from setting
+      tower_settings:
+        name: AWX_ISOLATION_SHOW_PATHS
+        value: []
+
+    - name: Delete dummy credential
+      tower_credential:
+        name: dummy
+        kind: ssh
+        state: absent
diff --git a/awx_collection/tools/roles/template_galaxy/templates/README.md.j2 b/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
index ed02006c3d..274df392b5 100644
--- a/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
+++ b/awx_collection/tools/roles/template_galaxy/templates/README.md.j2
@@ -127,7 +127,7 @@ py.test awx_collection/test/awx/
 
 ## Running Integration Tests
 
-The integration tests require a virtualenv with `ansible` >= 2.9 and `tower_cli`.
+The integration tests require a virtualenv with `ansible` >= 2.9 and `awxkit`.
 The collection must first be installed, which can be done using `make install_collection`.
 You also need a configuration file, as described in the running section.