fixed test

ansible-collections · Nov 17, 2024 · 90242ca · 90242ca
1 parent 5a87153
commit 90242ca
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -7,12 +7,16 @@ NC=\033[0m  # No Color
 prepare_symlinks:
 	ansible-playbook tools/prepare_symlinks.yml
 
+.PHONY: install-ansible-collections
+install-ansible-collections:
+	ansible-galaxy collection install --upgrade -r tests/integration/requirements.yml
+
 .PHONY: remove_aliases
 remove_aliases:
 	@find tests/integration/targets/ -name "aliases" -exec rm -f {} +
 
 .PHONY: eco-vcenter-ci
-eco-vcenter-ci: prepare_symlinks remove_aliases
+eco-vcenter-ci: install-ansible-collections prepare_symlinks remove_aliases
 	@[ -f /tmp/vmware_rest_tests_report.txt ] && rm /tmp/vmware_rest_tests_report.txt || true; \
 	@failed=0; \
 	total=0; \

diff --git a/tests/integration/requirements.yml b/tests/integration/requirements.yml
@@ -0,0 +1,2 @@
+collections:
+  - name: vmware.vmware
diff --git a/tests/integration/targets/group_vars.yml b/tests/integration/targets/group_vars.yml
@@ -9,4 +9,5 @@ vm_network_name: "VM Network"
 test_network_name: "TestNetwork"
 shared_storage_01: "eco-iscsi-ds1"
 eco_nfs_datastore_iso: "eco-nfs-datastore-iso"
-vcenter_vm_folder: "e2e-qe"
+vcenter_vm_folder: "e2e-qe"
+vcenter_resource_pool: "Resources"
diff --git a/tests/integration/targets/vmware_rest_lookup_plugin/defaults/main.yml b/tests/integration/targets/vmware_rest_lookup_plugin/defaults/main.yml
@@ -1,5 +1,3 @@
 ---
-vcenter_esxi_host: "10.46.29.129"
 vcenter_datastore: "{{ shared_storage_01 }}"
 test_cluster: "test-cluster"
-vcenter_resource_pool: "Resources"
diff --git a/tests/integration/targets/vmware_rest_lookup_plugin/playbook.yml b/tests/integration/targets/vmware_rest_lookup_plugin/playbook.yml
@@ -1,7 +1,5 @@
 - hosts: localhost
   gather_facts: no
-  collections:
-    - vmware.vmware
 
   tasks:
     - name: Import eco-vcenter credentials

diff --git a/tests/integration/targets/vmware_rest_lookup_plugin/tasks/main.yml b/tests/integration/targets/vmware_rest_lookup_plugin/tasks/main.yml
@@ -29,7 +29,15 @@
     - name: Verify number of clusters in datacenter
       ansible.builtin.assert:
         that: lookup('vmware.vmware_rest.cluster_moid', '/' + vcenter_datacenter + '/') | length > 1
-
+
+    - name: Lookup clusters in datacenter
+      ansible.builtin.assert:
+        that: lookup('vmware.vmware_rest.cluster_moid', '/' + vcenter_datacenter + '/' + item)
+      loop:
+        - ""
+        - "{{ vcenter_cluster_name }}"
+        - "{{ test_cluster }}"
+
     - name: Lookup clusters in datacenter
       ansible.builtin.assert:
         that: lookup('vmware.vmware_rest.cluster_moid', '/' + vcenter_datacenter + '/' + item)
@@ -38,6 +46,10 @@
         - "{{ vcenter_cluster_name }}"
         - "{{ test_cluster }}"
 
+    - name: verify no inner clusters
+      ansible.builtin.assert:
+        that: lookup('vmware.vmware_rest.cluster_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length == 0
+
     - name: Get specific cluster info
       vmware.vmware_rest.vcenter_cluster_info:
         cluster: "{{ lookup('vmware.vmware_rest.cluster_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name) }}"
@@ -47,25 +59,47 @@
       ansible.builtin.assert:
         that: cluster_info.value.name == vcenter_cluster_name
 
+    # Test host_moid
+    - name: Get random host info
+      vmware.vmware_rest.vcenter_host_info:
+        hosts: "{{ lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/')[0] }}"
+      register: my_host
+
+    - name: Lookup hosts
+      ansible.builtin.assert:
+        that: lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + item)
+      loop:
+        - "{{ my_host.value[0].name }}"
+        - "{{ vcenter_cluster_name }}/"
+        - "{{ vcenter_cluster_name }}/{{ my_host.value[0].name }}"
+
+    - name: Verify number of hosts in cluster
+      ansible.builtin.assert:
+        that: lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
+
+    - name: Verify no hosts in cluster
+      ansible.builtin.assert:
+        that: lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 0
+
     # Test datastore_moid
     - name: Verify number of datastores in datacenter
       ansible.builtin.assert:
         that: lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/') | length > 1
 
     - name: Verify number of datastores in cluster
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
+        that: lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length == 0
 
     - name: Lookup datastores in datacenter
       ansible.builtin.assert:
         that: lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/' + item)
       loop:
         - ""
-        - "{{ vcenter_esxi_host }}/"
-        - "{{ vcenter_esxi_host }}/{{ shared_storage_01 }}"
+        - "{{ my_host.value[0].name }}/"
+        - "{{ my_host.value[0].name }}/{{ shared_storage_01 }}"
         - "{{ shared_storage_01 }}"
         - "{{ eco_nfs_datastore_iso }}"
-  
+
     - name: Get specific datastore info info
       vmware.vmware_rest.vcenter_datastore_info:
         datastore: "{{ lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/' + shared_storage_01) }}"
@@ -75,15 +109,6 @@
       ansible.builtin.assert:
         that: datastore_info.value.name == shared_storage_01
 
-    # Failed task. Opened bug
-    # - name: Verify no datastores
-    #   ansible.builtin.assert:
-    #     that: lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 0
-
-    - name: Print datastores from empty cluster
-      ansible.builtin.debug:
-        var: lookup('vmware.vmware_rest.datastore_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/')
-
     # Test folder_moid
     - name: Lookup folders
       ansible.builtin.assert:
@@ -106,71 +131,52 @@
 
     - name: Verify number of networks in cluster
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.network_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
+        that: lookup('vmware.vmware_rest.network_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length == 0
 
-    # Failed task. Opened bug
-    # - name: Verify no networks in cluster
-    #   ansible.builtin.assert:
-    #     that: lookup('vmware.vmware_rest.network_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 0
+    # Test vm_moid
+    - name: Get random VM's info
+      vmware.vmware_rest.vcenter_vm_info:
+        vm: "{{ lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/')[0] }}"
+      register: vm_info
 
-    - name: Print networks from empty cluster
+    - name: Lookup VMs
       ansible.builtin.debug:
-        var: lookup('vmware.vmware_rest.network_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/')
+        var: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/' + item)
+      loop:
+        - "{{ my_host.value[0].name }}/"
+        - "{{ vm_info.value.identity.name }}"
+        - "{{ vcenter_resource_pool }}/"
 
-    # Test host_moid
-    - name: Lookup hosts
+    - name: Verify number of VMs in a cluster
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + item)
-      loop:
-        - "{{ vcenter_esxi_host }}"
-        - "{{ vcenter_cluster_name }}/"
-        - "{{ vcenter_cluster_name }}/{{ vcenter_esxi_host }}"
-
-    - name: Verify number of hosts in cluster
+        that: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
+
+    - name: Verify no VMs in a cluster
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
-  
-    - name: Verify no hosts in cluster
+        that: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 0
+
+    - name: Verify number of resource pools in a cluster
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.host_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 0
+        that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
 
-    # Test vm_moid
-    - name: Lookup VMs
+    - name: Verify that just 1 resource pool in a cluster
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/' + item)
-      loop:
-        - "{{ vcenter_esxi_host }}/"
-        # - "{{ vcenter_vm }}"
-        # - "{{ vcenter_resource_pool }}/"
-
-    - name: Verify number of VMs in a cluster
+        that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 1
+
+    - name: Verify no resource pool found
       ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
+        that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + vcenter_resource_pool + '/') | length == 0
 
-    - name: Print VMs from empty cluster
-      ansible.builtin.debug:
-        var: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/')
-
-    # Failed task. Opened bug
-    # - name: Verify no VMs in a cluster
-    #   ansible.builtin.assert:
-    #     that: lookup('vmware.vmware_rest.vm_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 0
+    - name: Verify resource pool doesn't exist
+      ansible.builtin.assert:
+        that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + "no_resource_pool") is none
 
     - name: Lookup resource pools
       ansible.builtin.assert:
         that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/' + item)
       loop:
-        - "{{ vcenter_resource_pool }}"
-        - "{{ vcenter_resource_pool }}/"
         - ""
-
-    - name: Verify number of resource pools in a cluster
-      ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + vcenter_cluster_name + '/') | length > 1
-
-    - name: Verify that just 1 resource pool in a cluster
-      ansible.builtin.assert:
-        that: lookup('vmware.vmware_rest.resource_pool_moid', '/' + vcenter_datacenter + '/' + test_cluster + '/') | length == 1
+        - "{{ vcenter_resource_pool }}"
 
   always:
     - name: Destroy test cluster
@@ -183,3 +189,4 @@
         port: "{{ vcenter_port }}"
         cluster_name: "{{ test_cluster }}"
         state: absent
+