Refactoring code

Author: harikrishna-patnala

pkg/cloud/instance.go

@@ -312,20 +312,31 @@ func (c *client) CheckLimits(
 	return nil
 }
 
-func (c *client) isIpAvailableInNetwork(ip, networkID string) (bool, error) {
+func (c *client) listPublicIPsInNetwork(networkID, ip string) ([]*cloudstack.PublicIpAddress, error) {
 	params := c.cs.Address.NewListPublicIpAddressesParams()
 	params.SetNetworkid(networkID)
-	params.SetIpaddress(ip)
 	params.SetAllocatedonly(false)
 	params.SetForvirtualnetwork(false)
 	params.SetListall(true)
+	if ip != "" {
+		params.SetIpaddress(ip)
+	}
 
 	resp, err := c.cs.Address.ListPublicIpAddresses(params)
 	if err != nil {
-		return false, errors.Wrapf(err, "failed to list public IP addresses for network %q", networkID)
+		return nil, errors.Wrapf(err, "failed to list public IP addresses for network %q", networkID)
+	}
+
+	return resp.PublicIpAddresses, nil
+}
+
+func (c *client) isIPAvailableInNetwork(ip, networkID string) (bool, error) {
+	publicIPs, err := c.listPublicIPsInNetwork(networkID, ip)
+	if err != nil {
+		return false, err
 	}
 
-	for _, addr := range resp.PublicIpAddresses {
+	for _, addr := range publicIPs {
 		if addr.State == "Free" {
 			return true, nil
 		}
@@ -335,18 +346,12 @@ func (c *client) isIpAvailableInNetwork(ip, networkID string) (bool, error) {
 }
 
 func (c *client) hasFreeIPInNetwork(resolvedNet *cloudstack.Network) (bool, error) {
-	params := c.cs.Address.NewListPublicIpAddressesParams()
-	params.SetNetworkid(resolvedNet.Id)
-	params.SetAllocatedonly(false)
-	params.SetForvirtualnetwork(false)
-	params.SetListall(true)
-
-	resp, err := c.cs.Address.ListPublicIpAddresses(params)
+	publicIPs, err := c.listPublicIPsInNetwork(resolvedNet.Id, "")
 	if err != nil {
-		return false, errors.Wrapf(err, "failed to check free IPs for network %q", resolvedNet.Id)
+		return false, err
 	}
 
-	for _, addr := range resp.PublicIpAddresses {
+	for _, addr := range publicIPs {
 		if addr.State == "Free" {
 			return true, nil
 		}
@@ -355,13 +360,14 @@ func (c *client) hasFreeIPInNetwork(resolvedNet *cloudstack.Network) (bool, erro
 	return false, nil
 }
 
-func (c *client) buildStaticIPEntry(ip, networkID string, resolvedNet *cloudstack.Network) (map[string]string, error) {
+func (c *client) buildStaticIPEntry(ip string, resolvedNet *cloudstack.Network) (map[string]string, error) {
+	networkID := resolvedNet.Id
 	if err := c.validateIPInCIDR(ip, resolvedNet, networkID); err != nil {
 		return nil, err
 	}
 
 	if resolvedNet.Type == "Shared" {
-		isAvailable, err := c.isIpAvailableInNetwork(ip, networkID)
+		isAvailable, err := c.isIPAvailableInNetwork(ip, networkID)
 		if err != nil {
 			return nil, err
 		}
@@ -407,14 +413,14 @@ func (c *client) buildIPToNetworkList(csMachine *infrav1.CloudStackMachine) ([]m
 	var ipToNetworkList []map[string]string
 
 	for _, net := range csMachine.Spec.Networks {
-		networkID, resolvedNet, err := c.resolveNetworkReference(net)
+		resolvedNet, err := c.resolveNetwork(net)
 		if err != nil {
 			return nil, err
 		}
 
 		var entry map[string]string
 		if net.IP != "" {
-			entry, err = c.buildStaticIPEntry(net.IP, networkID, resolvedNet)
+			entry, err = c.buildStaticIPEntry(net.IP, resolvedNet)
 			if err != nil {
 				return nil, err
 			}
@@ -431,27 +437,19 @@ func (c *client) buildIPToNetworkList(csMachine *infrav1.CloudStackMachine) ([]m
 	return ipToNetworkList, nil
 }
 
-func (c *client) resolveNetworkReference(net infrav1.NetworkSpec) (string, *cloudstack.Network, error) {
+func (c *client) resolveNetwork(net infrav1.NetworkSpec) (*cloudstack.Network, error) {
 	if net.ID == "" {
-		resolvedNet, err := c.resolveNetworkByName(net.Name)
-		if err != nil {
-			return "", nil, err
-		}
-		return resolvedNet.Id, resolvedNet, nil
+		return c.resolveNetworkByName(net.Name)
 	}
 
 	resolvedNet, _, err := c.cs.Network.GetNetworkByID(net.ID, cloudstack.WithProject(c.user.Project.ID))
 	if err != nil {
-		return "", nil, errors.Wrapf(err, "failed to get network %q by ID", net.ID)
+		return nil, errors.Wrapf(err, "failed to get network %q by ID", net.ID)
 	}
-	return net.ID, resolvedNet, nil
+	return resolvedNet, nil
 }
 
 func (c *client) validateIPInCIDR(ipStr string, net *cloudstack.Network, netID string) error {
-	if net == nil {
-		return errors.Errorf("network details not found for validation")
-	}
-
 	ip := netpkg.ParseIP(ipStr)
 	if ip == nil {
 		return errors.Errorf("invalid IP address %q", ipStr)

templates/cluster-template-multiple-networks.yaml

@@ -74,11 +74,15 @@ spec:
       offering:
         name: ${CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING}
       networks:
-          - name: ${CLOUDSTACK_NETWORK_NAME} # default primary network and should match with failureDomains.zone.network.name
-            ip: 10.1.1.21 # optional ip address in the network
-          - name: # extra network, it can be network name or ID
-            ip: 10.1.1.31 # optional ip address in the network
-          - id: # extra network, it can be network name or ID
+        - name: ${CLOUDSTACK_NETWORK_NAME} # (optional) default primary network; must match failureDomains.zone.network.name
+          # ip: 10.1.1.21                   # (optional) static IP in the primary network
+
+        # Additional (extra) networks can be specified below. Use either 'name' or 'id', and optionally an 'ip'.
+        # - name: isolated-net2             # (optional) extra network by name
+        #   ip: 10.1.1.31                   # (optional) static IP in this network
+
+        # - id: a1b2c3d4-5678-90ef-gh12-3456789ijklm  # (optional) extra network by ID
+        #   ip: 10.1.1.32                             # (optional) static IP in this network
       template:
         name: ${CLOUDSTACK_TEMPLATE_NAME}
 ---
@@ -118,11 +122,15 @@ spec:
       template:
         name: ${CLOUDSTACK_TEMPLATE_NAME}
       networks:
-        - name: ${CLOUDSTACK_NETWORK_NAME} # default primary network and should match with failureDomains.zone.network.name
-          ip: 10.1.1.41 # optional ip address in the network
-        - name: # extra network, it can be network name or ID
-          ip: 10.1.1.51 # optional ip address in the network
-        - id: # extra network, it can be network name or ID
+        - name: ${CLOUDSTACK_NETWORK_NAME} # (optional) default primary network; must match failureDomains.zone.network.name
+          # ip: 10.1.1.41                   # (optional) static IP in the primary network
+
+        # Additional (extra) networks can be specified below. Use either 'name' or 'id', and optionally an 'ip'.
+        # - name: isolated-net3             # (optional) extra network by name
+        #   ip: 10.1.1.51                   # (optional) static IP in this network
+
+        # - id: f5c93c15-d27b-4c93-b27c-00f48226b9a9  # (optional) extra network by ID
+        #   ip: 10.1.1.52                             # (optional) static IP in this network
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate