vmware: refactoring of vmware test roles -- part4

Refactoring of the following roles to make use of the new
`prepare_vmware_tests` role.

- `vmware_guest`
- `vmware_guest_boot_facts`
- `vmware_guest_custom_attribute_defs`
- `vmware_guest_customization_facts`
- `vmware_guest_disk_facts`
- `vmware_guest_facts`
- `vmware_guest_find`
- `vmware_guest_move`
- `vmware_guest_powerstate`
- `vmware_guest_snapshot`
- `vmware_guest_snapshot_facts`
- `vmware_guest_tools_wait`

This patch depends on: https://github.com/ansible/ansible/pull/55719

Original PR: https://github.com/ansible/ansible/pull/54882

1 files changed, 62 insertions, 116 deletions

diff --git a/test/integration/targets/vmware_guest/tasks/create_rp_d1_c1_f0.yml b/test/integration/targets/vmware_guest/tasks/create_rp_d1_c1_f0.yml
index 7a89cc1675..df9d4f14cd 100644
--- a/test/integration/targets/vmware_guest/tasks/create_rp_d1_c1_f0.yml
+++ b/test/integration/targets/vmware_guest/tasks/create_rp_d1_c1_f0.yml
@@ -1,60 +1,14 @@
-- name: Wait for Flask controller to come up online
-  wait_for:
-    host: "{{ vcsim }}"
-    port: 5000
-    state: started
-
-- name: kill vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/killall
-- name: start vcsim with no folders
-  uri:
-    url: http://{{ vcsim }}:5000/spawn?datacenter=1&cluster=2&pool=2&folder=0
-  register: vcsim_instance
-
-- name: Wait for Flask controller to come up online
-  wait_for:
-    host: "{{ vcsim }}"
-    port: 443
-    state: started
-
-- name: get a list of VMS from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=VM
-  register: vmlist
-
-- name: get a list of clusters from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=CCR
-  register: clusts
-
-- name: get a list of resource pools from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=RP
-  register: res_pools
-
-- name: get a list of hosts from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=H
-  register: hosts
-
-- debug: var=vcsim_instance
-- debug: var=vmlist
-- debug: var=res_pools
-- debug: var=clusts
-- debug: var=hosts
-
 # Create one with the defaults
 - name: create new VM with default resource pool
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
+    datacenter: "{{ dc1 }}"
     hardware:
         num_cpus: 1
         memory_mb: 512
@@ -63,8 +17,7 @@
           type: thin
           autoselect_datastore: True
     state: poweredoff
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rp_d1_c1_f0
 
 - debug: var=clone_rp_d1_c1_f0
@@ -72,21 +25,20 @@
 - name: assert that changes were made
   assert:
     that:
-      - "clone_rp_d1_c1_f0.results|map(attribute='changed')|unique|list == [true]"
+      - clone_rp_d1_c1_f0 is changed
 
 - name: delete the new VMs
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     #guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
+    datacenter: "{{ dc1 }}"
     state: absent
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rp_d1_c1_f0_delete
 
 - debug: var=clone_rp_d1_c1_f0_delete
@@ -94,20 +46,20 @@
 - name: assert that changes were made with deletion
   assert:
     that:
-        - "clone_rp_d1_c1_f0_delete.results|map(attribute='changed')|unique|list == [true]"
+        - clone_rp_d1_c1_f0_delete is changed
 
 # now create with just a cluster
 - name: create new VM with default resource pool in cluster
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
-    cluster: "{{ clusts['json'][0]|basename }}"
+    datacenter: "{{ dc1 }}"
+    cluster: "{{ ccr1 }}"
     hardware:
         num_cpus: 1
         memory_mb: 512
@@ -116,8 +68,7 @@
           type: thin
           autoselect_datastore: True
     state: poweredoff
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rpc_d1_c1_f0
 
 - debug: var=clone_rpc_d1_c1_f0
@@ -125,22 +76,21 @@
 - name: assert that changes were made
   assert:
     that:
