4.9.8

CHANGELOG.md

@@ -1,9 +1,8 @@
-## Version 4.9.3
+## Version 4.9.8
 
 ### Исправлено
 
-#### kvmvm
+#### kvmvmm
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-1016 | Ошибка при изменении полей `ram` и `cpu`, приводящая к невозможности измения параметров виртуальной машины в resources `decort_kvmvm` и `decort_cb_kvmvm` в cloudapi/kvmvm и в cloudbroker/kvmvm |
-| BATF-1018 | Ошибка при изменении поля `started`, приводящая к невозможности запуска виртуальной машины в resources `decort_kvmvm` в cloudapi/kvmvm |
+| BATF-1220 | Ошибки применения новой конфигурации после импортирования в resource `decort_kvmvm` в cloudapi/kvmvm и в `decort_cb_kvmvm` в cloudbroker/kvmvm |

Makefile

@@ -7,7 +7,7 @@ ZIPDIR = ./zip
 BINARY=${NAME}
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=4.9.3
+VERSION=4.9.8
 OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 
 FILES = ${BINARY}_${VERSION}_darwin_amd64\

README.md

@@ -2,7 +2,7 @@
 
 Terraform provider для платформы Digital Energy Cloud Orchestration Technology (DECORT)
 
-## Соответсвие версий платформы версиям провайдера
+## Соответствие версий платформы версиям провайдера
 
 | Версия DECORT API | Версия провайдера Terraform |
 | ------ | ------ |

internal/service/cloudapi/disks/old_schemas.go

@@ -0,0 +1,421 @@
+package disks
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceDiskV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"account_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew:    true,
+				Description: "The unique ID of the subscriber-owner of the disk",
+			},
+			"disk_name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of disk",
+			},
+			"size_max": {
+				Type:        schema.TypeInt,
+				Required:    true,
+				Description: "Size in GB",
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew:    true,
+				Description: "ID of the grid (platform)",
+			},
+			"pool": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Pool for disk location",
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Storage endpoint provider ID to create disk",
+			},
+			"desc": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Description of disk",
+			},
+			"type": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validation.StringInSlice([]string{"D", "B", "T"}, false),
+				Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+			},
+			"detach": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Detaching the disk from compute",
+			},
+			"permanently": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Whether to completely delete the disk, works only with non attached disks",
+			},
+			"shareable": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
+			"iotune": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"read_bytes_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Number of bytes to read per second",
+						},
+						"read_bytes_sec_max": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Maximum number of bytes to read",
+						},
+						"read_iops_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Number of io read operations per second",
+						},
+						"read_iops_sec_max": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Maximum number of io read operations",
+						},
+						"size_iops_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Size of io operations",
+						},
+						"total_bytes_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Total size bytes per second",
+						},
+						"total_bytes_sec_max": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Maximum total size of bytes per second",
+						},
+						"total_iops_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Total number of io operations per second",
+						},
+						"total_iops_sec_max": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Maximum total number of io operations per second",
+						},
+						"write_bytes_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Number of bytes to write per second",
+						},
+						"write_bytes_sec_max": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Maximum number of bytes to write per second",
+						},
+						"write_iops_sec": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Number of write operations per second",
+						},
+						"write_iops_sec_max": {
+							Type:        schema.TypeInt,
+							Optional:    true,
+							Computed:    true,
+							Description: "Maximum number of write operations per second",
+						},
+					},
+				},
+			},
+			"present_to": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"disk_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Disk ID. Duplicates the value of the ID parameter",
+			},
+			"account_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The name of the subscriber '(account') to whom this disk belongs",
+			},
+			"acl": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			// "boot_partition": {
+			// 	Type:        schema.TypeInt,
+			// 	Computed:    true,
+			// 	Description: "Number of disk partitions",
+			// },
+			"computes": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"compute_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"compute_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"created_time": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Created time",
+			},
+			"deleted_time": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Deleted time",
+			},
+			"destruction_time": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Time of final deletion",
+			},
+			"devicename": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the device",
+			},
+			// "disk_path": {
+			// 	Type:        schema.TypeString,
+			// 	Computed:    true,
+			// 	Description: "Disk path",
+			// },
+			// "guid": {
+			// 	Type:        schema.TypeInt,
+			// 	Computed:    true,
+			// 	Description: "Disk ID on the storage side",
+			// },
+			"image_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Image ID",
+			},
+			"images": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Description: "IDs of images using the disk",
+			},
+			// "iqn": {
+			// 	Type:        schema.TypeString,
+			// 	Computed:    true,
+			// 	Description: "Disk IQN",
+			// },
+			// "login": {
+			// 	Type:        schema.TypeString,
+			// 	Computed:    true,
+			// 	Description: "Login to access the disk",
+			// },
+			// "milestones": {
+			// 	Type:        schema.TypeInt,
+			// 	Computed:    true,
+			// 	Description: "Milestones",
+			// },
+			"order": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Disk order",
+			},
+			"params": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Disk params",
+			},
+			"parent_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "ID of the parent disk",
+			},
+			// "passwd": {
+			// 	Type:        schema.TypeString,
+			// 	Computed:    true,
+			// 	Description: "Password to access the disk",
+			// },
+			"pci_slot": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "ID of the pci slot to which the disk is connected",
+			},
+			// "purge_attempts": {
+			// 	Type:        schema.TypeInt,
+			// 	Computed:    true,
+			// 	Description: "Number of deletion attempts",
+			// },
+			"purge_time": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Time of the last deletion attempt",
+			},
+			"replication": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"pool_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"role": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"self_volume_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"storage_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"volume_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+				Description: "Replication status",
+			},
+			// "reality_device_number": {
+			// 	Type:        schema.TypeInt,
+			// 	Computed:    true,
+			// 	Description: "Reality device number",
+			// },
+			// "reference_id": {
+			// 	Type:        schema.TypeString,
+			// 	Computed:    true,
+			// 	Description: "ID of the reference to the disk",
+			// },
+			"res_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Resource ID",
+			},
+			"res_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the resource",
+			},
+			"role": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Disk role",
+			},
+			"sep_type": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
+			},
+			"size_used": {
+				Type:        schema.TypeFloat,
+				Computed:    true,
+				Description: "Number of used space, in GB",
+			},
+			"snapshots": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "ID of the snapshot",
+						},
+						"label": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Name of the snapshot",
+						},
+						"res_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Reference to the snapshot",
+						},
+						"snap_set_guid": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The set snapshot ID",
+						},
+						"snap_set_time": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "The set time of the snapshot",
+						},
+						"timestamp": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Snapshot time",
+						},
+					},
+				},
+			},
+			"status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Disk status",
+			},
+			"tech_status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Technical status of the disk",
+			},
+			"vmid": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Virtual Machine ID (Deprecated)",
+			},
+		},
+	}
+}

