add 'annotations' parameter to the NewDeviceInfo API

bart0sh · bart0sh · commit 55f3e17dd012 · 2022-02-07T15:15:30.000+02:00
Signed-off-by: Ed Bartosh &lt;eduard.bartosh@intel.com&gt;
diff --git a/cmd/dlb_plugin/dlb_plugin.go b/cmd/dlb_plugin/dlb_plugin.go
@@ -88,7 +88,7 @@ func (dp *DevicePlugin) scan() dpapi.DeviceTree {
 			ContainerPath: file,
 			Permissions:   "rw",
 		}}
-		deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, nil)
+		deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, nil, nil)
 
 		sysfsDev := filepath.Join(dp.sysfsDir, filepath.Base(file))
 		sriovNumVFs := pluginutils.GetSriovNumVFs(sysfsDev)
diff --git a/cmd/fpga_plugin/dfl_test.go b/cmd/fpga_plugin/dfl_test.go
@@ -139,7 +139,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -158,7 +158,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -177,7 +177,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	result := getRegionDevelTree(getDevicesDFL())
 	if !reflect.DeepEqual(result, expected) {
@@ -194,7 +194,7 @@ func TestGetRegionTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -208,7 +208,7 @@ func TestGetRegionTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -222,7 +222,7 @@ func TestGetRegionTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	result := getRegionTree(getDevicesDFL())
 	if !reflect.DeepEqual(result, expected) {
@@ -239,7 +239,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -249,7 +249,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
 		},
 	}
 
-	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -258,7 +258,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -267,7 +267,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -276,7 +276,7 @@ func TestGetAfuTreeDFL(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.4", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.4", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	result := getAfuTree(getDevicesDFL())
 	if !reflect.DeepEqual(result, expected) {
diff --git a/cmd/fpga_plugin/fpga_plugin.go b/cmd/fpga_plugin/fpga_plugin.go
@@ -83,7 +83,7 @@ func getRegionDevelTree(devices []device) dpapi.DeviceTree {
 				Permissions:   "rw",
 			}
 
-			regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))
+			regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))
 		}
 	}
 
@@ -112,7 +112,7 @@ func getRegionTree(devices []device) dpapi.DeviceTree {
 				}
 			}
 
-			regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))
+			regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))
 		}
 	}
 
@@ -144,7 +144,7 @@ func getAfuTree(devices []device) dpapi.DeviceTree {
 						Permissions:   "rw",
 					},
 				}
-				afuTree.AddDevice(devType, afu.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))
+				afuTree.AddDevice(devType, afu.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))
 			}
 		}
 	}
diff --git a/cmd/fpga_plugin/opae_test.go b/cmd/fpga_plugin/opae_test.go
@@ -129,7 +129,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -143,7 +143,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -157,7 +157,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	result := getRegionDevelTree(getDevicesOPAE())
 	if !reflect.DeepEqual(result, expected) {
@@ -174,7 +174,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -183,7 +183,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -192,7 +192,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	result := getRegionTree(getDevicesOPAE())
 	if !reflect.DeepEqual(result, expected) {
@@ -209,7 +209,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -218,7 +218,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))
+	expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))
 
 	nodes = []pluginapi.DeviceSpec{
 		{
@@ -227,7 +227,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {
 			Permissions:   "rw",
 		},
 	}
-	expected.AddDevice("af-fff.fff.__________________________________________8", "intel-fpga-port.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))
+	expected.AddDevice("af-fff.fff.__________________________________________8", "intel-fpga-port.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))
 
 	result := getAfuTree(getDevicesOPAE())
 	if !reflect.DeepEqual(result, expected) {
diff --git a/cmd/gpu_plugin/gpu_plugin.go b/cmd/gpu_plugin/gpu_plugin.go
@@ -329,7 +329,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
 		}
 
 		if len(nodes) > 0 {
-			deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil)
+			deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil)
 
 			for i := 0; i < dp.options.sharedDevNum; i++ {
 				devID := fmt.Sprintf("%s-%d", f.Name(), i)
@@ -343,7 +343,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
 	}
 	// all Intel GPUs are under single monitoring resource
 	if len(monitor) > 0 {
-		deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, monitor, nil, nil)
+		deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, monitor, nil, nil, nil)
 		devTree.AddDevice(monitorType, monitorID, deviceInfo)
 	}
 
