add todo and remove multiple interface scenario

Author: NihaNallappagari

azure-ipam/ipam.go

@@ -146,7 +146,7 @@ func (p *IPAMPlugin) CmdAdd(args *cniSkel.CmdArgs) error {
 	for _, podIPInfo := range resp.PodIPInfo {
 		// Skip if interface already seen
 		// This is to avoid duplicate interfaces in the result
-		// Deduplication is necessary because there is one podIPInfo entry for each IP family(IPv4 and IPv6), and both may point to the same interface or if multiple interfaces are assigned to the same pod
+		// Deduplication is necessary because there is one podIPInfo entry for each IP family(IPv4 and IPv6), and both may point to the same interface
 		if podIPInfo.MacAddress == "" || seenInterfaces[podIPInfo.MacAddress] {
 			continue
 		}

azure-ipam/ipam_test.go

@@ -266,46 +266,6 @@ func (c *MockCNSClient) RequestIPs(ctx context.Context, ipconfig cns.IPConfigsRe
 						Subnet:    "fd11:1234::/120",
 					},
 				},
-				{
-					PodIPConfig: cns.IPSubnet{
-						IPAddress:    "192.168.1.10",
-						PrefixLength: 24,
-					},
-					MacAddress: "aa:bb:cc:dd:ee:ff",
-					NetworkContainerPrimaryIPConfig: cns.IPConfiguration{
-						IPSubnet: cns.IPSubnet{
-							IPAddress:    "192.168.1.0",
-							PrefixLength: 24,
-						},
-						DNSServers:       nil,
-						GatewayIPAddress: "192.168.1.1",
-					},
-					HostPrimaryIPInfo: cns.HostIPInfo{
-						Gateway:   "192.168.1.1",
-						PrimaryIP: "192.168.1.1",
-						Subnet:    "192.168.1.0/24",
-					},
-				},
-				{
-					PodIPConfig: cns.IPSubnet{
-						IPAddress:    "172.16.1.10",
-						PrefixLength: 24,
-					},
-					MacAddress: "",
-					NetworkContainerPrimaryIPConfig: cns.IPConfiguration{
-						IPSubnet: cns.IPSubnet{
-							IPAddress:    "172.16.1.0",
-							PrefixLength: 24,
-						},
-						DNSServers:       nil,
-						GatewayIPAddress: "172.16.1.1",
-					},
-					HostPrimaryIPInfo: cns.HostIPInfo{
-						Gateway:   "172.16.1.1",
-						PrimaryIP: "172.16.1.1",
-						Subnet:    "172.16.1.0/24",
-					},
-				},
 			},
 			Response: cns.Response{
 				ReturnCode: 0,
@@ -449,53 +409,6 @@ func TestCmdAdd(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name: "Test MAC address deduplication and multi-interface",
-			args: buildArgs("happyArgsMultiInterface", happyPodArgs, happyNetConfByteArr),
-			want: &types100.Result{
-				CNIVersion: "1.0.0",
-				Interfaces: []*types100.Interface{
-					{
-						Mac: "00:11:22:33:44:55", // First unique MAC (dual-stack)
-					},
-					{
-						Mac: "aa:bb:cc:dd:ee:ff", // Second unique MAC
-					},
-				},
-				IPs: []*types100.IPConfig{
-					{
-						Address: net.IPNet{
-							IP:   net.IPv4(10, 0, 1, 10),
-							Mask: net.CIDRMask(24, 32),
-						},
-						Gateway: net.IPv4(10, 0, 0, 1),
-					},
-					{
-						Address: net.IPNet{
-							IP:   net.ParseIP("fd11:1234::1"),
-							Mask: net.CIDRMask(120, 128),
-						},
-						Gateway: net.ParseIP("fe80::1234:5678:9abc"),
-					},
-					{
-						Address: net.IPNet{
-							IP:   net.IPv4(192, 168, 1, 10),
-							Mask: net.CIDRMask(24, 32),
-						},
-						Gateway: net.IPv4(192, 168, 1, 1),
-					},
-					{
-						Address: net.IPNet{
-							IP:   net.IPv4(172, 16, 1, 10),
-							Mask: net.CIDRMask(24, 32),
-						},
-						Gateway: net.IPv4(172, 16, 1, 1),
-					},
-				},
-				DNS: cniTypes.DNS{},
-			},
-			wantErr: false,
-		},
 		{
 			name:    "CNI add with nil gateway IP",
 			args:    buildArgs("nilGateway", happyPodArgs, happyNetConfByteArr),

cns/kubecontroller/nodenetworkconfig/conversion_linux.go

@@ -16,6 +16,8 @@ import (
 func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPrefix netip.Prefix, subnet cns.IPSubnet) (*cns.CreateNetworkContainerRequest, error) {
 	secondaryIPConfigs := map[string]cns.SecondaryIPConfig{}
 
+	// Todo: Segregate the NIC’s primary IP from the list of secondary IPs to ensure the primary IP is not assigned to pods
+	// WorkItem: https://msazure.visualstudio.com/One/_workitems/edit/33460135
 	// iterate through all IP addresses in the subnet described by primaryPrefix and
 	// add them to the request as secondary IPConfigs.
 	for addr := primaryIPPrefix.Masked().Addr(); primaryIPPrefix.Contains(addr); addr = addr.Next() {

cns/restserver/internalapi.go

@@ -216,6 +216,8 @@ func (service *HTTPRestService) syncHostNCVersion(ctx context.Context, channelMo
 	if len(outdatedNCs) == 0 {
 		return len(programmedNCs), nil
 	}
+	// Todo: Query NMA for the supported API to validate the build version. If supported, query IMDS for the Swiftv2 NC version list and perform synchostversion update.
+	// WorkItem: https://msazure.visualstudio.com/One/_workitems/edit/33460135
 	ncVersionListResp, err := service.nma.GetNCVersionList(ctx)
 	if err != nil {
 		return len(programmedNCs), errors.Wrap(err, "failed to get nc version list from nmagent")