Merge pull request #55730 from goneri/vmware_refact_part5

vmware: refactoring of vmware test roles -- part5

2 files changed, 42 insertions, 79 deletions

diff --git a/test/integration/targets/vmware_host_config_facts/aliases b/test/integration/targets/vmware_host_config_facts/aliases
index 32dd9d5345..eb39c07bac 100644
--- a/test/integration/targets/vmware_host_config_facts/aliases
+++ b/test/integration/targets/vmware_host_config_facts/aliases
@@ -1,2 +1,3 @@
 shippable/vcenter/group1
 cloud/vcenter
+needs/target/prepare_vmware_tests
diff --git a/test/integration/targets/vmware_host_config_facts/tasks/main.yml b/test/integration/targets/vmware_host_config_facts/tasks/main.yml
index c074c3b06a..12b08561b0 100644
--- a/test/integration/targets/vmware_host_config_facts/tasks/main.yml
+++ b/test/integration/targets/vmware_host_config_facts/tasks/main.yml
@@ -1,85 +1,33 @@
 # Test code for the vmware_host_config_facts module.
 # Copyright: (c) 2018, Abhijeet Kasurde <akasurde@redhat.com>
 # 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 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 }}"
-
-- name: get a list of hosts from vcsim
-  uri:
-    url: http://{{ vcsim }}:5000/govc_find?filter=H
-  register: hosts
-
-- name: get a cluster
-  set_fact:
-    host1: "{{ hosts.json[0] | basename }}"
-
-- debug: var=ccr1
-- debug: var=host1
+- import_role:
+    name: prepare_vmware_tests
+  vars:
+    setup_attach_host: true
 
 - name: gather facts about all hosts in given cluster
   vmware_host_config_facts:
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance.json.username }}"
-    password: "{{ vcsim_instance.json.password }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
     validate_certs: no
     cluster_name: "{{ ccr1 }}"
   register: all_hosts_result
 
-- name: ensure facts are gathered for all hosts
-  assert:
-    that:
-        - all_hosts_result.hosts_facts
-
-- name: gather facts about a given host
-  vmware_host_config_facts:
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance.json.username }}"
-    password: "{{ vcsim_instance.json.password }}"
-    validate_certs: no
-    esxi_hostname: "{{ host1 }}"
-  register: single_hosts_result
+- debug:
+    var: all_hosts_result
 
 - name: ensure facts are gathered for all hosts
   assert:
     that:
-        - single_hosts_result.hosts_facts
+        - all_hosts_result.hosts_facts
 
 - name: gather facts about all hosts in given cluster in check mode
   vmware_host_config_facts:
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance.json.username }}"
-    password: "{{ vcsim_instance.json.password }}"
+    hostname: "{{ vcenter_hostname }}"
+    username: "{{ vcenter_username }}"
+    password: "{{ vcenter_password }}"
     validate_certs: no
     cluster_name: "{{ ccr1 }}"
   register: all_hosts_result_check_mode
@@ -90,17 +38,31 @@
     that:
         - all_hosts_result_check_mode.hosts_facts
 
-- name: gather facts about a given host in check mode
-  vmware_host_config_facts:
-    hostname: "{{ vcsim }}"
-    username: "{{ vcsim_instance.json.username }}"
-    password: "{{ vcsim_instance.json.password }}"
-    validate_certs: no
-    esxi_hostname: "{{ host1 }}"
-  register: single_hosts_result_check_mode
-  check_mode: yes
-
-- name: ensure facts are gathered for all hosts
-  assert:
-    that:
-        - single_hosts_result_check_mode.hosts_facts
+- when: vcsim is not defined
+  block:
+  - name: gather facts about a given host in check mode
+    vmware_host_config_facts:
+      hostname: "{{ vcenter_hostname }}"
+      username: "{{ vcenter_username }}"
+      password: "{{ vcenter_password }}"
+      validate_certs: no
+      esxi_hostname: "{{ hostvars[esxi1].ansible_host }}"
+    register: single_hosts_result_check_mode
+    check_mode: yes
+  - name: ensure facts are gathered for all hosts
+    assert:
+      that:
+          - single_hosts_result_check_mode.hosts_facts
+
+  - name: gather facts about a given host
+    vmware_host_config_facts:
+      hostname: "{{ vcenter_hostname }}"
+      username: "{{ vcenter_username }}"
+      password: "{{ vcenter_password }}"
+      validate_certs: no
+      esxi_hostname: "{{ hostvars[esxi1].ansible_host }}"
+    register: single_hosts_result
+  - name: ensure facts are gathered for all hosts
+    assert:
+      that:
+          - single_hosts_result.hosts_facts