Move GetDiskNumber to cim package

Author: laozc

pkg/cim/disk.go

@@ -76,3 +76,12 @@ func ListDisks(selectorList []string) ([]*storage.MSFT_Disk, error) {
 
 	return disks, nil
 }
+
+// GetDiskNumber returns the number of a disk.
+func GetDiskNumber(disk *storage.MSFT_Disk) (uint32, error) {
+	number, err := disk.GetProperty("Number")
+	if err != nil {
+		return 0, err
+	}
+	return uint32(number.(int32)), err
+}

pkg/os/iscsi/api.go

@@ -196,12 +196,12 @@ func (APIImplementor) GetTargetDisks(portal *TargetPortal, iqn string) ([]string
 
 	var ids []string
 	for _, disk := range disks {
-		number, err := disk.GetProperty("Number")
+		number, err := cim.GetDiskNumber(disk)
 		if err != nil {
 			return nil, fmt.Errorf("error getting number of disk %v on target %s from target portal at (%s:%d). err: %w", disk, iqn, portal.Address, portal.Port, err)
 		}
 
-		ids = append(ids, strconv.Itoa(int(number.(int32))))
+		ids = append(ids, strconv.Itoa(int(number)))
 	}
 	return ids, nil
 }