fixup! specs-go,cdi: implement NetDevice injection.

Author: klihub

pkg/cdi/container-edits.go

@@ -117,7 +117,7 @@ func (e *ContainerEdits) Apply(spec *oci.Spec) error {
 		// specgen is currently missing functionality to set Linux NetDevices,
 		// so we use a locally rolled function for now.
 		for _, dev := range e.NetDevices {
-			specgenAddLinuxNetDevice(&specgen, dev.HostInterface, (&LinuxNetDevice{dev}).toOCI())
+			specgenAddLinuxNetDevice(&specgen, dev.HostInterfaceName, (&LinuxNetDevice{dev}).toOCI())
 		}
 	}
 
@@ -301,17 +301,17 @@ func ValidateNetDevices(devices []*cdi.LinuxNetDevice) error {
 		if err := (&LinuxNetDevice{dev}).Validate(); err != nil {
 			return err
 		}
-		if other, ok := hostSeen[dev.HostInterface]; ok {
-			return fmt.Errorf("invalid linux net device, duplicate HostInterface %q with names %q and %q",
-				dev.HostInterface, dev.Name, other)
+		if other, ok := hostSeen[dev.HostInterfaceName]; ok {
+			return fmt.Errorf("invalid linux net device, duplicate HostInterfaceName %q with names %q and %q",
+				dev.HostInterfaceName, dev.Name, other)
 		}
-		hostSeen[dev.HostInterface] = dev.Name
+		hostSeen[dev.HostInterfaceName] = dev.Name
 
 		if other, ok := nameSeen[dev.Name]; ok {
-			return fmt.Errorf("invalid linux net device, duplicate Name %q with HostInterface %q and %q",
-				dev.Name, dev.HostInterface, other)
+			return fmt.Errorf("invalid linux net device, duplicate Name %q with HostInterfaceName %q and %q",
+				dev.Name, dev.HostInterfaceName, other)
 		}
-		nameSeen[dev.Name] = dev.HostInterface
+		nameSeen[dev.Name] = dev.HostInterfaceName
 	}
 
 	return nil
@@ -324,8 +324,8 @@ type LinuxNetDevice struct {
 
 // Validate LinuxNetDevice.
 func (d *LinuxNetDevice) Validate() error {
-	if d.HostInterface == "" {
-		return errors.New("invalid linux net device, empty HostInterface")
+	if d.HostInterfaceName == "" {
+		return errors.New("invalid linux net device, empty HostInterfaceName")
 	}
 	if d.Name == "" {
 		return errors.New("invalid linux net device, empty Name")

pkg/cdi/container-edits_test.go

@@ -304,8 +304,8 @@ func TestValidateContainerEdits(t *testing.T) {
 			edits: &cdi.ContainerEdits{
 				NetDevices: []*cdi.LinuxNetDevice{
 					{
-						HostInterface: "eno1",
-						Name:          "netdev0",
+						HostInterfaceName: "eno1",
+						Name:              "netdev0",
 					},
 				},
 			},
@@ -315,8 +315,8 @@ func TestValidateContainerEdits(t *testing.T) {
 			edits: &cdi.ContainerEdits{
 				NetDevices: []*cdi.LinuxNetDevice{
 					{
-						HostInterface: "",
-						Name:          "netdev0",
+						HostInterfaceName: "",
+						Name:              "netdev0",
 					},
 				},
 			},
@@ -327,8 +327,8 @@ func TestValidateContainerEdits(t *testing.T) {
 			edits: &cdi.ContainerEdits{
 				NetDevices: []*cdi.LinuxNetDevice{
 					{
-						HostInterface: "eno1",
-						Name:          "",
+						HostInterfaceName: "eno1",
+						Name:              "",
 					},
 				},
 			},
@@ -628,12 +628,12 @@ func TestApplyContainerEdits(t *testing.T) {
 			edits: &cdi.ContainerEdits{
 				NetDevices: []*cdi.LinuxNetDevice{
 					{
-						HostInterface: "eno1",
-						Name:          "netdev0",
+						HostInterfaceName: "eno1",
+						Name:              "netdev0",
 					},
 					{
-						HostInterface: "eno2",
-						Name:          "netdev1",
+						HostInterfaceName: "eno2",
+						Name:              "netdev1",
 					},
 				},
 			},
@@ -664,12 +664,12 @@ func TestApplyContainerEdits(t *testing.T) {
 			edits: &cdi.ContainerEdits{
 				NetDevices: []*cdi.LinuxNetDevice{
 					{
-						HostInterface: "eno1",
-						Name:          "netdev2",
+						HostInterfaceName: "eno1",
+						Name:              "netdev2",
 					},
 					{
-						HostInterface: "eno2",
-						Name:          "netdev1",
+						HostInterfaceName: "eno2",
+						Name:              "netdev1",
 					},
 				},
 			},

specs-go/config.go

@@ -74,6 +74,6 @@ type IntelRdt struct {
 
 // LinuxNetDevice represents an OCI LinuxNetDevice to be added to the OCI Spec.
 type LinuxNetDevice struct {
-	HostInterface string `json:"hostInterface" yaml:"hostInterface"`
-	Name          string `json:"name"   yaml:"name"`
+	HostInterfaceName string `json:"hostInterfaceName" yaml:"hostInterfaceName"`
+	Name              string `json:"name"   yaml:"name"`
 }