fix: logic to detect attached disks.

Move from counting disks with valid partitions to disk bus type.

Author: jescarri

internal/driver/limits.go

@@ -44,15 +44,11 @@ func attachedVolumeCount(hw hwinfo.HardwareInfo) (int, error) {
 	count := 0
 	for _, disk := range bdev.Disks {
 		driveType := strings.ToLower(disk.DriveType.String())
-		// Skip loopbacks, virtual devices, CD-ROMs, and removable drives
-		if disk.IsRemovable || driveType == "virtual" || driveType == "cdrom" {
+		controllerType := strings.ToLower(disk.StorageController.String())
+		if driveType == "virtual" || driveType == "cdrom" || controllerType == "loop" || controllerType == "unknown" {
 			continue
 		}
-
-		// Only consider disks that have partitions and aren't read-only
-		if len(disk.Partitions) > 0 {
-			count++
-		}
+		count++
 	}
 	return count, nil
 }

internal/driver/limits_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/jaypipes/ghw"
+	"github.com/jaypipes/ghw/pkg/block"
 	"go.uber.org/mock/gomock"
 
 	"github.com/linode/linode-blockstorage-csi-driver/mocks"
@@ -67,8 +68,9 @@ func TestAttachedVolumeCount(t *testing.T) {
 			blkInfo: &ghw.BlockInfo{
 				Disks: []*ghw.Disk{
 					{
-						DriveType:   DRIVE_TYPE_VIRTUAL,
-						IsRemovable: false,
+						DriveType:         DRIVE_TYPE_VIRTUAL,
+						StorageController: block.StorageControllerUnknown,
+						IsRemovable:       false,
 						Partitions: []*ghw.Partition{
 							{
 								Name:       "vd1p1",
@@ -77,6 +79,18 @@ func TestAttachedVolumeCount(t *testing.T) {
 							},
 						},
 					},
+					{
+						DriveType:         DRIVE_TYPE_VIRTUAL,
+						StorageController: block.StorageControllerLoop,
+						IsRemovable:       false,
+						Partitions: []*ghw.Partition{
+							{
+								Name:       "loop1",
+								MountPoint: "/mnt/virtual1",
+								SizeBytes:  1024 * 1024 * 1024,
+							},
+						},
+					},
 				},
 			},
 		},
@@ -86,8 +100,9 @@ func TestAttachedVolumeCount(t *testing.T) {
 			blkInfo: &ghw.BlockInfo{
 				Disks: []*ghw.Disk{
 					{
-						DriveType:   DRIVE_TYPE_VIRTUAL,
-						IsRemovable: false,
+						DriveType:         DRIVE_TYPE_VIRTUAL,
+						IsRemovable:       false,
+						StorageController: block.StorageControllerUnknown,
 						Partitions: []*ghw.Partition{
 							{
 								Name:       "vd1p1",
@@ -97,8 +112,9 @@ func TestAttachedVolumeCount(t *testing.T) {
 						},
 					},
 					{
-						DriveType:   DRIVE_TYPE_VIRTUAL,
-						IsRemovable: false,
+						DriveType:         DRIVE_TYPE_VIRTUAL,
+						IsRemovable:       false,
+						StorageController: block.StorageControllerLoop,
 						Partitions: []*ghw.Partition{
 							{
 								Name:       "loop1",
@@ -108,8 +124,9 @@ func TestAttachedVolumeCount(t *testing.T) {
 						},
 					},
 					{
-						DriveType:   DRIVE_TYPE_SSD,
-						IsRemovable: false,
+						DriveType:         DRIVE_TYPE_SSD,
+						IsRemovable:       false,
+						StorageController: block.StorageControllerSCSI,
 						Partitions: []*ghw.Partition{
 							{
 								Name:       "nvme0n1",

internal/driver/nodeserver_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/jaypipes/ghw"
+	"github.com/jaypipes/ghw/pkg/block"
 	"go.uber.org/mock/gomock"
 	"k8s.io/mount-utils"
 	"k8s.io/utils/exec"
@@ -733,8 +734,9 @@ func TestNodeGetInfo(t *testing.T) {
 			blkInfo: &ghw.BlockInfo{
 				Disks: []*ghw.Disk{
 					{
-						DriveType:   ghw.DRIVE_TYPE_SSD,
-						IsRemovable: false,
+						DriveType:         ghw.DRIVE_TYPE_SSD,
+						IsRemovable:       false,
+						StorageController: block.StorageControllerSCSI,
 						Partitions: []*ghw.Partition{
 							{
 								Name:       "sda",