Merge pull request redhat-cop#72 from anna-savina/add_common_vars_yml…

…_file

Integration tests refactoring: moved common variables into a shared group_vars.yml file.

tests/integration/targets/group_vars.yml

@@ -0,0 +1,13 @@
+---
+# vcenter specific vars
+# please edit according to your vcenter configs
+vcenter_cluster_name: "Eco-Cluster"
+vcenter_datacenter: "Eco-Datacenter"
+vcenter_port: 443
+custom_esxi_8_username: "root"
+custom_esxi_8_password: "!#%135qEt"
+custom_esxi_8_iso_path: "[eco-nfs-datastore-iso] custom_esxi_8.iso"
+datastore1_rhel_8_9_iso_path: "[datastore1] ISO/rhel-8.9-x86_64-boot.iso"
+datastore1_rhel_9_3_iso_path: "[datastore1] ISO/rhel-9.3-x86_64-dvd.iso"
+vm_network_name: "VM Network"
+test_network_name: "TestNetwork"

tests/integration/targets/vmware_ops_cluster_settings_test/tasks/main.yml

@@ -7,6 +7,10 @@
 - name: Run cluster settings role on the vCenter Env
   tags: eco-vcenter-ci
   block:
+    - name: Import common vars
+      ansible.builtin.include_vars:
+        file: ../group_vars.yml
+
     - name: "Create New Cluster: {{ cluster_settings_cluster_name }}"
       community.vmware.vmware_cluster:
         hostname: '{{ cluster_settings_hostname }}'

tests/integration/targets/vmware_ops_cluster_settings_test/vars/main.yml

@@ -3,9 +3,9 @@ cluster_settings_hostname: "{{ vcenter_hostname }}"
 cluster_settings_username: "{{ vcenter_username }}"
 cluster_settings_password: "{{ vcenter_password }}"
 cluster_settings_validate_certs: false
-cluster_settings_port: "443"
+cluster_settings_port: "{{ vcenter_port }}"
 cluster_settings_cluster_name: "Test-Cluster"
-cluster_settings_datacenter_name: "Eco-Datacenter"
+cluster_settings_datacenter_name: "{{ vcenter_datacenter }}"
 
 # DPM
 cluster_settings_dpm_enable: True

tests/integration/targets/vmware_ops_content_library_test/tasks/main.yml

@@ -3,6 +3,10 @@
   tags:
     - eco-vcenter-ci
   block:
+    - name: Import common vars
+      ansible.builtin.include_vars:
+        file: ../group_vars.yml
+
     - name: Create Content Library
       ansible.builtin.import_role:
         name: cloud.vmware_ops.content_library

tests/integration/targets/vmware_ops_content_library_test/vars/main.yml

@@ -3,7 +3,7 @@ content_library_hostname: "{{ vcenter_hostname }}"
 content_library_username: "{{ vcenter_username }}"
 content_library_password: "{{ vcenter_password }}"
 content_library_validate_certs: false
-content_library_datacenter_name: Eco-Datacenter
+content_library_datacenter_name: "{{ vcenter_datacenter }}"
 
 content_library_datastore_name: "datastore3"
 content_library_type: local

tests/integration/targets/vmware_ops_deploy_ovf_test/tasks/main.yml

@@ -3,6 +3,10 @@
   tags:
     - eco-vcenter-ci
   block:
+    - name: Import common vars
+      ansible.builtin.include_vars:
+        file: ../group_vars.yml
+
     - name: Create Test VM
       community.vmware.vmware_guest:
         hostname: "{{ deploy_ovf_hostname }}"

tests/integration/targets/vmware_ops_deploy_ovf_test/vars/main.yml

@@ -5,9 +5,9 @@ deploy_ovf_hostname: "{{ vcenter_hostname }}"
 deploy_ovf_username: "{{ vcenter_username }}"
 deploy_ovf_password: "{{ vcenter_password }}"
 deploy_ovf_validate_certs: false