internal/service/cloudapi/disks/resource_disk.go

@@ -783,7 +783,7 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 
 func ResourceDisk() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceDiskCreate,
 		ReadContext:   resourceDiskRead,
@@ -803,5 +803,12 @@ func ResourceDisk() *schema.Resource {
 		},
 
 		Schema: resourceDiskSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceDiskV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceDiskUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudapi/disks/state_upgraders.go

@@ -0,0 +1,14 @@
+package disks
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourceDiskUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceDiskUpgradeV1: upgrading state")
+	rawState["present_to"] = make(map[string]uint64)
+
+	return rawState, nil
+}

internal/service/cloudapi/image/old_schemas.go

@@ -0,0 +1,782 @@
+package image
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
+)
+
+func resourceImageFromBlankComputeSchemaV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"compute_id": {
+				Type:        schema.TypeInt,
+				Required:    true,
+				Description: "Compute Id",
+			},
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of the rescue disk",
+			},
+			"boot_type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"bios", "uefi"}, true),
+				Description:  "Boot type of image BIOS or UEFI",
+			},
+			"type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"linux", "windows", "other"}, true),
+				Description:  "Image type linux, windows or other",
+			},
+
+			"username": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Optional username for the image",
+			},
+			"password": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Optional password for the image",
+			},
+			"account_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "AccountId to make the image exclusive",
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "storage endpoint provider ID",
+			},
+			"pool_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "pool for image create",
+			},
+			"hot_resize": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Computed:    true,
+				Description: "Does this machine supports hot resize",
+			},
+			"async_mode": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "create an image in async/sync mode",
+			},
+
+			"image_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"unc_path": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"ckey": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"acl": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"architecture": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"bootable": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"compute_ci_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"cd_presented_to": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"deleted_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"desc": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"drivers": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"enabled": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"guid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"history": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"timestamp": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"last_modified": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"link_to": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"milestones": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"image_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"network_interface_naming": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"provider_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"purge_attempts": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"present_to": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"res_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"rescuecd": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"shared_with": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"size": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"version": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceImageFromBlankDiskSchemaV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"disk_id": {
+				Type:        schema.TypeInt,
+				Required:    true,
+				Description: "Disk Id",
+			},
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of the rescue disk",
+			},
+			"boot_type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"bios", "uefi"}, true),
+				Description:  "Boot type of image BIOS or UEFI",
+			},
+			"type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"linux", "windows", "other"}, true),
+				Description:  "Image type linux, windows or other",
+			},
+			"architecture": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"X86_64"}, true),
+				Description:  "binary architecture of this image, one of X86_64",
+			},
+
+			"username": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Optional username for the image",
+			},
+			"password": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Optional password for the image",
+			},
+			"account_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "AccountId to make the image exclusive",
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "storage endpoint provider ID",
+			},
+			"pool_name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "pool for image create",
+			},
+			"drivers": {
+				Type:     schema.TypeList,
+				Required: true,
+				Elem: &schema.Schema{
+					StateFunc:    statefuncs.StateFuncToUpper,
+					ValidateFunc: validation.StringInSlice([]string{"SVA_KVM_X86", "KVM_X86"}, false), // observe case while validating
+					Type:         schema.TypeString,
+				},
+				Description: "List of types of compute suitable for image. Example: [ \"KVM_X86\" ]",
+			},
+			"bootable": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "bootable image",
+			},
+			"hot_resize": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Computed:    true,
+				Description: "Does this machine supports hot resize",
+			},
+			"async_mode": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "create an image in async/sync mode",
+			},
+
+			"image_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"unc_path": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"ckey": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"acl": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"compute_ci_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"cd_presented_to": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"deleted_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"desc": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"enabled": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"guid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"history": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"timestamp": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"last_modified": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"link_to": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"milestones": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"image_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"network_interface_naming": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"provider_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"purge_attempts": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"present_to": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"res_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"rescuecd": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"shared_with": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"size": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"version": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func dataSourceImageExtendSchemaV1() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"image_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"show_all": {
+			Type:     schema.TypeBool,
+			Default:  false,
+			Optional: true,
+		},
+		"unc_path": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ckey": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"account_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"acl": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"architecture": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"boot_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"bootable": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"compute_ci_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"cd_presented_to": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"desc": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"drivers": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"enabled": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"history": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"timestamp": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"hot_resize": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"last_modified": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"link_to": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"image_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"network_interface_naming": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"pool_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"provider_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"purge_attempts": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"res_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rescuecd": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"sep_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"shared_with": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"size": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"username": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"version": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+}
+func resourceMainImageSchemaV1(sch map[string]*schema.Schema) map[string]*schema.Schema {
+	delete(sch, "show_all")
+	sch["name"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Required:    true,
+		Description: "Name of the rescue disk",
+	}
+
+	sch["url"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Required:    true,
+		Description: "URL where to download media from",
+	}
+
+	sch["image_id"] = &schema.Schema{
+		Type:        schema.TypeInt,
+		Optional:    true,
+		Computed:    true,
+		Description: "image id",
+	}
+
+	sch["boot_type"] = &schema.Schema{
+		Type:         schema.TypeString,
+		Required:     true,
+		ValidateFunc: validation.StringInSlice([]string{"bios", "uefi"}, true),
+		Description:  "Boot type of image bios or uefi",
+	}
+
+	sch["type"] = &schema.Schema{
+		Type:         schema.TypeString,
+		Required:     true,
+		ValidateFunc: validation.StringInSlice([]string{"linux", "windows", "other"}, true),
+		Description:  "Image type linux, windows or other",
+	}
+
+	sch["hot_resize"] = &schema.Schema{
+		Type:        schema.TypeBool,
+		Optional:    true,
+		Computed:    true,
+		Description: "Does this machine supports hot resize",
+	}
+
+	sch["username"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Optional:    true,
+		Computed:    true,
+		Description: "Optional username for the image",
+	}
+
+	sch["password"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Optional:    true,
+		Computed:    true,
+		Description: "Optional password for the image",
+	}
+
+	sch["account_id"] = &schema.Schema{
+		Type:        schema.TypeInt,
+		Required:    true,
+		Description: "AccountId to make the image exclusive",
+	}
+
+	sch["username_dl"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Optional:    true,
+		Description: "username for upload binary media",
+	}
+
+	sch["password_dl"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Optional:    true,
+		Description: "password for upload binary media",
+	}
+
+	sch["pool_name"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Optional:    true,
+		Computed:    true,
+		Description: "pool for image create",
+	}
+
+	sch["sep_id"] = &schema.Schema{
+		Type:        schema.TypeInt,
+		Optional:    true,
+		Computed:    true,
+		Description: "storage endpoint provider ID",
+	}
+
+	sch["architecture"] = &schema.Schema{
+		Type:         schema.TypeString,
+		Optional:     true,
+		Computed:     true,
+		ValidateFunc: validation.StringInSlice([]string{"X86_64"}, true),
+		Description:  "binary architecture of this image, one of X86_64",
+	}
+
+	sch["drivers"] = &schema.Schema{
+		Type:     schema.TypeList,
+		Required: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeString,
+		},
+	}
+
+	sch["network_interface_naming"] = &schema.Schema{
+		Type:         schema.TypeString,
+		Optional:     true,
+		Computed:     true,
+		ValidateFunc: validation.StringInSlice([]string{"eth", "ens"}, true),
+		Description:  "select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming",
+	}
+
+	return sch
+}
+
+func resourceImageSchemaV1() *schema.Resource {
+	return &schema.Resource{Schema: resourceMainImageSchemaV1(dataSourceImageExtendSchemaV1())}
+}
+
+func resourceMainImageVirtualSchemaV1(sch map[string]*schema.Schema) map[string]*schema.Schema {
+	delete(sch, "show_all")
+	sch["name"] = &schema.Schema{
+		Type:        schema.TypeString,
+		Required:    true,
+		Description: "Name of the rescue disk",
+	}
+
+	sch["link_to"] = &schema.Schema{
+		Type:        schema.TypeInt,
+		Required:    true,
+		Description: "ID of real image to link this virtual image to upon creation",
+	}
+
+	sch["image_id"] = &schema.Schema{
+		Type:        schema.TypeInt,
+		Computed:    true,
+		Description: "Image id",
+	}
+
+	return sch
+}
+
+func resourceImageVirtualSchemaV1() *schema.Resource {
+	return &schema.Resource{Schema: resourceMainImageVirtualSchemaV1(dataSourceImageExtendSchemaV1())}
+}

