Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions pkg/cdi/spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,63 @@ func TestRequiredVersion(t *testing.T) {
},
expectedVersion: "0.7.0",
},
{

description: "global edit RDT schemata requires v1.1.0",
spec: &cdi.Spec{
ContainerEdits: cdi.ContainerEdits{
IntelRdt: &cdi.IntelRdt{
Schemata: []string{"foo"},
},
},
},
expectedVersion: "1.1.0",
},
{

description: "global edit RDT monitoring requires v1.1.0",
spec: &cdi.Spec{
ContainerEdits: cdi.ContainerEdits{
IntelRdt: &cdi.IntelRdt{
EnableMonitoring: true,
},
},
},
expectedVersion: "1.1.0",
},
{
description: "device edit RDT schemata requires v1.1.0",
spec: &cdi.Spec{
Devices: []cdi.Device{
{
Name: "device0",
ContainerEdits: cdi.ContainerEdits{
IntelRdt: &cdi.IntelRdt{
Schemata: []string{"foo"},
},
},
},
},
},
expectedVersion: "1.1.0",
},
{

description: "device edit RDT monitoring requires v1.1.0",
spec: &cdi.Spec{
Devices: []cdi.Device{
{
Name: "device0",
ContainerEdits: cdi.ContainerEdits{
IntelRdt: &cdi.IntelRdt{
EnableMonitoring: true,
},
},
},
},
},
expectedVersion: "1.1.0",
},
}

for _, tc := range testCases {
Expand Down
9 changes: 9 additions & 0 deletions specs-go/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,15 @@ func requiresV110(spec *Spec) bool {
return true
}
}

for _, dev := range spec.Devices {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch @klihub. Thanks.

if i := dev.ContainerEdits.IntelRdt; i != nil {
if i.Schemata != nil || i.EnableMonitoring {
return true
}
}
}

return false
}

Expand Down