-deploy_ovf_datacenter_name: Eco-Datacenter
-deploy_ovf_cluster_name: Eco-Cluster
-deploy_ovf_folder: /Eco-Datacenter/vm/e2e-qe
+deploy_ovf_datacenter_name: "{{ vcenter_datacenter }}"
+deploy_ovf_cluster_name: "{{ vcenter_cluster_name }}"
+deploy_ovf_folder: "/{{ vcenter_datacenter }}/vm/e2e-qe"
 deploy_ovf_datastore: datastore3
 deploy_ovf_power_on: true
 

tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/tasks/main.yml

@@ -17,6 +17,10 @@
 - name: Test esxi maintenance mode on vcenter env
   tags: eco-vcenter-ci
   block:
+    - name: Import common vars
+      ansible.builtin.include_vars:
+        file: ../group_vars.yml
+
     - name: Run task for adding resource pool
       ansible.builtin.include_tasks: add_or_remove_resource_pool.yml
       vars:

tests/integration/targets/vmware_ops_esxi_maintenance_mode_test/vars/main.yml

@@ -2,25 +2,22 @@
 # General vars
 resource_prefix: host-maintenance 
 resource_pool_name: "{{ resource_prefix }}-pool"
-cluster_name: "Eco-Cluster"
-datacenter_name: "Eco-Datacenter"
-network_name: "TestNetwork"
 
 # Vars for cloud.vmware_ops.provision_virtual_esxi role
 provision_virtual_esxi_hostname: "{{ vcenter_hostname }}"
 provision_virtual_esxi_username: "{{ vcenter_username }}"
 provision_virtual_esxi_password: "{{ vcenter_password }}"
 provision_virtual_esxi_validate_certs: false
-provision_virtual_esxi_port: 443
-provision_virtual_esxi_cluster: "{{ cluster_name }}"
-provision_virtual_esxi_datacenter: "{{ datacenter_name }}"
+provision_virtual_esxi_port: "{{ vcenter_port }}"
+provision_virtual_esxi_cluster: "{{ vcenter_cluster_name }}"
+provision_virtual_esxi_datacenter: "{{ vcenter_datacenter }}"
 provision_virtual_esxi_folder: ""
 provision_virtual_esxi_resource_pool: "{{ resource_pool_name }}"
-provision_virtual_esxi_datastore_iso_path: "[eco-nfs-datastore-iso] custom_esxi_8.iso"
+provision_virtual_esxi_datastore_iso_path: "{{ custom_esxi_8_iso_path }}"
 provision_virtual_esxi_vms:
   - name: ci-vcenter-maintenance-test
 provision_virtual_esxi_networks:
-    - name: "{{ network_name }}"
+    - name: "{{ test_network_name }}"
       device_type: "vmxnet3"
       type: "dhcp"
       mac: "00:50:56:8b:93:a5"
@@ -34,11 +31,11 @@ vcenter_host_connection_hostname: "{{ vcenter_hostname }}"
 vcenter_host_connection_username: "{{ vcenter_username }}"
 vcenter_host_connection_password: "{{ vcenter_password }}"
 vcenter_host_connection_validate_certs: false
-vcenter_host_connection_port: 443
-vcenter_host_connection_cluster: "{{ cluster_name }}"
-vcenter_host_connection_datacenter: "{{ datacenter_name }}"
-vcenter_host_connection_esxi_username: "root"
-vcenter_host_connection_esxi_password: "!#%135qEt"
+vcenter_host_connection_port: "{{ vcenter_port }}"
+vcenter_host_connection_cluster: "{{ vcenter_cluster_name }}"
+vcenter_host_connection_datacenter: "{{ vcenter_datacenter }}"
+vcenter_host_connection_esxi_username: "{{ custom_esxi_8_username }}"
+vcenter_host_connection_esxi_password: "{{ custom_esxi_8_password }}"
 
 # Var for cloud.vmware_ops.provision_vm role
 provision_vm_hostname: "{{ provision_virtual_esxi_hostname }}"
@@ -55,4 +52,4 @@ esxi_maintenance_mode_hostname: "{{ vcenter_hostname }}"
 esxi_maintenance_mode_username: "{{ vcenter_username }}"
 esxi_maintenance_mode_password: "{{ vcenter_password }}"
 esxi_maintenance_mode_validate_certs: false
