Merge pull request #22 from ttsuuubasa/cohdi-dev

refactor: remove hardcoded GPU device type and use configurable attributes

Author: ttsuuubasa

pkg/manager/manager.go

@@ -39,7 +39,6 @@ import (
 
 const (
 	configMapName = "composable-dra/composable-dra-dds"
-	GpuDeviceType = "gpu"
 )
 
 type CDIManager struct {
@@ -537,12 +536,8 @@ func (m *CDIManager) generatePool(device *device, fabricID int, generation int64
 	var devices []resourceapi.Device
 	for i := 0; i < device.availableDeviceCount; i++ {
 		d := resourceapi.Device{
-			Name: fmt.Sprintf("%s-gpu%d", device.k8sDeviceName, i),
-			Attributes: map[resourceapi.QualifiedName]resourceapi.DeviceAttribute{
-				"type": {
-					StringValue: ptr.To(GpuDeviceType),
-				},
-			},
+			Name:                     fmt.Sprintf("%s-%d", device.k8sDeviceName, i),
+			Attributes:               make(map[resourceapi.QualifiedName]resourceapi.DeviceAttribute),
 			BindsToNode:              ptr.To(true),
 			BindingConditions:        []string{"FabricDeviceReady"},
 			BindingFailureConditions: []string{"FabricDeviceReschedule", "FabricDeviceFailed"},

pkg/manager/manager_test.go

@@ -650,7 +650,7 @@ func TestCheckResourcePoolLoop(t *testing.T) {
 						}
 						var deviceFound bool
 						for _, device := range resourceslice.Spec.Devices {
-							if len(tc.expectedDeviceName) > 0 && device.Name == tc.expectedDeviceName+"-gpu0" {
+							if len(tc.expectedDeviceName) > 0 && device.Name == tc.expectedDeviceName+"-0" {
 								deviceFound = true
 								for expectedKey, expectedValue := range tc.expectedAttributes {
 									value := device.Attributes[resourceapi.QualifiedName(expectedKey)]
@@ -1176,7 +1176,7 @@ func TestCDIManagerManageCDIResourceSlices(t *testing.T) {
 							t.Errorf("unexpected device num, expected %d but got %d", availableDevice, len(resourceslice.Spec.Devices))
 						}
 						for _, device := range resourceslice.Spec.Devices {
-							if device.Name == tc.expectedDeviceName+"-gpu0" {
+							if device.Name == tc.expectedDeviceName+"-0" {
 								deviceFound = true
 								productName := device.Attributes["productName"]
 								if productName.StringValue != nil && *productName.StringValue != tc.expectedProductName {
@@ -1313,7 +1313,7 @@ func TestCDIManagerGeneratePool(t *testing.T) {
 				"productName": "TEST DEVICE 1",
 			},
 			availableDeviceCount: 3,
-			expectedDeviceName:   "test-device-1-gpu0",
+			expectedDeviceName:   "test-device-1-0",
 		},
 	}
 	for _, tc := range testCases {