fix: endpointID for Stateless CNI should add ifName if the NiCType is DelegatedNIC to cover for SwiftV2

Author: behzad-mir

cni/network/network.go

@@ -712,11 +712,11 @@ func (plugin *NetPlugin) createEpInfo(opt *createEpInfoOpt) (*network.EndpointIn
 	if opt.ifInfo.NICType == cns.InfraNIC && !*opt.infraSeen {
 		// so we do not break existing scenarios, only the first infra gets the original endpoint id generation
 		ifName = opt.args.IfName
-		endpointID = plugin.nm.GetEndpointID(opt.args.ContainerID, ifName)
+		endpointID = plugin.nm.GetEndpointID(opt.args.ContainerID, ifName, opt.ifInfo.NICType)
 		*opt.infraSeen = true
 	} else {
 		ifName = "eth" + strconv.Itoa(opt.endpointIndex)
-		endpointID = plugin.nm.GetEndpointID(opt.args.ContainerID, ifName)
+		endpointID = plugin.nm.GetEndpointID(opt.args.ContainerID, ifName, opt.ifInfo.NICType)
 	}
 
 	endpointInfo := network.EndpointInfo{
@@ -1096,7 +1096,7 @@ func (plugin *NetPlugin) Delete(args *cniSkel.CmdArgs) error {
 	// for when the endpoint is not created, but the ips are already allocated (only works if single network, single infra)
 	// this block is not applied to stateless CNI
 	if len(epInfos) == 0 {
-		endpointID := plugin.nm.GetEndpointID(args.ContainerID, args.IfName)
+		endpointID := plugin.nm.GetEndpointID(args.ContainerID, args.IfName, cns.InfraNIC)
 		if !nwCfg.MultiTenancy {
 			logger.Warn("Could not query endpoint",
 				zap.String("endpoint", endpointID),

network/manager.go

@@ -115,7 +115,7 @@ type NetworkManager interface {
 	DetachEndpoint(networkID string, endpointID string) error
 	UpdateEndpoint(networkID string, existingEpInfo *EndpointInfo, targetEpInfo *EndpointInfo) error
 	GetNumberOfEndpoints(ifName string, networkID string) int
-	GetEndpointID(containerID, ifName string) string
+	GetEndpointID(containerID, ifName string, nicType cns.NICType) string
 	IsStatelessCNIMode() bool
 	SaveState(eps []*endpoint) error
 	DeleteState(epInfos []*EndpointInfo) error
@@ -732,8 +732,11 @@ func (nm *networkManager) GetNumberOfEndpoints(ifName string, networkId string)
 }
 
 // GetEndpointID returns a unique endpoint ID based on the CNI mode.
-func (nm *networkManager) GetEndpointID(containerID, ifName string) string {
+func (nm *networkManager) GetEndpointID(containerID, ifName string, nicType cns.NICType) string {
 	if nm.IsStatelessCNIMode() {
+		if nicType == cns.DelegatedVMNIC {
+			return containerID + "-" + ifName
+		}
 		return containerID
 	}
 	if len(containerID) > ContainerIDLength {

network/manager_mock.go

@@ -1,6 +1,7 @@
 package network
 
 import (
+	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/common"
 )
 
@@ -82,8 +83,11 @@ func (nm *MockNetworkManager) IsStatelessCNIMode() bool {
 }
 
 // GetEndpointID returns the ContainerID value
-func (nm *MockNetworkManager) GetEndpointID(containerID, ifName string) string {
+func (nm *MockNetworkManager) GetEndpointID(containerID, ifName string, nicType cns.NICType) string {
 	if nm.IsStatelessCNIMode() {
+		if nicType == cns.DelegatedVMNIC {
+			return containerID + "-" + ifName
+		}
 		return containerID
 	}
 	if len(containerID) > ContainerIDLength {