Merge pull request #12030 from openshift-cherrypick-robot/cherry-pick-10916-to-release-4.17

[release-4.17] IPI disk removal when cluster is destroyed

Author: petr-balogh

ocs_ci/cleanup/vsphere/cleanup.py

@@ -85,11 +85,14 @@ def delete_ipi_nodes(vsphere, cluster_name):
 
     vms_ipi = []
     for vm in vms_dc:
-        if cluster_name in vm.name:
+        if cluster_name in vm.name and "generated-zone" not in vm.name:
             vms_ipi.append(vm)
             logger.info(vm.name)
-    if vms_ipi:
-        vsphere.destroy_vms(vms_ipi)
+    try:
+        if vms_ipi:
+            vsphere.destroy_vms(vms_ipi, remove_disks=True)
+    except Exception as e:
+        logger.error(f"Destroy failed with error {e}")
 
 
 def get_vsphere_connection(server, user, password):

ocs_ci/deployment/vmware.py

@@ -1611,6 +1611,21 @@ def destroy_cluster(self, log_level="DEBUG"):
             template_folder = get_infra_id(self.cluster_path)
         else:
             logger.warning("metadata.json file doesn't exist.")
+        vsphere = VSPHERE(
+            config.ENV_DATA["vsphere_server"],
+            config.ENV_DATA["vsphere_user"],
+            config.ENV_DATA["vsphere_password"],
+        )
+        all_vms = vsphere.get_vms_by_string(config.ENV_DATA["cluster_name"])
+        vsphere.stop_vms(all_vms)
+
+        for vm in all_vms:
+            try:
+                vsphere.remove_disks_with_main_disk(vm)
+            except Exception as e:
+                logger.error(
+                    f"Removing disks for {vm.name} in destroy fail with the error {e}"
+                )
 
         try:
             run_cmd(

ocs_ci/utility/vsphere.py

@@ -664,7 +664,7 @@ def poweron_vms(self, vms):
         tasks = [vm.PowerOn() for vm in to_poweron_vms]
         WaitForTasks(tasks, self._si)
 
-    def destroy_vms(self, vms):
+    def destroy_vms(self, vms, remove_disks=False):
         """
         Destroys the VM's
 
@@ -673,6 +673,14 @@ def destroy_vms(self, vms):
 
         """
         self.poweroff_vms(vms)
+        if remove_disks:
+            for vm in vms:
+                try:
+                    self.remove_disks_with_main_disk(vm)
+                except Exception as e:
+                    logger.error(
+                        f"Failed to remove disks for VM {vm.name} with error {e}"
+                    )
         logger.info(f"Destroying VM's: {[vm.name for vm in vms]}")
         tasks = [vm.Destroy_Task() for vm in vms]
         WaitForTasks(tasks, self._si)
@@ -816,6 +824,36 @@ def get_used_unit_number(self, vm):
             if hasattr(device.backing, "fileName") and device.unitNumber != 0
         ]
 
+    def remove_disks_with_main_disk(self, vm):
+        """
+        Removes all disks for a VM
+
+        Args:
+            vm (vim.VirtualMachine): VM instance
+
+        """
+        extra_disk_unit_numbers = self.get_used_unit_number_with_all_unit_number(vm)
+        if extra_disk_unit_numbers:
+            for each_disk_unit_number in extra_disk_unit_numbers:
+                self.remove_disk(vm=vm, identifier=each_disk_unit_number)
+
+    def get_used_unit_number_with_all_unit_number(self, vm):
+        """
+        Gets the used unit numbers including main disk for a VM
+
+        Args:
+            vm (vim.VirtualMachine): VM instance
+
+        Returns:
+            list: list of unit numbers
+
+        """
+        return [
+            device.unitNumber
+            for device in vm.config.hardware.device
+            if hasattr(device.backing, "fileName")
+        ]
+
     def check_folder_exists(self, name, cluster, dc):
         """
         Checks whether folder exists in Templates
@@ -1798,3 +1836,27 @@ def add_interface_to_compute_vms(
                     f"Task for configuring network for {vm.name} did not complete successfully."
                 )
             logger.info(f"Network adapter added to {vm.name} successfully.")
+
+    def get_vms_by_string(self, str_to_match):
+        """
+        Gets the VM's with search string
+
+        Args:
+            str_to_match (str): String to match VM's
+
+        Returns:
+            list: VM instance
+
+        """
+
+        content = self.get_content
+        container = content.rootFolder
+        view_type = [vim.VirtualMachine]
+        recursive = True
+
+        container_view = content.viewManager.CreateContainerView(
+            container, view_type, recursive
+        )
+        vms = [vm for vm in container_view.view if str_to_match in vm.name]
+        container_view.Destroy()
+        return vms