internal/service/cloudapi/image/resource_image.go

@@ -235,7 +235,7 @@ func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 
 func ResourceImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageCreate,
 		ReadContext:   resourceImageRead,
@@ -255,5 +255,12 @@ func ResourceImage() *schema.Resource {
 		},
 
 		Schema: resourceImageSchemaMake(dataSourceImageExtendSchemaMake()),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageSchemaV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentToUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudapi/image/resource_image_from_blank_compute.go

@@ -255,7 +255,7 @@ func resourceImageFromBlankComputeUpdate(ctx context.Context, d *schema.Resource
 
 func ResourceImageFromBlankCompute() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageFromBlankComputeCreate,
 		ReadContext:   resourceImageFromBlankComputeRead,
@@ -275,6 +275,13 @@ func ResourceImageFromBlankCompute() *schema.Resource {
 		},
 
 		Schema: resourceImageFromBlankComputeSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageFromBlankComputeSchemaV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentToUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }
 

internal/service/cloudapi/image/resource_image_from_platform_disk.go

@@ -245,7 +245,7 @@ func resourceImageFromPlatformDiskUpdate(ctx context.Context, d *schema.Resource
 
 func ResourceImageFromPlatformDisk() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageFromPlatformDiskCreate,
 		ReadContext:   resourceImageFromPlatformDiskRead,
@@ -265,6 +265,13 @@ func ResourceImageFromPlatformDisk() *schema.Resource {
 		},
 
 		Schema: resourceImageFromPlatformDiskSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageFromBlankDiskSchemaV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentToUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }
 

