Merge pull request #55730 from goneri/vmware_refact_part5

vmware: refactoring of vmware test roles -- part5

1 files changed, 22 insertions, 77 deletions

diff --git a/test/integration/targets/vmware_host_scanhba/tasks/main.yml b/test/integration/targets/vmware_host_scanhba/tasks/main.yml
index 4774be4e9b..2701b10473 100644
--- a/test/integration/targets/vmware_host_scanhba/tasks/main.yml
+++ b/test/integration/targets/vmware_host_scanhba/tasks/main.yml
@@ -1,80 +1,25 @@
 # Test code for the vmware_host_scanhba module.
 # Copyright: (c) 2019, Michael Eaton <me@michaeleaton.me>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-- 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
-  uri:
-    url: http://{{ vcsim }}:5000/spawn?cluster=2
-  register: vcsim_instance
-
-- debug:
-    var: vcsim_instance
-
-- name: Wait for vcsim server to come up online
-  wait_for:
-    host: "{{ vcsim }}"
-    port: 443
-    state: started
-
-- name: get a list of Datacenter from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=DC
-  register: datacenters
-
-- name: get a datacenter
-  set_fact:
-    dc1: "{{ datacenters.json[0] | basename }}"
-
-- debug: var=dc1
-
-- name: get a list of Cluster from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=CCR
-  register: clusters
-
-- name: get a cluster
-  set_fact:
-    ccr1: "{{ clusters.json[0] | basename }}"
-
-- debug: var=ccr1
-
-- name: add host
-  vmware_host:
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance.json.username }}"
-    password: "{{ vcsim_instance.json.password }}"
-    validate_certs: no
-    esxi_hostname: test_host_system_0001
-    esxi_username: "{{ vcsim_instance.json.username }}"
-    esxi_password: "{{ vcsim_instance.json.password }}"
-    datacenter_name: "{{ dc1 }}"
-    cluster_name: "{{ ccr1 }}"
-    state: present
-
-- name: Recan HBA's for an entire cluster (there should be at least one host as above)
-  vmware_host_scanhba:
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance.json.username }}"
-    password: "{{ vcsim_instance.json.password }}"
-    validate_certs: no
-    cluster_name: '{{ ccr1 }}'
-    refresh_storage: false
-  register: host_scan_results
-
-- debug: msg="{{ host_scan_results }}"
-
-- name: ensure a change occured (as in the scan happened) and the task didnt fail
-  assert:
-    that:
-        - host_scan_results.changed 
-        - not host_scan_results.failed
\ No newline at end of file
+- when: vcsim is not defined
+  block:
+    - import_role:
+          name: prepare_vmware_tests
+      vars:
+        setup_attach_host: true
+
+    - name: Recan HBA's for an entire cluster (there should be at least one host as above)
+      vmware_host_scanhba:
+        hostname: "{{ vcenter_hostname }}"
+        username: "{{ vcenter_username }}"
+        password: "{{ vcenter_password }}"
+        validate_certs: no
+        cluster_name: '{{ ccr1 }}'
+        refresh_storage: false
+      register: host_scan_results
+    - debug: msg="{{ host_scan_results }}"
+    - name: ensure a change occured (as in the scan happened) and the task didnt fail
+      assert:
+        that:
+            - host_scan_results.changed
+            - not host_scan_results.failed