-esxi_maintenance_mode_port: "443"
+esxi_maintenance_mode_port: "{{ vcenter_port }}"

tests/integration/targets/vmware_ops_export_vm_as_ovf_test/tasks/main.yml

@@ -3,6 +3,10 @@
   tags:
     - eco-vcenter-ci
   block:
+    - name: Import common vars
+      ansible.builtin.include_vars:
+        file: ../group_vars.yml
+
     - name: Create Test VM
       community.vmware.vmware_guest:
         hostname: "{{ export_vm_as_ovf_hostname }}"
@@ -11,7 +15,7 @@
         validate_certs: false
         name: "{{ export_vm_as_ovf_vm_name }}"
         state: poweredoff
-        folder: /Eco-Datacenter/vm/e2e-qe
+        folder: "/{{ vcenter_datacenter }}/vm/e2e-qe"
         datacenter: "{{ export_vm_as_ovf_datacenter_name }}"
         disk:
           - size_gb: 5

tests/integration/targets/vmware_ops_export_vm_as_ovf_test/vars/main.yml

@@ -3,7 +3,7 @@ export_vm_as_ovf_hostname: "{{ vcenter_hostname }}"
 export_vm_as_ovf_username: "{{ vcenter_username }}"
 export_vm_as_ovf_password: "{{ vcenter_password }}"
 export_vm_as_ovf_validate_certs: false
-export_vm_as_ovf_datacenter_name: Eco-Datacenter
+export_vm_as_ovf_datacenter_name: "{{ vcenter_datacenter }}"
 
 export_vm_as_ovf_export_dir: /tmp/export_vm_as_ovf
 export_vm_as_ovf_vm_name: export-vm-as-ovf-test

tests/integration/targets/vmware_ops_manage_folder_test/tasks/main.yml

@@ -1,4 +1,9 @@
 ---
+- name: Import common vars for tests on vCenter Environment
+  ansible.builtin.include_vars:
+    file: ../group_vars.yml
+  tags: eco-vcenter-ci
+
 - name: Create Folder Tree
   loop: "{{ folder_types }}"
   ansible.builtin.include_role:

tests/integration/targets/vmware_ops_manage_folder_test/vars/main.yml

@@ -3,8 +3,8 @@ manage_folder_hostname: "{{ vcenter_hostname }}"
 manage_folder_username: "{{ vcenter_username }}"
 manage_folder_password: "{{ vcenter_password }}"
 manage_folder_validate_certs: false
-manage_folder_port: "443"
-manage_folder_datacenter_name: "Eco-Datacenter"
+manage_folder_port: "{{ vcenter_port }}"
+manage_folder_datacenter_name: "{{ vcenter_datacenter }}"
 folder_types:
   - host
   - vm

tests/integration/targets/vmware_ops_provision_virtual_esxi_test/tasks/cleanup_esxi.yml

@@ -5,7 +5,7 @@
     provision_vm_hostname: "{{ provision_virtual_esxi_hostname }}"
     provision_vm_username: "{{ provision_virtual_esxi_username }}"
     provision_vm_password: "{{ provision_virtual_esxi_password }}"
-    provision_vm_validate_certs: false
+    provision_vm_validate_certs: "{{ provision_virtual_esxi_validate_certs }}"
     provision_vm_port: "{{ provision_virtual_esxi_port }}"
     provision_vm_cluster: "{{ provision_virtual_esxi_cluster }}"
     provision_vm_datacenter: "{{ provision_virtual_esxi_datacenter }}"
@@ -19,7 +19,7 @@
     provision_vm_hostname: "{{ provision_virtual_esxi_hostname }}"
     provision_vm_username: "{{ provision_virtual_esxi_username }}"
     provision_vm_password: "{{ provision_virtual_esxi_password }}"
-    provision_vm_validate_certs: false
+    provision_vm_validate_certs: "{{ provision_virtual_esxi_validate_certs }}"
     provision_vm_port: "{{ provision_virtual_esxi_port }}"
     provision_vm_cluster: "{{ provision_virtual_esxi_cluster }}"
     provision_vm_datacenter: "{{ provision_virtual_esxi_datacenter }}"