internal/service/cloudapi/image/resource_image_virtual.go

@@ -107,7 +107,7 @@ func resourceImageVirtualLink(ctx context.Context, d *schema.ResourceData, m int
 
 func ResourceImageVirtual() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageVirtualCreate,
 		ReadContext:   resourceImageRead,
@@ -127,5 +127,12 @@ func ResourceImageVirtual() *schema.Resource {
 		},
 
 		Schema: resourceImageVirtualSchemaMake(dataSourceImageExtendSchemaMake()),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageVirtualSchemaV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentToUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudapi/image/state_upgraders.go

@@ -0,0 +1,14 @@
+package image
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourcePresentToUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourcePresentToUpgradeV1: upgrading state")
+	rawState["present_to"] = make(map[string]uint64)
+
+	return rawState, nil
+}

internal/service/cloudapi/kvmvm/flattens.go

@@ -447,6 +447,9 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("boot_type", computeRec.BootType)
 	d.Set("hot_resize", computeRec.HotResize)
 	d.Set("network_interface_naming", computeRec.NetworkInterfaceNaming)
+	d.Set("cpu_pin", computeRec.CPUPin)
+	d.Set("numa_affinity", computeRec.NumaAffinity)
+	d.Set("hp_backed", computeRec.HPBacked)
 
 	d.Set("enabled", false)
 	if computeRec.Status == status.Enabled {

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -297,7 +297,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	loaderType, loaderTypeOk := d.GetOk("loader_type")
 	bootType, bootTypeOk := d.GetOk("boot_type")
-	hotResize, hotResizeOk := d.GetOk("hot_resize")
+	hotResize, hotResizeOk := d.GetOkExists("hot_resize")
 	networkInterfaceNaming, networkInterfaceNamingOk := d.GetOk("network_interface_naming")
 
 	if loaderTypeOk {
@@ -901,10 +901,15 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	// Note bene: numa_affinity, cpu_pin and hp_backed, cpu, ram are not allowed to be changed for compute in STARTED tech status.
+	// 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", "chipset", "preferred_cpu") && d.Get("started").(bool) {
+	if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset", "preferred_cpu", "hot_resize") && d.Get("started").(bool) {
+		isStopRequired = true
+	}
+
+	old, new := d.GetChange("cpu")
+	if old.(int) > new.(int) && d.Get("started").(bool) && d.Get("force_resize").(bool) {
 		isStopRequired = true
 	}
 	if isStopRequired {
@@ -1098,15 +1103,6 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 
 		if len(deletedDisks) > 0 {
-			stopReq := compute.StopRequest{
-				ComputeID: computeRec.ID,
-				Force:     false,
-			}
-
-			_, err := c.CloudAPI().Compute().Stop(ctx, stopReq)
-			if err != nil {
-				return diag.FromErr(err)
-			}
 
 			for _, disk := range deletedDisks {
 				diskConv := disk.(map[string]interface{})
@@ -1127,14 +1123,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 					return diag.FromErr(err)
 				}
 			}
-			req := compute.StartRequest{
-				ComputeID: computeRec.ID,
-				AltBootID: 0,
-			}
-			_, err = c.CloudAPI().Compute().Start(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
+
 		}
 
 		if len(addedDisks) > 0 {
@@ -1765,32 +1754,6 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	c := m.(*controller.ControllerCfg)
 	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 
-	if start, ok := d.GetOk("started"); ok {
-		if start.(bool) {
-			req := compute.StopRequest{ComputeID: computeId}
-			log.Debugf("resourceComputeDelete: stoping Compute ID %d", computeId)
-			if _, err := c.CloudAPI().Compute().Stop(ctx, req); err != nil {
-				diag.FromErr(err)
-			}
-		}
-	}
-
-	pciList, ok := d.GetOk("pci_devices")
-
-	if d.Get("permanently").(bool) && ok {
-		pciDevices := pciList.(*schema.Set).List()
-		for _, v := range pciDevices {
-			pciID := v.(int)
-			req := compute.DetachPCIDeviceRequest{
-				ComputeID: computeId,
-				DeviceID:  uint64(pciID),
-			}
-			_, err := c.CloudAPI().Compute().DetachPCIDevice(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
 	req := compute.DeleteRequest{
 		ComputeID:   computeId,
 		Permanently: d.Get("permanently").(bool),

internal/service/cloudbroker/disks/old_schemas.go

@@ -0,0 +1,391 @@
+package disks
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceDiskV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"account_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew: true,
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew: true,
+			},
+			"disk_name": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"D", "B", "T"}, false),
+				Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+			},
+
+			"desc": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"size_max": {
+				Type:     schema.TypeInt,
+				Required: true,
+			},
+			"ssd_size": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+			"iops": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "max IOPS disk can perform",
+			},
+			"sep_id": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+			},
+			"pool": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"node_ids": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"detach": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "detach disk from machine first",
+			},
+			"permanently": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "whether to completely delete the disk, works only with non attached disks",
+			},
+			"shareable": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
+			"restore": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "restore deleting disk",
+			},
+			"account_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"acl": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"boot_partition": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"computes": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"compute_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"compute_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"created_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"deleted_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"destruction_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"devicename": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"disk_path": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"guid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"disk_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"image_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"images": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"iotune": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"read_bytes_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"read_bytes_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"read_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"read_iops_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"size_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_bytes_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_bytes_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_iops_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_bytes_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_bytes_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_iops_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"iqn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"login": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"milestones": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+
+			"order": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"params": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"parent_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"passwd": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"pci_slot": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"present_to": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"purge_attempts": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"purge_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"replication": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"pool_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"role": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"self_volume_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"storage_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"volume_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+				Description: "Replication status",
+			},
+			"reality_device_number": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"reference_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"res_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"res_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"role": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"sep_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"size_used": {
+				Type:     schema.TypeFloat,
+				Computed: true,
+			},
+			"snapshots": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"label": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"reference_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"res_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"snap_set_guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"snap_set_time": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"timestamp": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"vmid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+		},
+	}
+}

