4.5.3

internal/service/cloudbroker/kvmvm/schema.go

@@ -5,6 +5,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
 )
 
 func dataSourceComputeSchemaMake() map[string]*schema.Schema {
@@ -145,6 +146,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
+		"boot_disk_size": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"cd_image_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -769,57 +774,6 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
-
-		//extra parameters
-		"boot_disk_size": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"boot_disk_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"pool": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"extra_disks": {
-			Type:     schema.TypeSet,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "IDs of the extra disk(s) attached to this compute.",
-		},
-		"network": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"net_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ip_address": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"mac": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-			Description: "Network connection(s) for this compute.",
-		},
 	}
 	return res
 }
@@ -1023,7 +977,7 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 							Type: schema.TypeString,
 						},
 					},
-					"bootdisk_size": {
+					"boot_disk_size": {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
@@ -2577,10 +2531,13 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Description:  "Number of CPUs to allocate to this compute instance.",
 		},
 		"ram": {
-			Type:         schema.TypeInt,
-			Required:     true,
-			ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
-			Description:  "Amount of RAM in MB to allocate to this compute instance.",
+			Type:     schema.TypeInt,
+			Required: true,
+			ValidateFunc: validation.All(
+				validation.IntAtLeast(constants.MinRamPerCompute),
+				validators.DivisibleBy(constants.RAMDivisibility),
+			),
+			Description: "Amount of RAM in MB to allocate to this compute instance.",
 		},
 		"image_id": {
 			Type:        schema.TypeInt,
@@ -2631,7 +2588,7 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 		"stack_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
-			Default:     0,
+			Computed:    true,
 			Description: "ID of stack to start compute",
 		},
 		"is": {
@@ -2699,9 +2656,8 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Description: "Set affinity label for compute",
 		},
 		"affinity_rules": {
-			Type:     schema.TypeSet,
+			Type:     schema.TypeList,
 			Optional: true,
-			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"topology": {
@@ -2729,7 +2685,7 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 					},
 					"value": {
 						Type:        schema.TypeString,
-						Required:    true,
+						Optional:    true,
 						Description: "value that must match the key to be taken into account when analyzing this rule",
 					},
 				},
@@ -2738,7 +2694,6 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 		"anti_affinity_rules": {
 			Type:     schema.TypeList,
 			Optional: true,
-			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"topology": {
@@ -2766,7 +2721,7 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 					},
 					"value": {
 						Type:        schema.TypeString,
-						Required:    true,
+						Optional:    true,
 						Description: "value that must match the key to be taken into account when analyzing this rule",
 					},
 				},
@@ -3015,6 +2970,12 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Flag for redeploy compute",
 		},
+		"force_resize": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Flag for resize compute",
+		},
 		"data_disks": {
 			Type:         schema.TypeString,
 			Optional:     true,