Fix destroy flow issues to delete virtual disk

Signed-off-by: Manjunath-A-C <[email protected]>

Author: manju956

cli/utils/command_util.py

@@ -79,9 +79,9 @@ def remove_vopt_device(config, cookies, vios, vopt_name):
     return
 
 
-def remove_virtual_disk(config, cookies, vios_uuid, vg_id, vdisk):
+def remove_virtual_disk(config, cookies, vios_uuid, vg_id, vdisk_name):
     try:
-        found, vdisk, vg = vstorage.check_if_vdisk_exists(config, cookies, vios_uuid, vdisk)
+        found, vdisk, vg = vstorage.check_if_vdisk_exists(config, cookies, vios_uuid, vg_id, vdisk_name)
         if not found:
             logger.debug(f"No virtualdisk '{vdisk}' is found under volumegroup")
             return
@@ -101,7 +101,7 @@ def remove_virtual_disk(config, cookies, vios_uuid, vg_id, vdisk):
             return
 
         logger.debug(
-            f"Virtualdisk '{vdisk}' has been deleted successfully")
+            f"Virtualdisk '{vdisk_name}' has been deleted successfully")
     except Exception as e:
         raise e
     return

cli/vios/vios.py

@@ -171,18 +171,18 @@ def cleanup_vios(config, cookies, sys_uuid, partition_uuid, vios_uuid_list):
                 storage_cleaned = True
             # Check if attached disk is virtual disk
             if not phys_disk_found:
-                vdisk_found, vdisk = storage.check_if_vdisk_attached(vios, partition_uuid)
+                vdisk_found, vdisk = vstorage.check_if_vdisk_attached(vios, partition_uuid)
                 if vdisk_found:
                     logger.info(
                         f"Removing SCSI mapping for virtual disk '{vdisk}'")
                     command_util.remove_scsi_mappings(
                         config, cookies, sys_uuid, partition_uuid, vios_uuid, vios, vdisk)
-                    if not util.use_existing_vd(config):
-                        # delete associated virtual disk
-                        vg_id = get_volume_group(config, cookies, vios_uuid, util.get_volume_group_name(config))
-                        command_util.remove_virtual_disk(config, cookies, vios_uuid, vg_id, vdisk)
-                        logger.info(f"Delete virtualdisk '{vdisk}' associated to partition '{util.get_partition_name(config)}'")
-                    storage_cleaned = True
+
+                # delete associated virtual disk
+                vg_id = get_volume_group(config, cookies, vios_uuid, util.get_volume_group_name(config))
+                command_util.remove_virtual_disk(config, cookies, vios_uuid, vg_id, util.get_virtual_disk_name(config))
+                logger.info(f"Deleted virtualdisk '{util.get_virtual_disk_name(config)}' associated to partition '{util.get_partition_name(config)}'")
+                storage_cleaned = True
 
             vios = get_vios_details(config, cookies, sys_uuid, vios_uuid)
             logger.info(f"Removing SCSI mapping for vOPT device '{vopt}'")
@@ -212,17 +212,17 @@ def cleanup_vios(config, cookies, sys_uuid, partition_uuid, vios_uuid_list):
                             config, cookies, sys_uuid, partition_uuid, vios_uuid, vios, phys_disk)
                     # Check if attached disk is virtual disk
                     if not phys_disk_found:
-                        vdisk_found, vdisk = storage.check_if_vdisk_attached(vios, partition_uuid)
+                        vdisk_found, vdisk = vstorage.check_if_vdisk_attached(vios, partition_uuid)
                         if vdisk_found:
                             logger.info(
                                 f"Removing SCSI mapping for virtual disk '{vdisk}'")
                             command_util.remove_scsi_mappings(
                                 config, cookies, sys_uuid, partition_uuid, vios_uuid, vios, vdisk)
-                            # delete associated virtual disk
+                        # delete associated virtual disk
                         vg_id = get_volume_group(config, cookies, vios_uuid, util.get_volume_group_name(config))
-                        command_util.remove_virtual_disk(config, cookies, vios_uuid, vg_id, vdisk)
+                        command_util.remove_virtual_disk(config, cookies, vios_uuid, vg_id, util.get_virtual_disk_name(config))
                         logger.info(
-                            f"Delete virtualdisk '{vdisk}' associated to partition '{util.get_partition_name(config)}'")
+                            f"Delete virtualdisk '{util.get_virtual_disk_name(config)}' associated to partition '{util.get_partition_name(config)}'")
     except Exception as e:
         logger.error(f"failed to clean up VIOS, error: {e}")