diff --git a/cmd/qat_plugin/dpdkdrv/dpdkdrv.go b/cmd/qat_plugin/dpdkdrv/dpdkdrv.go
@@ -430,7 +430,7 @@ func (dp *DevicePlugin) scan() (dpapi.DeviceTree, error) {
 			fmt.Sprintf("%s%d", envVarPrefix, n): vfBdf,
 		}
 
-		devinfo := dpapi.NewDeviceInfo(pluginapi.Healthy, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs)
+		devinfo := dpapi.NewDeviceInfo(pluginapi.Healthy, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs, nil)
 
 		devTree.AddDevice("generic", vfBdf, devinfo)
 	}
diff --git a/cmd/qat_plugin/kerneldrv/kerneldrv.go b/cmd/qat_plugin/kerneldrv/kerneldrv.go
@@ -102,7 +102,7 @@ func getDevTree(sysfs string, qatDevs []device, config map[string]section) (dpap
 					// The rest should use QAT_SECTION_NAME_XXX variables.
 					"QAT_SECTION_NAME": sname,
 				}
-				deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, envs)
+				deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, envs, nil)
 				devTree.AddDevice(devType, fmt.Sprintf("%s_%s_%d", sname, ep.id, i), deviceInfo)
 				uniqID++
 			}
diff --git a/cmd/sgx_plugin/sgx_plugin.go b/cmd/sgx_plugin/sgx_plugin.go
@@ -94,13 +94,13 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {
 	for i := uint(0); i < dp.nEnclave; i++ {
 		devID := fmt.Sprintf("%s-%d", "sgx-enclave", i)
 		nodes := []pluginapi.DeviceSpec{{HostPath: sgxEnclavePath, ContainerPath: sgxEnclavePath, Permissions: "rw"}}
-		devTree.AddDevice(deviceTypeEnclave, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil))
+		devTree.AddDevice(deviceTypeEnclave, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil))
 	}
 
 	for i := uint(0); i < dp.nProvision; i++ {
 		devID := fmt.Sprintf("%s-%d", "sgx-provision", i)
 		nodes := []pluginapi.DeviceSpec{{HostPath: sgxProvisionPath, ContainerPath: sgxProvisionPath, Permissions: "rw"}}
-		devTree.AddDevice(deviceTypeProvision, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil))
+		devTree.AddDevice(deviceTypeProvision, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil))
 	}
 
 	return devTree, nil
diff --git a/cmd/vpu_plugin/vpu_plugin.go b/cmd/vpu_plugin/vpu_plugin.go
@@ -224,7 +224,7 @@ func (dp *devicePlugin) scanUsb(devTree *dpapi.DeviceTree) {
 					ContainerPath: hddlServicePath2,
 				},
 			}
-			devTree.AddDevice(deviceType, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil))
+			devTree.AddDevice(deviceType, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil, nil))
 		}
 	}
 }
@@ -284,7 +284,7 @@ func (dp *devicePlugin) scanPci(devTree *dpapi.DeviceTree) {
 				devID := fmt.Sprintf("%s-device-%d", deviceTypePci, i)
 				// VPU pci device found and added to node
 				klog.V(1).Info(devID)
-				devTree.AddDevice(deviceTypePci, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil))
+				devTree.AddDevice(deviceTypePci, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil, nil))
 			}
 		}
 	}
