Skip to content

Commit 65a3c9f

Browse files
committed
Move GetDiskNumber to cim package
1 parent dfb404a commit 65a3c9f

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

pkg/cim/disk.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,12 @@ func ListDisks(selectorList []string) ([]*storage.MSFT_Disk, error) {
7676

7777
return disks, nil
7878
}
79+
80+
// GetDiskNumber returns the number of a disk.
81+
func GetDiskNumber(disk *storage.MSFT_Disk) (uint32, error) {
82+
number, err := disk.GetProperty("Number")
83+
if err != nil {
84+
return 0, err
85+
}
86+
return uint32(number.(int32)), err
87+
}

pkg/os/iscsi/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ func (APIImplementor) GetTargetDisks(portal *TargetPortal, iqn string) ([]string
197197

198198
var ids []string
199199
for _, disk := range disks {
200-
number, err := disk.GetProperty("Number")
200+
number, err := cim.GetDiskNumber(disk)
201201
if err != nil {
202202
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)
203203
}
204204

205-
ids = append(ids, strconv.Itoa(int(number.(int32))))
205+
ids = append(ids, strconv.Itoa(int(number)))
206206
}
207207
return ids, nil
208208
}

0 commit comments

Comments
 (0)