cri,nri: pass any linux net devices to plugins.

klihub · mikebrow · commit ef36e6181456 · 2025-12-17T15:03:51.000-06:00
Signed-off-by: Krisztian Litkey &lt;krisztian.litkey@intel.com&gt;
diff --git a/internal/cri/nri/nri_api_linux.go b/internal/cri/nri/nri_api_linux.go
@@ -882,6 +882,13 @@ func (c *criContainer) GetScheduler() *api.LinuxScheduler {
 	return api.FromOCILinuxScheduler(c.spec.Process.Scheduler)
 }
 
+func (c *criContainer) GetNetDevices() map[string]*api.LinuxNetDevice {
+	if c.spec.Linux == nil {
+		return nil
+	}
+	return api.FromOCILinuxNetDevices(c.spec.Linux.NetDevices)
+}
+
 func (c *criContainer) GetPid() uint32 {
 	return c.pid
 }
diff --git a/internal/nri/container.go b/internal/nri/container.go
@@ -47,6 +47,7 @@ type LinuxContainer interface {
 	GetCgroupsPath() string
 	GetIOPriority() *nri.LinuxIOPriority
 	GetScheduler() *nri.LinuxScheduler
+	GetNetDevices() map[string]*nri.LinuxNetDevice
 }
 
 func commonContainerToNRI(ctr Container) *nri.Container {
diff --git a/internal/nri/container_linux.go b/internal/nri/container_linux.go
@@ -33,6 +33,7 @@ func containerToNRI(ctr Container) *nri.Container {
 		CgroupsPath: lnxCtr.GetCgroupsPath(),
 		IoPriority:  lnxCtr.GetIOPriority(),
 		Scheduler:   lnxCtr.GetScheduler(),
+		NetDevices:  lnxCtr.GetNetDevices(),
 	}
 	return nriCtr
 }

Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,13 @@ func (c criContainer) GetScheduler() api.LinuxScheduler {`
`882`	`882`	`return api.FromOCILinuxScheduler(c.spec.Process.Scheduler)`
`883`	`883`	`}`
`884`	`884`
	`885`	`+func (c criContainer) GetNetDevices() map[string]api.LinuxNetDevice {`
	`886`	`+ if c.spec.Linux == nil {`
	`887`	`+ return nil`
	`888`	`+ }`
	`889`	`+ return api.FromOCILinuxNetDevices(c.spec.Linux.NetDevices)`
	`890`	`+}`
	`891`	`+`
`885`	`892`	`func (c *criContainer) GetPid() uint32 {`
`886`	`893`	`return c.pid`
`887`	`894`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ type LinuxContainer interface {`
`47`	`47`	`GetCgroupsPath() string`
`48`	`48`	`GetIOPriority() *nri.LinuxIOPriority`
`49`	`49`	`GetScheduler() *nri.LinuxScheduler`
	`50`	`+ GetNetDevices() map[string]*nri.LinuxNetDevice`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`func commonContainerToNRI(ctr Container) *nri.Container {`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ func containerToNRI(ctr Container) *nri.Container {`
`33`	`33`	`CgroupsPath: lnxCtr.GetCgroupsPath(),`
`34`	`34`	`IoPriority: lnxCtr.GetIOPriority(),`
`35`	`35`	`Scheduler: lnxCtr.GetScheduler(),`
	`36`	`+ NetDevices: lnxCtr.GetNetDevices(),`
`36`	`37`	`}`
`37`	`38`	`return nriCtr`
`38`	`39`	`}`