Add ID in the network spec

Author: harikrishna-patnala

api/v1beta3/cloudstackmachine_types.go

@@ -33,10 +33,14 @@ const (
 )
 
 type NetworkSpec struct {
-	// The name of the network
+	// CloudStack Network Name (required to resolve ID)
 	Name string `json:"name"`
-	// Optional static IP in that network
+
+	// Optional IP in the network
 	IP string `json:"ip,omitempty"`
+
+	// Optional Network ID (overrides Name if set)
+	ID string `json:"id,omitempty"`
 }
 
 // CloudStackMachineSpec defines the desired state of CloudStackMachine
@@ -62,13 +66,10 @@ type CloudStackMachineSpec struct {
 	// +optional
 	DiskOffering CloudStackResourceDiskOffering `json:"diskOffering,omitempty"`
 
-	// The primary network interface (overrides zone.network)
-	// +optional
-	Network *NetworkSpec `json:"network,omitempty"`
-
-	// Additional networks (attached as secondary NICs)
+	// The list of networks (overrides zone.network)
 	// +optional
-	ExtraNetworks []NetworkSpec `json:"extraNetworks,omitempty"`
+	// In CloudStackMachineSpec
+	Networks []NetworkSpec `json:"networks,omitempty"`
 
 	// CloudStack ssh key to use.
 	// +optional

pkg/cloud/instance.go

@@ -334,39 +334,23 @@ func (c *client) DeployVM(
 
 	p := c.cs.VirtualMachine.NewDeployVirtualMachineParams(offering.Id, templateID, fd.Spec.Zone.ID)
 
-	if csMachine.Spec.Network == nil && len(csMachine.Spec.ExtraNetworks) == 0 && fd.Spec.Zone.Network.ID != "" {
-		// No explicit NICs; fallback to single default network ID
+	if len(csMachine.Spec.Networks) == 0 && fd.Spec.Zone.Network.ID != "" {
 		p.SetNetworkids([]string{fd.Spec.Zone.Network.ID})
 	} else {
-		// Build ipToNetworkList for multiple NICs
 		ipToNetworkList := []map[string]string{}
 
-		// Primary NIC
-		if csMachine.Spec.Network != nil {
-			id, err := c.resolveNetworkIDByName(csMachine.Spec.Network.Name)
-			if err != nil {
-				return err
+		for _, net := range csMachine.Spec.Networks {
+			networkID := net.ID
+			if networkID == "" {
+				var err error
+				networkID, err = c.resolveNetworkIDByName(net.Name)
+				if err != nil {
+					return err
+				}
 			}
-			entry := map[string]string{"networkid": id}
-			if csMachine.Spec.Network.IP != "" {
-				entry["ip"] = csMachine.Spec.Network.IP
-			}
-			ipToNetworkList = append(ipToNetworkList, entry)
-		} else if fd.Spec.Zone.Network.ID != "" {
-			ipToNetworkList = append(ipToNetworkList, map[string]string{
-				"networkid": fd.Spec.Zone.Network.ID,
-			})
-		}
-
-		// Extra NICs
-		for _, extra := range csMachine.Spec.ExtraNetworks {
-			id, err := c.resolveNetworkIDByName(extra.Name)
-			if err != nil {
-				return err
-			}
-			entry := map[string]string{"networkid": id}
-			if extra.IP != "" {
-				entry["ip"] = extra.IP
+			entry := map[string]string{"networkid": networkID}
+			if net.IP != "" {
+				entry["ip"] = net.IP
 			}
 			ipToNetworkList = append(ipToNetworkList, entry)
 		}