diff --git a/pkg/deviceplugin/api.go b/pkg/deviceplugin/api.go
@@ -23,11 +23,12 @@ import (
 
 // DeviceInfo contains information about device maintained by Device Plugin.
 type DeviceInfo struct {
-	mounts   []pluginapi.Mount
-	envs     map[string]string
-	topology *pluginapi.TopologyInfo
-	state    string
-	nodes    []pluginapi.DeviceSpec
+	mounts      []pluginapi.Mount
+	envs        map[string]string
+	annotations map[string]string
+	topology    *pluginapi.TopologyInfo
+	state       string
+	nodes       []pluginapi.DeviceSpec
 }
 
 // UseDefaultMethodError allows the plugin to request running the default
@@ -44,12 +45,13 @@ func init() {
 }
 
 // NewDeviceInfo makes DeviceInfo struct and adds topology information to it.
-func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginapi.Mount, envs map[string]string) DeviceInfo {
+func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginapi.Mount, envs map[string]string, annotations map[string]string) DeviceInfo {
 	deviceInfo := DeviceInfo{
-		state:  state,
-		nodes:  nodes,
-		mounts: mounts,
-		envs:   envs,
+		state:       state,
+		nodes:       nodes,
+		mounts:      mounts,
+		envs:        envs,
+		annotations: annotations,
 	}
 
 	devPaths := []string{}
@@ -70,13 +72,14 @@ func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginap
 
 // NewDeviceInfoWithTopologyHints makes DeviceInfo struct with topology information provided to it.
 func NewDeviceInfoWithTopologyHints(state string, nodes []pluginapi.DeviceSpec, mounts []pluginapi.Mount, envs map[string]string,
-	topology *pluginapi.TopologyInfo) DeviceInfo {
+	annotations map[string]string, topology *pluginapi.TopologyInfo) DeviceInfo {
 	return DeviceInfo{
-		state:    state,
-		nodes:    nodes,
-		mounts:   mounts,
-		envs:     envs,
-		topology: topology,
+		state:       state,
+		nodes:       nodes,
+		mounts:      mounts,
+		envs:        envs,
+		annotations: annotations,
+		topology:    topology,
 	}
 }
 
diff --git a/pkg/deviceplugin/server.go b/pkg/deviceplugin/server.go
@@ -160,13 +160,17 @@ func (srv *server) Allocate(ctx context.Context, rqt *pluginapi.AllocateRequest)
 				cresp.Mounts = append(cresp.Mounts, &dev.mounts[i])
 			}
 
-			for key, value := range dev.envs {
-				if cresp.Envs == nil {
-					cresp.Envs = make(map[string]string)
-				}
+			cresp.Envs = map[string]string{}
 
+			for key, value := range dev.envs {
 				cresp.Envs[key] = value
 			}
+
+			cresp.Annotations = map[string]string{}
+
+			for key, value := range dev.annotations {
+				cresp.Annotations[key] = value
+			}
 		}
 
 		response.ContainerResponses = append(response.ContainerResponses, cresp)