internal/service/cloudbroker/disks/resource_disk.go

@@ -407,7 +407,7 @@ func resourceDiskChangeNodes(ctx context.Context, d *schema.ResourceData, m inte
 
 func ResourceDisk() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceDiskCreate,
 		ReadContext:   resourceDiskRead,
@@ -427,5 +427,12 @@ func ResourceDisk() *schema.Resource {
 		},
 
 		Schema: resourceDiskSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceDiskV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceDiskUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/disks/state_upgrader.go

@@ -0,0 +1,14 @@
+package disks
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourceDiskUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceDiskUpgradeV1: upgrading state")
+	rawState["present_to"] = make(map[string]uint64)
+
+	return rawState, nil
+}

internal/service/cloudbroker/image/resource_cdrom_image.go

@@ -222,7 +222,7 @@ func resourceImageCDROMEdit(ctx context.Context, d *schema.ResourceData, m inter
 
 func ResourceCDROMImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceCDROMImageCreate,
 		ReadContext:   resourceCDROMImageRead,
@@ -242,5 +242,12 @@ func ResourceCDROMImage() *schema.Resource {
 		},
 
 		Schema: resourceCDROMImageSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceCDROMImageV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_image.go

@@ -353,7 +353,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 
 func ResourceImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageCreate,
 		ReadContext:   resourceImageRead,
@@ -373,5 +373,12 @@ func ResourceImage() *schema.Resource {
 		},
 
 		Schema: resourceImageSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_image_from_blank_compute.go

@@ -261,7 +261,7 @@ func resourceImageFromBlankComputeUpdate(ctx context.Context, d *schema.Resource
 
 func ResourceImageFromBlankCompute() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageFromBlankComputeCreate,
 		ReadContext:   resourceImageFromBlankComputeRead,
@@ -281,5 +281,12 @@ func ResourceImageFromBlankCompute() *schema.Resource {
 		},
 
 		Schema: resourceImageFromBlankComputeSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageFromBlankComputeV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_image_from_platform_disk.go

@@ -268,7 +268,7 @@ func resourceImageFromPlatformDiskUpdate(ctx context.Context, d *schema.Resource
 
 func ResourceImageFromPlatformDisk() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageFromPlatformDiskCreate,
 		ReadContext:   resourceImageFromPlatformDiskRead,
@@ -288,5 +288,12 @@ func ResourceImageFromPlatformDisk() *schema.Resource {
 		},
 
 		Schema: resourceImageFromPlatformDiskSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageFromPlatformDiskV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_virtual_image.go

@@ -189,7 +189,7 @@ func resourceImageLink(ctx context.Context, d *schema.ResourceData, m interface{
 
 func ResourceVirtualImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceVirtualImageCreate,
 		ReadContext:   resourceVirtualImageRead,
@@ -209,5 +209,12 @@ func ResourceVirtualImage() *schema.Resource {
 		},
 
 		Schema: resourceVirtualImageSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceVirtualImageV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/state_upgrader.go

@@ -0,0 +1,14 @@
+package image
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourcePresentTOUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourcePresentTOUpgradeV1: upgrading state")
+	rawState["present_to"] = make(map[string]uint64)
+
+	return rawState, nil
+}

internal/service/cloudbroker/kvmvm/flattens.go

@@ -103,6 +103,9 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("boot_type", computeRec.BootType)
 	d.Set("hot_resize", computeRec.HotResize)
 	d.Set("network_interface_naming", computeRec.NetworkInterfaceNaming)
+	d.Set("numa_affinity", computeRec.NumaAffinity)
+	d.Set("cpu_pin", computeRec.CPUPin)
+	d.Set("hp_backed", computeRec.HPBacked)
 	return nil
 }
 

internal/service/cloudbroker/kvmvm/resource_compute.go

@@ -251,7 +251,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	loaderType, loaderTypeOk := d.GetOk("loader_type")
 	bootType, bootTypeOk := d.GetOk("boot_type")
-	hotResize, hotResizeOk := d.GetOk("hot_resize")
+	hotResize, hotResizeOk := d.GetOkExists("hot_resize")
 	networkInterfaceNaming, networkInterfaceNamingOk := d.GetOk("network_interface_naming")
 
 	if loaderTypeOk {
@@ -875,33 +875,6 @@ func resourceComputeDelete(ctx context.Context, d *schema.ResourceData, m interf
 	c := m.(*controller.ControllerCfg)
 	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 
-	if start, ok := d.GetOk("started"); ok {
-		if start.(bool) {
-			req := compute.StopRequest{ComputeID: computeId}
-			log.Debugf("resourceComputeDelete: stoping Compute ID %d", computeId)
-			if _, err := c.CloudBroker().Compute().Stop(ctx, req); err != nil {
-				diag.FromErr(err)
-			}
-		}
-	}
-
-	pciList, ok := d.GetOk("pci_devices")
-
-	if d.Get("permanently").(bool) && ok {
-		pciDevices := pciList.(*schema.Set).List()
-		for _, v := range pciDevices {
-			pciID := v.(int)
-			req := compute.DetachPCIDeviceRequest{
-				ComputeID: computeId,
-				DeviceID:  uint64(pciID),
-			}
-			_, err := c.CloudBroker().Compute().DetachPciDevice(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
 	req := compute.DeleteRequest{
 		ComputeID:   computeId,
 		Permanently: d.Get("permanently").(bool),

internal/service/cloudbroker/kvmvm/utility_compute.go

@@ -111,7 +111,13 @@ func utilityComputeResize(ctx context.Context, d *schema.ResourceData, m interfa
 	c := m.(*controller.ControllerCfg)
 	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 
-	if d.Get("started").(bool) {
+	var isStopRequired bool
+
+	old, new := d.GetChange("cpu")
+	if d.Get("started").(bool) && (old.(int) > new.(int)) && d.Get("force_resize").(bool) {
+		isStopRequired = true
+	}
+	if isStopRequired {
 		stopReq := compute.StopRequest{
 			ComputeID: computeId,
 			Force:     false,
@@ -176,7 +182,7 @@ func utilityComputeResize(ctx context.Context, d *schema.ResourceData, m interfa
 		}
 	}
 
-	if d.Get("started").(bool) {
+	if isStopRequired {
 		if _, err := c.CloudBroker().Compute().Start(ctx, compute.StartRequest{ComputeID: computeId}); err != nil {
 			return err
 		}
@@ -275,15 +281,6 @@ func utilityComputeUpdateDisks(ctx context.Context, d *schema.ResourceData, m in
 	}
 
 	if len(deletedDisks) > 0 {
-		stopReq := compute.StopRequest{
-			ComputeID: computeId,
-			Force:     false,
-		}
-
-		_, err := c.CloudBroker().Compute().Stop(ctx, stopReq)
-		if err != nil {
-			return err
-		}
 
 		for _, disk := range deletedDisks {
 			diskConv := disk.(map[string]interface{})
@@ -302,14 +299,7 @@ func utilityComputeUpdateDisks(ctx context.Context, d *schema.ResourceData, m in
 				return err
 			}
 		}
-		req := compute.StartRequest{
-			ComputeID: computeId,
-			AltBootID: 0,
-		}
-		_, err = c.CloudBroker().Compute().Start(ctx, req)
-		if err != nil {
-			return err
-		}
+
 	}
 
 	if len(addedDisks) > 0 {
@@ -921,7 +911,7 @@ func utilityComputeUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	// 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", "chipset", "preferred_cpu") && d.Get("started").(bool) {
+	if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset", "preferred_cpu", "hot_resize") && d.Get("started").(bool) {
 		isStopRequired = true
 	}
 	if isStopRequired {