updates to IPFamily and dependencies

Author: rjdenney

cns/NetworkContainerContract.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Azure/azure-container-networking/cns/restserver"
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	"github.com/google/uuid"
@@ -128,7 +127,7 @@ type CreateNetworkContainerRequest struct {
 	EndpointPolicies           []NetworkContainerRequestPolicies
 	NCStatus                   v1alpha.NCStatus
 	NetworkInterfaceInfo       NetworkInterfaceInfo //nolint // introducing new field for backendnic, to be used later by cni code
-	IPFamilies                 map[restserver.IPFamily]struct{}
+	IPFamilies                 map[IPFamily]struct{}
 }
 
 func (req *CreateNetworkContainerRequest) Validate() error {
@@ -744,3 +743,10 @@ type NodeRegisterRequest struct {
 	NumCores             int
 	NmAgentSupportedApis []string
 }
+
+type IPFamily string
+
+const (
+	IPv4Family IPFamily = "ipv4"
+	IPv6Family IPFamily = "ipv6"
+)

cns/kubecontroller/nodenetworkconfig/conversion_linux.go

@@ -6,7 +6,6 @@ import (
 	"strconv"
 
 	"github.com/Azure/azure-container-networking/cns"
-	"github.com/Azure/azure-container-networking/cns/restserver"
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	"github.com/pkg/errors"
 )
@@ -17,7 +16,7 @@ import (
 //nolint:gocritic //ignore hugeparam
 func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPrefix netip.Prefix, subnet cns.IPSubnet) (*cns.CreateNetworkContainerRequest, error) {
 	secondaryIPConfigs := map[string]cns.SecondaryIPConfig{}
-	ipFamilies := map[restserver.IPFamily]struct{}{}
+	ipFamilies := map[cns.IPFamily]struct{}{}
 
 	// iterate through all IP addresses in the subnet described by primaryPrefix and
 	// add them to the request as secondary IPConfigs.
@@ -30,9 +29,9 @@ func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPre
 	}
 	// adds the IPFamily of the primary CIDR to the set
 	if primaryIPPrefix.Addr().Is4() {
-		ipFamilies[restserver.IPv4Family] = struct{}{}
+		ipFamilies[cns.IPv4Family] = struct{}{}
 	} else {
-		ipFamilies[restserver.IPv6Family] = struct{}{}
+		ipFamilies[cns.IPv6Family] = struct{}{}
 	}
 
 	// Add IPs from CIDR block to the secondary IPConfigs
@@ -55,9 +54,9 @@ func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPre
 			}
 			// adds the IPFamily of the secondary CIDR to the set
 			if cidrPrefix.Addr().Is4() {
-				ipFamilies[restserver.IPv4Family] = struct{}{}
+				ipFamilies[cns.IPv4Family] = struct{}{}
 			} else {
-				ipFamilies[restserver.IPv6Family] = struct{}{}
+				ipFamilies[cns.IPv6Family] = struct{}{}
 			}
 		}
 	}

cns/restserver/const.go

@@ -13,10 +13,3 @@ const (
 	dncApiVersion       = "?api-version=2018-03-01"
 	nmaAPICallTimeout   = 2 * time.Second
 )
-
-type IPFamily string
-
-const (
-	IPv4Family IPFamily = "ipv4"
-	IPv6Family IPFamily = "ipv6"
-)

cns/restserver/ipam.go

@@ -992,7 +992,7 @@ func (service *HTTPRestService) AssignDesiredIPConfigs(podInfo cns.PodInfo, desi
 // In the case of dualstack we would expect to have one IPv6 from one NC and one IPv4 from a second NC
 func (service *HTTPRestService) AssignAvailableIPConfigs(podInfo cns.PodInfo) ([]cns.PodIpInfo, error) {
 	//  Map used to get the number of IPFamilies across all NCs
-	ipFamilies := map[IPFamily]struct{}{}
+	ipFamilies := map[cns.IPFamily]struct{}{}
 
 	// checks to make sure we have at least one NC
 	if len(service.state.ContainerStatus) == 0 {
@@ -1015,16 +1015,16 @@ func (service *HTTPRestService) AssignAvailableIPConfigs(podInfo cns.PodInfo) ([
 	// Creates a slice of PodIpInfo with the size as number of NCs to hold the result for assigned IP configs
 	podIPInfo := make([]cns.PodIpInfo, numOfIPFamilies)
 	// This map is used to store whether or not we have found an available IP from an NC when looping through the pool
-	ipsToAssign := make(map[IPFamily]cns.IPConfigurationStatus)
+	ipsToAssign := make(map[cns.IPFamily]cns.IPConfigurationStatus)
 
 	// Searches for available IPs in the pool
 	for _, ipState := range service.PodIPConfigState {
 		// get the IPFamily of the current ipState
-		var ipStateFamily IPFamily
+		var ipStateFamily cns.IPFamily
 		if net.ParseIP(ipState.IPAddress).To4() != nil {
-			ipStateFamily = IPv4Family
+			ipStateFamily = cns.IPv4Family
 		} else {
-			ipStateFamily = IPv6Family
+			ipStateFamily = cns.IPv6Family
 		}
 
 		// check if the IP with the same family type exists already

cns/restserver/ipusage.go

@@ -5,19 +5,6 @@ import (
 	"github.com/Azure/azure-container-networking/cns/types"
 )
 
-type ipState struct {
-	// allocatedIPs are all the IPs given to CNS by DNC.
-	allocatedIPs int64
-	// assignedIPs are the IPs CNS gives to Pods.
-	assignedIPs int64
-	// availableIPs are the IPs in state "Available".
-	availableIPs int64
-	// programmingIPs are the IPs in state "PendingProgramming".
-	programmingIPs int64
-	// releasingIPs are the IPs in state "PendingReleasr".
-	releasingIPs int64
-}
-
 func (service *HTTPRestService) buildIPState() *ipState {
 	service.Lock()
 	defer service.Unlock()

cns/restserver/restserver.go

@@ -80,7 +80,7 @@ type HTTPRestService struct {
 	PnpIDByMacAddress          map[string]string
 	imdsClient                 imdsClient
 	nodesubnetIPFetcher        *nodesubnet.IPFetcher
-	IPFamilies                 []IPFamily
+	IPFamilies                 []cns.IPFamily
 }
 
 type CNIConflistGenerator interface {