From a5b808511395487f2c9679c11c27bdb1250c08d0 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 8 May 2018 09:43:11 -0700 Subject: [PATCH] Move pyvmomi install into cloud test plugin. --- test/integration/targets/vcenter_folder/tasks/main.yml | 6 ------ test/integration/targets/vcenter_license/tasks/main.yml | 5 ----- test/integration/targets/vmware_cluster/tasks/main.yml | 6 ------ .../integration/targets/vmware_cluster_facts/tasks/main.yml | 6 ------ test/integration/targets/vmware_datacenter/tasks/main.yml | 6 ------ .../targets/vmware_datastore_cluster/tasks/main.yml | 6 ------ .../targets/vmware_datastore_facts/tasks/main.yml | 5 ----- .../targets/vmware_datastore_maintenancemode/tasks/main.yml | 5 ----- .../targets/vmware_drs_rule_facts/tasks/main.yml | 6 ------ .../integration/targets/vmware_dvs_portgroup/tasks/main.yml | 5 ----- test/integration/targets/vmware_dvswitch/tasks/main.yml | 6 ------ test/integration/targets/vmware_guest/tasks/main.yml | 6 ------ test/integration/targets/vmware_guest_facts/tasks/main.yml | 6 ------ test/integration/targets/vmware_guest_find/tasks/main.yml | 6 ------ .../targets/vmware_guest_powerstate/tasks/main.yml | 6 ------ .../targets/vmware_guest_snapshot/tasks/main.yml | 6 ------ .../targets/vmware_guest_snapshot_facts/tasks/main.yml | 6 ------ .../targets/vmware_guest_tools_wait/tasks/main.yml | 6 ------ test/integration/targets/vmware_host/tasks/main.yml | 6 ------ .../targets/vmware_host_acceptance/tasks/main.yml | 5 ----- .../targets/vmware_host_capability_facts/tasks/main.yml | 5 ----- .../targets/vmware_host_config_facts/tasks/main.yml | 6 ------ .../targets/vmware_host_config_manager/tasks/main.yml | 5 ----- .../targets/vmware_host_dns_facts/tasks/main.yml | 6 ------ test/integration/targets/vmware_host_facts/tasks/main.yml | 5 ----- .../targets/vmware_host_firewall_facts/tasks/main.yml | 6 ------ .../targets/vmware_host_firewall_manager/tasks/main.yml | 6 ------ test/integration/targets/vmware_host_ntp/tasks/main.yml | 5 ----- .../targets/vmware_host_package_facts/tasks/main.yml | 5 ----- .../targets/vmware_host_service_facts/tasks/main.yml | 5 ----- .../targets/vmware_host_service_manager/tasks/main.yml | 5 ----- .../targets/vmware_host_vmnic_facts/tasks/main.yml | 5 ----- .../targets/vmware_local_role_manager/tasks/main.yml | 6 ------ .../targets/vmware_local_user_facts/tasks/main.yml | 6 ------ .../targets/vmware_local_user_manager/tasks/main.yml | 6 ------ .../targets/vmware_maintenancemode/tasks/main.yml | 6 ------ .../targets/vmware_portgroup_facts/tasks/main.yml | 6 ------ .../integration/targets/vmware_resource_pool/tasks/main.yml | 6 ------ .../targets/vmware_resource_pool_facts/tasks/main.yml | 6 ------ .../targets/vmware_target_canonical_facts/tasks/main.yml | 6 ------ test/integration/targets/vmware_vm_facts/tasks/main.yml | 6 ------ .../targets/vmware_vm_vm_drs_rule/tasks/main.yml | 5 ----- .../targets/vmware_vmkernel_facts/tasks/main.yml | 5 ----- test/integration/targets/vmware_vswitch/tasks/main.yml | 5 ----- .../integration/targets/vmware_vswitch_facts/tasks/main.yml | 5 ----- test/runner/requirements/integration.cloud.vcenter.txt | 1 + 46 files changed, 1 insertion(+), 253 deletions(-) create mode 100644 test/runner/requirements/integration.cloud.vcenter.txt diff --git a/test/integration/targets/vcenter_folder/tasks/main.yml b/test/integration/targets/vcenter_folder/tasks/main.yml index bcb446f24e..49980e0b1d 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vcenter_license/tasks/main.yml b/test/integration/targets/vcenter_license/tasks/main.yml index 76498971dc..8fd2dd9df0 100644 --- a/test/integration/targets/vcenter_license/tasks/main.yml +++ b/test/integration/targets/vcenter_license/tasks/main.yml @@ -2,11 +2,6 @@ # Copyright: (c) 2017, Dag Wieers # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - - name: Store the vCenter container IP set_fact: vcenter_host: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_cluster/tasks/main.yml b/test/integration/targets/vmware_cluster/tasks/main.yml index 1ef660e40e..e0282aa6d7 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_cluster_facts/tasks/main.yml b/test/integration/targets/vmware_cluster_facts/tasks/main.yml index a197919317..9e12deaafd 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_datacenter/tasks/main.yml b/test/integration/targets/vmware_datacenter/tasks/main.yml index cfbc77b673..5ddd21f495 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_datastore_cluster/tasks/main.yml b/test/integration/targets/vmware_datastore_cluster/tasks/main.yml index 817f349246..f7b924ce0a 100644 --- a/test/integration/targets/vmware_datastore_cluster/tasks/main.yml +++ b/test/integration/targets/vmware_datastore_cluster/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: '{{ lookup("env", "vcenter_host") }}' diff --git a/test/integration/targets/vmware_datastore_facts/tasks/main.yml b/test/integration/targets/vmware_datastore_facts/tasks/main.yml index 5c7c8c6713..7f2eb1a2a1 100644 --- a/test/integration/targets/vmware_datastore_facts/tasks/main.yml +++ b/test/integration/targets/vmware_datastore_facts/tasks/main.yml @@ -3,11 +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: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml b/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml index f709f9cc8f..4795d4ed6d 100644 --- a/test/integration/targets/vmware_datastore_maintenancemode/tasks/main.yml +++ b/test/integration/targets/vmware_datastore_maintenancemode/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 datastore maintenance mode properties -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 cc8d052ba1..e47cc949a9 100644 --- a/test/integration/targets/vmware_drs_rule_facts/tasks/main.yml +++ b/test/integration/targets/vmware_drs_rule_facts/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2018, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml b/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml index 945f0eda60..512ebaf95f 100644 --- a/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml +++ b/test/integration/targets/vmware_dvs_portgroup/tasks/main.yml @@ -16,11 +16,6 @@ # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - name: store the vcenter container ip set_fact: diff --git a/test/integration/targets/vmware_dvswitch/tasks/main.yml b/test/integration/targets/vmware_dvswitch/tasks/main.yml index 1718dc7e46..1c16bab467 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: Make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_guest/tasks/main.yml b/test/integration/targets/vmware_guest/tasks/main.yml index 9f6f354074..cea8576907 100644 --- a/test/integration/targets/vmware_guest/tasks/main.yml +++ b/test/integration/targets/vmware_guest/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, James Tanner # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_guest_facts/tasks/main.yml b/test/integration/targets/vmware_guest_facts/tasks/main.yml index fee12ba54e..879631be6e 100644 --- a/test/integration/targets/vmware_guest_facts/tasks/main.yml +++ b/test/integration/targets/vmware_guest_facts/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_guest_find/tasks/main.yml b/test/integration/targets/vmware_guest_find/tasks/main.yml index fe6bc68515..72ef13b4b0 100644 --- a/test/integration/targets/vmware_guest_find/tasks/main.yml +++ b/test/integration/targets/vmware_guest_find/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, James Tanner # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_guest_powerstate/tasks/main.yml b/test/integration/targets/vmware_guest_powerstate/tasks/main.yml index 1dcdef839a..105df5e303 100644 --- a/test/integration/targets/vmware_guest_powerstate/tasks/main.yml +++ b/test/integration/targets/vmware_guest_powerstate/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_guest_snapshot/tasks/main.yml b/test/integration/targets/vmware_guest_snapshot/tasks/main.yml index 8cfb84e135..c985c44a4d 100644 --- a/test/integration/targets/vmware_guest_snapshot/tasks/main.yml +++ b/test/integration/targets/vmware_guest_snapshot/tasks/main.yml @@ -1,9 +1,3 @@ -# - name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: ansible_user_id == 'root' -# # - name: store the vcenter container ip # set_fact: # vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 3433c59d5f..55c245ef8c 100644 --- a/test/integration/targets/vmware_guest_snapshot_facts/tasks/main.yml +++ b/test/integration/targets/vmware_guest_snapshot_facts/tasks/main.yml @@ -4,12 +4,6 @@ # TODO: vcsim does not support snapshot related functionalities -# - name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: ansible_user_id == 'root' -# # - name: store the vcenter container ip # set_fact: # vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 4173431ae2..ff1569bc51 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_host/tasks/main.yml b/test/integration/targets/vmware_host/tasks/main.yml index 8947315973..22b1f00d4e 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_host_acceptance/tasks/main.yml b/test/integration/targets/vmware_host_acceptance/tasks/main.yml index 88017132ad..d7fd2ae42f 100644 --- a/test/integration/targets/vmware_host_acceptance/tasks/main.yml +++ b/test/integration/targets/vmware_host_acceptance/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 Acceptance Level related to operations -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 8209de95e9..79aac98240 100644 --- a/test/integration/targets/vmware_host_capability_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_capability_facts/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 host system capabilities -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 dafaf44dbf..9b89767db0 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 c53959da76..4995393feb 100644 --- a/test/integration/targets/vmware_host_config_manager/tasks/main.yml +++ b/test/integration/targets/vmware_host_config_manager/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 update host configuartion -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 43781d7ecb..b6c63b8a8e 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_host_facts/tasks/main.yml b/test/integration/targets/vmware_host_facts/tasks/main.yml index 33a7282f92..f6ffffcc31 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: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 4e6b04e168..aaa9611262 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 ed6d620edd..a9f3b05e50 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_host_ntp/tasks/main.yml b/test/integration/targets/vmware_host_ntp/tasks/main.yml index fc278f59e8..1df2ac7c79 100644 --- a/test/integration/targets/vmware_host_ntp/tasks/main.yml +++ b/test/integration/targets/vmware_host_ntp/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 update host NTP configuration -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'user' }}" #- name: store the vcenter container ip # set_fact: 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 26826fd3a0..1b15a5815f 100644 --- a/test/integration/targets/vmware_host_package_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_package_facts/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 Package Manager related to operations -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 1d960d20d8..3000ea9d62 100644 --- a/test/integration/targets/vmware_host_service_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_service_facts/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 service related to operations -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 9c36cd3e54..2e9146cabc 100644 --- a/test/integration/targets/vmware_host_service_manager/tasks/main.yml +++ b/test/integration/targets/vmware_host_service_manager/tasks/main.yml @@ -4,11 +4,6 @@ # TODO: vcsim does not support service management # commenting this testcase till the time. -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 b81f6329a1..d51bce443e 100644 --- a/test/integration/targets/vmware_host_vmnic_facts/tasks/main.yml +++ b/test/integration/targets/vmware_host_vmnic_facts/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 networkConfig related to operations -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: 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 4c3404977a..5a31df6560 100644 --- a/test/integration/targets/vmware_local_role_manager/tasks/main.yml +++ b/test/integration/targets/vmware_local_role_manager/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 193dfe2093..0c96f33dcc 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: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" - #- name: store the vcenter container ip # set_fact: # vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 041520e89b..2379160374 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: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" - #- name: store the vcenter container ip # set_fact: # vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_maintenancemode/tasks/main.yml b/test/integration/targets/vmware_maintenancemode/tasks/main.yml index 56af958d5c..ef5853d3d6 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_portgroup_facts/tasks/main.yml b/test/integration/targets/vmware_portgroup_facts/tasks/main.yml index 25fe3d9265..8d6481d097 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_resource_pool/tasks/main.yml b/test/integration/targets/vmware_resource_pool/tasks/main.yml index a65cdf098f..ab9ed32642 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 1f139cab28..178f888ed7 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 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 3b152c83cf..c74db2c3d3 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: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" - #- name: store the vcenter container ip # set_fact: # vcsim: "{{ lookup('env', 'vcenter_host') }}" diff --git a/test/integration/targets/vmware_vm_facts/tasks/main.yml b/test/integration/targets/vmware_vm_facts/tasks/main.yml index 5ef5f495b7..23ac9fa8c3 100644 --- a/test/integration/targets/vmware_vm_facts/tasks/main.yml +++ b/test/integration/targets/vmware_vm_facts/tasks/main.yml @@ -2,12 +2,6 @@ # Copyright: (c) 2017, Abhijeet Kasurde # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -- name: make sure pyvmomi is installed - pip: - name: pyvmomi - state: latest - when: "{{ ansible_user_id == 'root' }}" - - name: store the vcenter container ip set_fact: vcsim: "{{ lookup('env', 'vcenter_host') }}" 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 41b088cd20..708681b83d 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 @@ -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 manage DRS rule -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: diff --git a/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml b/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml index ce6caf2a6b..4ce69a7a90 100644 --- a/test/integration/targets/vmware_vmkernel_facts/tasks/main.yml +++ b/test/integration/targets/vmware_vmkernel_facts/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 HostVirtualNicManager related to operations -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: diff --git a/test/integration/targets/vmware_vswitch/tasks/main.yml b/test/integration/targets/vmware_vswitch/tasks/main.yml index af85ae3053..34bdd831b0 100644 --- a/test/integration/targets/vmware_vswitch/tasks/main.yml +++ b/test/integration/targets/vmware_vswitch/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: akasurde: VCSIM does not suport network manager system -#- name: Make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: diff --git a/test/integration/targets/vmware_vswitch_facts/tasks/main.yml b/test/integration/targets/vmware_vswitch_facts/tasks/main.yml index cef97afdf4..8492d438f8 100644 --- a/test/integration/targets/vmware_vswitch_facts/tasks/main.yml +++ b/test/integration/targets/vmware_vswitch_facts/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 networkConfig related to operations -#- name: make sure pyvmomi is installed -# pip: -# name: pyvmomi -# state: latest -# when: "{{ ansible_user_id == 'root' }}" #- name: store the vcenter container ip # set_fact: diff --git a/test/runner/requirements/integration.cloud.vcenter.txt b/test/runner/requirements/integration.cloud.vcenter.txt new file mode 100644 index 0000000000..6f750903ca --- /dev/null +++ b/test/runner/requirements/integration.cloud.vcenter.txt @@ -0,0 +1 @@ +pyvmomi