tests: minor improvement (ansible-collections#370)

tests: minor improvement better name for variables drop a pause call
goneri · Nov 24, 2022 · d44f958 · d44f958
1 parent edf3d90
commit d44f958
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 19 deletions.
diff --git a/tests/integration/targets/vcenter_library_and_ovf_clone/tasks/main.yaml b/tests/integration/targets/vcenter_library_and_ovf_clone/tasks/main.yaml
@@ -6,7 +6,7 @@
       folder: "{{ lookup('vmware.vmware_rest.folder_moid', '/my_dc/vm') }}"
       resource_pool: "{{ lookup('vmware.vmware_rest.resource_pool_moid', '/my_dc/host/my_cluster/Resources') }}"
     name: test_vm1
-    guest_OS: DEBIAN_8_64
+    guest_OS: RHEL_7_64
     hardware_version: VMX_11
     memory:
       hot_add_enabled: true
@@ -64,7 +64,7 @@
   vmware.vmware_rest.content_locallibrary_info:
   register: all_content_libraries
 
-- name: Use the name to identify a content library
+- name: Use the name to identify the right item
   set_fact:
     my_first_library: "{{ all_content_libraries.value | selectattr('name', 'equalto', 'my_library_on_nfs')|first }}"
 
@@ -83,7 +83,7 @@
     target:
       library_id: "{{ nfs_lib.id }}"
     create_spec:
-      name: my_vm
+      name: golden_image
       description: an OVF example
       flags: []
     state: present
@@ -102,7 +102,7 @@
     target:
       library_id: "{{ nfs_lib.id }}"
     create_spec:
-      name: my_vm
+      name: golden_image
       description: an OVF example
       flags: []
     state: present
@@ -120,7 +120,7 @@
 - name: _Create a new VM from the OVF with a wrong folder
   vmware.vmware_rest.vcenter_ovf_libraryitem:
     session_timeout: 2900
-    ovf_library_item_id: '{{ (lib_items.value|selectattr("name", "equalto", "my_vm")|first).id }}'
+    ovf_library_item_id: '{{ (lib_items.value|selectattr("name", "equalto", "golden_image")|first).id }}'
     state: deploy
     target:
       resource_pool_id: "{{ lookup('vmware.vmware_rest.resource_pool_moid', '/my_dc/host/my_cluster/Resources') }}"
@@ -134,8 +134,7 @@
 
 - name: Create a new VM from the OVF
   vmware.vmware_rest.vcenter_ovf_libraryitem:
-    session_timeout: 2900
-    ovf_library_item_id: '{{ (lib_items.value|selectattr("name", "equalto", "my_vm")|first).id }}'
+    ovf_library_item_id: '{{ (lib_items.value|selectattr("name", "equalto", "golden_image")|first).id }}'
     state: deploy
     target:
       resource_pool_id: "{{ lookup('vmware.vmware_rest.resource_pool_moid', '/my_dc/host/my_cluster/Resources') }}"
@@ -150,8 +149,7 @@
 
 - name: Create a new VM from the OVF and specify the host and folder
   vmware.vmware_rest.vcenter_ovf_libraryitem:
-    session_timeout: 2900
-    ovf_library_item_id: '{{ (lib_items.value|selectattr("name", "equalto", "my_vm")|first).id }}'
+    ovf_library_item_id: '{{ (lib_items.value|selectattr("name", "equalto", "golden_image")|first).id }}'
     state: deploy
     target:
       resource_pool_id: "{{ lookup('vmware.vmware_rest.resource_pool_moid', '/my_dc/host/my_cluster/Resources') }}"

diff --git a/tests/integration/targets/vcenter_vm_clone_on_library/tasks/main.yaml b/tests/integration/targets/vcenter_vm_clone_on_library/tasks/main.yaml
@@ -9,7 +9,7 @@
       - datastore_id: "{{ lookup('vmware.vmware_rest.datastore_moid', '/my_dc/datastore/local') }}"
         type: 'DATASTORE'
     state: present
-  register: ds_lib
+  register: nfs_lib
 
 - ansible.builtin.set_fact:
     disk_name: rhel-8.5
@@ -93,8 +93,8 @@
 
 - name: Create a VM template on the library
   vmware.vmware_rest.vcenter_vmtemplate_libraryitems:
-    name: foobar2001
-    library: "{{ ds_lib.id }}"
+    name: golden-template
+    library: "{{ nfs_lib.id }}"
     source_vm: "{{ my_vm.id }}"
     placement:
       cluster: "{{ lookup('vmware.vmware_rest.cluster_moid', '/my_dc/host/my_cluster') }}"
@@ -109,8 +109,8 @@
 
 - name: _Create the same template again
   vmware.vmware_rest.vcenter_vmtemplate_libraryitems:
-    name: foobar2001
-    library: "{{ ds_lib.id }}"
+    name: golden-template
+    library: "{{ nfs_lib.id }}"
     source_vm: "{{ my_vm.id }}"
     placement:
       cluster: "{{ lookup('vmware.vmware_rest.cluster_moid', '/my_dc/host/my_cluster') }}"
@@ -122,12 +122,28 @@
     that:
       - not (_result is changed)
 
+- name: Get the list of items of the NFS library
+  vmware.vmware_rest.content_library_item_info:
+    library_id: '{{ nfs_lib.id }}'
+  register: lib_items
+
+- debug:
+    var: all_content_libraries
+
+- name: Use the name to identify the item
+  set_fact:
+    my_template_item: "{{ lib_items.value | selectattr('name', 'equalto', 'golden-template')|first }}"
+
+- assert:
+    that:
+      - mylib_item.id == my_template_item.id
+
 
 - name: Deploy a new VM based on the template
   vmware.vmware_rest.vcenter_vmtemplate_libraryitems:
-    name: foobar2002
-    library: "{{ ds_lib.id }}"
-    template_library_item: "{{ mylib_item.id }}"
+    name: vm-from-template
+    library: "{{ nfs_lib.id }}"
+    template_library_item: "{{ my_template_item.id }}"
     placement:
       cluster: "{{ lookup('vmware.vmware_rest.cluster_moid', '/my_dc/host/my_cluster') }}"
       folder: "{{ lookup('vmware.vmware_rest.folder_moid', '/my_dc/vm') }}"

diff --git a/tests/integration/targets/vcenter_vm_cloning/tasks/main.yaml b/tests/integration/targets/vcenter_vm_cloning/tasks/main.yaml
@@ -83,8 +83,16 @@
     state: start
     vm: '{{ my_vm.id }}'
 
-- pause:
-    seconds: 30
+
+- name: Wait until my VM is ready
+  vmware.vmware_rest.vcenter_vm_tools_info:
+    vm: '{{ my_vm.id }}'
+  register: vm_tools_info
+  until:
+  - vm_tools_info is not failed
+  - vm_tools_info.value.run_state == "RUNNING"
+  retries: 10
+  delay: 5
 
 - name: Create an instant clone of a VM
   vmware.vmware_rest.vcenter_vm: