Merge pull request #222 from Cloud-Temple/221-the-os_network_adapter-are-always-connected-to-the-template-network

bugfix(#221): Fixed a bug on os_network_adapter of resource iaas_opensource_virtual_machine causing wrong network configuration

Author: Alexandre-Cann

CHANGELOG.md

@@ -1,8 +1,15 @@
 ***Warning: Using "Release Candidate" versions (-rc.X) in a **production environment** is **strongly discouraged**, as they may contain unresolved bugs and pose risks to the stability and security of your systems.***
 
-# 1.5.4 (February 10th, 2026)
+# 1.5.5 (February 12th, 2026)
 <img id="latest" src="https://badgen.net/badge/channel/latest/yellow" alt="Channel: latest" />
 
+BUG FIXES :
+
+  * Fixed a bug causing `os_network_adapter` on resource `cloudtemple_iaas_opensource_virtual_machine` to be connected to the network from the original template used.
+  * Fixed a bug causing `os_network_adapter` on resource `cloudtemple_iaas_opensource_virtual_machine` to be created with `mac_address` of the network adapter from the original template used.
+
+# 1.5.4 (February 10th, 2026)
+
 BUG FIXES :
 
   * Fixed a bug causing resource `cloudtemple_compute_iaas_opensource_network_adapter` to be created disconnected by default when `attached` property was not set.

internal/client/compute_iaas_opensource_virtual_machine.go

@@ -68,7 +68,7 @@ type CloudInit struct {
 
 type OSNetworkAdapter struct {
 	NetworkID string `json:"networkId"`
-	MAC       string `json:"macAddress"`
+	MAC       string `json:"mac,omitempty"`
 }
 
 type CreateOpenIaasVirtualMachineRequest struct {

internal/provider/resource_compute_iaas_opensource_virtual_machine.go

@@ -434,6 +434,8 @@ func openIaasVirtualMachineCreate(ctx context.Context, d *schema.ResourceData, m
 		}
 	}
 
+	osNetworkAdapters := d.Get("os_network_adapter").([]interface{})
+
 	// Deploy from template
 	if d.Get("template_id").(string) != "" {
 		template, err := c.Compute().OpenIaaS().Template().Read(ctx, d.Get("template_id").(string))
@@ -444,11 +446,16 @@ func openIaasVirtualMachineCreate(ctx context.Context, d *schema.ResourceData, m
 			return diag.Errorf("Could not find template with id : %s", d.Get("template_id").(string))
 		}
 
+		if osNetworkAdapters != nil && len(osNetworkAdapters) != len(template.NetworkAdapters) {
+			return diag.Errorf("the number of os_network_adapter (%d) must match the number of network adapters in the template (%d)", len(osNetworkAdapters), len(template.NetworkAdapters))
+		}
+
 		templateNetworkAdapters := make([]client.OSNetworkAdapter, len(template.NetworkAdapters))
-		for i, networkAdapter := range template.NetworkAdapters {
+		for i := range template.NetworkAdapters {
+			osNetworkAdapter := osNetworkAdapters[i].(map[string]interface{})
 			templateNetworkAdapters[i] = client.OSNetworkAdapter{
-				NetworkID: networkAdapter.Network.ID,
-				MAC:       networkAdapter.MacAddress,
+				NetworkID: osNetworkAdapter["network_id"].(string),
+				MAC:       osNetworkAdapter["mac_address"].(string),
 			}
 		}
 
@@ -479,7 +486,6 @@ func openIaasVirtualMachineCreate(ctx context.Context, d *schema.ResourceData, m
 			return diag.Errorf("Could not find marketplace item info with id : %s", d.Get("marketplace_item_id").(string))
 		}
 
-		osNetworkAdapters := d.Get("os_network_adapter").([]interface{})
 		if osNetworkAdapters != nil && len(osNetworkAdapters) != len(openIaasItemInfo.NetworkAdapters) {
 			return diag.Errorf("the number of os_network_adapter (%d) must match the number of network adapters in the marketplace item (%d)", len(osNetworkAdapters), len(openIaasItemInfo.NetworkAdapters))
 		}
@@ -535,7 +541,7 @@ func openIaasVirtualMachineCreate(ctx context.Context, d *schema.ResourceData, m
 		return diag.Errorf("could not list network adapters of virtual machine, %s", err)
 	}
 
-	osNetworkAdapters := helpers.UpdateNestedMapItems(d, helpers.FlattenOpenIaaSOSNetworkAdaptersData(networkAdapters), "os_network_adapter")
+	osNetworkAdapters = helpers.UpdateNestedMapItems(d, helpers.FlattenOpenIaaSOSNetworkAdaptersData(networkAdapters), "os_network_adapter")
 	if err := d.Set("os_network_adapter", osNetworkAdapters); err != nil {
 		return diag.FromErr(err)
 	}