diff options
79 files changed, 24 insertions, 459 deletions
diff --git a/test/integration/targets/inventory_vmware_vm_inventory/runme.sh b/test/integration/targets/inventory_vmware_vm_inventory/runme.sh index 3dccb1b326..7ba306f700 100755 --- a/test/integration/targets/inventory_vmware_vm_inventory/runme.sh +++ b/test/integration/targets/inventory_vmware_vm_inventory/runme.sh @@ -8,8 +8,7 @@ set -euo pipefail PYTHON=${ANSIBLE_TEST_PYTHON_INTERPRETER:-python} export ANSIBLE_CONFIG=ansible.cfg -export vcenter_host="${vcenter_host:-0.0.0.0}" -export VMWARE_SERVER="${vcenter_host}" +export VMWARE_SERVER="${VCENTER_HOST}" export VMWARE_USERNAME="${VMWARE_USERNAME:-user}" export VMWARE_PASSWORD="${VMWARE_PASSWORD:-pass}" VMWARE_CONFIG=test-config.vmware.yaml @@ -36,16 +35,16 @@ cleanup() { trap cleanup INT TERM EXIT -echo "DEBUG: Using ${vcenter_host} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" +echo "DEBUG: Using ${VCENTER_HOST} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" echo "Kill all previous instances" -curl "http://${vcenter_host}:5000/killall" > /dev/null 2>&1 +curl "http://${VCENTER_HOST}:5000/killall" > /dev/null 2>&1 echo "Start new VCSIM server" -curl "http://${vcenter_host}:5000/spawn?datacenter=1&cluster=1&folder=0" > /dev/null 2>&1 +curl "http://${VCENTER_HOST}:5000/spawn?datacenter=1&cluster=1&folder=0" > /dev/null 2>&1 echo "Debugging new instances" -curl "http://${vcenter_host}:5000/govc_find" +curl "http://${VCENTER_HOST}:5000/govc_find" # Get inventory ansible-inventory -i ${VMWARE_CONFIG} --list diff --git a/test/integration/targets/inventory_vmware_vm_inventory/test_vmware_vm_inventory.yml b/test/integration/targets/inventory_vmware_vm_inventory/test_vmware_vm_inventory.yml index 5cdc1350ba..f59200aaa7 100644 --- a/test/integration/targets/inventory_vmware_vm_inventory/test_vmware_vm_inventory.yml +++ b/test/integration/targets/inventory_vmware_vm_inventory/test_vmware_vm_inventory.yml @@ -8,10 +8,7 @@ tasks: - name: store the vcenter container ip set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - - - debug: - var: vcsim + vcsim: "{{ lookup('env', 'VCENTER_HOST') }}" - name: Check that there are 'all' and 'otherGuest' groups present in inventory assert: diff --git a/test/integration/targets/vcenter_folder/tasks/main.yml b/test/integration/targets/vcenter_folder/tasks/main.yml index 74b21d6af8..317be6e630 100644 --- a/test/integration/targets/vcenter_folder/tasks/main.yml +++ b/test/integration/targets/vcenter_folder/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vcenter_license/tasks/main.yml b/test/integration/targets/vcenter_license/tasks/main.yml index 8fd2dd9df0..74f67b02b8 100644 --- a/test/integration/targets/vcenter_license/tasks/main.yml +++ b/test/integration/targets/vcenter_license/tasks/main.yml @@ -2,31 +2,24 @@ # Copyright: (c) 2017, Dag Wieers <dag@wieers.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Store the vCenter container IP - set_fact: - vcenter_host: "{{ lookup('env', 'vcenter_host') }}" - -- debug: - var: vcenter_host - -- name: Wait for vcsim controller to come online {{ vcenter_host }} +- name: Wait for vcsim controller to come online {{ vcsim }} wait_for: - host: "{{ vcenter_host }}" + host: "{{ vcsim }}" port: 5000 state: started - name: Kill vcsim uri: - url: http://{{ vcenter_host }}:5000/killall + url: http://{{ vcsim }}:5000/killall - name: Start vcsim uri: - url: http://{{ vcenter_host }}:5000/spawn?cluster=2 + url: http://{{ vcsim }}:5000/spawn?cluster=2 register: vcsim_instance -- name: Wait for vcsim server to come up online {{ vcenter_host }} +- name: Wait for vcsim server to come up online {{ vcsim }} wait_for: - host: "{{ vcenter_host }}" + host: "{{ vcsim }}" port: 443 state: started @@ -36,7 +29,7 @@ # FIXME: ServerFaultCode: LicenseManager:LicenseManager does not implement: AddLicense #- name: Add a vCenter evaluation license # vcenter_license: -# hostname: '{{ vcenter_host }}' +# hostname: '{{ vcsim }}' # username: '{{ vcsim_instance["json"]["username"] }}' # password: '{{ vcsim_instance["json"]["password"] }}' # validate_certs: no @@ -45,7 +38,7 @@ #- name: Remove an (unused) vCenter evaluation license # vcenter_license: -# hostname: '{{ vcenter_host }}' +# hostname: '{{ vcsim }}' # username: '{{ vcsim_instance["json"]["username"] }}' # password: '{{ vcsim_instance["json"]["password"] }}' # validate_certs: no @@ -54,7 +47,7 @@ #- name: Add an invalid vCenter license # vcenter_license: -# hostname: '{{ vcenter_host }}' +# hostname: '{{ vcsim }}' # username: '{{ vcsim_instance["json"]["username"] }}' # password: '{{ vcsim_instance["json"]["password"] }}' # validate_certs: no diff --git a/test/integration/targets/vmware_about_facts/tasks/main.yml b/test/integration/targets/vmware_about_facts/tasks/main.yml index d791b2ec72..72fa54cd5e 100644 --- a/test/integration/targets/vmware_about_facts/tasks/main.yml +++ b/test/integration/targets/vmware_about_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_cluster/tasks/main.yml b/test/integration/targets/vmware_cluster/tasks/main.yml index e0282aa6d7..e772d65d2b 100644 --- a/test/integration/targets/vmware_cluster/tasks/main.yml +++ b/test/integration/targets/vmware_cluster/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_cluster_facts/tasks/main.yml b/test/integration/targets/vmware_cluster_facts/tasks/main.yml index 9e12deaafd..d4480e326d 100644 --- a/test/integration/targets/vmware_cluster_facts/tasks/main.yml +++ b/test/integration/targets/vmware_cluster_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_datacenter/tasks/main.yml b/test/integration/targets/vmware_datacenter/tasks/main.yml index 5ddd21f495..f7a8b0eaa1 100644 --- a/test/integration/targets/vmware_datacenter/tasks/main.yml +++ b/test/integration/targets/vmware_datacenter/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for vcsim controller to come online {{ vcsim }} wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_datastore_cluster/tasks/main.yml b/test/integration/targets/vmware_datastore_cluster/tasks/main.yml index f7b924ce0a..435ca04daf 100644 --- a/test/integration/targets/vmware_datastore_cluster/tasks/main.yml +++ b/test/integration/targets/vmware_datastore_cluster/tasks/main.yml @@ -2,13 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: '{{ lookup("env", "vcenter_host") }}' - -- debug: - var: vcsim - - name: Wait for Flask controller to come up online wait_for: host: '{{ vcsim }}' diff --git a/test/integration/targets/vmware_datastore_facts/tasks/main.yml b/test/integration/targets/vmware_datastore_facts/tasks/main.yml index dab779f950..dd42b00b27 100644 --- a/test/integration/targets/vmware_datastore_facts/tasks/main.yml +++ b/test/integration/targets/vmware_datastore_facts/tasks/main.yml @@ -3,13 +3,6 @@ # Copyright (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: - var: vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml b/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml index dd7418cab5..495bdd2651 100644 --- a/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml +++ b/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support datastore maintenance mode properties -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_drs_group/tasks/main.yml b/test/integration/targets/vmware_drs_group/tasks/main.yml index c94f5ebe0a..02b5218664 100644 --- a/test/integration/targets/vmware_drs_group/tasks/main.yml +++ b/test/integration/targets/vmware_drs_group/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2018, Karsten Kaj Jakobsen <kj@patientsky.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_drs_group_facts/tasks/main.yml b/test/integration/targets/vmware_drs_group_facts/tasks/main.yml index 65bb3fc769..e0777adbf8 100644 --- a/test/integration/targets/vmware_drs_group_facts/tasks/main.yml +++ b/test/integration/targets/vmware_drs_group_facts/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2018, Karsten Kaj Jakobsen <kj@patientsky.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_drs_rule_facts/tasks/main.yml b/test/integration/targets/vmware_drs_rule_facts/tasks/main.yml index e47cc949a9..bea32bc9b9 100644 --- a/test/integration/targets/vmware_drs_rule_facts/tasks/main.yml +++ b/test/integration/targets/vmware_drs_rule_facts/tasks/main.yml @@ -2,11 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml b/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml index 512ebaf95f..fd5807f744 100644 --- a/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml +++ b/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml @@ -17,12 +17,6 @@ # along with Ansible. If not, see <http://www.gnu.org/licenses/>. # -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_dvs_portgroup_facts/tasks/main.yml b/test/integration/targets/vmware_dvs_portgroup_facts/tasks/main.yml index c2db996bb4..bcd98def7f 100644 --- a/test/integration/targets/vmware_dvs_portgroup_facts/tasks/main.yml +++ b/test/integration/targets/vmware_dvs_portgroup_facts/tasks/main.yml @@ -2,11 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_dvswitch/tasks/main.yml b/test/integration/targets/vmware_dvswitch/tasks/main.yml index dbdd095892..aad1e8bf6a 100644 --- a/test/integration/targets/vmware_dvswitch/tasks/main.yml +++ b/test/integration/targets/vmware_dvswitch/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_dvswitch_pvlans/tasks/main.yml b/test/integration/targets/vmware_dvswitch_pvlans/tasks/main.yml index 8d2b80a26b..69563fc579 100644 --- a/test/integration/targets/vmware_dvswitch_pvlans/tasks/main.yml +++ b/test/integration/targets/vmware_dvswitch_pvlans/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_dvswitch_uplink_pg/tasks/main.yml b/test/integration/targets/vmware_dvswitch_uplink_pg/tasks/main.yml index b9e3ce3a20..f245e25a86 100644 --- a/test/integration/targets/vmware_dvswitch_uplink_pg/tasks/main.yml +++ b/test/integration/targets/vmware_dvswitch_uplink_pg/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest/tasks/main.yml b/test/integration/targets/vmware_guest/tasks/main.yml index 41a8615191..451233b156 100644 --- a/test/integration/targets/vmware_guest/tasks/main.yml +++ b/test/integration/targets/vmware_guest/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2017, James Tanner <tanner.jc@gmail.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - include: poweroff_d1_c1_f0.yml - include: poweroff_d1_c1_f1.yml - include: check_mode.yml diff --git a/test/integration/targets/vmware_guest/tasks/poweroff_d1_c1_f1.yml b/test/integration/targets/vmware_guest/tasks/poweroff_d1_c1_f1.yml index 9049aaba46..e748ff90b7 100644 --- a/test/integration/targets/vmware_guest/tasks/poweroff_d1_c1_f1.yml +++ b/test/integration/targets/vmware_guest/tasks/poweroff_d1_c1_f1.yml @@ -8,11 +8,6 @@ port: 5000 state: started -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: kill vcsim uri: url: http://{{ vcsim }}:5000/killall diff --git a/test/integration/targets/vmware_guest_custom_attribute_defs/tasks/main.yml b/test/integration/targets/vmware_guest_custom_attribute_defs/tasks/main.yml index 06674f279b..45a0e22870 100644 --- a/test/integration/targets/vmware_guest_custom_attribute_defs/tasks/main.yml +++ b/test/integration/targets/vmware_guest_custom_attribute_defs/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_custom_attributes/tasks/main.yml b/test/integration/targets/vmware_guest_custom_attributes/tasks/main.yml index 34a6b06592..bf58105851 100644 --- a/test/integration/targets/vmware_guest_custom_attributes/tasks/main.yml +++ b/test/integration/targets/vmware_guest_custom_attributes/tasks/main.yml @@ -5,12 +5,6 @@ # TODO: Current pinned version of vcsim does not support custom fields # commenting testcase below -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_facts/tasks/main.yml b/test/integration/targets/vmware_guest_facts/tasks/main.yml index bdba6d4a59..6745584585 100644 --- a/test/integration/targets/vmware_guest_facts/tasks/main.yml +++ b/test/integration/targets/vmware_guest_facts/tasks/main.yml @@ -3,12 +3,6 @@ # Copyright: (c) 2018, James E. King III (@jeking3) <jking@apache.org> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_find/tasks/main.yml b/test/integration/targets/vmware_guest_find/tasks/main.yml index 72ef13b4b0..b4aa0cff82 100644 --- a/test/integration/targets/vmware_guest_find/tasks/main.yml +++ b/test/integration/targets/vmware_guest_find/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2017, James Tanner <tanner.jc@gmail.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: wait for flask server wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_move/tasks/main.yml b/test/integration/targets/vmware_guest_move/tasks/main.yml index f03f352134..9f636c24db 100644 --- a/test/integration/targets/vmware_guest_move/tasks/main.yml +++ b/test/integration/targets/vmware_guest_move/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2018, Jose Angel Munoz <josea.munoz@gmail.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_powerstate/tasks/main.yml b/test/integration/targets/vmware_guest_powerstate/tasks/main.yml index 105df5e303..287d5db1af 100644 --- a/test/integration/targets/vmware_guest_powerstate/tasks/main.yml +++ b/test/integration/targets/vmware_guest_powerstate/tasks/main.yml @@ -2,10 +2,5 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - include: poweroff_d1_c1_f0.yml - include: poweroff_d1_c1_f1.yml diff --git a/test/integration/targets/vmware_guest_powerstate/tasks/poweroff_d1_c1_f1.yml b/test/integration/targets/vmware_guest_powerstate/tasks/poweroff_d1_c1_f1.yml index f3e611cdc2..2d35940a29 100644 --- a/test/integration/targets/vmware_guest_powerstate/tasks/poweroff_d1_c1_f1.yml +++ b/test/integration/targets/vmware_guest_powerstate/tasks/poweroff_d1_c1_f1.yml @@ -8,11 +8,6 @@ port: 5000 state: started -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: kill vcsim uri: url: http://{{ vcsim }}:5000/killall diff --git a/test/integration/targets/vmware_guest_snapshot/tasks/main.yml b/test/integration/targets/vmware_guest_snapshot/tasks/main.yml index 10916a25e3..8a6c12c87f 100644 --- a/test/integration/targets/vmware_guest_snapshot/tasks/main.yml +++ b/test/integration/targets/vmware_guest_snapshot/tasks/main.yml @@ -1,8 +1,3 @@ - - name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - - debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_snapshot_facts/tasks/main.yml b/test/integration/targets/vmware_guest_snapshot_facts/tasks/main.yml index 361cbf40a2..1e712c97da 100644 --- a/test/integration/targets/vmware_guest_snapshot_facts/tasks/main.yml +++ b/test/integration/targets/vmware_guest_snapshot_facts/tasks/main.yml @@ -4,11 +4,6 @@ # TODO: vcsim does not support snapshot related functionalities - - name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - - debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_guest_tools_wait/tasks/main.yml b/test/integration/targets/vmware_guest_tools_wait/tasks/main.yml index ff1569bc51..f5d983efb8 100644 --- a/test/integration/targets/vmware_guest_tools_wait/tasks/main.yml +++ b/test/integration/targets/vmware_guest_tools_wait/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017 Philippe Dellaert <philippe@dellaert.org> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host/tasks/main.yml b/test/integration/targets/vmware_host/tasks/main.yml index 8aa76dfe31..a9d9a44cfe 100644 --- a/test/integration/targets/vmware_host/tasks/main.yml +++ b/test/integration/targets/vmware_host/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_acceptance/tasks/main.yml b/test/integration/targets/vmware_host_acceptance/tasks/main.yml index 816866564a..11138f2a2f 100644 --- a/test/integration/targets/vmware_host_acceptance/tasks/main.yml +++ b/test/integration/targets/vmware_host_acceptance/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support Acceptance Level related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_active_directory/tasks/main.yml b/test/integration/targets/vmware_host_active_directory/tasks/main.yml index 4aea37d67f..60bb7a7372 100644 --- a/test/integration/targets/vmware_host_active_directory/tasks/main.yml +++ b/test/integration/targets/vmware_host_active_directory/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_capability_facts/tasks/main.yml b/test/integration/targets/vmware_host_capability_facts/tasks/main.yml index a149a1df0e..298a676180 100644 --- a/test/integration/targets/vmware_host_capability_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_capability_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support host system capabilities -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" 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 c89a11944a..c074c3b06a 100644 --- a/test/integration/targets/vmware_host_config_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_config_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_config_manager/tasks/main.yml b/test/integration/targets/vmware_host_config_manager/tasks/main.yml index e28aea6bc5..4004479260 100644 --- a/test/integration/targets/vmware_host_config_manager/tasks/main.yml +++ b/test/integration/targets/vmware_host_config_manager/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support update host configuartion -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_dns_facts/tasks/main.yml b/test/integration/targets/vmware_host_dns_facts/tasks/main.yml index b6a645934b..6a88fb9719 100644 --- a/test/integration/targets/vmware_host_dns_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_dns_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_facts/tasks/main.yml b/test/integration/targets/vmware_host_facts/tasks/main.yml index f6ffffcc31..ea85d3a056 100644 --- a/test/integration/targets/vmware_host_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_facts/tasks/main.yml @@ -1,8 +1,3 @@ -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: kill vcsim uri: url: "{{ 'http://' + vcsim + ':5000/killall' }}" diff --git a/test/integration/targets/vmware_host_feature_facts/tasks/main.yml b/test/integration/targets/vmware_host_feature_facts/tasks/main.yml index 39450580b1..f2c6c8511a 100644 --- a/test/integration/targets/vmware_host_feature_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_feature_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support host feature capabilities -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_firewall_facts/tasks/main.yml b/test/integration/targets/vmware_host_firewall_facts/tasks/main.yml index af3fc8a09b..a3e2c9914e 100644 --- a/test/integration/targets/vmware_host_firewall_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_firewall_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_firewall_manager/tasks/main.yml b/test/integration/targets/vmware_host_firewall_manager/tasks/main.yml index f90e6b6583..1786991598 100644 --- a/test/integration/targets/vmware_host_firewall_manager/tasks/main.yml +++ b/test/integration/targets/vmware_host_firewall_manager/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_hyperthreading/tasks/main.yml b/test/integration/targets/vmware_host_hyperthreading/tasks/main.yml index 894042e38c..b2062fa39a 100644 --- a/test/integration/targets/vmware_host_hyperthreading/tasks/main.yml +++ b/test/integration/targets/vmware_host_hyperthreading/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_ipv6/tasks/main.yml b/test/integration/targets/vmware_host_ipv6/tasks/main.yml index 1caa2d4f1a..854afe7c20 100644 --- a/test/integration/targets/vmware_host_ipv6/tasks/main.yml +++ b/test/integration/targets/vmware_host_ipv6/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_kernel_manager/tasks/main.yml b/test/integration/targets/vmware_host_kernel_manager/tasks/main.yml index 4b9d8e7a38..3db58cdea6 100644 --- a/test/integration/targets/vmware_host_kernel_manager/tasks/main.yml +++ b/test/integration/targets/vmware_host_kernel_manager/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2019, Aaron Longchamps <a.j.longchamps@gmail.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_ntp/tasks/main.yml b/test/integration/targets/vmware_host_ntp/tasks/main.yml index 0c275d0477..f661971475 100644 --- a/test/integration/targets/vmware_host_ntp/tasks/main.yml +++ b/test/integration/targets/vmware_host_ntp/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support update host NTP configuration -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_ntp_facts/tasks/main.yml b/test/integration/targets/vmware_host_ntp_facts/tasks/main.yml index 0b989bef00..1221612f4c 100644 --- a/test/integration/targets/vmware_host_ntp_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_ntp_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support NTP Manager related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_package_facts/tasks/main.yml b/test/integration/targets/vmware_host_package_facts/tasks/main.yml index b773e50b1d..c4934962c5 100644 --- a/test/integration/targets/vmware_host_package_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_package_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support Package Manager related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_powermgmt_policy/tasks/main.yml b/test/integration/targets/vmware_host_powermgmt_policy/tasks/main.yml index 8eb4b79006..b8e573e60b 100644 --- a/test/integration/targets/vmware_host_powermgmt_policy/tasks/main.yml +++ b/test/integration/targets/vmware_host_powermgmt_policy/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_powerstate/tasks/main.yml b/test/integration/targets/vmware_host_powerstate/tasks/main.yml index a2d9047b37..09ada4a9c6 100644 --- a/test/integration/targets/vmware_host_powerstate/tasks/main.yml +++ b/test/integration/targets/vmware_host_powerstate/tasks/main.yml @@ -3,11 +3,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # TODO: vcsim does not support Powerstate related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - name: Wait for Flask controller to come up online wait_for: diff --git a/test/integration/targets/vmware_host_scanhba/tasks/main.yml b/test/integration/targets/vmware_host_scanhba/tasks/main.yml index 61d8f74780..4774be4e9b 100644 --- a/test/integration/targets/vmware_host_scanhba/tasks/main.yml +++ b/test/integration/targets/vmware_host_scanhba/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_service_facts/tasks/main.yml b/test/integration/targets/vmware_host_service_facts/tasks/main.yml index 08ad30ab83..0d51fa2d91 100644 --- a/test/integration/targets/vmware_host_service_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_service_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support service related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_service_manager/tasks/main.yml b/test/integration/targets/vmware_host_service_manager/tasks/main.yml index 786b27938b..a6a58bc152 100644 --- a/test/integration/targets/vmware_host_service_manager/tasks/main.yml +++ b/test/integration/targets/vmware_host_service_manager/tasks/main.yml @@ -5,12 +5,6 @@ # TODO: vcsim does not support service management # commenting this testcase till the time. -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_snmp/tasks/main.yml b/test/integration/targets/vmware_host_snmp/tasks/main.yml index 2c28f2312c..b008f46998 100644 --- a/test/integration/targets/vmware_host_snmp/tasks/main.yml +++ b/test/integration/targets/vmware_host_snmp/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_ssl_facts/tasks/main.yml b/test/integration/targets/vmware_host_ssl_facts/tasks/main.yml index a39f9409a7..9f2f2ed4c1 100644 --- a/test/integration/targets/vmware_host_ssl_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_ssl_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_vmhba_facts/tasks/main.yml b/test/integration/targets/vmware_host_vmhba_facts/tasks/main.yml index a389f90cb6..dc97378e8d 100644 --- a/test/integration/targets/vmware_host_vmhba_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_vmhba_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support networkConfig related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_host_vmnic_facts/tasks/main.yml b/test/integration/targets/vmware_host_vmnic_facts/tasks/main.yml index 85999d1450..1544e84ed5 100644 --- a/test/integration/targets/vmware_host_vmnic_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_vmnic_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support networkConfig related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_inventory/runme.sh b/test/integration/targets/vmware_inventory/runme.sh index 9a713e4f3a..a4c4bf5605 100755 --- a/test/integration/targets/vmware_inventory/runme.sh +++ b/test/integration/targets/vmware_inventory/runme.sh @@ -9,8 +9,7 @@ contrib_dir=../../../../contrib/inventory echo "DEBUG: using ${contrib_dir}" export ANSIBLE_CONFIG=ansible.cfg -export vcenter_host="${vcenter_host:-0.0.0.0}" -export VMWARE_SERVER="${vcenter_host}" +export VMWARE_SERVER="${VCENTER_HOST}" export VMWARE_USERNAME="${VMWARE_USERNAME:-user}" export VMWARE_PASSWORD="${VMWARE_PASSWORD:-pass}" @@ -42,16 +41,16 @@ function cleanup { fi } -echo "DEBUG: Using ${vcenter_host} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" +echo "DEBUG: Using ${VCENTER_HOST} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" echo "Kill all previous instances" -curl "http://${vcenter_host}:5000/killall" > /dev/null 2>&1 +curl "http://${VCENTER_HOST}:5000/killall" > /dev/null 2>&1 echo "Start new VCSIM server" -curl "http://${vcenter_host}:5000/spawn?datacenter=1&cluster=1&folder=0" > /dev/null 2>&1 +curl "http://${VCENTER_HOST}:5000/spawn?datacenter=1&cluster=1&folder=0" > /dev/null 2>&1 echo "Debugging new instances" -curl "http://${vcenter_host}:5000/govc_find" +curl "http://${VCENTER_HOST}:5000/govc_find" # Get inventory ansible-playbook -i ./vmware_inventory.sh "./test_vmware_inventory.yml" --connection=local "$@" diff --git a/test/integration/targets/vmware_inventory/test_vmware_inventory.yml b/test/integration/targets/vmware_inventory/test_vmware_inventory.yml index 9cd8ff8917..4aa994ade0 100644 --- a/test/integration/targets/vmware_inventory/test_vmware_inventory.yml +++ b/test/integration/targets/vmware_inventory/test_vmware_inventory.yml @@ -8,10 +8,7 @@ tasks: - name: store the vcenter container ip set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - - - debug: - var: vcsim + vcsim: "{{ lookup('env', 'VCENTER_HOST') }}" - name: Check that groups present in inventory assert: diff --git a/test/integration/targets/vmware_local_role_facts/tasks/main.yml b/test/integration/targets/vmware_local_role_facts/tasks/main.yml index c8627ebd1d..c11b066a79 100644 --- a/test/integration/targets/vmware_local_role_facts/tasks/main.yml +++ b/test/integration/targets/vmware_local_role_facts/tasks/main.yml @@ -11,11 +11,6 @@ - Anonymous - ReadOnly -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_local_role_manager/tasks/main.yml b/test/integration/targets/vmware_local_role_manager/tasks/main.yml index aff9d16904..3de081cbeb 100644 --- a/test/integration/targets/vmware_local_role_manager/tasks/main.yml +++ b/test/integration/targets/vmware_local_role_manager/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2017-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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_local_user_facts/tasks/main.yml b/test/integration/targets/vmware_local_user_facts/tasks/main.yml index f97ba6d1bc..53bb188ed9 100644 --- a/test/integration/targets/vmware_local_user_facts/tasks/main.yml +++ b/test/integration/targets/vmware_local_user_facts/tasks/main.yml @@ -5,12 +5,6 @@ # Commenting local user testcases as older vcsim docker image # does not support this. -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_local_user_manager/tasks/main.yml b/test/integration/targets/vmware_local_user_manager/tasks/main.yml index 1ec81e9aba..db7a582b36 100644 --- a/test/integration/targets/vmware_local_user_manager/tasks/main.yml +++ b/test/integration/targets/vmware_local_user_manager/tasks/main.yml @@ -5,12 +5,6 @@ # Commenting local user testcases as older vcsim docker image # does not support this. -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_maintenancemode/tasks/main.yml b/test/integration/targets/vmware_maintenancemode/tasks/main.yml index ef5853d3d6..61060efa1e 100644 --- a/test/integration/targets/vmware_maintenancemode/tasks/main.yml +++ b/test/integration/targets/vmware_maintenancemode/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_portgroup_facts/tasks/main.yml b/test/integration/targets/vmware_portgroup_facts/tasks/main.yml index 9beb4b59c4..c41d95ea28 100644 --- a/test/integration/targets/vmware_portgroup_facts/tasks/main.yml +++ b/test/integration/targets/vmware_portgroup_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_resource_pool/tasks/main.yml b/test/integration/targets/vmware_resource_pool/tasks/main.yml index ab9ed32642..ec40c2a3fa 100644 --- a/test/integration/targets/vmware_resource_pool/tasks/main.yml +++ b/test/integration/targets/vmware_resource_pool/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_resource_pool_facts/tasks/main.yml b/test/integration/targets/vmware_resource_pool_facts/tasks/main.yml index 178f888ed7..fd151e1f5a 100644 --- a/test/integration/targets/vmware_resource_pool_facts/tasks/main.yml +++ b/test/integration/targets/vmware_resource_pool_facts/tasks/main.yml @@ -2,12 +2,6 @@ # 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: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_target_canonical_facts/tasks/main.yml b/test/integration/targets/vmware_target_canonical_facts/tasks/main.yml index 1aa0af8ecd..46142a0fb4 100644 --- a/test/integration/targets/vmware_target_canonical_facts/tasks/main.yml +++ b/test/integration/targets/vmware_target_canonical_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support SCSI target releated operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vcenter_settings/tasks/main.yml b/test/integration/targets/vmware_vcenter_settings/tasks/main.yml index 04cfd6e59a..fb375880cc 100644 --- a/test/integration/targets/vmware_vcenter_settings/tasks/main.yml +++ b/test/integration/targets/vmware_vcenter_settings/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vcenter_statistics/tasks/main.yml b/test/integration/targets/vmware_vcenter_statistics/tasks/main.yml index c6961b27e7..65fe611b36 100644 --- a/test/integration/targets/vmware_vcenter_statistics/tasks/main.yml +++ b/test/integration/targets/vmware_vcenter_statistics/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Christian Kotte <christian.kotte@gmx.de> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vm_facts/tasks/main.yml b/test/integration/targets/vmware_vm_facts/tasks/main.yml index 6d29cb9ca4..6632a2efeb 100644 --- a/test/integration/targets/vmware_vm_facts/tasks/main.yml +++ b/test/integration/targets/vmware_vm_facts/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vm_host_drs_rule/tasks/main.yml b/test/integration/targets/vmware_vm_host_drs_rule/tasks/main.yml index 54e5a1fceb..275fc35377 100644 --- a/test/integration/targets/vmware_vm_host_drs_rule/tasks/main.yml +++ b/test/integration/targets/vmware_vm_host_drs_rule/tasks/main.yml @@ -4,11 +4,6 @@ # TODO: vcsim does not support manage DRS rule -- name: Store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: Wait for flask server wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vm_vm_drs_rule/tasks/main.yml b/test/integration/targets/vmware_vm_vm_drs_rule/tasks/main.yml index b9b833206b..58c1943ea8 100644 --- a/test/integration/targets/vmware_vm_vm_drs_rule/tasks/main.yml +++ b/test/integration/targets/vmware_vm_vm_drs_rule/tasks/main.yml @@ -4,11 +4,6 @@ # TODO: vcsim does not support manage DRS rule -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" -- debug: var=vcsim - - name: wait for flask server wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vmkernel/tasks/main.yml b/test/integration/targets/vmware_vmkernel/tasks/main.yml index a015b96cf7..122e04a15d 100644 --- a/test/integration/targets/vmware_vmkernel/tasks/main.yml +++ b/test/integration/targets/vmware_vmkernel/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support HostVirtualNicManager-related operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml b/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml index 1c71afb843..61396c8c30 100644 --- a/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml +++ b/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support HostVirtualNicManager related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vspan_session/tasks/main.yml b/test/integration/targets/vmware_vspan_session/tasks/main.yml index 27607e2006..f3a33d8c37 100644 --- a/test/integration/targets/vmware_vspan_session/tasks/main.yml +++ b/test/integration/targets/vmware_vspan_session/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Peter Gyorgy <gyorgy.peter@edu.bme.hu> # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/integration/targets/vmware_vswitch/tasks/main.yml b/test/integration/targets/vmware_vswitch/tasks/main.yml index e30496680a..4532e58c0e 100644 --- a/test/integration/targets/vmware_vswitch/tasks/main.yml +++ b/test/integration/targets/vmware_vswitch/tasks/main.yml @@ -4,13 +4,6 @@ # TODO: akasurde: VCSIM does not suport network manager system -- name: store the vcenter container ip - set_fact: - vcsim: '{{ lookup("env", "vcenter_host") }}' - -- debug: - var: vcsim - - name: Wait for Flask controller to come up online wait_for: host: '{{ vcsim }}' diff --git a/test/integration/targets/vmware_vswitch_facts/tasks/main.yml b/test/integration/targets/vmware_vswitch_facts/tasks/main.yml index 4b818b0a14..937f1e026a 100644 --- a/test/integration/targets/vmware_vswitch_facts/tasks/main.yml +++ b/test/integration/targets/vmware_vswitch_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support networkConfig related to operations -- name: store the vcenter container ip - set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - -- debug: var=vcsim - - name: Wait for Flask controller to come up online wait_for: host: "{{ vcsim }}" diff --git a/test/runner/lib/cloud/vcenter.py b/test/runner/lib/cloud/vcenter.py index cfccd4665e..cb2c59f780 100644 --- a/test/runner/lib/cloud/vcenter.py +++ b/test/runner/lib/cloud/vcenter.py @@ -149,6 +149,8 @@ class VcenterEnvironment(CloudEnvironment): :type env: dict[str, str] :type cmd: list[str] """ + cmd.append('-e') + cmd.append('vcsim=%s' % self._get_cloud_config('vcenter_host')) # Send the container IP down to the integration test(s) - env['vcenter_host'] = self._get_cloud_config('vcenter_host') + env['VCENTER_HOST'] = self._get_cloud_config('vcenter_host') |