4.8.0

2024-12-27 12:00:59 +03:00
parent de8857b1d5
commit dc39a6412e
370 changed files with 34359 additions and 612 deletions
--- a/internal/service/cloudapi/kvmvm/data_source_compute.go
+++ b/internal/service/cloudapi/kvmvm/data_source_compute.go
@@ -703,6 +703,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"chipset": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -950,6 +954,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,
--- a/internal/service/cloudapi/kvmvm/data_source_compute_list.go
+++ b/internal/service/cloudapi/kvmvm/data_source_compute_list.go
@@ -121,6 +121,10 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"boot_order": {
 			Type:     schema.TypeList,
 			Computed: true,
--- a/internal/service/cloudapi/kvmvm/flattens.go
+++ b/internal/service/cloudapi/kvmvm/flattens.go
@@ -183,6 +183,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"affinity_weight":     compute.AffinityWeight,
 			"anti_affinity_rules": flattenListRules(compute.AntiAffinityRules),
 			"arch":                compute.Architecture,
+			"auto_start_w_node":   compute.AutoStart,
 			"boot_order":          compute.BootOrder,
 			"bootdisk_size":       compute.BootDiskSize,
 			"chipset":             compute.Chipset,
@@ -362,6 +363,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("account_name", computeRec.AccountName)
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("arch", computeRec.Architecture)
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("boot_order", computeRec.BootOrder)
 	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
 	d.Set("boot_disk_size", bootDisk.SizeMax)
@@ -429,6 +431,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("updated_by", computeRec.UpdatedBy)
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)
@@ -613,6 +616,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("affinity_rules", flattenAffinityRules(computeRec.AffinityRules))
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("anti_affinity_rules", flattenListRules(computeRec.AntiAffinityRules))
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("arch", computeRec.Architecture)
 	d.Set("chipset", computeRec.Chipset)
 	d.Set("boot_order", computeRec.BootOrder)
@@ -672,6 +676,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_managed", computeRec.UserManaged)
 	d.Set("userdata", string(userdata))
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)
--- a/internal/service/cloudapi/kvmvm/resource_compute.go
+++ b/internal/service/cloudapi/kvmvm/resource_compute.go
@@ -491,12 +491,26 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			req := compute.PinToStackRequest{
 				ComputeID: computeId,
 			}
+			req.AutoStart = d.Get("auto_start_w_node").(bool)
 			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
 			if err != nil {
 				warnings.Add(err)
 			}
 		}

+		if !d.Get("pin_to_stack").(bool) && d.Get("auto_start_w_node").(bool) {
+			req := compute.UpdateRequest{
+				ComputeID: computeId,
+				AutoStart: d.Get("auto_start_w_node").(bool),
+				CPUPin:    d.Get("cpu_pin").(bool),
+				HPBacked:  d.Get("hp_backed").(bool),
+			}
+			_, err := c.CloudAPI().Compute().Update(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+
 		if d.Get("pause").(bool) {
 			req := compute.PauseRequest{
 				ComputeID: computeId,
@@ -619,7 +633,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}

 	if !hasRG {
-		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause rgID %d not allowed or does not exist", d.Get("rg_id").(int))
+		return diag.Errorf("resourceComputeUpdate: can't update Compute because rgID %d not allowed or does not exist", d.Get("rg_id").(int))
 	}

 	hasImage, err := existImageId(ctx, d, m)
@@ -628,7 +642,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}

 	if !hasImage {
-		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause imageID %d not allowed or does not exist", d.Get("image_id").(int))
+		return diag.Errorf("resourceComputeUpdate: can't update Compute because imageID %d not allowed or does not exist", d.Get("image_id").(int))
 	}

 	if disks, ok := d.GetOk("disks"); ok {
@@ -862,7 +876,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}

-	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed") {
+	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed", "chipset", "auto_start_w_node") {
 		req := compute.UpdateRequest{
 			ComputeID: computeRec.ID,
 		}
@@ -876,21 +890,17 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		if d.HasChange("numa_affinity") {
 			req.NumaAffinity = d.Get("numa_affinity").(string)
 		}
-		if d.HasChange("cpu_pin") {
-			req.CPUPin = d.Get("cpu_pin").(bool)
-		}
-		if d.HasChange("hp_backed") {
-			req.HPBacked = d.Get("hp_backed").(bool)
-		}
-
 		if d.HasChange("chipset") {
 			req.Chipset = d.Get("chipset").(string)
 		}
+		req.CPUPin = d.Get("cpu_pin").(bool)
+		req.HPBacked = d.Get("hp_backed").(bool)
+		req.AutoStart = d.Get("auto_start_w_node").(bool)

 		// Note bene: numa_affinity, cpu_pin and hp_backed are not allowed to be changed for compute in STARTED tech status.
 		// If STARTED, we need to stop it before update
 		var isStopRequired bool
-		if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed") && d.Get("started").(bool) {
+		if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset") && d.Get("started").(bool) {
 			isStopRequired = true
 		}
 		if isStopRequired {
@@ -1481,7 +1491,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 			req := compute.PinToStackRequest{
 				ComputeID: computeRec.ID,
 			}
-
+			req.AutoStart = d.Get("auto_start_w_node").(bool)
 			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
 			if err != nil {
 				return diag.FromErr(err)
@@ -2123,6 +2133,12 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Default:  false,
 		},
+		"auto_start_w_node": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Computed:    true,
+			Description: "Flag for start compute after node exits from MAINTENANCE state",
+		},
 		"auto_start": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -2411,6 +2427,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -2444,11 +2464,14 @@ func ResourceCompute() *schema.Resource {
 		},

 		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
-			if diff.HasChanges() || diff.HasChanges("network", "affinity_rules", "anti_affinity_rules",
+			if diff.HasChanges() || diff.HasChanges("chipset", "pin_to_stack", "auto_start_w_node", "network", "affinity_rules", "anti_affinity_rules",
 				"disks", "extra_disks", "tags", "port_forwarding", "user_access", "snapshot", "pci_devices") {
 				diff.SetNewComputed("updated_time")
 				diff.SetNewComputed("updated_by")
 			}
+			if diff.HasChanges("pin_to_stack") {
+				diff.SetNewComputed("pinned")
+			}
 			return nil
 		},