Address PR comments

Author: NihaNallappagari

azure-ipam/ipconfig/ipconfig.go

@@ -7,7 +7,6 @@ import (
 	"net/netip"
 
 	"github.com/Azure/azure-container-networking/cns"
-	"github.com/Azure/azure-container-networking/cns/logger"
 	cniSkel "github.com/containernetworking/cni/pkg/skel"
 	cniTypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/pkg/errors"

cns/restserver/internalapi.go

@@ -195,7 +195,7 @@ func (service *HTTPRestService) syncHostNCVersion(ctx context.Context, channelMo
 		// For prefix-on-NIC SwiftV2 NIC scenario, the NC details is published to different path in NMAgent and call to NMA here creates error. So Skipping nma check, synchost version logic.
 		ncStatus := service.state.ContainerStatus[idx]
 		if mac := ncStatus.CreateNetworkContainerRequest.NetworkInterfaceInfo.MACAddress; mac != "" {
-			logger.Printf("NC %s has MAC address for prefix on nic swiftv2 scenario, skipping syncHostNCVersion", ncStatus.ID)
+			logger.Printf("NC %s has MAC address for prefix on nic swiftv2 prefix on NIC scenario, skipping syncHostNCVersion", ncStatus.ID)
 			continue
 		}
 		// Will open a separate PR to convert all the NC version related variable to int. Change from string to int is a pain.
@@ -377,6 +377,7 @@ func (service *HTTPRestService) ReconcileIPAssignment(podInfoByIP map[string]cns
 }
 
 func (service *HTTPRestService) CreateNCs(ncReqs []*cns.CreateNetworkContainerRequest) types.ResponseCode {
+	logger.Printf("Creating network containers for nc requests: [%+v]", ncReqs)
 	for _, ncReq := range ncReqs {
 		returnCode := service.CreateOrUpdateNetworkContainerInternal(ncReq)
 		if returnCode != types.Success {
@@ -566,6 +567,7 @@ func (service *HTTPRestService) MustEnsureNoStaleNCs(validNCIDs []string) {
 
 // This API will be called by CNS RequestController on CRD update.
 func (service *HTTPRestService) CreateOrUpdateNetworkContainerInternal(req *cns.CreateNetworkContainerRequest) types.ResponseCode {
+	logger.Printf("[Azure CNS] CreateOrUpdateNetworkContainerInternal called for network container %s", req.NetworkContainerid)
 	if req.NetworkContainerid == "" {
 		logger.Errorf("[Azure CNS] Error. NetworkContainerid is empty")
 		return types.NetworkContainerNotSpecified
@@ -627,8 +629,9 @@ func (service *HTTPRestService) CreateOrUpdateNetworkContainerInternal(req *cns.
 	} else {
 		logger.Errorf(returnMessage)
 	}
-
+	logger.Printf(("service.Options[common.OptProgramSNATIPTables]: %v"), service.Options[common.OptProgramSNATIPTables])
 	if service.Options[common.OptProgramSNATIPTables] == true {
+		logger.Printf("inside if block")
 		returnCode, returnMessage = service.programSNATRules(req)
 		if returnCode != 0 {
 			logger.Errorf(returnMessage)

cns/restserver/ipam.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"net/netip"
 	"strconv"
 	"strings"
 
@@ -1009,14 +1010,14 @@ func (service *HTTPRestService) AssignAvailableIPConfigs(podInfo cns.PodInfo) ([
 				break
 			}
 
-			ip := net.ParseIP(secIPConfig.IPAddress)
-			if ip == nil {
+			addr, err := netip.ParseAddr(secIPConfig.IPAddress)
+			if err != nil {
 				continue
 			}
 
-			if ip.To4() != nil {
+			if addr.Is4() {
 				ncIPFamilies[cns.IPv4] = struct{}{}
-			} else {
+			} else if addr.Is6() {
 				ncIPFamilies[cns.IPv6] = struct{}{}
 			}
 		}