diff --git a/pkg/idxd/plugin.go b/pkg/idxd/plugin.go
@@ -202,7 +202,7 @@ func (dp *DevicePlugin) scan() (dpapi.DeviceTree, error) {
 		for i := 0; i < amount; i++ {
 			deviceType := fmt.Sprintf("wq-%s-%s", wqType, wqMode)
 			deviceID := fmt.Sprintf("%s-%s-%d", deviceType, wqName, i)
-			devTree.AddDevice(deviceType, deviceID, dpapi.NewDeviceInfo(pluginapi.Healthy, devNodes, nil, nil))
+			devTree.AddDevice(deviceType, deviceID, dpapi.NewDeviceInfo(pluginapi.Healthy, devNodes, nil, nil, nil))
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {`
`139`	`139`	`Permissions: "rw",`
`140`	`140`	`},`
`141`	`141`	`}`
`142`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`142`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`143`	`143`
`144`	`144`	`nodes = []pluginapi.DeviceSpec{`
`145`	`145`	`{`
`@@ -158,7 +158,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {`
`158`	`158`	`Permissions: "rw",`
`159`	`159`	`},`
`160`	`160`	`}`
`161`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`161`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`162`	`162`
`163`	`163`	`nodes = []pluginapi.DeviceSpec{`
`164`	`164`	`{`
`@@ -177,7 +177,7 @@ func TestGetRegionDevelTreeDFL(t *testing.T) {`
`177`	`177`	`Permissions: "rw",`
`178`	`178`	`},`
`179`	`179`	`}`
`180`		`- expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`180`	`+ expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`181`	`181`
`182`	`182`	`result := getRegionDevelTree(getDevicesDFL())`
`183`	`183`	`if !reflect.DeepEqual(result, expected) {`
`@@ -194,7 +194,7 @@ func TestGetRegionTreeDFL(t *testing.T) {`
`194`	`194`	`Permissions: "rw",`
`195`	`195`	`},`
`196`	`196`	`}`
`197`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`197`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`198`	`198`
`199`	`199`	`nodes = []pluginapi.DeviceSpec{`
`200`	`200`	`{`
`@@ -208,7 +208,7 @@ func TestGetRegionTreeDFL(t *testing.T) {`
`208`	`208`	`Permissions: "rw",`
`209`	`209`	`},`
`210`	`210`	`}`
`211`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`211`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "region2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`212`	`212`
`213`	`213`	`nodes = []pluginapi.DeviceSpec{`
`214`	`214`	`{`
`@@ -222,7 +222,7 @@ func TestGetRegionTreeDFL(t *testing.T) {`
`222`	`222`	`Permissions: "rw",`
`223`	`223`	`},`
`224`	`224`	`}`
`225`		`- expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`225`	`+ expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "region3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`226`	`226`
`227`	`227`	`result := getRegionTree(getDevicesDFL())`
`228`	`228`	`if !reflect.DeepEqual(result, expected) {`
`@@ -239,7 +239,7 @@ func TestGetAfuTreeDFL(t *testing.T) {`
`239`	`239`	`Permissions: "rw",`
`240`	`240`	`},`
`241`	`241`	`}`
`242`		`- expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`242`	`+ expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`243`	`243`
`244`	`244`	`nodes = []pluginapi.DeviceSpec{`
`245`	`245`	`{`
`@@ -249,7 +249,7 @@ func TestGetAfuTreeDFL(t *testing.T) {`
`249`	`249`	`},`
`250`	`250`	`}`
`251`	`251`
`252`		`- expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`252`	`+ expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`253`	`253`
`254`	`254`	`nodes = []pluginapi.DeviceSpec{`
`255`	`255`	`{`
`@@ -258,7 +258,7 @@ func TestGetAfuTreeDFL(t *testing.T) {`
`258`	`258`	`Permissions: "rw",`
`259`	`259`	`},`
`260`	`260`	`}`
`261`		`- expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`261`	`+ expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "dfl-port.2", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`262`	`262`
`263`	`263`	`nodes = []pluginapi.DeviceSpec{`
`264`	`264`	`{`
`@@ -267,7 +267,7 @@ func TestGetAfuTreeDFL(t *testing.T) {`
`267`	`267`	`Permissions: "rw",`
`268`	`268`	`},`
`269`	`269`	`}`
`270`		`- expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`270`	`+ expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.3", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`271`	`271`
`272`	`272`	`nodes = []pluginapi.DeviceSpec{`
`273`	`273`	`{`
`@@ -276,7 +276,7 @@ func TestGetAfuTreeDFL(t *testing.T) {`
`276`	`276`	`Permissions: "rw",`
`277`	`277`	`},`
`278`	`278`	`}`
`279`		`- expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.4", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`279`	`+ expected.AddDevice("af-fff.fff.__________________________________________8", "dfl-port.4", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`280`	`280`
`281`	`281`	`result := getAfuTree(getDevicesDFL())`
`282`	`282`	`if !reflect.DeepEqual(result, expected) {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func getRegionDevelTree(devices []device) dpapi.DeviceTree {`
`83`	`83`	`Permissions: "rw",`
`84`	`84`	`}`
`85`	`85`
`86`		`- regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))`
	`86`	`+ regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -112,7 +112,7 @@ func getRegionTree(devices []device) dpapi.DeviceTree {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))`
	`115`	`+ regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`@@ -144,7 +144,7 @@ func getAfuTree(devices []device) dpapi.DeviceTree {`
`144`	`144`	`Permissions: "rw",`
`145`	`145`	`},`
`146`	`146`	`}`
`147`		`- afuTree.AddDevice(devType, afu.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))`
	`147`	`+ afuTree.AddDevice(devType, afu.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil, nil))`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {`
`129`	`129`	`Permissions: "rw",`
`130`	`130`	`},`
`131`	`131`	`}`
`132`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`132`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`133`	`133`
`134`	`134`	`nodes = []pluginapi.DeviceSpec{`
`135`	`135`	`{`
`@@ -143,7 +143,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {`
`143`	`143`	`Permissions: "rw",`
`144`	`144`	`},`
`145`	`145`	`}`
`146`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`146`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`147`	`147`
`148`	`148`	`nodes = []pluginapi.DeviceSpec{`
`149`	`149`	`{`
`@@ -157,7 +157,7 @@ func TestGetRegionDevelTreeOPAE(t *testing.T) {`
`157`	`157`	`Permissions: "rw",`
`158`	`158`	`},`
`159`	`159`	`}`
`160`		`- expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`160`	`+ expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`161`	`161`
`162`	`162`	`result := getRegionDevelTree(getDevicesOPAE())`
`163`	`163`	`if !reflect.DeepEqual(result, expected) {`
`@@ -174,7 +174,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {`
`174`	`174`	`Permissions: "rw",`
`175`	`175`	`},`
`176`	`176`	`}`
`177`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`177`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`178`	`178`
`179`	`179`	`nodes = []pluginapi.DeviceSpec{`
`180`	`180`	`{`
`@@ -183,7 +183,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {`
`183`	`183`	`Permissions: "rw",`
`184`	`184`	`},`
`185`	`185`	`}`
`186`		`- expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`186`	`+ expected.AddDevice(regionMode+"-ce48969398f05f33946d560708be108a", "intel-fpga-fme.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`187`	`187`
`188`	`188`	`nodes = []pluginapi.DeviceSpec{`
`189`	`189`	`{`
`@@ -192,7 +192,7 @@ func TestGetRegionTreeOPAE(t *testing.T) {`
`192`	`192`	`Permissions: "rw",`
`193`	`193`	`},`
`194`	`194`	`}`
`195`		`- expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`195`	`+ expected.AddDevice(regionMode+"-"+unhealthyInterfaceID, "intel-fpga-fme.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`196`	`196`
`197`	`197`	`result := getRegionTree(getDevicesOPAE())`
`198`	`198`	`if !reflect.DeepEqual(result, expected) {`
`@@ -209,7 +209,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {`
`209`	`209`	`Permissions: "rw",`
`210`	`210`	`},`
`211`	`211`	`}`
`212`		`- expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`212`	`+ expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.0", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`213`	`213`
`214`	`214`	`nodes = []pluginapi.DeviceSpec{`
`215`	`215`	`{`
`@@ -218,7 +218,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {`
`218`	`218`	`Permissions: "rw",`
`219`	`219`	`},`
`220`	`220`	`}`
`221`		`- expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil))`
	`221`	`+ expected.AddDevice("af-ce4.d84.zkiWk5jwXzOUbVYHCL4QithCTcSko8QT-J5DNoP5BAs", "intel-fpga-port.1", dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil))`
`222`	`222`
`223`	`223`	`nodes = []pluginapi.DeviceSpec{`
`224`	`224`	`{`
`@@ -227,7 +227,7 @@ func TestGetAfuTreeOPAE(t *testing.T) {`
`227`	`227`	`Permissions: "rw",`
`228`	`228`	`},`
`229`	`229`	`}`
`230`		`- expected.AddDevice("af-fff.fff.__________________________________________8", "intel-fpga-port.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil))`
	`230`	`+ expected.AddDevice("af-fff.fff.__________________________________________8", "intel-fpga-port.2", dpapi.NewDeviceInfo(pluginapi.Unhealthy, nodes, nil, nil, nil))`
`231`	`231`
`232`	`232`	`result := getAfuTree(getDevicesOPAE())`
`233`	`233`	`if !reflect.DeepEqual(result, expected) {`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`if len(nodes) > 0 {`
`332`		`- deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil)`
	`332`	`+ deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, nil, nil, nil)`
`333`	`333`
`334`	`334`	`for i := 0; i < dp.options.sharedDevNum; i++ {`
`335`	`335`	`devID := fmt.Sprintf("%s-%d", f.Name(), i)`
`@@ -343,7 +343,7 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {`
`343`	`343`	`}`
`344`	`344`	`// all Intel GPUs are under single monitoring resource`
`345`	`345`	`if len(monitor) > 0 {`
`346`		`- deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, monitor, nil, nil)`
	`346`	`+ deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, monitor, nil, nil, nil)`
`347`	`347`	`devTree.AddDevice(monitorType, monitorID, deviceInfo)`
`348`	`348`	`}`
`349`	`349`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ func (dp *DevicePlugin) scan() (dpapi.DeviceTree, error) {`
`430`	`430`	`fmt.Sprintf("%s%d", envVarPrefix, n): vfBdf,`
`431`	`431`	`}`
`432`	`432`
`433`		`- devinfo := dpapi.NewDeviceInfo(pluginapi.Healthy, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs)`
	`433`	`+ devinfo := dpapi.NewDeviceInfo(pluginapi.Healthy, dp.getDpdkDeviceSpecs(dpdkDeviceName), dp.getDpdkMounts(dpdkDeviceName), envs, nil)`
`434`	`434`
`435`	`435`	`devTree.AddDevice("generic", vfBdf, devinfo)`
`436`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func getDevTree(sysfs string, qatDevs []device, config map[string]section) (dpap`
`102`	`102`	`// The rest should use QAT_SECTION_NAME_XXX variables.`
`103`	`103`	`"QAT_SECTION_NAME": sname,`
`104`	`104`	`}`
`105`		`- deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, envs)`
	`105`	`+ deviceInfo := dpapi.NewDeviceInfo(pluginapi.Healthy, devs, nil, envs, nil)`
`106`	`106`	`devTree.AddDevice(devType, fmt.Sprintf("%s_%s_%d", sname, ep.id, i), deviceInfo)`
`107`	`107`	`uniqID++`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,13 +94,13 @@ func (dp *devicePlugin) scan() (dpapi.DeviceTree, error) {`
`94`	`94`	`for i := uint(0); i < dp.nEnclave; i++ {`
`95`	`95`	`devID := fmt.Sprintf("%s-%d", "sgx-enclave", i)`
`96`	`96`	`nodes := []pluginapi.DeviceSpec{{HostPath: sgxEnclavePath, ContainerPath: sgxEnclavePath, Permissions: "rw"}}`
`97`		`- devTree.AddDevice(deviceTypeEnclave, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil))`
	`97`	`+ devTree.AddDevice(deviceTypeEnclave, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil))`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`for i := uint(0); i < dp.nProvision; i++ {`
`101`	`101`	`devID := fmt.Sprintf("%s-%d", "sgx-provision", i)`
`102`	`102`	`nodes := []pluginapi.DeviceSpec{{HostPath: sgxProvisionPath, ContainerPath: sgxProvisionPath, Permissions: "rw"}}`
`103`		`- devTree.AddDevice(deviceTypeProvision, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil))`
	`103`	`+ devTree.AddDevice(deviceTypeProvision, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, deprecatedMounts, nil, nil))`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`return devTree, nil`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func (dp devicePlugin) scanUsb(devTree dpapi.DeviceTree) {`
`224`	`224`	`ContainerPath: hddlServicePath2,`
`225`	`225`	`},`
`226`	`226`	`}`
`227`		`- devTree.AddDevice(deviceType, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil))`
	`227`	`+ devTree.AddDevice(deviceType, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil, nil))`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`	`}`
`@@ -284,7 +284,7 @@ func (dp devicePlugin) scanPci(devTree dpapi.DeviceTree) {`
`284`	`284`	`devID := fmt.Sprintf("%s-device-%d", deviceTypePci, i)`
`285`	`285`	`// VPU pci device found and added to node`
`286`	`286`	`klog.V(1).Info(devID)`
`287`		`- devTree.AddDevice(deviceTypePci, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil))`
	`287`	`+ devTree.AddDevice(deviceTypePci, devID, dpapi.NewDeviceInfo(pluginapi.Healthy, nodes, mounts, nil, nil))`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`	`}`