Prefix On NIC v6 Support

Author: kadevu

azure-ipam/ipam.go

@@ -143,17 +143,24 @@ func (p *IPAMPlugin) CmdAdd(args *cniSkel.CmdArgs) error {
 		cniResult.IPs[i] = ipConfig
 	}
 
-	cniResult.Interfaces = make([]*types100.Interface, 1)
-	interfaceMap := make(map[string]bool)
-	cniResult.Interfaces = make([]*types100.Interface, 0, len(resp.PodIPInfo))
+	cniResult.Interfaces = []*types100.Interface{}
+	seenInterfaces := map[string]bool{}
+
 	for _, podIPInfo := range resp.PodIPInfo {
-		if _, exists := interfaceMap[podIPInfo.InterfaceName]; !exists {
-			cniResult.Interfaces = append(cniResult.Interfaces, &types100.Interface{
-				Name: podIPInfo.InterfaceName, // Populate interface name based on MacAddress
-				Mac:  podIPInfo.MacAddress,
-			})
-			interfaceMap[podIPInfo.InterfaceName] = true
+		if seenInterfaces[podIPInfo.MacAddress] {
+			continue
+		}
+
+		infMac, err := net.ParseMAC(podIPInfo.MacAddress)
+		if err != nil {
+			p.logger.Error("Failed to parse interface MAC address", zap.Error(err), zap.String("macAddress", podIPInfo.MacAddress))
+			return cniTypes.NewError(cniTypes.ErrUnsupportedField, err.Error(), "failed to parse interface MAC address")
 		}
+
+		cniResult.Interfaces = append(cniResult.Interfaces, &types100.Interface{
+			Mac: infMac.String(),
+		})
+		seenInterfaces[podIPInfo.MacAddress] = true
 	}
 
 	// Get versioned result

cns/restserver/util.go

@@ -171,8 +171,6 @@ func (service *HTTPRestService) saveNetworkContainerGoalState(req cns.CreateNetw
 		hostVersion = "-1"
 	}
 
-	hostVersion = req.Version
-
 	// Remove the auth token before saving the containerStatus to cns json file
 	createNetworkContainerRequest := req
 	createNetworkContainerRequest.AuthorizationToken = ""

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/avast/retry-go/v3 v3.1.1
 	github.com/avast/retry-go/v4 v4.6.1
 	github.com/billgraziano/dpapi v0.5.0
-	github.com/containernetworking/cni v1.2.3
+	github.com/containernetworking/cni v1.2.2
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/golang/mock v1.6.0
@@ -25,7 +25,7 @@ require (
 	github.com/microsoft/ApplicationInsights-Go v0.4.4
 	github.com/nxadm/tail v1.4.11
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.36.0
+	github.com/onsi/gomega v1.33.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.21.1