another refactor

Author: kadevu

cns/restserver/internalapi_test.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
-	"net/netip"
 	"os"
 	"reflect"
 	"strconv"
@@ -914,16 +913,6 @@ func generateNetworkContainerRequest(secondaryIps map[string]cns.SecondaryIPConf
 	ipSubnet.IPAddress = primaryIP
 	ipSubnet.PrefixLength = subnetPrfixLength
 	ipConfig.IPSubnet = ipSubnet
-	ipFamilies := map[cns.IPFamily]struct{}{}
-
-	for _, secIPConfig := range secondaryIps {
-		IP, _ := netip.ParseAddr(secIPConfig.IPAddress)
-		if IP.Is4() {
-			ipFamilies[cns.IPv4Family] = struct{}{}
-		} else {
-			ipFamilies[cns.IPv6Family] = struct{}{}
-		}
-	}
 
 	req := cns.CreateNetworkContainerRequest{
 		NetworkContainerType: dockerContainerType,

cns/restserver/ipam.go

@@ -25,7 +25,6 @@ var (
 	ErrStoreEmpty             = errors.New("empty endpoint state store")
 	ErrParsePodIPFailed       = errors.New("failed to parse pod's ip")
 	ErrNoNCs                  = errors.New("no NCs found in the CNS internal state")
-	ErrNoIPFamilies           = errors.New("No IP Families found on NCs")
 	ErrOptManageEndpointState = errors.New("CNS is not set to manage the endpoint state")
 	ErrEndpointStateNotFound  = errors.New("endpoint state could not be found in the statefile")
 	ErrGetAllNCResponseEmpty  = errors.New("failed to get NC responses from statefile")
@@ -1002,6 +1001,10 @@ func (service *HTTPRestService) AssignAvailableIPConfigs(podInfo cns.PodInfo) ([
 
 	// Gets the IPFamilies from all NCs and store them in a map. This will be used to determine the number of IPs to return
 	for ncID := range service.state.ContainerStatus {
+		if len(ipFamilies) == 2 {
+			break
+		}
+
 		for _, secIPConfig := range service.state.ContainerStatus[ncID].CreateNetworkContainerRequest.SecondaryIPConfigs {
 			if len(ipFamilies) == 2 {
 				break