From cade59835207a09ff9a38b3c6ce1d0794d19dcf8 Mon Sep 17 00:00:00 2001 From: Mario Lenz Date: Sat, 14 Sep 2024 17:07:55 +0200 Subject: [PATCH] Remove deprecated modules from tests --- .../tasks/setup_cluster.yml | 4 +- .../targets/vmware_cluster/aliases | 3 - .../targets/vmware_cluster/tasks/main.yml | 120 ------------- .../targets/vmware_cluster_dpm/tasks/main.yml | 6 +- .../targets/vmware_cluster_drs/aliases | 3 - .../targets/vmware_cluster_drs/tasks/main.yml | 157 ------------------ .../targets/vmware_cluster_ha/tasks/main.yml | 4 +- .../vmware_cluster_info/tasks/main.yml | 2 +- .../vmware_cluster_vsan/tasks/main.yml | 4 +- .../targets/vmware_evc_mode/tasks/main.yml | 2 +- .../prepare_environment.yml | 6 + 11 files changed, 17 insertions(+), 294 deletions(-) delete mode 100644 tests/integration/targets/vmware_cluster/aliases delete mode 100644 tests/integration/targets/vmware_cluster/tasks/main.yml delete mode 100644 tests/integration/targets/vmware_cluster_drs/aliases delete mode 100644 tests/integration/targets/vmware_cluster_drs/tasks/main.yml diff --git a/tests/integration/targets/prepare_vmware_tests/tasks/setup_cluster.yml b/tests/integration/targets/prepare_vmware_tests/tasks/setup_cluster.yml index 608dbdd20..32fd6e482 100644 --- a/tests/integration/targets/prepare_vmware_tests/tasks/setup_cluster.yml +++ b/tests/integration/targets/prepare_vmware_tests/tasks/setup_cluster.yml @@ -1,10 +1,10 @@ - name: Create Cluster - vmware_cluster: + vmware.vmware.cluster: datacenter_name: '{{ dc1 }}' cluster_name: '{{ ccr1 }}' - name: Enable DRS on Cluster - vmware_cluster_drs: + vmware.vmware.cluster_drs: datacenter_name: '{{ dc1 }}' cluster_name: '{{ ccr1 }}' enable: true diff --git a/tests/integration/targets/vmware_cluster/aliases b/tests/integration/targets/vmware_cluster/aliases deleted file mode 100644 index b1682114e..000000000 --- a/tests/integration/targets/vmware_cluster/aliases +++ /dev/null @@ -1,3 +0,0 @@ -cloud/vcenter -needs/target/prepare_vmware_tests -zuul/vmware/vcenter_only diff --git a/tests/integration/targets/vmware_cluster/tasks/main.yml b/tests/integration/targets/vmware_cluster/tasks/main.yml deleted file mode 100644 index 4da7a6f14..000000000 --- a/tests/integration/targets/vmware_cluster/tasks/main.yml +++ /dev/null @@ -1,120 +0,0 @@ -# Test code for the vmware_cluster module. -# Copyright: (c) 2017, Abhijeet Kasurde -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -- import_role: - name: prepare_vmware_tests - vars: - setup_datacenter: true - -# Testcase 0001: Add Cluster -- &add_cluster - name: add cluster - vmware_cluster: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_0001 - state: present - register: cluster_result_0001 - -- &ensure_changed - name: ensure cluster is present - assert: - that: - - "{{ cluster_result_0001.changed == true }}" - -# # Broken by: https://github.com/ansible/ansible/issues/54857 -# - <<: *add_cluster -# name: add cluster (again) - -# - &ensure_unchanged -# name: ensure cluster is unchanged -# assert: -# that: -# - "{{ cluster_result_0001.changed == false }}" - -- &del_cluster - name: delete cluster - vmware_cluster: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_0001 - state: absent - register: cluster_result_0001 - -- <<: *ensure_changed - -- <<: *del_cluster - name: delete cluster (again) - -#- <<: *ensure_unchanged -- name: ensure cluster is unchanged - assert: - that: - - "{{ cluster_result_0001.changed == false }}" - -- name: Create Cluster with special characters - vmware_cluster: - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - validate_certs: false - datacenter_name: "{{ dc1 }}" - cluster_name: 'Cluster\/%' - state: present - register: create_cluster_with_special_characters_result - -- assert: - that: - - create_cluster_with_special_characters_result.changed is sameas true - -- name: Create Cluster with special characters(idempotency check) - vmware_cluster: - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - validate_certs: false - datacenter_name: "{{ dc1 }}" - cluster_name: 'Cluster\/%' - state: present - register: create_cluster_with_special_characters_idempotency_check_result - -- assert: - that: - - create_cluster_with_special_characters_idempotency_check_result.changed is sameas false - -- name: Delete Cluster with special characters - vmware_cluster: - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - validate_certs: false - datacenter_name: "{{ dc1 }}" - cluster_name: 'Cluster\/%' - state: absent - register: delete_cluster_with_special_characters_result - -- assert: - that: - - delete_cluster_with_special_characters_result.changed is sameas true - -- name: Delete Cluster with special characters(idempotency check) - vmware_cluster: - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - validate_certs: false - datacenter_name: "{{ dc1 }}" - cluster_name: 'Cluster\/%' - state: absent - register: delete_cluster_with_special_characters_idempotency_check_result - -- assert: - that: - - delete_cluster_with_special_characters_idempotency_check_result.changed is sameas false diff --git a/tests/integration/targets/vmware_cluster_dpm/tasks/main.yml b/tests/integration/targets/vmware_cluster_dpm/tasks/main.yml index 6e4c44834..7f2315468 100644 --- a/tests/integration/targets/vmware_cluster_dpm/tasks/main.yml +++ b/tests/integration/targets/vmware_cluster_dpm/tasks/main.yml @@ -7,7 +7,7 @@ # Setup: Create test cluster - name: Create test cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" @@ -52,11 +52,11 @@ # Delete test cluster - name: Delete test cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" datacenter_name: "{{ dc1 }}" cluster_name: test_cluster_dpm - state: absent \ No newline at end of file + state: absent diff --git a/tests/integration/targets/vmware_cluster_drs/aliases b/tests/integration/targets/vmware_cluster_drs/aliases deleted file mode 100644 index b1682114e..000000000 --- a/tests/integration/targets/vmware_cluster_drs/aliases +++ /dev/null @@ -1,3 +0,0 @@ -cloud/vcenter -needs/target/prepare_vmware_tests -zuul/vmware/vcenter_only diff --git a/tests/integration/targets/vmware_cluster_drs/tasks/main.yml b/tests/integration/targets/vmware_cluster_drs/tasks/main.yml deleted file mode 100644 index 3e4b77a49..000000000 --- a/tests/integration/targets/vmware_cluster_drs/tasks/main.yml +++ /dev/null @@ -1,157 +0,0 @@ -# Test code for the vmware_cluster module. -# Copyright: (c) 2017, Abhijeet Kasurde -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -- import_role: - name: prepare_vmware_tests - -# Setup: Create test cluster -- name: Create test cluster - vmware_cluster: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - state: present - -# Testcase 0001: Enable DRS -- name: Enable DRS - vmware_cluster_drs: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - enable: true - register: cluster_drs_result_0001 - -- name: Ensure DRS is enabled - assert: - that: - - "{{ cluster_drs_result_0001.changed == true }}" - -# Testcase 0002: Disable DRS -- name: Disable DRS - vmware_cluster_drs: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - enable: false - register: cluster_drs_result_0002 - -- name: Ensure DRS is disabled - assert: - that: - - "{{ cluster_drs_result_0002.changed == true }}" - -- name: Enable DRS for the following tests - vmware_cluster_drs: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - enable: true - register: cluster_drs_result_0001 - -- name: Change advanced setting "TryBalanceVmsPerHost" (check-mode) - vmware_cluster_drs: &change_balance_vms - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - enable: true - advanced_settings: - 'TryBalanceVmsPerHost': '1' - check_mode: true - register: change_balance_vms_check - -- assert: - that: - - change_balance_vms_check.changed - -- name: Change advanced setting "TryBalanceVmsPerHost" - vmware_cluster_drs: *change_balance_vms - register: change_balance_vms - -- assert: - that: - - change_balance_vms.changed - -- name: Change advanced setting "TryBalanceVmsPerHost" again (idempotency) - vmware_cluster_drs: *change_balance_vms - register: change_balance_vms_again - -- assert: - that: - - not change_balance_vms_again.changed - -- name: Try to deactivate already off predictive drs setting (check-mode) - vmware_cluster_drs: &change_predictive_drs_deactivate - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - enable: true - predictive_drs: false - check_mode: true - register: change_predictive_drs_check - -- assert: - that: - - not change_predictive_drs_check.changed - -- name: Try to activate predictive drs setting (check-mode) - vmware_cluster_drs: &change_predictive_drs_activate - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - enable: true - predictive_drs: true - check_mode: true - register: change_predictive_drs_check - -- assert: - that: - - change_predictive_drs_check.changed - -- name: Try to deactivate already off predictive drs setting - vmware_cluster_drs: *change_predictive_drs_deactivate - register: change_predictive_drs_check - -- assert: - that: - - not change_predictive_drs_check.changed - -- name: Try to activate predictive drs setting - vmware_cluster_drs: *change_predictive_drs_activate - register: change_predictive_drs_check - -- assert: - that: - - change_predictive_drs_check.changed - -# Delete test cluster -- name: Delete test cluster - vmware_cluster: - validate_certs: false - hostname: "{{ vcenter_hostname }}" - username: "{{ vcenter_username }}" - password: "{{ vcenter_password }}" - datacenter_name: "{{ dc1 }}" - cluster_name: test_cluster_drs - state: absent diff --git a/tests/integration/targets/vmware_cluster_ha/tasks/main.yml b/tests/integration/targets/vmware_cluster_ha/tasks/main.yml index 065394cef..0fbe0cfcb 100644 --- a/tests/integration/targets/vmware_cluster_ha/tasks/main.yml +++ b/tests/integration/targets/vmware_cluster_ha/tasks/main.yml @@ -7,7 +7,7 @@ # Setup: Create test cluster - name: Create test cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" @@ -293,7 +293,7 @@ # Delete test cluster - name: Delete test cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" diff --git a/tests/integration/targets/vmware_cluster_info/tasks/main.yml b/tests/integration/targets/vmware_cluster_info/tasks/main.yml index 57240619d..834785d91 100644 --- a/tests/integration/targets/vmware_cluster_info/tasks/main.yml +++ b/tests/integration/targets/vmware_cluster_info/tasks/main.yml @@ -165,7 +165,7 @@ # - cluster_info.clusters[ccr1].tags is defined - name: "Prepare a cluster name with character to be URL-encoded" - vmware_cluster: + vmware.vmware.cluster: hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" diff --git a/tests/integration/targets/vmware_cluster_vsan/tasks/main.yml b/tests/integration/targets/vmware_cluster_vsan/tasks/main.yml index 9143632f1..567692a04 100644 --- a/tests/integration/targets/vmware_cluster_vsan/tasks/main.yml +++ b/tests/integration/targets/vmware_cluster_vsan/tasks/main.yml @@ -7,7 +7,7 @@ # Setup: Create test cluster - name: Create test cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" @@ -124,7 +124,7 @@ # Delete test cluster - name: Delete test cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" diff --git a/tests/integration/targets/vmware_evc_mode/tasks/main.yml b/tests/integration/targets/vmware_evc_mode/tasks/main.yml index 2204df414..4bde04c28 100644 --- a/tests/integration/targets/vmware_evc_mode/tasks/main.yml +++ b/tests/integration/targets/vmware_evc_mode/tasks/main.yml @@ -8,7 +8,7 @@ setup_datacenter: true - name: add cluster - vmware_cluster: + vmware.vmware.cluster: validate_certs: false hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" diff --git a/tests/integration/targets/vmware_vm_inventory/prepare_environment.yml b/tests/integration/targets/vmware_vm_inventory/prepare_environment.yml index 7e24b2d94..0376e2e37 100644 --- a/tests/integration/targets/vmware_vm_inventory/prepare_environment.yml +++ b/tests/integration/targets/vmware_vm_inventory/prepare_environment.yml @@ -7,6 +7,12 @@ password: '{{ vcenter_password }}' port: "{{ vcenter_port|default('443') }}" validate_certs: "{{ vmware_validate_certs|default('no') }}" + vmware.vmware.vmware: + hostname: '{{ vcenter_hostname }}' + username: '{{ vcenter_username }}' + password: '{{ vcenter_password }}' + port: "{{ vcenter_port|default('443') }}" + validate_certs: "{{ vmware_validate_certs|default('no') }}" tasks: - import_role: name: prepare_vmware_tests