tests/integration/targets/vmware_ops_provision_virtual_esxi_test/tasks/main.yml

@@ -7,6 +7,10 @@
 - name: Test Virtual Esxi Provisioning on vCenter Env
   tags: eco-vcenter-ci
   block:
+  - name: Import common vars
+    ansible.builtin.include_vars:
+      file: ../group_vars.yml
+
   - name: Add Resource Pool
     community.vmware.vmware_resource_pool:
       hostname: "{{ provision_virtual_esxi_hostname }}"
@@ -45,7 +49,7 @@
       provision_vm_hostname: "{{ provision_virtual_esxi_hostname }}"
       provision_vm_username: "{{ provision_virtual_esxi_username }}"
       provision_vm_password: "{{ provision_virtual_esxi_password }}"
-      provision_vm_validate_certs: false
+      provision_vm_validate_certs: "{{ provision_virtual_esxi_validate_certs }}"
       provision_vm_port: "{{ provision_virtual_esxi_port }}"
       provision_vm_cluster: "{{ provision_virtual_esxi_cluster }}"
       provision_vm_datacenter: "{{ provision_virtual_esxi_datacenter }}"

tests/integration/targets/vmware_ops_provision_virtual_esxi_test/vars/main.yml

@@ -3,17 +3,16 @@ provision_virtual_esxi_hostname: "{{ vcenter_hostname }}"
 provision_virtual_esxi_username: "{{ vcenter_username }}"
 provision_virtual_esxi_password: "{{ vcenter_password }}"
 provision_virtual_esxi_validate_certs: false
-provision_virtual_esxi_port: 443
-provision_virtual_esxi_cluster: "Eco-Cluster"
+provision_virtual_esxi_port: "{{ vcenter_port }}"
+provision_virtual_esxi_cluster: "{{ vcenter_cluster_name }}"
 provision_virtual_esxi_folder: "e2e-qe"
-provision_virtual_esxi_datacenter: "Eco-Datacenter"
-provision_virtual_esxi_datastore_iso_path: "[eco-nfs-datastore-iso] esxi_8.iso"
+provision_virtual_esxi_datacenter: "{{ vcenter_datacenter }}"
+provision_virtual_esxi_datastore_iso_path: "{{ custom_esxi_8_iso_path }}"
 resource_pool_name: ci-resource-pool-test
 provision_virtual_esxi_vms:
   - name: ci-esxi-test-1
-network_name: "VM Network"
 provision_virtual_esxi_networks:
-    - name: "{{ network_name }}"
+    - name: "{{ vm_network_name }}"
       device_type: "vmxnet3"
       type: "dhcp"
       mac: "00:50:56:8b:95:ff"

tests/integration/targets/vmware_ops_provision_vm_test/tasks/main.yml

@@ -6,6 +6,10 @@
 
 - name: Perform VM Lifecycle Operations in vCenter Environment
   block:
+  - name: Import common vars
+    ansible.builtin.include_vars:
+      file: ../group_vars.yml
+
   - name: Provision multiple VMs
     loop: "{{ provision_vms }}"
     ansible.builtin.include_tasks: provision_vms_with_validation.yml

tests/integration/targets/vmware_ops_provision_vm_test/vars/main.yml

@@ -4,9 +4,9 @@ provision_vm_username: "{{ vcenter_username }}"
 provision_vm_password: "{{ vcenter_password }}"
 provision_vm_validate_certs: false
 
-provision_vm_cluster: "Eco-Cluster"
-provision_vm_folder: "/Eco-Datacenter/vm/e2e-qe"
-provision_vm_datacenter: "Eco-Datacenter"
+provision_vm_cluster: "{{ vcenter_cluster_name }}"
+provision_vm_folder: "/{{ vcenter_datacenter }}/vm/e2e-qe"
+provision_vm_datacenter: "{{ vcenter_datacenter }}"
 
 # Create VM template
 provision_vms_template:
