wip

Signed-off-by: Patryk Diak <[email protected]>

Author: kyrtapz

pkg/cloudprovider/gcp.go

@@ -13,6 +13,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/utils/ptr"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -246,6 +247,7 @@ func (g *GCP) getSubnet(networkInterface *google.NetworkInterface) (*net.IPNet,
 // Note: there is also a global "alias IP per VPC quota", but OpenShift clusters on
 // GCP seem to have that value defined to 15,000. So we can skip that.
 func (g *GCP) getCapacity(networkInterface *google.NetworkInterface, cpicIPs sets.Set[string]) int {
+	klog.Infof("getCapacity, existing cpicIPs: %+v", cpicIPs)
 	currentIPUsage := 0
 	for _, aliasIPRange := range networkInterface.AliasIpRanges {
 		var aliasIP net.IP
@@ -256,6 +258,7 @@ func (g *GCP) getCapacity(networkInterface *google.NetworkInterface, cpicIPs set
 		}
 
 		if aliasIP != nil && !cpicIPs.Has(aliasIP.String()) {
+			klog.Infof("getCapacity, assigned IP address %s", aliasIP.String())
 			currentIPUsage++
 		}
 	}

pkg/cloudprovider/openstack.go

@@ -567,7 +567,6 @@ func (o *OpenStack) getNeutronPortNodeEgressIPConfiguration(p neutronports.Port,
 	// Loop over all subnets. OpenStack potentially has several IPv4 or IPv6 subnets per port, but the
 	// CloudPrivateIPConfig expects only a single subnet of each address family per port. Throw an error
 	// in such a case.
-	var cloudPrivateIPsCount int
 	for _, s := range subnets {
 		// Parse CIDR information into ip and ipnet.
 		ip, ipnet, err = net.ParseCIDR(s.CIDR)
@@ -587,13 +586,14 @@ func (o *OpenStack) getNeutronPortNodeEgressIPConfiguration(p neutronports.Port,
 			}
 			ipv6 = ipnet.String()
 		}
-		// Loop over all cloudPrivateIPConfigs and check if they are part of this ipnet.
-		// If the IP is contained in the ipnet, increase cloudPrivateIPsCount.
-		for ipStr := range cpicIPs {
-			cip := net.ParseIP(ipStr)
-			if cip != nil && ipnet.Contains(cip) {
-				cloudPrivateIPsCount++
-			}
+	}
+
+	// Loop over all cloudPrivateIPConfigs and check if they are part of this port.
+	// If the IP is contained in the port, increase cloudPrivateIPsCount.
+	cloudPrivateIPsCount := 0
+	for _, portIP := range p.AllowedAddressPairs {
+		if cpicIPs.Has(portIP.IPAddress) {
+			cloudPrivateIPsCount++
 		}
 	}
 

pkg/cloudprovider/openstack_test.go

@@ -65,6 +65,15 @@ var portMap = map[string]neutronports.Port{
 			{
 				IPAddress: "192.0.2.2",
 			},
+			{
+				IPAddress: "192.0.2.10",
+			},
+			{
+				IPAddress: "2000::1",
+			},
+			{
+				IPAddress: "2000::2",
+			},
 		},
 		DeviceID:    "9e5476bd-a4ec-4653-93d6-72c93aa682ba",
 		DeviceOwner: novaDeviceOwner,
@@ -1028,7 +1037,7 @@ func TestGetNeutronPortNodeEgressIPConfiguration(t *testing.T) {
 					IPv6: "2000::/64",
 				},
 				Capacity: capacity{
-					IP: ptr.To(openstackMaxCapacity - 2), // 2 allowed_address_pairs configured on the port.
+					IP: ptr.To(openstackMaxCapacity - 5), // 5 allowed_address_pairs configured on the port.
 				},
 			},
 		},
@@ -1041,7 +1050,7 @@ func TestGetNeutronPortNodeEgressIPConfiguration(t *testing.T) {
 					IPv6: "2000::/64",
 				},
 				Capacity: capacity{
-					IP: ptr.To(openstackMaxCapacity + 3 - 2), // excluding 2 allowed_address_pairs configured on the port.
+					IP: ptr.To(openstackMaxCapacity - 2), // excluding 2 allowed_address_pairs configured on the port.
 				},
 			},
 			// Configure IPs with 3 ips are within neutron subnet, 1 ip outside neutron subnet.
@@ -1096,23 +1105,23 @@ func TestAllowUnAllowIPAddressOnNeutronPort(t *testing.T) {
 		{
 			portID:     "9ab428d4-58f8-42d7-9672-90c3f5641f83",
 			ip:         net.ParseIP("192.0.2.20"),
-			allowedIPs: []string{"192.0.2.1", "192.0.2.2", "192.0.2.20"},
+			allowedIPs: []string{"192.0.2.1", "192.0.2.10", "192.0.2.2", "192.0.2.20", "2000::1", "2000::2"},
 		},
 		{
 			portID:     "9ab428d4-58f8-42d7-9672-90c3f5641f83",
 			ip:         net.ParseIP("192.0.2.21"),
-			allowedIPs: []string{"192.0.2.1", "192.0.2.2", "192.0.2.20", "192.0.2.21"},
+			allowedIPs: []string{"192.0.2.1", "192.0.2.10", "192.0.2.2", "192.0.2.20", "192.0.2.21", "2000::1", "2000::2"},
 		},
 		{
 			portID:     "9ab428d4-58f8-42d7-9672-90c3f5641f83",
 			ip:         net.ParseIP("192.0.2.20"),
 			unallow:    true,
-			allowedIPs: []string{"192.0.2.1", "192.0.2.2", "192.0.2.21"},
+			allowedIPs: []string{"192.0.2.1", "192.0.2.10", "192.0.2.2", "192.0.2.21", "2000::1", "2000::2"},
 		},
 		{
 			portID:     "9ab428d4-58f8-42d7-9672-90c3f5641f83",
 			ip:         net.ParseIP("192.0.2.21"),
-			allowedIPs: []string{"192.0.2.1", "192.0.2.2", "192.0.2.21"},
+			allowedIPs: []string{"192.0.2.1", "192.0.2.10", "192.0.2.2", "192.0.2.21", "2000::1", "2000::2"},
 			errString:  "the requested IP for assignment is already assigned",
 		},
 		{
@@ -1132,7 +1141,7 @@ func TestAllowUnAllowIPAddressOnNeutronPort(t *testing.T) {
 			portID:     "9ab428d4-58f8-42d7-9672-90c3f5641f83",
 			ip:         net.ParseIP("192.0.2.21"),
 			unallow:    true,
-			allowedIPs: []string{"192.0.2.1", "192.0.2.2"},
+			allowedIPs: []string{"192.0.2.1", "192.0.2.10", "192.0.2.2", "2000::1", "2000::2"},
 		},
 	}