install openstack.cloud collection explicitly (#345)

install openstack.cloud collection explicitly

Updated tests/utils scripts, install openstack.cloud collection explicitly.

Reviewed-by: Anton Sidelnikov

Author: vineet-pruthi

plugins/modules/anti_ddos_fip_statuses_info.py

@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 DOCUMENTATION = '''
 ---
 module: anti_ddos_fip_statuses_info

plugins/modules/anti_ddos_optional_policies_info.py

@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 DOCUMENTATION = '''
 ---
 module: anti_ddos_optional_policies_info

tests/utils/integration.sh

@@ -30,8 +30,21 @@ rsync -av . \
     "$TEST_DIR" > /dev/null|| true
 
 if [ -f "requirements.txt" ]; then
-    ansible-galaxy collection install -p "${ANSIBLE_COLLECTIONS_PATH}"
-    ansible-galaxy role install -p "${ANSIBLE_COLLECTIONS_PATH}"
+    ansible-galaxy collection install -r requirements.txt -p ${ANSIBLE_COLLECTIONS_PATH}
+    ansible-galaxy role install -r requirements.txt -p ${ANSIBLE_COLLECTIONS_PATH}
+fi
+
+# Initialize PYTHONPATH and ANSIBLE_COLLECTIONS_PATHS if not set
+export PYTHONPATH=${ANSIBLE_COLLECTIONS_PATH}:${PYTHONPATH:-""}
+export ANSIBLE_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATH}:${ANSIBLE_COLLECTIONS_PATHS:-""}
+
+# Install the necessary openstack.cloud collection explicitly
+ansible-galaxy collection install openstack.cloud -f -p ${ANSIBLE_COLLECTIONS_PATH}
+
+# Verify that the collection is installed
+if [ ! -d "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud" ]; then
+    echo "Error: openstack.cloud collection is not installed correctly."
+    exit 1
 fi
 
 cd "$TEST_DIR"

tests/utils/sanity.sh

@@ -19,11 +19,24 @@ rsync -av . \
     --exclude ci \
     --exclude .tox \
     --exclude .git \
-    "$TEST_DIR" > /dev/null|| true
+    "$TEST_DIR" > /dev/null || true
 
 if [ -f "requirements.txt" ]; then
-    ansible-galaxy collection install -p ${ANSIBLE_COLLECTIONS_PATH}
-    ansible-galaxy role install -p ${ANSIBLE_COLLECTIONS_PATH}
+    ansible-galaxy collection install -r requirements.txt -p ${ANSIBLE_COLLECTIONS_PATH}
+    ansible-galaxy role install -r requirements.txt -p ${ANSIBLE_COLLECTIONS_PATH}
+fi
+
+# Install the necessary openstack.cloud collection explicitly
+ansible-galaxy collection install openstack.cloud -f -p ${ANSIBLE_COLLECTIONS_PATH}
+
+# Initialize PYTHONPATH and ANSIBLE_COLLECTIONS_PATHS if not set
+export PYTHONPATH=${ANSIBLE_COLLECTIONS_PATH}:${PYTHONPATH:-""}
+export ANSIBLE_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATH}:${ANSIBLE_COLLECTIONS_PATHS:-""}
+
+# Verify that the collection is installed
+if [ ! -d "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud" ]; then
+    echo "Error: openstack.cloud collection is not installed correctly."
+    exit 1
 fi
 
 cd "$TEST_DIR"
@@ -41,5 +54,4 @@ fi
 echo "Ansible version: $ANSIBLE_VER"
 echo "Tests to skip: $SKIP_TESTS"
 
-ansible-test sanity -v \
-    $SKIP_TESTS
+ansible-test sanity -v $SKIP_TESTS

tests/utils/units.sh

@@ -22,8 +22,21 @@ rsync -av . \
     "$TEST_DIR" > /dev/null|| true
 
 if [ -f "requirements.txt" ]; then
-    ansible-galaxy collection install -p ${ANSIBLE_COLLECTIONS_PATH}
-    ansible-galaxy role install -p ${ANSIBLE_COLLECTIONS_PATH}
+    ansible-galaxy collection install -r requirements.txt -p ${ANSIBLE_COLLECTIONS_PATH}
+    ansible-galaxy role install -r requirements.txt -p ${ANSIBLE_COLLECTIONS_PATH}
+fi
+
+# Install the necessary openstack.cloud collection explicitly
+ansible-galaxy collection install openstack.cloud -f -p ${ANSIBLE_COLLECTIONS_PATH}
+
+# Initialize PYTHONPATH and ANSIBLE_COLLECTIONS_PATHS if not set
+export PYTHONPATH=${ANSIBLE_COLLECTIONS_PATH}:${PYTHONPATH:-""}
+export ANSIBLE_COLLECTIONS_PATHS=${ANSIBLE_COLLECTIONS_PATH}:${ANSIBLE_COLLECTIONS_PATHS:-""}
+
+# Verify that the collection is installed
+if [ ! -d "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/openstack/cloud" ]; then
+    echo "Error: openstack.cloud collection is not installed correctly."
+    exit 1
 fi
 
 cd "$TEST_DIR"