@@ -17,9 +17,9 @@ provision_vms_template:
         unit_number: 0
         state: present
         type: iso
-        iso_path: "[datastore1] ISO/rhel-9.3-x86_64-dvd.iso"
+        iso_path: "{{ datastore1_rhel_9_3_iso_path }}"
     provision_vm_networks:
-      - name: "VM Network"
+      - name: "{{ vm_network_name }}"
         device_type: "vmxnet3"
         mac: "00:50:56:bd:d2:9e"
         type: "dhcp"
@@ -52,9 +52,9 @@ provision_vms:
         unit_number: 0
         state: present
         type: iso
-        iso_path: "[datastore1] ISO/rhel-9.3-x86_64-dvd.iso"
+        iso_path: "{{ datastore1_rhel_9_3_iso_path }}"
     provision_vm_networks:
-      - name: "VM Network"
+      - name: "{{ vm_network_name }}"
         device_type: "vmxnet3"
         mac: "00:50:56:bd:d2:9e"
         type: "dhcp"
@@ -78,9 +78,9 @@ provision_vms:
         unit_number: 0
         state: present
         type: iso
-        iso_path: "[datastore1] ISO/rhel-8.9-x86_64-boot.iso"
+        iso_path: "{{ datastore1_rhel_8_9_iso_path }}"
     provision_vm_networks:
-      - name: "VM Network"
+      - name: "{{ vm_network_name }}"
         device_type: "vmxnet3"
         mac: "00:50:56:bd:d2:9e"
         type: "dhcp"
@@ -153,7 +153,7 @@ vm_updated_cdrom:
     unit_number: 0
     state: present
     type: iso
-    iso_path: "[datastore1] ISO/rhel-8.9-x86_64-boot.iso"
+    iso_path: "{{ datastore1_rhel_8_9_iso_path }}"
 
 vm_update_os_customization:
   existing_vm: true

tests/integration/targets/vmware_ops_snapshot_management_test/tasks/main.yml

@@ -8,6 +8,10 @@
 
 - name: Test VM snapshot management role in vCenter Environment
   block:
+    - name: Import common vars
+      ansible.builtin.include_vars:
+        file: ../group_vars.yml
+
     - name: Setup test - Provision VM
       ansible.builtin.import_role:
         name: cloud.vmware_ops.provision_vm

tests/integration/targets/vmware_ops_snapshot_management_test/vars/main.yml

@@ -4,8 +4,8 @@ snapshot_management_username: "{{ vcenter_username }}"
 snapshot_management_password: "{{ vcenter_password }}"
 snapshot_management_validate_certs: false
 
-snapshot_management_folder: "/Eco-Datacenter/vm/e2e-qe"
-snapshot_management_datacenter: "Eco-Datacenter"
+snapshot_management_folder: "/{{ vcenter_datacenter }}/vm/e2e-qe"
+snapshot_management_datacenter: "{{ vcenter_datacenter }}"
 
 vm_snapshots:
 - snapshot_management_snapshot_name: "{{ manage_snapshot_vm_name }}-snapshot-1"
@@ -34,7 +34,7 @@ provision_vm_username: "{{ snapshot_management_username }}"
 provision_vm_password: "{{ snapshot_management_password }}"
 provision_vm_validate_certs: "{{ snapshot_management_validate_certs }}"
 
-provision_vm_cluster: "Eco-Cluster"
+provision_vm_cluster: "{{ vcenter_cluster_name }}"
 provision_vm_folder: "{{ snapshot_management_folder }}"
 provision_vm_datacenter: "{{ snapshot_management_datacenter }}"
 
@@ -46,9 +46,9 @@ provision_vm_cdrom:
     unit_number: 0
     state: present
     type: iso
-    iso_path: "[datastore1] ISO/rhel-9.3-x86_64-dvd.iso"
+    iso_path: "{{ datastore1_rhel_9_3_iso_path }}"
 provision_vm_networks:
-  - name: "VM Network"
+  - name: "{{ vm_network_name }}"
     device_type: "vmxnet3"
     mac: "00:50:56:bd:d2:9e"
     type: "dhcp"