-      - "clone_rpc_d1_c1_f0.results|map(attribute='changed')|unique|list == [true]"
+      - clone_rpc_d1_c1_f0 is changed
 
 - name: delete the new VMs
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     #guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
-    cluster: "{{ clusts['json'][0]|basename }}"
+    datacenter: "{{ dc1 }}"
+    cluster: "{{ ccr1 }}"
     state: absent
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rpc_d1_c1_f0_delete
 
 - debug: var=clone_rpc_d1_c1_f0_delete
@@ -148,21 +98,21 @@
 - name: assert that changes were made with deletion
   assert:
     that:
-        - "clone_rpc_d1_c1_f0_delete.results|map(attribute='changed')|unique|list == [true]"
+        - clone_rpc_d1_c1_f0_delete is changed
 
 # now create with a specific resource pool
 - name: create new VM with specific resource pool in cluster
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
-    cluster: "{{ clusts['json'][0]|basename }}"
-    resource_pool: "{{ res_pools['json'][2]|basename }}"
+    datacenter: "{{ dc1 }}"
+    cluster: "{{ ccr1 }}"
+    resource_pool: DC0_C0_RP1
     hardware:
         num_cpus: 1
         memory_mb: 512
@@ -171,8 +121,7 @@
           type: thin
           autoselect_datastore: True
     state: poweredoff
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rpcp_d1_c1_f0
 
 - debug: var=clone_rpcp_d1_c1_f0
@@ -180,22 +129,21 @@
 - name: assert that changes were made
   assert:
     that:
-      - "clone_rpcp_d1_c1_f0.results|map(attribute='changed')|unique|list == [true]"
+      - clone_rpcp_d1_c1_f0 is changed
 
 - name: delete the new VMs
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     #guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
-    cluster: "{{ clusts['json'][0]|basename }}"
+    datacenter: "{{ dc1 }}"
+    cluster: "{{ ccr1 }}"
     state: absent
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rpcp_d1_c1_f0_delete
 
 - debug: var=clone_rpcp_d1_c1_f0_delete
@@ -203,20 +151,20 @@
 - name: assert that changes were made with deletion
   assert:
     that:
-        - "clone_rpcp_d1_c1_f0_delete.results|map(attribute='changed')|unique|list == [true]"
+        - clone_rpcp_d1_c1_f0_delete is changed
 
 # now create with a specific host
 - name: create new VM with specific host
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
-    esxi_hostname: "{{ hosts['json'][0]|basename }}"
+    datacenter: "{{ dc1 }}"
+    esxi_hostname: '{{ hostvars[esxi1].ansible_host }}'
     hardware:
         num_cpus: 1
         memory_mb: 512
@@ -225,8 +173,7 @@
           type: thin
           autoselect_datastore: True
     state: poweredoff
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rph_d1_c1_f0
 
 - debug: var=clone_rph_d1_c1_f0
@@ -234,21 +181,20 @@
 - name: assert that changes were made
   assert:
     that:
-      - "clone_rph_d1_c1_f0.results|map(attribute='changed')|unique|list == [true]"
+      - clone_rph_d1_c1_f0 is changed
 
 - name: delete the new VMs
   vmware_guest:
     validate_certs: False
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance['json']['username'] }}"
-    password: "{{ vcsim_instance['json']['password'] }}"
-    name: "{{ 'newvm_' + item|basename }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
+    name: newvm_2
     #template: "{{ item|basename }}"
     #guest_id: centos64Guest
-    datacenter: "{{ (item|basename).split('_')[0] }}"
+    datacenter: "{{ dc1 }}"
     state: absent
-    folder: "{{ item|dirname }}"
-  with_items: "{{ vmlist['json'][0] }}"
+    folder: F0
   register: clone_rph_d1_c1_f0_delete
 
 - debug: var=clone_rph_d1_c1_f0_delete
@@ -256,4 +202,4 @@
 - name: assert that changes were made with deletion
   assert:
     that:
-        - "clone_rph_d1_c1_f0_delete.results|map(attribute='changed')|unique|list == [true]"
+        - clone_rph_d1_c1_f0_delete is changed