4.6.0

internal/service/cloudapi/account/data_source_account.go

@@ -307,6 +307,13 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"compute_features": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"created_by": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudapi/account/data_source_account_computes_list.go

@@ -135,6 +135,11 @@ func dataSourceAccountComputesListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by extnet ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/account/data_source_account_disks_list.go

@@ -101,6 +101,11 @@ func dataSourceAccountDisksListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by disk type",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/account/data_source_account_list.go

@@ -46,13 +46,14 @@ func flattenAccountList(al *account.ListAccounts) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, acc := range al.Data {
 		temp := map[string]interface{}{
-			"acl":          flattenRgAcl(acc.ACL),
-			"created_time": acc.CreatedTime,
-			"deleted_time": acc.DeletedTime,
-			"account_id":   acc.ID,
-			"account_name": acc.Name,
-			"status":       acc.Status,
-			"updated_time": acc.UpdatedTime,
+			"acl":              flattenRgAcl(acc.ACL),
+			"compute_features": acc.ComputeFeatures,
+			"created_time":     acc.CreatedTime,
+			"deleted_time":     acc.DeletedTime,
+			"account_id":       acc.ID,
+			"account_name":     acc.Name,
+			"status":           acc.Status,
+			"updated_time":     acc.UpdatedTime,
 		}
 		res = append(res, temp)
 	}
@@ -112,6 +113,11 @@ func dataSourceAccountListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by status",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -159,6 +165,13 @@ func dataSourceAccountListSchemaMake() map[string]*schema.Schema {
 							},
 						},
 					},
+					"compute_features": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
 					"created_time": {
 						Type:     schema.TypeInt,
 						Computed: true,

internal/service/cloudapi/account/data_source_account_rg_list.go

@@ -138,6 +138,11 @@ func dataSourceAccountRGListSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "ID of the account",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/account/data_source_account_templates_list.go

@@ -103,6 +103,11 @@ func dataSourceAccountTemplatesListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by type",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/account/data_source_account_vins_list.go

@@ -54,6 +54,8 @@ func flattenAccountVinsList(avl *account.ListVINS) []map[string]interface{} {
 			"deleted_by":     av.DeletedBy,
 			"deleted_time":   av.DeletedTime,
 			"external_ip":    av.ExternalIP,
+			"extnet_id":      av.ExtnetId,
+			"free_ips":       av.FreeIPs,
 			"vin_id":         av.ID,
 			"vin_name":       av.Name,
 			"network":        av.Network,
@@ -112,6 +114,11 @@ func dataSourceAccountVinsListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by external IP",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -160,6 +167,14 @@ func dataSourceAccountVinsListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"free_ips": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"vin_id": {
 						Type:     schema.TypeInt,
 						Computed: true,

internal/service/cloudapi/account/flattens.go

@@ -12,6 +12,7 @@ func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
 	d.Set("companyurl", acc.CompanyURL)
+	d.Set("compute_features", acc.ComputeFeatures)
 	d.Set("created_by", acc.CreatedBy)
 	d.Set("created_time", acc.CreatedTime)
 	d.Set("deactivation_time", acc.DeactivationTime)

internal/service/cloudapi/account/resource_account.go

@@ -279,19 +279,6 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("restore") {
-		restore := d.Get("restore").(bool)
-		if restore && acc.Status == "DELETED" {
-			req := account.RestoreRequest{
-				AccountID: accountId,
-			}
-			_, err := c.CloudAPI().Account().Restore(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
 	if d.HasChange("users") {
 		deletedUsers := make([]interface{}, 0)
 		addedUsers := make([]interface{}, 0)
@@ -542,6 +529,13 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"compute_features": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"created_by": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudapi/account/utility_account_computes_list.go

@@ -1,102 +1,106 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListComputes, error) {
-	c := m.(*controller.ControllerCfg)
-	var id uint64
-
-	id = uint64(d.Get("account_id").(int))
-
-	req := account.ListComputesRequest{
-		AccountID: id,
-	}
-
-	if compute_id, ok := d.GetOk("compute_id"); ok {
-		req.ComputeID = uint64(compute_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if rg_name, ok := d.GetOk("rg_name"); ok {
-		req.RGName = rg_name.(string)
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-
-	if tech_status, ok := d.GetOk("tech_status"); ok {
-		req.TechStatus = tech_status.(string)
-	}
-
-	if ip_address, ok := d.GetOk("ip_address"); ok {
-		req.IPAddress = ip_address.(string)
-	}
-
-	if extnet_name, ok := d.GetOk("extnet_name"); ok {
-		req.ExtNetName = extnet_name.(string)
-	}
-
-	if extnet_id, ok := d.GetOk("extnet_id"); ok {
-		req.ExtNetID = uint64(extnet_id.(int))
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityAccountComputesListCheckPresence: load account list")
-	accountComputesList, err := c.CloudAPI().Account().ListComputes(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountComputesList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListComputes, error) {
+	c := m.(*controller.ControllerCfg)
+	var id uint64
+
+	id = uint64(d.Get("account_id").(int))
+
+	req := account.ListComputesRequest{
+		AccountID: id,
+	}
+
+	if compute_id, ok := d.GetOk("compute_id"); ok {
+		req.ComputeID = uint64(compute_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if rg_name, ok := d.GetOk("rg_name"); ok {
+		req.RGName = rg_name.(string)
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if tech_status, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = tech_status.(string)
+	}
+
+	if ip_address, ok := d.GetOk("ip_address"); ok {
+		req.IPAddress = ip_address.(string)
+	}
+
+	if extnet_name, ok := d.GetOk("extnet_name"); ok {
+		req.ExtNetName = extnet_name.(string)
+	}
+
+	if extnet_id, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extnet_id.(int))
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityAccountComputesListCheckPresence: load account list")
+	accountComputesList, err := c.CloudAPI().Account().ListComputes(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountComputesList, nil
+}

internal/service/cloudapi/account/utility_account_deleted_list.go

@@ -1,76 +1,80 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListAccounts, error) {
-	c := m.(*controller.ControllerCfg)
-
-	req := account.ListDeletedRequest{}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if acl, ok := d.GetOk("acl"); ok {
-		req.ACL = acl.(string)
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	log.Debugf("utilityAccountDeletedListCheckPresence: load")
-	accountDeletedList, err := c.CloudAPI().Account().ListDeleted(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	return accountDeletedList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListAccounts, error) {
+	c := m.(*controller.ControllerCfg)
+
+	req := account.ListDeletedRequest{}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if acl, ok := d.GetOk("acl"); ok {
+		req.ACL = acl.(string)
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	log.Debugf("utilityAccountDeletedListCheckPresence: load")
+	accountDeletedList, err := c.CloudAPI().Account().ListDeleted(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	return accountDeletedList, nil
+}

internal/service/cloudapi/account/utility_account_disks_list.go

@@ -1,84 +1,88 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountDisksListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListDisks, error) {
-	c := m.(*controller.ControllerCfg)
-	var id uint64
-
-	id = uint64(d.Get("account_id").(int))
-
-	req := account.ListDisksRequest{
-		AccountID: id,
-	}
-
-	if disk_id, ok := d.GetOk("disk_id"); ok {
-		req.DiskID = uint64(disk_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
-		req.DiskMaxSize = uint64(disk_max_size.(int))
-	}
-
-	if typeVal, ok := d.GetOk("type"); ok {
-		req.Type = typeVal.(string)
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	accountDisksList, err := c.CloudAPI().Account().ListDisks(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountDisksList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountDisksListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListDisks, error) {
+	c := m.(*controller.ControllerCfg)
+	var id uint64
+
+	id = uint64(d.Get("account_id").(int))
+
+	req := account.ListDisksRequest{
+		AccountID: id,
+	}
+
+	if disk_id, ok := d.GetOk("disk_id"); ok {
+		req.DiskID = uint64(disk_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
+		req.DiskMaxSize = uint64(disk_max_size.(int))
+	}
+
+	if typeVal, ok := d.GetOk("type"); ok {
+		req.Type = typeVal.(string)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	accountDisksList, err := c.CloudAPI().Account().ListDisks(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountDisksList, nil
+}

internal/service/cloudapi/account/utility_account_list.go

@@ -1,79 +1,83 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListAccounts, error) {
-	c := m.(*controller.ControllerCfg)
-	req := account.ListRequest{}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if acl, ok := d.GetOk("acl"); ok {
-		req.ACL = acl.(string)
-	}
-
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-
-	log.Debugf("utilityAccountListCheckPresence: load account list")
-	accountList, err := c.CloudAPI().Account().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListAccounts, error) {
+	c := m.(*controller.ControllerCfg)
+	req := account.ListRequest{}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if acl, ok := d.GetOk("acl"); ok {
+		req.ACL = acl.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	log.Debugf("utilityAccountListCheckPresence: load account list")
+	accountList, err := c.CloudAPI().Account().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountList, nil
+}

internal/service/cloudapi/account/utility_account_rg_list.go

@@ -1,90 +1,94 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountRGListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListRG, error) {
-	c := m.(*controller.ControllerCfg)
-	var id uint64
-
-	id = uint64(d.Get("account_id").(int))
-
-	req := account.ListRGRequest{
-		AccountID: id,
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-
-	if vins_id, ok := d.GetOk("vins_id"); ok {
-		req.VINSID = uint64(vins_id.(int))
-	}
-
-	if vm_id, ok := d.GetOk("vm_id"); ok {
-		req.VMID = uint64(vm_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-
-	log.Debugf("utilityAccountRGListCheckPresence: load account list")
-	accountRGList, err := c.CloudAPI().Account().ListRG(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountRGList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountRGListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListRG, error) {
+	c := m.(*controller.ControllerCfg)
+	var id uint64
+
+	id = uint64(d.Get("account_id").(int))
+
+	req := account.ListRGRequest{
+		AccountID: id,
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if vins_id, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vins_id.(int))
+	}
+
+	if vm_id, ok := d.GetOk("vm_id"); ok {
+		req.VMID = uint64(vm_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	log.Debugf("utilityAccountRGListCheckPresence: load account list")
+	accountRGList, err := c.CloudAPI().Account().ListRG(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountRGList, nil
+}

internal/service/cloudapi/account/utility_account_templates_list.go

@@ -1,80 +1,83 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountTemplatesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListTemplates, error) {
-	c := m.(*controller.ControllerCfg)
-
-	id := uint64(d.Get("account_id").(int))
-
-	req := account.ListTemplatesRequest{
-		AccountID: id,
-	}
-
-	if include_deleted, ok := d.GetOk("include_deleted"); ok {
-		req.IncludeDeleted = include_deleted.(bool)
-	}
-	if imageId, ok := d.GetOk("image_id"); ok {
-		req.ImageID = uint64(imageId.(int))
-	}
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-	if typeTemplates, ok := d.GetOk("type"); ok {
-		req.Type = typeTemplates.(string)
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityAccountTemplatesListCheckPresence: load")
-	accountTemplatesList, err := c.CloudAPI().Account().ListTemplates(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountTemplatesList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountTemplatesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListTemplates, error) {
+	c := m.(*controller.ControllerCfg)
+
+	id := uint64(d.Get("account_id").(int))
+
+	req := account.ListTemplatesRequest{
+		AccountID: id,
+	}
+
+	if include_deleted, ok := d.GetOk("include_deleted"); ok {
+		req.IncludeDeleted = include_deleted.(bool)
+	}
+	if imageId, ok := d.GetOk("image_id"); ok {
+		req.ImageID = uint64(imageId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if typeTemplates, ok := d.GetOk("type"); ok {
+		req.Type = typeTemplates.(string)
+	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityAccountTemplatesListCheckPresence: load")
+	accountTemplatesList, err := c.CloudAPI().Account().ListTemplates(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountTemplatesList, nil
+}

internal/service/cloudapi/account/utility_account_vins_list.go

@@ -1,86 +1,90 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountVinsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListVINS, error) {
-	c := m.(*controller.ControllerCfg)
-	var id uint64
-
-	id = uint64(d.Get("account_id").(int))
-
-	req := account.ListVINSRequest{
-		AccountID: id,
-	}
-
-	if vins_id, ok := d.GetOk("vins_id"); ok {
-		req.VINSID = uint64(vins_id.(int))
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if ext_ip, ok := d.GetOk("ext_ip"); ok {
-		req.ExtIP = ext_ip.(string)
-	}
-
-	log.Debugf("utilityAccountVinsListCheckPresence: load account list")
-	accountVinsList, err := c.CloudAPI().Account().ListVINS(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountVinsList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountVinsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListVINS, error) {
+	c := m.(*controller.ControllerCfg)
+	var id uint64
+
+	id = uint64(d.Get("account_id").(int))
+
+	req := account.ListVINSRequest{
+		AccountID: id,
+	}
+
+	if vins_id, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vins_id.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if ext_ip, ok := d.GetOk("ext_ip"); ok {
+		req.ExtIP = ext_ip.(string)
+	}
+
+	log.Debugf("utilityAccountVinsListCheckPresence: load account list")
+	accountVinsList, err := c.CloudAPI().Account().ListVINS(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountVinsList, nil
+}

internal/service/cloudapi/bservice/data_source_bservice_list.go

@@ -131,6 +131,11 @@ func dataSourceBasicServiceListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "ID of the resource group to query for BasicService instances",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/bservice/resource_bservice.go

@@ -34,7 +34,7 @@ package bservice
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -85,37 +85,38 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 		return diag.FromErr(err)
 	}
 
-	warn := dc.Warnings{}
+	warnings := dc.Warnings{}
+	enable := d.Get("enable").(bool)
 
-	if !d.Get("enable").(bool) && d.Get("start").(bool) {
-
-		warn.Add(fmt.Errorf("the basic service is in tech_status %s, troubles can occur with the usage. Please, enable bservice first", service.TechStatus))
-	}
-
-	if d.Get("enable").(bool) && (service.Status == status.Disabled || service.Status == status.Created) {
+	if enable && (service.Status == status.Disabled || service.Status == status.Created) {
 		log.Debugf("trying to enable bservice %v", serviceId)
 		_, err := c.CloudAPI().BService().Enable(ctx, bservice.EnableRequest{
 			ServiceID: serviceId,
 		})
 
 		if err != nil {
-			return diag.FromErr(err)
+			warnings.Add(err)
 		}
-
 	}
-	if d.Get("start").(bool) && d.Get("enable").(bool) {
-
+	if d.Get("start").(bool) {
 		log.Debugf("trying to start bservice %v", serviceId)
-		_, err = c.CloudAPI().BService().Start(ctx, bservice.StartRequest{
-			ServiceID: serviceId,
-		})
 
-		if err != nil {
-			return diag.FromErr(err)
+		if !enable {
+			warnings.Add(errors.New("can not start bservice that is not enabled. Set enable = true and start = true to enable and start bservice"))
+		}
+
+		if enable {
+			_, err := c.CloudAPI().BService().Start(ctx, bservice.StartRequest{
+				ServiceID: serviceId,
+			})
+
+			if err != nil {
+				warnings.Add(err)
+			}
 		}
 	}
 
-	return append(warn.Get(), resourceBasicServiceRead(ctx, d, m)...)
+	return append(warnings.Get(), resourceBasicServiceRead(ctx, d, m)...)
 }
 
 func resourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -241,44 +242,35 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 	case status.Disabling:
 		log.Debugf("The basic service is in status: %s, troubles can occur with the update.", bs.Status)
 	case status.Deleted:
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
-
-		if restore, ok := d.GetOk("restore"); ok {
-			if restore.(bool) {
-				restoreReq := bservice.RestoreRequest{
-					ServiceID: id,
-				}
-				_, err := c.CloudAPI().BService().Restore(ctx, restoreReq)
-				if err != nil {
-					return diag.FromErr(err)
-				}
+		if d.Get("restore").(bool) {
+			restoreReq := bservice.RestoreRequest{
+				ServiceID: bs.ID,
+			}
+			_, err := c.CloudAPI().BService().Restore(ctx, restoreReq)
+			if err != nil {
+				return diag.FromErr(err)
 			}
-			hasChanged = true
-		}
 
-		if enable, ok := d.GetOk("enable"); ok {
-			if enable.(bool) {
+			hasChanged = true
+
+			if d.Get("enable").(bool) {
 				enableReq := bservice.EnableRequest{
-					ServiceID: id,
+					ServiceID: bs.ID,
 				}
 				_, err = c.CloudAPI().BService().Enable(ctx, enableReq)
 				if err != nil {
 					return diag.FromErr(err)
 				}
-				hasChanged = true
 			}
-		}
 
-		if start, ok := d.GetOk("start"); ok {
-			if start.(bool) {
+			if d.Get("start").(bool) {
 				startReq := bservice.StartRequest{
-					ServiceID: id,
+					ServiceID: bs.ID,
 				}
 				_, err = c.CloudAPI().BService().Start(ctx, startReq)
 				if err != nil {
 					return diag.FromErr(err)
 				}
-				hasChanged = true
 			}
 		}
 	case status.Deleting:
@@ -301,8 +293,7 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 	}
 
 	if d.HasChange("enable") {
-		enable := d.Get("enable").(bool)
-		if enable {
+		if d.Get("enable").(bool) {
 			req := bservice.EnableRequest{
 				ServiceID: uint64(d.Get("service_id").(int)),
 			}
@@ -324,8 +315,7 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 	}
 
 	if d.HasChange("start") {
-		start := d.Get("start").(bool)
-		if start {
+		if d.Get("start").(bool) {
 			req := bservice.StartRequest{
 				ServiceID: uint64(d.Get("service_id").(int)),
 			}

internal/service/cloudapi/bservice/resource_bservice_group.go

@@ -43,6 +43,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
 )
 
 func resourceBasicServiceGroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -372,8 +373,12 @@ func resourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
 			Description: "compute CPU number. All computes in the group have the same CPU count",
 		},
 		"ram": {
-			Type:        schema.TypeInt,
-			Required:    true,
+			Type:     schema.TypeInt,
+			Required: true,
+			ValidateFunc: validation.All(
+				validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
+				validators.DivisibleBy(constants.RAM_DIVISIBILITY),
+			),
 			Description: "compute RAM volume in MB. All computes in the group have the same RAM volume",
 		},
 		"disk": {

internal/service/cloudapi/bservice/utility_bservicce_deleted_list.go

@@ -1,69 +1,73 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package bservice
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityBasicServiceDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListBasicServices, error) {
-	c := m.(*controller.ControllerCfg)
-	req := bservice.ListDeletedRequest{}
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
-	if rgId, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rgId.(int))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityBasicServiceDeletedListCheckPresence")
-	basicServiceDeletedList, err := c.CloudAPI().BService().ListDeleted(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return basicServiceDeletedList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package bservice
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityBasicServiceDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListBasicServices, error) {
+	c := m.(*controller.ControllerCfg)
+	req := bservice.ListDeletedRequest{}
+
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if rgId, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rgId.(int))
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityBasicServiceDeletedListCheckPresence")
+	basicServiceDeletedList, err := c.CloudAPI().BService().ListDeleted(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return basicServiceDeletedList, nil
+}

internal/service/cloudapi/bservice/utility_bservice_list.go

@@ -1,93 +1,96 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package bservice
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityBasicServiceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListBasicServices, error) {
-	c := m.(*controller.ControllerCfg)
-	req := bservice.ListRequest{}
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
-	if rgId, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rgId.(int))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if rg_name, ok := d.GetOk("rg_name"); ok {
-		req.RGName = rg_name.(string)
-	}
-
-	if tech_status, ok := d.GetOk("tech_status"); ok {
-		req.TechStatus = tech_status.(string)
-	}
-
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-
-	if acc_name, ok := d.GetOk("account_name"); ok {
-		req.AccountName = acc_name.(string)
-	}
-
-	log.Debugf("utilityBasicServiceListCheckPresence")
-	basicServiceList, err := c.CloudAPI().BService().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return basicServiceList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package bservice
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityBasicServiceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListBasicServices, error) {
+	c := m.(*controller.ControllerCfg)
+	req := bservice.ListRequest{}
+
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if rgId, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rgId.(int))
+	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if rg_name, ok := d.GetOk("rg_name"); ok {
+		req.RGName = rg_name.(string)
+	}
+
+	if tech_status, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = tech_status.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if acc_name, ok := d.GetOk("account_name"); ok {
+		req.AccountName = acc_name.(string)
+	}
+
+	log.Debugf("utilityBasicServiceListCheckPresence")
+	basicServiceList, err := c.CloudAPI().BService().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return basicServiceList, nil
+}

internal/service/cloudapi/disks/data_source_disk.go

@@ -294,6 +294,39 @@ func dataSourceDiskSchemaMake() map[string]*schema.Schema {
 			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,

internal/service/cloudapi/disks/data_source_disk_list.go

@@ -108,6 +108,11 @@ func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "find by pool name",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -376,6 +381,39 @@ func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
 					// 	Computed:    true,
 					// 	Description: "ID of the reference to the disk",
 					// },
+					"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",
+					},
 					"res_id": {
 						Type:        schema.TypeString,
 						Computed:    true,

internal/service/cloudapi/disks/data_source_disk_list_types.go

@@ -57,6 +57,11 @@ func dataSourceDiskListTypesRead(ctx context.Context, d *schema.ResourceData, m
 
 func dataSourceDiskListTypesSchemaMake() map[string]*schema.Schema {
 	res := map[string]*schema.Schema{
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go

@@ -87,6 +87,11 @@ func dataSourceDiskListTypesDetailedRead(ctx context.Context, d *schema.Resource
 
 func dataSourceDiskListTypesDetailedSchemaMake() map[string]*schema.Schema {
 	res := map[string]*schema.Schema{
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/disks/data_source_disk_list_unattached.go

@@ -113,6 +113,11 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "type of the disks",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/disks/data_source_disk_replication.go

@@ -0,0 +1,480 @@
+/*
+Copyright (c) 2019-2024 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package disks
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func dataSourceDiskReplicationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("dataSourceDiskReplicationRead: called for disk with ID: %s", d.Id())
+	c := m.(*controller.ControllerCfg)
+
+	req := disks.ReplicationStatusRequest{
+		DiskID: uint64(d.Get("disk_id").(int)),
+	}
+
+	status, err := c.CloudAPI().Disks().ReplicationStatus(ctx, req)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+
+	disk, err := utilityDiskReplicaCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	flattenDiskReplica(d, disk, status)
+
+	log.Debugf("dataSourceDiskReplicationRead: read complete for disk with ID: %s", d.Id())
+
+	return nil
+}
+
+func dataSourceDiskReplicationSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"disk_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Id of primary disk",
+		},
+		"replica_disk_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Id of secondary disk",
+		},
+		"status_replication": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Status of replication",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "The unique ID of the subscriber-owner of the disk",
+		},
+		"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",
+		},
+		"desc": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Description of disk",
+		},
+		"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",
+		// },
+		"gid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "ID of the grid (platform)",
+		},
+		// "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",
+		},
+		"iotune": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"read_bytes_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of bytes to read per second",
+					},
+					"read_bytes_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of bytes to read",
+					},
+					"read_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of io read operations per second",
+					},
+					"read_iops_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of io read operations",
+					},
+					"size_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Size of io operations",
+					},
+					"total_bytes_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Total size bytes per second",
+					},
+					"total_bytes_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum total size of bytes per second",
+					},
+					"total_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Total number of io operations per second",
+					},
+					"total_iops_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum total number of io operations per second",
+					},
+					"write_bytes_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of bytes to write per second",
+					},
+					"write_bytes_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of bytes to write per second",
+					},
+					"write_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of write operations per second",
+					},
+					"write_iops_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of write operations per second",
+					},
+				},
+			},
+		},
+		// "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",
+		// },
+		"disk_name": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Name of disk",
+		},
+		"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",
+		},
+		"pool": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Pool for disk location",
+		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		// "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_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Storage endpoint provider ID to create disk",
+		},
+		"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",
+		},
+		"shareable": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"size_max": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Size in GB",
+		},
+		"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",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+		},
+		"vmid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Virtual Machine ID (Deprecated)",
+		},
+	}
+
+	return rets
+}
+
+func DataSourceDiskReplication() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceDiskReplicationRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceDiskReplicationSchemaMake(),
+	}
+}

internal/service/cloudapi/disks/data_source_list_deleted.go

@@ -94,6 +94,11 @@ func dataSourceDiskDeletedListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "type of the disks",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -352,6 +357,39 @@ func dataSourceDiskDeletedListSchemaMake() map[string]*schema.Schema {
 						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,

internal/service/cloudapi/disks/flattens.go

@@ -72,7 +72,6 @@ func flattenDiskListUnattached(ul *disks.ListDisksUnattached) []map[string]inter
 
 func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 	diskAcl, _ := json.Marshal(disk.ACL)
-
 	d.Set("account_id", disk.AccountID)
 	d.Set("account_name", disk.AccountName)
 	d.Set("acl", string(diskAcl))
@@ -103,6 +102,7 @@ func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 	d.Set("present_to", disk.PresentTo)
 	// d.Set("purge_attempts", disk.PurgeAttempts)
 	d.Set("purge_time", disk.PurgeTime)
+	d.Set("replication", flattenDiskReplication(disk.Replication))
 	// d.Set("reality_device_number", disk.RealityDeviceNumber)
 	// d.Set("reference_id", disk.ReferenceID)
 	d.Set("res_id", disk.ResID)
@@ -120,6 +120,71 @@ func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 	d.Set("vmid", disk.VMID)
 }
 
+func flattenDiskReplication(rep disks.ItemReplication) []map[string]interface{} {
+	res := []map[string]interface{}{
+		{
+			"disk_id":        rep.DiskID,
+			"pool_id":        rep.PoolID,
+			"role":           rep.Role,
+			"self_volume_id": rep.SelfVolumeID,
+			"storage_id":     rep.StorageID,
+			"volume_id":      rep.VolumeID,
+		},
+	}
+	return res
+}
+
+func flattenDiskReplica(d *schema.ResourceData, disk *disks.RecordDisk, statusReplication string) {
+	diskAcl, _ := json.Marshal(disk.ACL)
+	d.Set("account_id", disk.AccountID)
+	d.Set("account_name", disk.AccountName)
+	d.Set("acl", string(diskAcl))
+	// d.Set("boot_partition", disk.BootPartition)
+	d.Set("computes", flattenDiskComputes(disk.Computes))
+	d.Set("created_time", disk.CreatedTime)
+	d.Set("deleted_time", disk.DeletedTime)
+	d.Set("desc", disk.Description)
+	d.Set("destruction_time", disk.DestructionTime)
+	d.Set("devicename", disk.DeviceName)
+	// d.Set("disk_path", disk.DiskPath)
+	d.Set("gid", disk.GID)
+	// d.Set("guid", disk.GUID)
+	d.Set("replica_disk_id", disk.ID)
+	d.Set("image_id", disk.ImageID)
+	d.Set("images", disk.Images)
+	d.Set("iotune", flattenIOTune(disk.IOTune))
+	// d.Set("iqn", disk.IQN)
+	// d.Set("login", disk.Login)
+	// d.Set("milestones", disk.Milestones)
+	d.Set("disk_name", disk.Name)
+	d.Set("order", disk.Order)
+	d.Set("params", disk.Params)
+	d.Set("parent_id", disk.ParentID)
+	// d.Set("passwd", disk.Passwd)
+	d.Set("pci_slot", disk.PCISlot)
+	d.Set("pool", disk.Pool)
+	d.Set("present_to", disk.PresentTo)
+	// d.Set("purge_attempts", disk.PurgeAttempts)
+	d.Set("purge_time", disk.PurgeTime)
+	d.Set("replication", flattenDiskReplication(disk.Replication))
+	// d.Set("reality_device_number", disk.RealityDeviceNumber)
+	// d.Set("reference_id", disk.ReferenceID)
+	d.Set("res_id", disk.ResID)
+	d.Set("res_name", disk.ResName)
+	d.Set("role", disk.Role)
+	d.Set("sep_id", disk.SepID)
+	d.Set("sep_type", disk.SepType)
+	d.Set("size_max", disk.SizeMax)
+	d.Set("size_used", disk.SizeUsed)
+	d.Set("shareable", disk.Shareable)
+	d.Set("snapshots", flattenDiskSnapshotList(disk.Snapshots))
+	d.Set("status", disk.Status)
+	d.Set("status_replication", statusReplication)
+	d.Set("tech_status", disk.TechStatus)
+	d.Set("type", disk.Type)
+	d.Set("vmid", disk.VMID)
+}
+
 func flattenDiskSnapshotList(sl disks.ListSnapshots) []interface{} {
 	res := make([]interface{}, 0, len(sl))
 	for _, snapshot := range sl {
@@ -166,6 +231,7 @@ func flattenDiskList(dl *disks.ListDisks) []map[string]interface{} {
 			"pool":             disk.Pool,
 			"present_to":       disk.PresentTo,
 			"purge_time":       disk.PurgeTime,
+			"replication":      flattenDiskReplication(disk.Replication),
 			"res_id":           disk.ResID,
 			"res_name":         disk.ResName,
 			"role":             disk.Role,

internal/service/cloudapi/disks/resource_check_input_values.go

@@ -2,9 +2,11 @@ package disks
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
@@ -34,3 +36,26 @@ func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool,
 
 	return len(locationList.FilterByGID(gid).Data) != 0, nil
 }
+
+func existDiskID(ctx context.Context, diskId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+
+	req := disks.ListRequest{
+		ByID: diskId,
+	}
+
+	diskList, err := c.CloudAPI().Disks().List(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	if len(diskList.Data) == 0 {
+		return fmt.Errorf("resourceDiskReplication: can't create or update Disk replication because DiskID %d is not allowed or does not exist", diskId)
+	}
+
+	if diskList.Data[0].SepType != "TATLIN" {
+		return fmt.Errorf("resourceDiskReplication: can't create or update Disk replication because DiskID %d is not TATLIN SEP Type", diskId)
+	}
+
+	return nil
+}

internal/service/cloudapi/disks/resource_disk.go

@@ -671,6 +671,39 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			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,

internal/service/cloudapi/disks/resource_disk_replication.go

@@ -0,0 +1,642 @@
+/*
+Copyright (c) 2019-2024 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package disks
+
+import (
+	"context"
+	"strconv"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func resourceDiskReplicationCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	diskId := uint64(d.Get("disk_id").(int))
+
+	log.Debugf("resourceDiskReplicationCreate: called for disk with ID: %d", diskId)
+
+	c := m.(*controller.ControllerCfg)
+
+	err := existDiskID(ctx, diskId, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	reqCreate := disks.ReplicateRequest{
+		DiskID:   diskId,
+		Name:     d.Get("disk_name").(string),
+		SepID:    uint64(d.Get("sep_id").(int)),
+		PoolName: d.Get("pool_name").(string),
+	}
+
+	diskReplicaId, err := c.CloudAPI().Disks().Replicate(ctx, reqCreate)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(diskReplicaId, 10))
+	d.Set("replica_disk_id", diskReplicaId)
+
+	log.Debugf("resourceDiskReplicationCreate: create replica complete for disk with ID: %d", diskId)
+
+	warnings := dc.Warnings{}
+
+	if start, ok := d.GetOk("start"); ok && !start.(bool) {
+		log.Debugf("resourceDiskReplicationCreate: replication between disk with ID: %d and replica with ID: %d, try to stop", diskId, diskReplicaId)
+		reqStop := disks.ReplicationStopRequest{
+			DiskID: diskId,
+		}
+		_, err = c.CloudAPI().Disks().ReplicationStop(ctx, reqStop)
+		if err != nil {
+			warnings.Add(err)
+		}
+		log.Debugf("resourceDiskReplicationCreate: replication between disk with ID: %d and replica with ID: %d, stoped", diskId, diskReplicaId)
+	}
+	return append(resourceDiskReplicationRead(ctx, d, m), warnings.Get()...)
+}
+
+func resourceDiskReplicationRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceDiskReplicationRead: called for disk with ID: %s", d.Id())
+	c := m.(*controller.ControllerCfg)
+
+	req := disks.ReplicationStatusRequest{
+		DiskID: uint64(d.Get("disk_id").(int)),
+	}
+
+	status, err := c.CloudAPI().Disks().ReplicationStatus(ctx, req)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	diskReplica, err := utilityDiskReplicaCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	flattenDiskReplica(d, diskReplica, status)
+
+	log.Debugf("resourceDiskReplicationRead: read complete for disk with ID: %s", d.Id())
+	return nil
+}
+
+func resourceDiskReplicationUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	diskId := uint64(d.Get("disk_id").(int))
+	log.Debugf("resourceDiskReplicationUpdate: called for disk with ID: %d", diskId)
+
+	err := existDiskID(ctx, diskId, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if d.HasChange("start") {
+		if err := utilityDiskReplicationUpdateStartStop(ctx, d, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("pause") {
+		if err := utilityDiskReplicationUpdatePause(ctx, d, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("reverse") {
+		if err := utilityDiskReplicationUpdateReverse(ctx, d, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	log.Debugf("resourceDiskReplicationUpdate: read complete for disk with ID: %d", diskId)
+	return resourceDiskReplicationRead(ctx, d, m)
+}
+
+func resourceDiskReplicationDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	diskId := uint64(d.Get("disk_id").(int))
+	log.Debugf("resourceDiskReplicationDelete: called for disk with ID: %d", diskId)
+
+	disk, err := utilityDiskReplicaCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	c := m.(*controller.ControllerCfg)
+
+	if d.Get("start").(bool) {
+		reqStop := disks.ReplicationStopRequest{
+			DiskID: uint64(d.Get("disk_id").(int)),
+		}
+
+		log.Debugf("resourceDiskReplicationDelete: stop replication for disk with ID: %d", diskId)
+		_, err = c.CloudAPI().Disks().ReplicationStop(ctx, reqStop)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		log.Debugf("resourceDiskReplicationDelete: stop replication for disk with ID: %d, complete", diskId)
+	}
+
+	reqDelete := disks.DeleteRequest{
+		DiskID:      disk.ID,
+		Detach:      d.Get("detach").(bool),
+		Permanently: d.Get("permanently").(bool),
+		Reason:      d.Get("reason").(string),
+	}
+
+	log.Debugf("resourceDiskReplicationDelete: delete disk replica for disk with ID: %d", diskId)
+	_, err = c.CloudAPI().Disks().Delete(ctx, reqDelete)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	log.Debugf("resourceDiskReplicationDelete: delete disk replica for disk with ID: %d, complete", diskId)
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceDiskReplicationSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"disk_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Id of primary disk",
+		},
+		"disk_name": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Name of disk replica",
+		},
+		"sep_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Storage endpoint provider ID to create disk replica",
+		},
+		"pool_name": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Pool for disk location",
+		},
+		"pause": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Resume replication",
+		},
+		"reverse": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Reverse replication",
+		},
+		"start": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     true,
+			Description: "Start/Stop replication",
+		},
+		"detach": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Detach disk from machine first",
+		},
+		"permanently": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Delete disk permanently",
+		},
+		"reason": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Reason for disk deletion",
+		},
+		"replica_disk_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Id of replica disk",
+		},
+		"status_replication": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Status of replication",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "The unique ID of the subscriber-owner of the disk",
+		},
+		"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",
+		},
+		"desc": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Description of disk",
+		},
+		"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",
+		// },
+		"gid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "ID of the grid (platform)",
+		},
+		// "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",
+		},
+		"iotune": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"read_bytes_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of bytes to read per second",
+					},
+					"read_bytes_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of bytes to read",
+					},
+					"read_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of io read operations per second",
+					},
+					"read_iops_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of io read operations",
+					},
+					"size_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Size of io operations",
+					},
+					"total_bytes_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Total size bytes per second",
+					},
+					"total_bytes_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum total size of bytes per second",
+					},
+					"total_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Total number of io operations per second",
+					},
+					"total_iops_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum total number of io operations per second",
+					},
+					"write_bytes_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of bytes to write per second",
+					},
+					"write_bytes_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of bytes to write per second",
+					},
+					"write_iops_sec": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Number of write operations per second",
+					},
+					"write_iops_sec_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Maximum number of write operations per second",
+					},
+				},
+			},
+		},
+		// "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",
+		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		// "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",
+		},
+		"shareable": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"size_max": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Size in GB",
+		},
+		"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",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+		},
+		"vmid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Virtual Machine ID (Deprecated)",
+		},
+	}
+
+	return rets
+}
+
+func ResourceDiskReplication() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceDiskReplicationCreate,
+		ReadContext:   resourceDiskReplicationRead,
+		UpdateContext: resourceDiskReplicationUpdate,
+		DeleteContext: resourceDiskReplicationDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout600s,
+			Read:    &constants.Timeout300s,
+			Update:  &constants.Timeout300s,
+			Delete:  &constants.Timeout300s,
+			Default: &constants.Timeout300s,
+		},
+
+		Schema: resourceDiskReplicationSchemaMake(),
+	}
+}

internal/service/cloudapi/disks/utility_disk_list.go

@@ -1,94 +1,97 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package disks
-
-import (
-	"context"
-	"strings"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.ListDisks, error) {
-	c := m.(*controller.ControllerCfg)
-	req := disks.ListRequest{}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-	if account_name, ok := d.GetOk("account_name"); ok {
-		req.AccountName = account_name.(string)
-	}
-	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
-		req.DiskMaxSize = int64(disk_max_size.(int))
-	}
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-	if shared, ok := d.GetOk("shared"); ok {
-		req.Shared = shared.(bool)
-	}
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
-	if diskType, ok := d.GetOk("type"); ok {
-		req.Type = strings.ToUpper(diskType.(string))
-	}
-	if sepId, ok := d.GetOk("sep_id"); ok {
-		req.AccountID = uint64(sepId.(int))
-	}
-	if pool_name, ok := d.GetOk("pool_name"); ok {
-		req.Pool = pool_name.(string)
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityDiskListCheckPresence: load disk list")
-	diskList, err := c.CloudAPI().Disks().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return diskList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package disks
+
+import (
+	"context"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.ListDisks, error) {
+	c := m.(*controller.ControllerCfg)
+	req := disks.ListRequest{}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if account_name, ok := d.GetOk("account_name"); ok {
+		req.AccountName = account_name.(string)
+	}
+	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
+		req.DiskMaxSize = int64(disk_max_size.(int))
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if shared, ok := d.GetOk("shared"); ok {
+		req.Shared = shared.(bool)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if diskType, ok := d.GetOk("type"); ok {
+		req.Type = strings.ToUpper(diskType.(string))
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.AccountID = uint64(sepId.(int))
+	}
+	if pool_name, ok := d.GetOk("pool_name"); ok {
+		req.Pool = pool_name.(string)
+	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityDiskListCheckPresence: load disk list")
+	diskList, err := c.CloudAPI().Disks().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return diskList, nil
+}

internal/service/cloudapi/disks/utility_disk_list_deleted.go

@@ -54,6 +54,10 @@ func utilityDiskListDeletedCheckPresence(ctx context.Context, d *schema.Resource
 		req.Type = typev.(string)
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/disks/utility_disk_list_unattached.go

@@ -37,6 +37,9 @@ func utilityDiskListUnattachedCheckPresence(ctx context.Context, d *schema.Resou
 	if pool_name, ok := d.GetOk("pool_name"); ok {
 		req.Pool = pool_name.(string)
 	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/disks/utility_disk_replica.go

@@ -0,0 +1,174 @@
+/*
+Copyright (c) 2019-2024 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package disks
+
+import (
+	"context"
+	"strconv"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityDiskReplicationUpdateStartStop(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	diskId := uint64(d.Get("disk_id").(int))
+	targetDiskId, _ := strconv.ParseUint(d.Id(), 10, 64)
+
+	log.Debugf("utilityDiskReplicationUpdateStartStop: start update for disk replica with ID: %d", diskId)
+	c := m.(*controller.ControllerCfg)
+
+	start, ok := d.GetOk("start")
+
+	if ok && start.(bool) {
+		log.Debugf("utilityDiskReplicationUpdateStartStop: start disk replication from Disk with ID: %d to Disk with ID: %d", diskId, targetDiskId)
+		req := disks.ReplicationStartRequest{
+			DiskID: diskId,
+			TargetDiskID: targetDiskId,
+		}
+		_, err := c.CloudAPI().Disks().ReplicationStart(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityDiskReplicationUpdateStartStop: start disk replication from Disk with ID: %d to Disk with ID: %d, complete", diskId, targetDiskId)
+	}
+
+	if ok && !start.(bool) {
+		log.Debugf("utilityDiskReplicationUpdateStartStop: stop disk replication from Disk with ID: %d to Disk with ID: %d", targetDiskId, diskId)
+		req := disks.ReplicationStopRequest{
+			DiskID: targetDiskId,
+		}
+		_, err := c.CloudAPI().Disks().ReplicationStop(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityDiskReplicationUpdateStartStop: stop disk replication from Disk with ID: %d to Disk with ID: %d, complete", targetDiskId, diskId)
+	}
+
+	log.Debugf("utilityDiskReplicationUpdateStartStop: complete update for disk replica with ID: %d", diskId)
+	return nil
+}
+
+func utilityDiskReplicationUpdatePause(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	diskId := uint64(d.Get("disk_id").(int))
+	log.Debugf("utilityDiskReplicationUpdatePause: start update for disk replica with ID: %d", diskId)
+	c := m.(*controller.ControllerCfg)
+
+	pause, ok := d.GetOk("pause")
+
+	if ok && pause.(bool) {
+		log.Debugf("utilityDiskReplicationUpdatePause: pause disk replication with ID: %d", diskId)
+		req := disks.ReplicationSuspendRequest{
+			DiskID: diskId,
+		}
+		_, err := c.CloudAPI().Disks().ReplicationSuspend(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityDiskReplicationUpdatePause: pause disk replication with ID: %d, complete", diskId)
+	}
+
+	if ok && !pause.(bool) {
+		log.Debugf("utilityDiskReplicationUpdatePause: resume disk replication with ID: %d", diskId)
+		req := disks.ReplicationResumeRequest{
+			DiskID: diskId,
+		}
+		_, err := c.CloudAPI().Disks().ReplicationResume(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityDiskReplicationUpdatePause: resume disk replication with ID: %d, complete", diskId)
+	}
+
+	log.Debugf("utilityDiskReplicationUpdatePause: complete update for disk replica with ID: %d", diskId)
+	return nil
+}
+
+func utilityDiskReplicationUpdateReverse(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	diskId := uint64(d.Get("disk_id").(int))
+	targetDiskId, _ := strconv.ParseUint(d.Id(), 10, 64)
+
+	log.Debugf("utilityDiskReplicaUpdateReverse: start update for disk replica with ID: %d", diskId)
+	c := m.(*controller.ControllerCfg)
+
+	reverse, ok := d.GetOk("reverse")
+
+	if ok && reverse.(bool) {
+		log.Debugf("utilityDiskReplicaUpdateReverse: reverse disk replication from Disk with ID: %d to Disk with ID: %d", diskId, targetDiskId)
+		req := disks.ReplicationReverseRequest{
+			DiskID: diskId,
+		}
+		_, err := c.CloudAPI().Disks().ReplicationReverse(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityDiskReplicaUpdateReverse: reverse disk replication from Disk with ID: %d to Disk with ID: %d, complete", diskId, targetDiskId)
+	}
+
+	if ok && !reverse.(bool) {
+		log.Debugf("utilityDiskReplicaUpdateReverse: reverse disk replication from Disk with ID: %d to Disk with ID: %d", targetDiskId, diskId)
+		req := disks.ReplicationReverseRequest{
+			DiskID: targetDiskId,
+		}
+		_, err := c.CloudAPI().Disks().ReplicationReverse(ctx, req)
+		if err != nil {
+			return err
+		}
+		log.Debugf("utilityDiskReplicaUpdateReverse: reverse disk replication from Disk with ID: %d to Disk with ID: %d, complete", targetDiskId, diskId)
+	}
+
+	log.Debugf("utilityDiskReplicaUpdateReverse: complete update for disk replica with ID: %d", diskId)
+	return nil
+}
+
+func utilityDiskReplicaCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.RecordDisk, error) {
+	c := m.(*controller.ControllerCfg)
+
+	req := disks.GetRequest{}
+
+	if d.Id() != "" {
+		diskId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		req.DiskID = diskId
+	} else {
+		req.DiskID = uint64(d.Get("replica_disk_id").(int))
+	}
+
+	log.Debugf("utilityDiskReplicaCheckPresence: load disk")
+	disk, err := c.CloudAPI().Disks().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return disk, nil
+}

internal/service/cloudapi/disks/utility_disk_types_detailed_list.go

@@ -46,7 +46,10 @@ func utilityDiskListTypesDetailedCheckPresence(ctx context.Context, d *schema.Re
 	req := disks.ListTypesRequest{
 		Detailed: true,
 	}
-	
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/disks/utility_disk_types_list.go

@@ -47,6 +47,9 @@ func utilityDiskListTypesCheckPresence(ctx context.Context, d *schema.ResourceDa
 		Detailed: false,
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/extnet/data_source_extnet_computes_list.go

@@ -72,6 +72,11 @@ func dataSourceExtnetComputesListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by compute ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/extnet/data_source_extnet_list.go

@@ -92,6 +92,11 @@ func dataSourceExtnetListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Find by status",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/extnet/utility_extnet_computes_list.go

@@ -1,72 +1,74 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package extnet
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityExtnetComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*extnet.ListExtNetComputes, error) {
-	c := m.(*controller.ControllerCfg)
-	req := extnet.ListComputesRequest{
-		AccountID: uint64(d.Get("account_id").(int)),
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-	if compute_id, ok := d.GetOk("compute_id"); ok {
-		req.ComputeID = uint64(compute_id.(int))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-
-	log.Debugf("utilityExtnetComputesListCheckPresence")
-	extnetComputesList, err := c.CloudAPI().ExtNet().ListComputes(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return extnetComputesList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityExtnetComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*extnet.ListExtNetComputes, error) {
+	c := m.(*controller.ControllerCfg)
+	req := extnet.ListComputesRequest{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+	if compute_id, ok := d.GetOk("compute_id"); ok {
+		req.ComputeID = uint64(compute_id.(int))
+	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityExtnetComputesListCheckPresence")
+	extnetComputesList, err := c.CloudAPI().ExtNet().ListComputes(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return extnetComputesList, nil
+}

internal/service/cloudapi/extnet/utility_extnet_list.go

@@ -1,84 +1,87 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package extnet
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityExtnetListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*extnet.ListExtNets, error) {
-	c := m.(*controller.ControllerCfg)
-	req := extnet.ListRequest{}
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-	if network, ok := d.GetOk("network"); ok {
-		req.Network = network.(string)
-	}
-	if vlan_id, ok := d.GetOk("vlan_id"); ok {
-		req.VLANID = uint64(vlan_id.(int))
-	}
-	if vnfdev_id, ok := d.GetOk("vnfdev_id"); ok {
-		req.VNFDevID = uint64(vnfdev_id.(int))
-	}
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityExtnetListCheckPresence")
-	extnetList, err := c.CloudAPI().ExtNet().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return extnetList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityExtnetListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*extnet.ListExtNets, error) {
+	c := m.(*controller.ControllerCfg)
+	req := extnet.ListRequest{}
+
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if network, ok := d.GetOk("network"); ok {
+		req.Network = network.(string)
+	}
+	if vlan_id, ok := d.GetOk("vlan_id"); ok {
+		req.VLANID = uint64(vlan_id.(int))
+	}
+	if vnfdev_id, ok := d.GetOk("vnfdev_id"); ok {
+		req.VNFDevID = uint64(vnfdev_id.(int))
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityExtnetListCheckPresence")
+	extnetList, err := c.CloudAPI().ExtNet().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return extnetList, nil
+}

internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go

@@ -95,6 +95,11 @@ func dataSourceFlipgroupListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by RG ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -105,6 +110,29 @@ func dataSourceFlipgroupListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Page size",
 		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Account id",
+		},
+		"conn_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Conn id",
+		},
+		"client_ids": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+			Description: "client_ids",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Status",
+		},
 		"items": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/flipgroup/utility_flipgroup.go

@@ -153,38 +153,48 @@ func utilityFlipgroupListCheckPresence(ctx context.Context, d *schema.ResourceDa
 	if name, ok := d.GetOk("name"); ok {
 		req.Name = name.(string)
 	}
-
 	if vinsId, ok := d.GetOk("vins_id"); ok {
 		req.VINSID = uint64(vinsId.(int))
 	}
-
 	if vinsName, ok := d.GetOk("vins_name"); ok {
 		req.VINSName = vinsName.(string)
 	}
-
 	if extNetId, ok := d.GetOk("extnet_id"); ok {
 		req.ExtNetID = uint64(extNetId.(int))
 	}
-
 	if byIp, ok := d.GetOk("by_ip"); ok {
 		req.ByIP = byIp.(string)
 	}
-
 	if rgId, ok := d.GetOk("rg_id"); ok {
 		req.RGID = uint64(rgId.(int))
 	}
-
 	if byId, ok := d.GetOk("by_id"); ok {
 		req.ByID = uint64(byId.(int))
 	}
-
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}
-
 	if size, ok := d.GetOk("size"); ok {
 		req.Size = uint64(size.(int))
 	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountId = uint64(accountId.(int))
+	}
+	if connId, ok := d.GetOk("conn_id"); ok {
+		req.ConnId = uint64(connId.(int))
+	}
+	if cliensId, ok := d.GetOk("client_ids"); ok {
+		cliensIds := cliensId.([]interface{})
+		for _, elem := range cliensIds {
+			req.ClientIDs = append(req.ClientIDs, uint64(elem.(int)))
+		}
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
 
 	fg_list, err := c.CloudAPI().FLIPGroup().List(ctx, req)
 	if err != nil {

internal/service/cloudapi/image/data_source_image_list.go

@@ -117,6 +117,11 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Find bootable images",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/image/flattens.go

@@ -1,9 +1,11 @@
 package image
 
 import (
+	"encoding/json"
+	"strconv"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
-	"strconv"
 )
 
 func flattenHistory(history []image.History) []map[string]interface{} {
@@ -21,6 +23,8 @@ func flattenHistory(history []image.History) []map[string]interface{} {
 }
 
 func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
+	cdPresentedTo, _ := json.Marshal(img.CdPresentedTo)
+
 	d.Set("unc_path", img.UNCPath)
 	d.Set("ckey", img.CKey)
 	d.Set("account_id", img.AccountID)
@@ -29,6 +33,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("boot_type", img.BootType)
 	d.Set("bootable", img.Bootable)
 	d.Set("compute_ci_id", img.ComputeCIID)
+	d.Set("cd_presented_to", string(cdPresentedTo))
 	d.Set("deleted_time", img.DeletedTime)
 	d.Set("desc", img.Description)
 	d.Set("drivers", img.Drivers)
@@ -42,6 +47,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("link_to", img.LinkTo)
 	d.Set("milestones", img.Milestones)
 	d.Set("image_name", img.Name)
+	d.Set("network_interface_naming", img.NetworkInterfaceNaming)
 	d.Set("password", img.Password)
 	d.Set("pool_name", img.Pool)
 	d.Set("provider_name", img.ProviderName)
@@ -63,24 +69,25 @@ func flattenImageList(il *image.ListImages) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, img := range il.Data {
 		temp := map[string]interface{}{
-			"account_id":   img.AccountID,
-			"architecture": img.Architecture,
-			"boot_type":    img.BootType,
-			"bootable":     img.Bootable,
-			"cdrom":        img.CDROM,
-			"desc":         img.Description,
-			"drivers":      img.Drivers,
-			"hot_resize":   img.HotResize,
-			"image_id":     img.ID,
-			"link_to":      img.LinkTo,
-			"image_name":   img.Name,
-			"pool_name":    img.Pool,
-			"sep_id":       img.SepID,
-			"size":         img.Size,
-			"status":       img.Status,
-			"type":         img.Type,
-			"username":     img.Username,
-			"virtual":      img.Virtual,
+			"account_id":               img.AccountID,
+			"architecture":             img.Architecture,
+			"boot_type":                img.BootType,
+			"bootable":                 img.Bootable,
+			"cdrom":                    img.CDROM,
+			"desc":                     img.Description,
+			"drivers":                  img.Drivers,
+			"hot_resize":               img.HotResize,
+			"image_id":                 img.ID,
+			"link_to":                  img.LinkTo,
+			"image_name":               img.Name,
+			"network_interface_naming": img.NetworkInterfaceNaming,
+			"pool_name":                img.Pool,
+			"sep_id":                   img.SepID,
+			"size":                     img.Size,
+			"status":                   img.Status,
+			"type":                     img.Type,
+			"username":                 img.Username,
+			"virtual":                  img.Virtual,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudapi/image/image_ds_subresource.go

@@ -1,216 +1,222 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package image
-
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-func dataSourceImageExtendSchemaMake() 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,
-		},
-		"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,
-		},
-		"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,
-		},
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceImageExtendSchemaMake() 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,
+		},
+	}
+}

internal/service/cloudapi/image/image_item_subresource.go

@@ -94,6 +94,10 @@ func dataSourceImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Image name",
 		},
+		"network_interface_naming": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"pool_name": {
 			Type:        schema.TypeString,
 			Computed:    true,

internal/service/cloudapi/image/image_rs_subresource.go

@@ -1,159 +1,160 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package image
-
-import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-)
-
-func resourceImageSchemaMake(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["gid"] = &schema.Schema{
-		Type:        schema.TypeInt,
-		Required:    true,
-		Description: "grid (platform) ID where this template should be create in",
-	}
-
-	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,
-		Optional:    true,
-		Computed:    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", "PPC64_LE"}, true),
-		Description:  "binary architecture of this image, one of X86_64 of PPC64_LE",
-	}
-
-	sch["drivers"] = &schema.Schema{
-		Type:     schema.TypeList,
-		Required: true,
-		Elem: &schema.Schema{
-			Type: schema.TypeString,
-		},
-	}
-
-	sch["permanently"] = &schema.Schema{
-		Type:        schema.TypeBool,
-		Optional:    true,
-		Default:     false,
-		Description: "whether to completely delete the image",
-	}
-
-	return sch
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceImageSchemaMake(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", "PPC64_LE"}, true),
+		Description:  "binary architecture of this image, one of X86_64 of PPC64_LE",
+	}
+
+	sch["drivers"] = &schema.Schema{
+		Type:     schema.TypeList,
+		Required: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeString,
+		},
+	}
+
+	sch["permanently"] = &schema.Schema{
+		Type:        schema.TypeBool,
+		Optional:    true,
+		Default:     false,
+		Description: "whether to completely delete the image",
+	}
+
+	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
+}

internal/service/cloudapi/image/resource_check_input_values.go

@@ -2,9 +2,12 @@ package image
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
@@ -34,3 +37,46 @@ func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool,
 
 	return len(locationList.FilterByGID(gid).Data) != 0, nil
 }
+
+func existComputeID(ctx context.Context, computeId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+	req := compute.GetRequest{ComputeID: computeId}
+
+	// check for compute existence
+	computeRecord, err := c.CloudAPI().Compute().Get(ctx, req)
+	if err != nil {
+		return fmt.Errorf("ComputeID %d is not allowed or does not exist", computeId)
+	}
+
+	// check if compute was created as blank
+	computeImageId := computeRecord.ImageID
+	bootImageId := -1
+	for _, d := range computeRecord.Disks {
+		if d.Type == "B" {
+			bootImageId = int(d.ImageID)
+			break
+		}
+	}
+
+	if computeImageId != 0 && bootImageId != 0 {
+		return fmt.Errorf("ComputeID %d is not allowed because it is not blank compute (either compute imageId or boot imageId are not zero)", computeId)
+	}
+
+	return nil
+}
+
+func existDiskID(ctx context.Context, diskId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+	req := disks.ListRequest{ByID: diskId}
+
+	diskList, err := c.CloudAPI().Disks().List(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	if len(diskList.Data) != 1 {
+		return fmt.Errorf("diskId %d is not allowed or doesn't exist", diskId)
+	}
+
+	return nil
+}

internal/service/cloudapi/image/resource_image.go

@@ -48,34 +48,23 @@ import (
 func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceImageCreate: called for image %s", d.Get("name").(string))
 
-	haveGID, err := existGID(ctx, d, m)
+	haveAccountID, err := existAccountID(ctx, d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	if !haveGID {
-		return diag.Errorf("resourceImageCreate: can't create Image because GID %d is not allowed or does not exist", d.Get("gid").(int))
-	}
-
-	if _, ok := d.GetOk("account_id"); ok {
-		haveAccountID, err := existAccountID(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		if !haveAccountID {
-			return diag.Errorf("resourceImageCreate: can't create Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
-		}
+	if !haveAccountID {
+		return diag.Errorf("resourceImageCreate: can't create Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
 	}
 
 	c := m.(*controller.ControllerCfg)
-	req := image.CreateRequest{}
-
-	req.Name = d.Get("name").(string)
-	req.URL = d.Get("url").(string)
-	req.GID = uint64(d.Get("gid").(int))
-	req.BootType = d.Get("boot_type").(string)
-	req.ImageType = d.Get("type").(string)
+	req := image.CreateRequest{
+		AccountID: uint64(d.Get("account_id").(int)),
+		Name:      d.Get("name").(string),
+		URL:       d.Get("url").(string),
+		BootType:  d.Get("boot_type").(string),
+		ImageType: d.Get("type").(string),
+	}
 
 	drivers := []string{}
 	for _, driver := range d.Get("drivers").([]interface{}) {
@@ -93,9 +82,6 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
 	if password, ok := d.GetOk("password"); ok {
 		req.Password = password.(string)
 	}
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
 	if usernameDL, ok := d.GetOk("username_dl"); ok {
 		req.UsernameDL = usernameDL.(string)
 	}
@@ -111,6 +97,9 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
 	if architecture, ok := d.GetOk("architecture"); ok {
 		req.Architecture = architecture.(string)
 	}
+	if networkInterfaceNaming, ok := d.GetOk("network_interface_naming"); ok {
+		req.NetworkInterfaceNaming = networkInterfaceNaming.(string)
+	}
 
 	imageId, err := c.CloudAPI().Image().Create(ctx, req)
 	if err != nil {
@@ -210,15 +199,13 @@ func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.Errorf("resourceImageUpdate: can't update Image because GID %d is not allowed or does not exist", d.Get("gid").(int))
 	}
 
-	if _, ok := d.GetOk("account_id"); ok {
-		haveAccountID, err := existAccountID(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+	haveAccountID, err := existAccountID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
-		if !haveAccountID {
-			return diag.Errorf("resourceImageUpdate: can't update Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
-		}
+	if !haveAccountID {
+		return diag.Errorf("resourceImageUpdate: can't update Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
 	}
 
 	image, err := utilityImageCheckPresence(ctx, d, m)

internal/service/cloudapi/image/resource_image_from_blank_compute.go

@@ -0,0 +1,508 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+)
+
+func resourceImageFromBlankComputeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	computeId := uint64(d.Get("compute_id").(int))
+	name := d.Get("name").(string)
+
+	log.Debugf("resourceImageFromBlankComputeCreate: called for image %s", name)
+
+	err := existComputeID(ctx, computeId, m)
+	if err != nil {
+		return diag.Errorf("resourceImageFromBlankComputeCreate: can't create Image: %v", err)
+	}
+
+	if _, ok := d.GetOk("account_id"); ok {
+		haveAccountID, err := existAccountID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveAccountID {
+			return diag.Errorf("resourceImageFromBlankComputeCreate: can't create Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
+		}
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := compute.CreateTemplateFromBlankRequest{
+		ComputeID: computeId,
+		Name:      name,
+		BootType:  d.Get("boot_type").(string),
+		ImageType: d.Get("type").(string),
+	}
+
+	if username, ok := d.GetOk("username"); ok {
+		req.Username = username.(string)
+	}
+	if password, ok := d.GetOk("password"); ok {
+		req.Password = password.(string)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.SepID = uint64(sepId.(int))
+	}
+	if poolName, ok := d.GetOk("pool_name"); ok {
+		req.PoolName = poolName.(string)
+	}
+	if hotresize, ok := d.GetOk("hot_resize"); ok {
+		req.HotResize = hotresize.(bool)
+	}
+
+	var imageId uint64
+	asyncMode := d.Get("async_mode").(bool)
+	if !asyncMode {
+		imageId, err = c.CloudAPI().Compute().CreateTemplateFromBlank(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	} else {
+		taskId, err := c.CloudAPI().Compute().CreateTemplateFromBlankAsync(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+
+		taskReq := tasks.GetRequest{
+			AuditID: strings.Trim(taskId, `"`),
+		}
+
+		for {
+			task, err := c.CloudAPI().Tasks().Get(ctx, taskReq)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+
+			log.Debugf("resourceImageFromBlankComputeCreate: instance creating - %s", task.Stage)
+
+			if task.Completed {
+				if task.Error != "" {
+					return diag.FromErr(fmt.Errorf("cannot create image instance: %v", task.Error))
+				}
+
+				id, err := task.Result.ID()
+				imageId = uint64(id)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+				break
+			}
+
+			time.Sleep(time.Second * 20)
+		}
+	}
+
+	d.SetId(strconv.FormatUint(imageId, 10))
+	d.Set("image_id", imageId)
+
+	_, err = utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return resourceImageFromBlankComputeRead(ctx, d, m)
+}
+
+func resourceImageFromBlankComputeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromBlankComputeRead: called for %s id: %s", d.Get("name").(string), d.Id())
+
+	img, err := utilityImageCheckPresence(ctx, d, m)
+	if img == nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	switch img.Status {
+	case status.Modeled:
+		return diag.Errorf("The image is in status: %s, please, contact support for more information", img.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceImageCreate(ctx, d, m)
+	}
+
+	flattenImage(d, img)
+
+	return nil
+}
+
+func resourceImageFromBlankComputeDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromBlankComputeDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
+
+	_, err := utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := image.DeleteRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+	}
+
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudAPI().Image().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceImageFromBlankComputeRename(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourceImageFromBlankComputeRename: called for %s, id: %s", d.Get("name").(string), d.Id())
+	c := m.(*controller.ControllerCfg)
+	req := image.RenameRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+		Name:    d.Get("name").(string),
+	}
+
+	_, err := c.CloudAPI().Image().Rename(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func resourceImageFromBlankComputeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromBlankComputeUpdate: called for %s, id: %s", d.Get("name").(string), d.Id())
+
+	// we do not allow change of compute_id, but allow resource update after import
+	old, _ := d.GetChange("compute_id")
+	if old.(int) != 0 && d.HasChange("compute_id") {
+		return diag.Errorf("resourceImageFromBlankComputeUpdate: can't update Image because compute_id is not allowed to be changed")
+	}
+
+	image, err := utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	switch image.Status {
+	case status.Modeled:
+		return diag.Errorf("The image is in status: %s, please, contact support for more information", image.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceImageCreate(ctx, d, m)
+	}
+
+	if d.HasChange("name") {
+		err := resourceImageFromBlankComputeRename(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	return resourceImageFromBlankComputeRead(ctx, d, m)
+}
+
+func ResourceImageFromBlankCompute() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceImageFromBlankComputeCreate,
+		ReadContext:   resourceImageFromBlankComputeRead,
+		UpdateContext: resourceImageFromBlankComputeUpdate,
+		DeleteContext: resourceImageFromBlankComputeDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout30m,
+			Read:    &constants.Timeout900s,
+			Update:  &constants.Timeout900s,
+			Delete:  &constants.Timeout900s,
+			Default: &constants.Timeout900s,
+		},
+
+		Schema: resourceImageFromBlankComputeSchemaMake(),
+	}
+}
+
+func resourceImageFromBlankComputeSchemaMake() map[string]*schema.Schema {
+	return 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",
+		},
+		"permanently": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "whether to completely delete the image",
+		},
+
+		"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,
+		},
+	}
+}

internal/service/cloudapi/image/resource_image_from_platform_disk.go

@@ -0,0 +1,506 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+)
+
+func resourceImageFromPlatformDiskCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	diskId := uint64(d.Get("disk_id").(int))
+	name := d.Get("name").(string)
+
+	log.Debugf("resourceImageFromPlatformDiskCreate: called for image %s", name)
+
+	err := existDiskID(ctx, diskId, m)
+	if err != nil {
+		return diag.Errorf("resourceImageFromPlatformDiskCreate: can't create Image: %v", err)
+	}
+
+	if _, ok := d.GetOk("account_id"); ok {
+		haveAccountID, err := existAccountID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveAccountID {
+			return diag.Errorf("resourceImageFromPlatformDiskCreate: can't create Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
+		}
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := disks.FromPlatformDiskRequest{
+		DiskID:       diskId,
+		Name:         name,
+		BootType:     d.Get("boot_type").(string),
+		ImageType:    d.Get("type").(string),
+		Architecture: d.Get("architecture").(string),
+		Bootable:     d.Get("bootable").(bool), // default value - true
+	}
+
+	if username, ok := d.GetOk("username"); ok {
+		req.Username = username.(string)
+	}
+	if password, ok := d.GetOk("password"); ok {
+		req.Password = password.(string)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.SepID = uint64(sepId.(int))
+	}
+	if poolName, ok := d.GetOk("pool_name"); ok {
+		req.PoolName = poolName.(string)
+	}
+	if driversInterface, ok := d.GetOk("drivers"); ok {
+		for _, d := range driversInterface.([]interface{}) {
+			req.Drivers = append(req.Drivers, d.(string))
+		}
+	}
+	if hotresize, ok := d.GetOk("hot_resize"); ok {
+		req.HotResize = hotresize.(bool)
+	}
+
+	var imageId uint64
+	asyncMode := d.Get("async_mode").(bool)
+	if !asyncMode {
+		imageId, err = c.CloudAPI().Disks().FromPlatformDisk(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	} else {
+		taskId, err := c.CloudAPI().Disks().FromPlatformDiskAsync(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+
+		taskReq := tasks.GetRequest{
+			AuditID: strings.Trim(taskId, `"`),
+		}
+
+		for {
+			task, err := c.CloudAPI().Tasks().Get(ctx, taskReq)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+
+			log.Debugf("resourceImageFromPlatformDiskCreate: instance creating - %s", task.Stage)
+
+			if task.Completed {
+				if task.Error != "" {
+					return diag.FromErr(fmt.Errorf("cannot create image instance: %v", task.Error))
+				}
+
+				id, err := task.Result.ID()
+				imageId = uint64(id)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+				break
+			}
+
+			time.Sleep(time.Second * 20)
+		}
+	}
+
+	d.SetId(strconv.FormatUint(imageId, 10))
+	d.Set("image_id", imageId)
+
+	_, err = utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return resourceImageFromPlatformDiskRead(ctx, d, m)
+}
+
+func resourceImageFromPlatformDiskRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromPlatformDiskRead: called for %s id: %s", d.Get("name").(string), d.Id())
+
+	img, err := utilityImageCheckPresence(ctx, d, m)
+	if img == nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	switch img.Status {
+	case status.Modeled:
+		return diag.Errorf("The image is in status: %s, please, contact support for more information", img.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+	}
+
+	flattenImage(d, img)
+
+	return nil
+}
+
+func resourceImageFromPlatformDiskDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromPlatformDiskDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
+
+	_, err := utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := image.DeleteRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+	}
+
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudAPI().Image().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceImageFromPlatformDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromPlatformDiskUpdate: called for %s, id: %s", d.Get("name").(string), d.Id())
+
+	// we do not allow change of disk_id, but allow resource update after import
+	old, _ := d.GetChange("disk_id")
+	if old.(int) != 0 && d.HasChange("disk_id") {
+		return diag.Errorf("resourceImageFromPlatformDiskUpdate: can't update Image because disk_id is not allowed to be changed")
+	}
+
+	image, err := utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	switch image.Status {
+	case status.Modeled:
+		return diag.Errorf("The image is in status: %s, please, contact support for more information", image.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+	}
+
+	if d.HasChange("name") {
+		err := resourceImageRename(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	return resourceImageFromPlatformDiskRead(ctx, d, m)
+}
+
+func ResourceImageFromPlatformDisk() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceImageFromPlatformDiskCreate,
+		ReadContext:   resourceImageFromPlatformDiskRead,
+		UpdateContext: resourceImageFromPlatformDiskUpdate,
+		DeleteContext: resourceImageFromPlatformDiskDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout30m,
+			Read:    &constants.Timeout900s,
+			Update:  &constants.Timeout900s,
+			Delete:  &constants.Timeout900s,
+			Default: &constants.Timeout900s,
+		},
+
+		Schema: resourceImageFromPlatformDiskSchemaMake(),
+	}
+}
+
+func resourceImageFromPlatformDiskSchemaMake() map[string]*schema.Schema {
+	return 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", "PPC64_LE"}, true),
+			Description:  "binary architecture of this image, one of X86_64 of PPC64_LE",
+		},
+
+		"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,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				StateFunc:    statefuncs.StateFuncToUpper,
+				ValidateFunc: validation.StringInSlice([]string{"SVA_KVM_X86", "KVM_X86", "KVM_PPC"}, 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",
+		},
+		"permanently": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "whether to completely delete the image",
+		},
+
+		"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,
+		},
+	}
+}

internal/service/cloudapi/image/utility_image_list.go

@@ -1,111 +1,115 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package image
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*image.ListImages, error) {
-	c := m.(*controller.ControllerCfg)
-	req := image.ListRequest{}
-
-	if sep_id, ok := d.GetOk("sep_id"); ok {
-		req.SEPID = uint64(sep_id.(int))
-	}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-
-	if architecture, ok := d.GetOk("architecture"); ok {
-		req.Architecture = architecture.(string)
-	}
-
-	if type_image, ok := d.GetOk("type_image"); ok {
-		req.TypeImage = type_image.(string)
-	}
-
-	if image_size, ok := d.GetOk("image_size"); ok {
-		req.ImageSize = uint64(image_size.(int))
-	}
-
-	if sep_name, ok := d.GetOk("sep_name"); ok {
-		req.SEPName = sep_name.(string)
-	}
-
-	if pool, ok := d.GetOk("pool"); ok {
-		req.Pool = pool.(string)
-	}
-
-	if public, ok := d.GetOk("public"); ok {
-		req.Public = public.(bool)
-	}
-
-	if hot_resize, ok := d.GetOk("hot_resize"); ok {
-		req.HotResize = hot_resize.(bool)
-	}
-
-	if bootable, ok := d.GetOk("bootable"); ok {
-		req.Bootable = bootable.(bool)
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityImageListCheckPresence: load image list")
-	imageList, err := c.CloudAPI().Image().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return imageList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*image.ListImages, error) {
+	c := m.(*controller.ControllerCfg)
+	req := image.ListRequest{}
+
+	if sep_id, ok := d.GetOk("sep_id"); ok {
+		req.SEPID = uint64(sep_id.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if architecture, ok := d.GetOk("architecture"); ok {
+		req.Architecture = architecture.(string)
+	}
+
+	if type_image, ok := d.GetOk("type_image"); ok {
+		req.TypeImage = type_image.(string)
+	}
+
+	if image_size, ok := d.GetOk("image_size"); ok {
+		req.ImageSize = uint64(image_size.(int))
+	}
+
+	if sep_name, ok := d.GetOk("sep_name"); ok {
+		req.SEPName = sep_name.(string)
+	}
+
+	if pool, ok := d.GetOk("pool"); ok {
+		req.Pool = pool.(string)
+	}
+
+	if public, ok := d.GetOk("public"); ok {
+		req.Public = public.(bool)
+	}
+
+	if hot_resize, ok := d.GetOk("hot_resize"); ok {
+		req.HotResize = hot_resize.(bool)
+	}
+
+	if bootable, ok := d.GetOk("bootable"); ok {
+		req.Bootable = bootable.(bool)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityImageListCheckPresence: load image list")
+	imageList, err := c.CloudAPI().Image().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return imageList, nil
+}

internal/service/cloudapi/k8s/data_source_k8ci_list.go

@@ -94,6 +94,11 @@ func dataSourceK8CIListSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Include deleted k8cis in result",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/k8s/data_source_k8s_list.go

@@ -179,6 +179,11 @@ func createK8sListSchema() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Optional: true,
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:     schema.TypeInt,
 			Optional: true,

internal/service/cloudapi/k8s/node_subresource.go

@@ -75,8 +75,8 @@ func mastersSchemaMake() map[string]*schema.Schema {
 	masters["num"] = &schema.Schema{
 		Type:         schema.TypeInt,
 		Required:     true,
-		ValidateFunc: validation.IntInSlice([]int{1, 3}),
-		Description:  "Number of nodes to create. Can be either 1 or 3",
+		ValidateFunc: validation.IntInSlice([]int{1, 3, 5}),
+		Description:  "Number of nodes to create. Can be either 1, 3 or 5",
 	}
 	masters["sep_id"] = &schema.Schema{
 		Type:     schema.TypeInt,
@@ -97,8 +97,8 @@ func mastersSchemaMake() map[string]*schema.Schema {
 		Required: true,
 		//ForceNew:    true,
 		ValidateFunc: validation.All(
-			validation.IntAtLeast(constants.MinRamPerCompute),
-			validators.DivisibleBy(constants.RAMDivisibility),
+			validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
+			validators.DivisibleBy(constants.RAM_DIVISIBILITY),
 		),
 		Description: "Node RAM in MB.",
 	}
@@ -125,8 +125,8 @@ func workersSchemaMake() map[string]*schema.Schema {
 		"ram": {
 			Type: schema.TypeInt,
 			ValidateFunc: validation.All(
-				validation.IntAtLeast(constants.MinRamPerCompute),
-				validators.DivisibleBy(constants.RAMDivisibility),
+				validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
+				validators.DivisibleBy(constants.RAM_DIVISIBILITY),
 			),
 			Required: true,
 		},

internal/service/cloudapi/k8s/resource_k8s.go

@@ -101,7 +101,7 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 	}
 	createReq.MasterNum = uint(masterNode.Num)
 	createReq.MasterCPU = uint(masterNode.Cpu)
-	createReq.MasterRAM = uint(masterNode.Ram)
+	createReq.MasterRAM = uint64(masterNode.Ram)
 	createReq.MasterDisk = uint(masterNode.Disk)
 	createReq.MasterSEPID = uint64(masterNode.SepID)
 	createReq.MasterSEPPool = masterNode.SepPool
@@ -115,7 +115,7 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 
 	createReq.WorkerNum = uint(workerNode.Num)
 	createReq.WorkerCPU = uint(workerNode.Cpu)
-	createReq.WorkerRAM = uint(workerNode.Ram)
+	createReq.WorkerRAM = uint64(workerNode.Ram)
 	createReq.WorkerDisk = uint(workerNode.Disk)
 	createReq.WorkerSEPID = uint64(workerNode.SepID)
 	createReq.WorkerSEPPool = workerNode.SepPool
@@ -183,12 +183,26 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 	}
 
 	if lbSysctlParams, ok := d.GetOk("lb_sysctl_params"); ok {
-		createReq.LbSysctlParams = lbSysctlParams.(string)
+		syscrlSliceMaps := lbSysctlParams.([]map[string]string)
+		res := make([]map[string]interface{}, 0, len(syscrlSliceMaps))
+		for _, syscrlMap := range syscrlSliceMaps {
+			tempMap := make(map[string]interface{})
+			for k, v := range syscrlMap {
+				if intVal, err := strconv.Atoi(v); err == nil {
+					tempMap[k] = intVal
+					continue
+				}
+				tempMap[k] = v
+			}
+			res = append(res, tempMap)
+		}
+		createReq.LbSysctlParams = res
 	}
 
 	if oidcCertificate, ok := d.GetOk("oidc_cert"); ok {
 		createReq.OidcCertificate = oidcCertificate.(string)
 	}
+	///
 
 	createReq.ExtNetOnly = d.Get("extnet_only").(bool)
 
@@ -231,7 +245,11 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 				return diag.FromErr(fmt.Errorf("cannot create k8s instance: %v", task.Error))
 			}
 
-			d.SetId(strconv.Itoa(int(task.Result)))
+			id, err := task.Result.ID()
+			if err != nil {
+				return diag.FromErr(err)
+			}
+			d.SetId(strconv.Itoa(id))
 			break
 		}
 
@@ -515,6 +533,31 @@ func resourceK8sUpdate(ctx context.Context, d *schema.ResourceData, m interface{
 		}
 	}
 
+	if d.HasChange("lb_sysctl_params") && d.Get("with_lb").(bool) {
+		lbSysctlParams := d.Get("lb_sysctl_params").([]map[string]string)
+		res := make([]map[string]interface{}, 0, len(lbSysctlParams))
+		for _, syscrlMap := range lbSysctlParams {
+			tempMap := make(map[string]interface{})
+			for k, v := range syscrlMap {
+				if intVal, err := strconv.Atoi(v); err == nil {
+					tempMap[k] = intVal
+					continue
+				}
+				tempMap[k] = v
+			}
+			res = append(res, tempMap)
+		}
+
+		req := lb.UpdateSysctParamsRequest{
+			LBID:         cluster.LBID,
+			SysctlParams: res,
+		}
+		_, err := c.CloudAPI().LB().UpdateSysctlParams(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceK8sRead(ctx, d, m)
 }
 
@@ -685,15 +728,22 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Description: "Use Highly Available schema for LB deploy",
 		},
 		"lb_sysctl_params": {
-			Type:        schema.TypeString,
+			Type:        schema.TypeList,
 			Optional:    true,
 			Description: "Custom sysctl values for Load Balancer instance. Applied on boot.",
+			Elem: &schema.Schema{
+				Type: schema.TypeMap,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 		},
 		"oidc_cert": {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Description: "insert ssl certificate in x509 pem format",
 		},
+
 		"desc": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -705,6 +755,7 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Default:     true,
 			Description: "Start k8s cluster",
 		},
+
 		"acl": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/k8s/resource_k8s_cp.go

@@ -109,7 +109,7 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 	}
 
 	if ram, ok := d.GetOk("ram"); ok {
-		createReq.MasterRAM = uint(ram.(int))
+		createReq.MasterRAM = uint64(ram.(int))
 	} else {
 		createReq.MasterRAM = 2048
 	}
@@ -168,7 +168,20 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 	}
 
 	if lbSysctlParams, ok := d.GetOk("lb_sysctl_params"); ok {
-		createReq.LbSysctlParams = lbSysctlParams.(string)
+		syscrlSliceMaps := lbSysctlParams.([]map[string]string)
+		res := make([]map[string]interface{}, 0, len(syscrlSliceMaps))
+		for _, syscrlMap := range syscrlSliceMaps {
+			tempMap := make(map[string]interface{})
+			for k, v := range syscrlMap {
+				if intVal, err := strconv.Atoi(v); err == nil {
+					tempMap[k] = intVal
+					continue
+				}
+				tempMap[k] = v
+			}
+			res = append(res, tempMap)
+		}
+		createReq.LbSysctlParams = res
 	}
 
 	if oidcCertificate, ok := d.GetOk("oidc_cert"); ok {
@@ -176,6 +189,8 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		log.Debug(createReq.OidcCertificate)
 	}
 
+	///
+
 	createReq.ExtNetOnly = d.Get("extnet_only").(bool)
 
 	if extNet, ok := d.GetOk("extnet_id"); ok {
@@ -217,7 +232,11 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 				return diag.FromErr(fmt.Errorf("cannot create k8s instance: %v", task.Error))
 			}
 
-			d.SetId(strconv.Itoa(int(task.Result)))
+			id, err := task.Result.ID()
+			if err != nil {
+				return diag.FromErr(err)
+			}
+			d.SetId(strconv.Itoa(id))
 			break
 		}
 
@@ -532,6 +551,31 @@ func resourceK8sCPUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
+	if d.HasChange("lb_sysctl_params") && d.Get("with_lb").(bool) {
+		lbSysctlParams := d.Get("lb_sysctl_params").([]map[string]string)
+		res := make([]map[string]interface{}, 0, len(lbSysctlParams))
+		for _, syscrlMap := range lbSysctlParams {
+			tempMap := make(map[string]interface{})
+			for k, v := range syscrlMap {
+				if intVal, err := strconv.Atoi(v); err == nil {
+					tempMap[k] = intVal
+					continue
+				}
+				tempMap[k] = v
+			}
+			res = append(res, tempMap)
+		}
+
+		req := lb.UpdateSysctParamsRequest{
+			LBID:         cluster.LBID,
+			SysctlParams: res,
+		}
+		_, err := c.CloudAPI().LB().UpdateSysctlParams(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceK8sCPRead(ctx, d, m)
 }
 
@@ -592,8 +636,8 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Type:         schema.TypeInt,
 			Optional:     true,
 			Computed:     true,
-			ValidateFunc: validation.IntInSlice([]int{1, 3}),
-			Description:  "Number of VMs to create. Can be either 1 or 3",
+			ValidateFunc: validation.IntInSlice([]int{1, 3, 5}),
+			Description:  "Number of VMs to create. Can be either 1, 3 or 5",
 		},
 		"cpu": {
 			Type:        schema.TypeInt,
@@ -606,8 +650,8 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 			ValidateFunc: validation.All(
-				validation.IntAtLeast(constants.MinRamPerCompute),
-				validators.DivisibleBy(constants.RAMDivisibility),
+				validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
+				validators.DivisibleBy(constants.RAM_DIVISIBILITY),
 			),
 			Description: "Node RAM in MB.",
 		},
@@ -680,9 +724,15 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Description: "Use Highly Available schema for LB deploy",
 		},
 		"lb_sysctl_params": {
-			Type:        schema.TypeString,
+			Type:        schema.TypeList,
 			Optional:    true,
 			Description: "Custom sysctl values for Load Balancer instance. Applied on boot.",
+			Elem: &schema.Schema{
+				Type: schema.TypeMap,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 		},
 		"oidc_cert": {
 			Type:        schema.TypeString,
@@ -724,6 +774,12 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Master group name.",
 		},
+		"permanently": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Determines if cluster should be destroyed",
+		},
 		"acl": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -776,12 +832,6 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "IP address of default load balancer.",
 		},
-		"permanently": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Determines if cluster should be destroyed",
-		},
 		"rg_name": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudapi/k8s/resource_k8s_wg.go

@@ -267,8 +267,8 @@ func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 			//ForceNew:    true,
 			Default: 1024,
 			ValidateFunc: validation.All(
-				validation.IntAtLeast(constants.MinRamPerCompute),
-				validators.DivisibleBy(constants.RAMDivisibility),
+				validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
+				validators.DivisibleBy(constants.RAM_DIVISIBILITY),
 			),
 			Description: "Worker node RAM in MB.",
 		},

internal/service/cloudapi/k8s/utility_k8ci.go

@@ -67,6 +67,9 @@ func utilityK8CIListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 	if include_disabled, ok := d.GetOk("include_disabled"); ok {
 		req.IncludeDisabled = include_disabled.(bool)
 	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/k8s/utility_k8s.go

@@ -265,6 +265,10 @@ func utilityK8sListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 		req.IncludeDeleted = includedeleted.(bool)
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}
@@ -329,6 +333,10 @@ func utilityK8sListDeletedCheckPresence(ctx context.Context, d *schema.ResourceD
 		req.TechStatus = tech_status.(string)
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/kvmvm/data_source_compute.go

@@ -360,6 +360,39 @@ func computeListDisksSchemaMake() map[string]*schema.Schema {
 			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,
@@ -489,6 +522,10 @@ func computeInterfacesSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"node_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"pci_slot": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -615,7 +652,11 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
-		"boot_disk_size": {
+		"bootdisk_size": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"cd_image_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
@@ -634,6 +675,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"cpu_pin": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"cpus": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -685,6 +730,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"hp_backed": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"image_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -720,10 +769,18 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"need_reboot" : {
+		"need_reboot": {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"numa_affinity": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"numa_node_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"natable_vins_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -771,6 +828,13 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"reserved_node_cpus": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/kvmvm/data_source_compute_list.go

@@ -124,7 +124,11 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
-		"boot_disk_size": {
+		"bootdisk_size": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"cd_image_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
@@ -143,6 +147,10 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"cpu_pin": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"cpus": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -194,6 +202,10 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"hp_backed": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"compute_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -237,6 +249,14 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"numa_affinity": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"numa_node_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"pinned": {
 			Type:     schema.TypeBool,
 			Computed: true,
@@ -257,6 +277,13 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"reserved_node_cpus": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -394,6 +421,11 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Optional: true,
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:     schema.TypeInt,
 			Optional: true,

internal/service/cloudapi/kvmvm/data_source_compute_list_deleted.go

@@ -109,6 +109,11 @@ func dataSourceComputeListDeletedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Find by Extnet ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:     schema.TypeInt,
 			Optional: true,

internal/service/cloudapi/kvmvm/data_source_compute_pci_device_list.go

@@ -80,6 +80,11 @@ func dataSourceComputePCIDeviceListSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Find by status",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -93,8 +98,49 @@ func dataSourceComputePCIDeviceListSchemaMake() map[string]*schema.Schema {
 		"items": {
 			Type:     schema.TypeList,
 			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"description": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"hwpath": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"device_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"stack_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"system_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
 			},
 		},
 		"entry_count": {

internal/service/cloudapi/kvmvm/data_source_compute_vgpu_list.go

@@ -80,6 +80,11 @@ func dataSourceComputeVGPUListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Include deleted computes. If using field 'status', then includedeleted will be ignored",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -93,8 +98,81 @@ func dataSourceComputeVGPUListSchemaMake() map[string]*schema.Schema {
 		"items": {
 			Type:     schema.TypeList,
 			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"gid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"vgpu_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"last_claimed_by": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"last_update_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"mode": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"pci_slot": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"pgpuid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"profile_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ram": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"reference_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"vm_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
 			},
 		},
 		"entry_count": {

internal/service/cloudapi/kvmvm/flattens.go

@@ -33,7 +33,6 @@ Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/w
 package kvmvm
 
 import (
-	"context"
 	"encoding/json"
 	"sort"
 	"strconv"
@@ -83,6 +82,7 @@ func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface
 			"net_id":        interfaceItem.NetID,
 			"netmask":       interfaceItem.NetMask,
 			"net_type":      interfaceItem.NetType,
+			"node_id":       interfaceItem.NodeID,
 			"pci_slot":      interfaceItem.PCISlot,
 			"qos":           flattenQOS(interfaceItem.QOS),
 			"target":        interfaceItem.Target,
@@ -164,10 +164,12 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"anti_affinity_rules": flattenListRules(compute.AntiAffinityRules),
 			"arch":                compute.Architecture,
 			"boot_order":          compute.BootOrder,
-			"boot_disk_size":      compute.BootDiskSize,
+			"bootdisk_size":       compute.BootDiskSize,
+			"cd_image_id":         compute.CdImageId,
 			"clone_reference":     compute.CloneReference,
 			"clones":              compute.Clones,
 			"computeci_id":        compute.ComputeCIID,
+			"cpu_pin":             compute.CPUPin,
 			"cpus":                compute.CPU,
 			"created_by":          compute.CreatedBy,
 			"created_time":        compute.CreatedTime,
@@ -180,6 +182,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"driver":              compute.Driver,
 			"gid":                 compute.GID,
 			"guid":                compute.GUID,
+			"hp_backed":           compute.HPBacked,
 			"compute_id":          compute.ID,
 			"image_id":            compute.ImageID,
 			"interfaces":          flattenInterfaces(compute.Interfaces),
@@ -190,11 +193,14 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"milestones":          compute.Milestones,
 			"name":                compute.Name,
 			"need_reboot":         compute.NeedReboot,
+			"numa_affinity":       compute.NumaAffinity,
+			"numa_node_id":        compute.NumaNodeId,
 			"pinned":              compute.Pinned,
 			"ram":                 compute.RAM,
 			"reference_id":        compute.ReferenceID,
 			"registered":          compute.Registered,
 			"res_name":            compute.ResName,
+			"reserved_node_cpus":  compute.ReservedNodeCpus,
 			"rg_id":               compute.RGID,
 			"rg_name":             compute.RGName,
 			"snap_sets":           flattenSnapSets(compute.SnapSets),
@@ -239,17 +245,25 @@ func flattenBootDisk(bootDisk *compute.ItemComputeDisk) []map[string]interface{}
 	return res
 }
 
-func flattenComputeDisksDemo(ctx context.Context, d *schema.ResourceData, disksList compute.ListComputeDisks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
+func flattenComputeDisksDemo(disksList compute.ListComputeDisks, disksBlocks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(disksList))
+
+	if len(disksBlocks) == 0 {
+		return res
+	}
+
+	sort.Slice(disksList, func(i, j int) bool {
+		return disksList[i].ID < disksList[j].ID
+	})
+
+	indexDataDisks := 0
+
 	for _, disk := range disksList {
 		if disk.ID == bootDiskId || findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
 			continue
 		}
 
-		permanently, ok := ctx.Value(DiskKey(strconv.Itoa(int(disk.ID)))).(bool) // get permamently from Create or Update context
-		if !ok {
-			permanently = getPermanentlyByDiskID(d, disk.ID) // get permanently from state when Read is not after Create/Update
-		}
+		pernamentlyValue := disksBlocks[indexDataDisks].(map[string]interface{})["permanently"].(bool)
 
 		temp := map[string]interface{}{
 			"disk_name":   disk.Name,
@@ -263,32 +277,15 @@ func flattenComputeDisksDemo(ctx context.Context, d *schema.ResourceData, disksL
 			"desc":        disk.Description,
 			"image_id":    disk.ImageID,
 			"size":        disk.SizeMax,
-			"permanently": permanently,
+			"permanently": pernamentlyValue,
 		}
 		res = append(res, temp)
+		indexDataDisks++
 	}
-	sort.Slice(res, func(i, j int) bool {
-		return res[i]["disk_id"].(uint64) < res[j]["disk_id"].(uint64)
-	})
 
 	return res
 }
 
-// getPermanentlyByDiskID gets permanently value of specific disk (by diskId) from disks current state
-func getPermanentlyByDiskID(d *schema.ResourceData, diskId uint64) bool {
-	disks := d.Get("disks").([]interface{})
-
-	for _, diskItem := range disks {
-		disk := diskItem.(map[string]interface{})
-		if uint64(disk["disk_id"].(int)) == diskId {
-			return disk["permanently"].(bool)
-		}
-	}
-
-	log.Infof("getPermanentlyByDiskID: disk with id %d not found in state", diskId)
-	return false
-}
-
 func flattenNetwork(interfaces compute.ListInterfaces) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(interfaces))
 
@@ -310,10 +307,10 @@ func findBootDisk(disks compute.ListComputeDisks) *compute.ItemComputeDisk {
 			return &disk
 		}
 	}
-	return nil
+	return &compute.ItemComputeDisk{}
 }
 
-func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec compute.RecordCompute) error {
+func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute) error {
 	// This function expects that compFacts string contains response from API compute/get,
 	// i.e. detailed information about compute instance.
 	//
@@ -336,6 +333,7 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec comp
 	d.Set("boot_disk_size", bootDisk.SizeMax)
 	d.Set("boot_disk", flattenBootDisk(bootDisk))
 	d.Set("boot_disk_id", bootDisk.ID)
+	d.Set("cd_image_id", computeRec.CdImageId)
 	d.Set("sep_id", bootDisk.SepID)
 	d.Set("pool", bootDisk.Pool)
 	d.Set("clone_reference", computeRec.CloneReference)
@@ -348,7 +346,7 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec comp
 	d.Set("deleted_time", computeRec.DeletedTime)
 	d.Set("description", computeRec.Description)
 	d.Set("devices", string(devices))
-	err := d.Set("disks", flattenComputeDisksDemo(ctx, d, computeRec.Disks, d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID))
+	err := d.Set("disks", flattenComputeDisksDemo(computeRec.Disks, d.Get("disks").([]interface{}), d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID))
 	if err != nil {
 		return err
 	}
@@ -370,6 +368,7 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec comp
 	d.Set("milestones", computeRec.Milestones)
 	d.Set("name", computeRec.Name)
 	d.Set("need_reboot", computeRec.NeedReboot)
+	d.Set("numa_node_id", computeRec.NumaNodeId)
 	d.Set("natable_vins_id", computeRec.NatableVINSID)
 	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
 	d.Set("natable_vins_name", computeRec.NatableVINSName)
@@ -383,6 +382,7 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec comp
 	d.Set("reference_id", computeRec.ReferenceID)
 	d.Set("registered", computeRec.Registered)
 	d.Set("res_name", computeRec.ResName)
+	d.Set("reserved_node_cpus", computeRec.ReservedNodeCpus)
 	d.Set("rg_id", computeRec.RGID)
 	d.Set("rg_name", computeRec.RGName)
 	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
@@ -513,6 +513,7 @@ func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interf
 			"pool":                  disk.Pool,
 			"present_to":            disk.PresentTo,
 			"purge_time":            disk.PurgeTime,
+			"replication":           flattenDiskReplication(disk.Replication),
 			"reality_device_number": disk.RealityDeviceNumber,
 			"res_id":                disk.ResID,
 			"role":                  disk.Role,
@@ -532,6 +533,20 @@ func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interf
 	return res
 }
 
+func flattenDiskReplication(rep compute.ItemReplication) []map[string]interface{} {
+	res := []map[string]interface{}{
+		{
+			"disk_id":        rep.DiskID,
+			"pool_id":        rep.PoolID,
+			"role":           rep.Role,
+			"self_volume_id": rep.SelfVolumeID,
+			"storage_id":     rep.StorageID,
+			"volume_id":      rep.VolumeID,
+		},
+	}
+	return res
+}
+
 func flattenCustomFields(customFields map[string]interface{}) string {
 	encoded, _ := json.Marshal(customFields)
 	return string(encoded)
@@ -563,10 +578,12 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("anti_affinity_rules", flattenListRules(computeRec.AntiAffinityRules))
 	d.Set("arch", computeRec.Architecture)
 	d.Set("boot_order", computeRec.BootOrder)
-	d.Set("boot_disk_size", computeRec.BootDiskSize)
+	d.Set("bootdisk_size", computeRec.BootDiskSize)
+	d.Set("cd_image_id", computeRec.CdImageId)
 	d.Set("clone_reference", computeRec.CloneReference)
 	d.Set("clones", computeRec.Clones)
 	d.Set("computeci_id", computeRec.ComputeCIID)
+	d.Set("cpu_pin", computeRec.CPUPin)
 	d.Set("cpus", computeRec.CPU)
 	d.Set("created_by", computeRec.CreatedBy)
 	d.Set("created_time", computeRec.CreatedTime)
@@ -579,6 +596,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("driver", computeRec.Driver)
 	d.Set("gid", computeRec.GID)
 	d.Set("guid", computeRec.GUID)
+	d.Set("hp_backed", computeRec.HPBacked)
 	d.Set("compute_id", computeRec.ID)
 	d.Set("image_id", computeRec.ImageID)
 	d.Set("image_name", computeRec.ImageName)
@@ -590,6 +608,8 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("milestones", computeRec.Milestones)
 	d.Set("name", computeRec.Name)
 	d.Set("need_reboot", computeRec.NeedReboot)
+	d.Set("numa_affinity", computeRec.NumaAffinity)
+	d.Set("numa_node_id", computeRec.NumaNodeId)
 	d.Set("natable_vins_id", computeRec.NatableVINSID)
 	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
 	d.Set("natable_vins_name", computeRec.NatableVINSName)
@@ -601,6 +621,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("reference_id", computeRec.ReferenceID)
 	d.Set("registered", computeRec.Registered)
 	d.Set("res_name", computeRec.ResName)
+	d.Set("reserved_node_cpus", computeRec.ReservedNodeCpus)
 	d.Set("rg_id", computeRec.RGID)
 	d.Set("rg_name", computeRec.RGName)
 	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
@@ -696,40 +717,50 @@ func flattenSnapshotUsage(computeSnapshotUsages compute.ListUsageSnapshots) []ma
 // 	return res
 // }
 
-func flattenVGPU(m []interface{}) []string {
-	output := []string{}
-	for _, item := range m {
-		switch d := item.(type) {
-		case string:
-			output = append(output, d)
-		case int:
-			output = append(output, strconv.Itoa(d))
-		case int64:
-			output = append(output, strconv.FormatInt(d, 10))
-		case float64:
-			output = append(output, strconv.FormatInt(int64(d), 10))
-		default:
-			output = append(output, "")
+func flattenVGPU(vgpuList []compute.ItemVGPU) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(vgpuList))
+	for _, dev := range vgpuList {
+		temp := map[string]interface{}{
+			"account_id":       dev.AccountID,
+			"created_time":     dev.CreatedTime,
+			"deleted_time":     dev.DeletedTime,
+			"gid":              dev.GID,
+			"guid":             dev.GUID,
+			"vgpu_id":          dev.ID,
+			"last_claimed_by":  dev.LastClaimedBy,
+			"last_update_time": dev.LastUpdateTime,
+			"mode":             dev.Mode,
+			"pci_slot":         dev.PCISlot,
+			"pgpuid":           dev.PGPUID,
+			"profile_id":       dev.ProfileID,
+			"ram":              dev.RAM,
+			"reference_id":     dev.ReferenceID,
+			"rg_id":            dev.RGID,
+			"status":           dev.Status,
+			"type":             dev.Type,
+			"vm_id":            dev.VMID,
 		}
+		res = append(res, temp)
 	}
-	return output
+	return res
 }
 
-func flattenPCIDevice(m []interface{}) []string {
-	output := []string{}
-	for _, item := range m {
-		switch d := item.(type) {
-		case string:
-			output = append(output, d)
-		case int:
-			output = append(output, strconv.Itoa(d))
-		case int64:
-			output = append(output, strconv.FormatInt(d, 10))
-		case float64:
-			output = append(output, strconv.FormatInt(int64(d), 10))
-		default:
-			output = append(output, "")
+func flattenPCIDevice(deviceList []compute.ItemPCIDevice) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(deviceList))
+	for _, dev := range deviceList {
+		temp := map[string]interface{}{
+			"compute_id":  dev.ComputeID,
+			"description": dev.Description,
+			"guid":        dev.GUID,
+			"hwpath":      dev.HwPath,
+			"device_id":   dev.ID,
+			"name":        dev.Name,
+			"rg_id":       dev.RGID,
+			"stack_id":    dev.StackID,
+			"status":      dev.Status,
+			"system_name": dev.SystemName,
 		}
+		res = append(res, temp)
 	}
-	return output
+	return res
 }

internal/service/cloudapi/kvmvm/network_subresource.go

@@ -128,7 +128,7 @@ func networkSubresourceSchemaMake() map[string]*schema.Schema {
 			Type:         schema.TypeString,
 			Required:     true,
 			StateFunc:    statefuncs.StateFuncToUpper,
-			ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS"}, false), // observe case while validating
+			ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS", "VFNIC"}, false), // observe case while validating
 			Description:  "Type of the network for this connection, either EXTNET or VINS.",
 		},
 

internal/service/cloudapi/kvmvm/old_schemas.go

@@ -33,13 +33,13 @@ func resourceComputeResourceV1() *schema.Resource {
 			"cpu": {
 				Type:         schema.TypeInt,
 				Required:     true,
-				ValidateFunc: validation.IntBetween(1, constants.MaxCpusPerCompute),
+				ValidateFunc: validation.IntBetween(1, constants.MAX_CPUS_PER_COMPUTE),
 				Description:  "Number of CPUs to allocate to this compute instance.",
 			},
 			"ram": {
 				Type:         schema.TypeInt,
 				Required:     true,
-				ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
+				ValidateFunc: validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
 				Description:  "Amount of RAM in MB to allocate to this compute instance.",
 			},
 			"image_id": {
@@ -191,7 +191,7 @@ func resourceComputeResourceV1() *schema.Resource {
 			"extra_disks": {
 				Type:     schema.TypeSet,
 				Optional: true,
-				MaxItems: constants.MaxExtraDisksPerCompute,
+				MaxItems: constants.MAX_EXTRA_DISKS_PER_COMPUTE,
 				Elem: &schema.Schema{
 					Type: schema.TypeInt,
 				},
@@ -202,7 +202,7 @@ func resourceComputeResourceV1() *schema.Resource {
 				Type:     schema.TypeSet,
 				Optional: true,
 				MinItems: 1,
-				MaxItems: constants.MaxNetworksPerCompute,
+				MaxItems: constants.MAX_NETWORKS_PER_COMPUTE,
 				Elem: &schema.Resource{
 					Schema: networkSubresourceSchemaMake(),
 				},
@@ -575,13 +575,13 @@ func resourceComputeResourceV2() *schema.Resource {
 			"cpu": {
 				Type:         schema.TypeInt,
 				Required:     true,
-				ValidateFunc: validation.IntBetween(1, constants.MaxCpusPerCompute),
+				ValidateFunc: validation.IntBetween(1, constants.MAX_CPUS_PER_COMPUTE),
 				Description:  "Number of CPUs to allocate to this compute instance.",
 			},
 			"ram": {
 				Type:         schema.TypeInt,
 				Required:     true,
-				ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
+				ValidateFunc: validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
 				Description:  "Amount of RAM in MB to allocate to this compute instance.",
 			},
 			"image_id": {
@@ -853,7 +853,7 @@ func resourceComputeResourceV2() *schema.Resource {
 				Type:     schema.TypeSet,
 				Optional: true,
 				Computed: true,
-				MaxItems: constants.MaxExtraDisksPerCompute,
+				MaxItems: constants.MAX_EXTRA_DISKS_PER_COMPUTE,
 				Elem: &schema.Schema{
 					Type: schema.TypeInt,
 				},
@@ -864,7 +864,7 @@ func resourceComputeResourceV2() *schema.Resource {
 				Type:     schema.TypeSet,
 				Optional: true,
 				MinItems: 1,
-				MaxItems: constants.MaxNetworksPerCompute,
+				MaxItems: constants.MAX_NETWORKS_PER_COMPUTE,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"net_type": {

internal/service/cloudapi/kvmvm/resource_check_input_values.go

@@ -41,6 +41,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vfpool"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
@@ -128,3 +129,36 @@ func existExtNetId(ctx context.Context, m interface{}, id int) (int, bool) {
 
 	return 0, true
 }
+
+func existVFPoolId(ctx context.Context, m interface{}, id int) (int, bool) {
+	c := m.(*controller.ControllerCfg)
+	req := vfpool.ListRequest{ByID: uint64(id)}
+
+	vfpoolList, err := c.CloudAPI().VFPool().List(ctx, req)
+	if err != nil {
+		log.Debugf("Unable to retrieve vfpool list, %s", err)
+		return id, false
+	}
+
+	if len(vfpoolList.Data) == 1 {
+		return 0, true
+	}
+
+	return id, false
+}
+
+func isMoreThanOneDisksTypeB(ctx context.Context, disks interface{}) bool {
+	count := 0
+
+	for _, elem := range disks.([]interface{}) {
+		diskVal := elem.(map[string]interface{})
+		if diskVal["disk_type"].(string) == "B" {
+			count++
+		}
+		if count > 1 {
+			return true
+		}
+	}
+
+	return false
+}

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -55,9 +55,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
-// DiskKey is custom string type to set up context Key for Disk ID
-type DiskKey string
-
 func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceComputeCreate: called for Compute name %q, RG ID %d", d.Get("name").(string), d.Get("rg_id").(int))
 	c := m.(*controller.ControllerCfg)
@@ -82,6 +79,12 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.Errorf("resourceComputeCreate: can't create Compute because imageID %d is not allowed or does not exist", d.Get("image_id").(int))
 	}
 
+	if disks, ok := d.GetOk("disks"); ok {
+		if isMoreThanOneDisksTypeB(ctx, disks) {
+			return diag.Errorf("resourceComputeCreate: can't create Compute because block disks have more 1 disk type 'B'")
+		}
+	}
+
 	if network, ok := d.GetOk("network"); ok {
 		networkList := network.(*schema.Set).List()
 		for _, elem := range networkList {
@@ -96,7 +99,13 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				if extNetId, ok := existExtNetId(ctx, m, networkData["net_id"].(int)); !ok {
 					return diag.Errorf("resourceComputeCreate: can't create compute because extnet ID %d is not allowed or does not exist", extNetId)
 				}
-
+			case "VFNIC":
+				if d.Get("driver").(string) == "KVM_PPC" {
+					return diag.Errorf("resourceComputeCreate: can't create compute because 'VFNIC' net_type is not allowed for driver 'KVM_PPC'")
+				}
+				if vfpoolId, ok := existVFPoolId(ctx, m, networkData["net_id"].(int)); !ok {
+					return diag.Errorf("resourceComputeCreate: can't create compute because vfpool ID %d is not allowed or does not exist", vfpoolId)
+				}
 			default:
 				continue
 			}
@@ -186,6 +195,57 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	if disks, ok := d.GetOk("disks"); ok {
+		disksX86 := make([]kvmx86.DataDisk, 0)
+		disksPPC := make([]kvmppc.DataDisk, 0)
+
+		for _, elem := range disks.([]interface{}) {
+			diskVal := elem.(map[string]interface{})
+			reqDataDisk := kvmx86.DataDisk{
+				DiskName: diskVal["disk_name"].(string),
+				Size:     uint64(diskVal["size"].(int)),
+			}
+			if sepId, ok := diskVal["sep_id"]; ok {
+				reqDataDisk.SepID = uint64(sepId.(int))
+			}
+			if pool, ok := diskVal["pool"]; ok {
+				reqDataDisk.Pool = pool.(string)
+			}
+			if desc, ok := diskVal["desc"]; ok {
+				reqDataDisk.Description = desc.(string)
+			}
+			if imageID, ok := diskVal["image_id"]; ok {
+				reqDataDisk.ImageID = uint64(imageID.(int))
+			}
+			disksX86 = append(disksX86, reqDataDisk)
+		}
+
+		createReqX86.DataDisks = disksX86
+
+		for _, elem := range disks.([]interface{}) {
+			diskVal := elem.(map[string]interface{})
+			reqDataDisk := kvmppc.DataDisk{
+				DiskName: diskVal["disk_name"].(string),
+				Size:     uint64(diskVal["size"].(int)),
+			}
+			if sepId, ok := diskVal["sep_id"]; ok {
+				reqDataDisk.SepID = uint64(sepId.(int))
+			}
+			if pool, ok := diskVal["pool"]; ok {
+				reqDataDisk.Pool = pool.(string)
+			}
+			if desc, ok := diskVal["desc"]; ok {
+				reqDataDisk.Description = desc.(string)
+			}
+			if imageID, ok := diskVal["image_id"]; ok {
+				reqDataDisk.ImageID = uint64(imageID.(int))
+			}
+			disksPPC = append(disksPPC, reqDataDisk)
+		}
+
+		createReqPPC.DataDisks = disksPPC
+	}
+
 	argVal, ok = d.GetOk("cloud_init")
 	if ok {
 		userdata := argVal.(string)
@@ -217,10 +277,16 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		createReqX86.Name = d.Get("name").(string)
 		createReqX86.CPU = uint64(d.Get("cpu").(int))
 		createReqX86.RAM = uint64(d.Get("ram").(int))
-		createReqX86.ImageID = uint64(d.Get("image_id").(int))
 
 		createReqX86.Driver = driver
 
+		if image, ok := d.GetOk("image_id"); ok {
+			createReqX86.ImageID = uint64(image.(int))
+		}
+		if withoutBootDisk, ok := d.GetOk("without_boot_disk"); ok {
+			createReqX86.WithoutBootDisk = withoutBootDisk.(bool)
+		}
+
 		if custom_fields, ok := d.GetOk("custom_fields"); ok {
 			val := custom_fields.(string)
 			val = strings.ReplaceAll(val, "\\", "")
@@ -231,6 +297,12 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			createReqX86.CustomFields = val
 		}
 
+		if numaAffinity, ok := d.GetOk("numa_affinity"); ok {
+			createReqX86.NumaAffinity = numaAffinity.(string)
+		}
+		createReqX86.CPUPin = d.Get("cpu_pin").(bool)
+		createReqX86.HPBacked = d.Get("hp_backed").(bool)
+
 		log.Debugf("resourceComputeCreate: creating Compute of type KVM VM x86")
 		apiResp, err := c.CloudAPI().KVMX86().Create(ctx, createReqX86)
 		if err != nil {
@@ -273,46 +345,8 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if disks, ok := d.GetOk("disks"); ok {
-		log.Debugf("resourceComputeCreate: Create disks on ComputeID: %d", computeId)
-		addedDisks := disks.([]interface{})
-		if len(addedDisks) > 0 {
-			for _, disk := range addedDisks {
-				diskConv := disk.(map[string]interface{})
-				req := compute.DiskAddRequest{
-					ComputeID: computeId,
-					DiskName:  diskConv["disk_name"].(string),
-					Size:      uint64(diskConv["size"].(int)),
-				}
-
-				if diskConv["sep_id"].(int) != 0 {
-					req.SepID = uint64(diskConv["sep_id"].(int))
-				}
-				if diskConv["disk_type"].(string) != "" {
-					req.DiskType = diskConv["disk_type"].(string)
-				}
-				if diskConv["pool"].(string) != "" {
-					req.Pool = diskConv["pool"].(string)
-				}
-				if diskConv["desc"].(string) != "" {
-					req.Description = diskConv["desc"].(string)
-				}
-				if diskConv["image_id"].(int) != 0 {
-					req.ImageID = uint64(diskConv["image_id"].(int))
-				}
-
-				diskId, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
-				if err != nil {
-					cleanup = true
-					return diag.FromErr(err)
-				}
-
-				ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
-			}
-		}
-	}
-
 	if !cleanup {
+
 		if enabled, ok := d.GetOk("enabled"); ok {
 			if enabled.(bool) {
 				req := compute.EnableRequest{ComputeID: computeId}
@@ -435,9 +469,12 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 					req := compute.PFWAddRequest{
 						ComputeID:       computeId,
 						PublicPortStart: uint64(pfwItem["public_port_start"].(int)),
-						LocalBasePort:   uint64(pfwItem["local_port"].(int)),
 						Proto:           pfwItem["proto"].(string),
 					}
+
+					if pfwItem["local_port"].(int) != 0 {
+						req.LocalBasePort = uint64(pfwItem["local_port"].(int))
+					}
 					if pfwItem["public_port_end"].(int) != 0 {
 						req.PublicPortEnd = int64(pfwItem["public_port_end"].(int))
 					}
@@ -587,7 +624,7 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
-	if err = flattenCompute(ctx, d, computeRec); err != nil {
+	if err = flattenCompute(d, computeRec); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -621,6 +658,12 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause imageID %d not allowed or does not exist", d.Get("image_id").(int))
 	}
 
+	if disks, ok := d.GetOk("disks"); ok {
+		if isMoreThanOneDisksTypeB(ctx, disks) {
+			return diag.Errorf("resourceComputeUpdate: can't update Compute because block disks have more 1 disk type 'B'")
+		}
+	}
+
 	if network, ok := d.GetOk("network"); ok {
 		networkList := network.(*schema.Set).List()
 		for _, elem := range networkList {
@@ -629,13 +672,19 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 			switch networkData["net_type"].(string) {
 			case "VINS":
 				if vinsId, ok := existVinsId(ctx, m, networkData["net_id"].(int)); !ok {
-					return diag.Errorf("resourceComputeCreate: can't update compute because vins ID %d is not allowed or does not exist", vinsId)
+					return diag.Errorf("resourceComputeUpdate: can't update compute because vins ID %d is not allowed or does not exist", vinsId)
 				}
 			case "EXTNET":
 				if extNetId, ok := existExtNetId(ctx, m, networkData["net_id"].(int)); !ok {
-					return diag.Errorf("resourceComputeCreate: can't update compute because extnet ID %d is not allowed or does not exist", extNetId)
+					return diag.Errorf("resourceComputeUpdate: can't update compute because extnet ID %d is not allowed or does not exist", extNetId)
+				}
+			case "VFNIC":
+				if d.Get("driver").(string) == "KVM_PPC" {
+					return diag.Errorf("resourceComputeUpdate: can't create compute because 'VFNIC' net_type is not allowed for driver 'KVM_PPC'")
+				}
+				if vfpoolId, ok := existVFPoolId(ctx, m, networkData["net_id"].(int)); !ok {
+					return diag.Errorf("resourceComputeUpdate: can't create compute because vfpool ID %d is not allowed or does not exist", vfpoolId)
 				}
-
 			default:
 				continue
 			}
@@ -839,7 +888,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChanges("description", "name") {
+	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed") {
 		req := compute.UpdateRequest{
 			ComputeID: computeRec.ID,
 		}
@@ -850,10 +899,39 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		if d.HasChange("description") {
 			req.Description = d.Get("description").(string)
 		}
+		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)
+		}
 
+		// 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) {
+			isStopRequired = true
+		}
+		if isStopRequired {
+			if _, err := c.CloudAPI().Compute().Stop(ctx, compute.StopRequest{ComputeID: computeRec.ID}); err != nil {
+				return diag.FromErr(err)
+			}
+		}
+
+		// perform update
 		if _, err := c.CloudAPI().Compute().Update(ctx, req); err != nil {
 			return diag.FromErr(err)
 		}
+
+		// If used to be STARTED, we need to start it after update
+		if isStopRequired {
+			if _, err := c.CloudAPI().Compute().Start(ctx, compute.StartRequest{ComputeID: computeRec.ID}); err != nil {
+				return diag.FromErr(err)
+			}
+		}
 	}
 
 	if d.HasChange("disks") {
@@ -862,14 +940,6 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		resizedDisks := make([]interface{}, 0)
 		renamedDisks := make([]interface{}, 0)
 
-		// save permanently in disks based on disk_id to context
-		for _, diskItemInterface := range d.Get("disks").([]interface{}) {
-			diskItem := diskItemInterface.(map[string]interface{})
-			diskId := diskItem["disk_id"].(int)
-			permanently := diskItem["permanently"].(bool)
-			ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(diskId)), permanently)
-		}
-
 		oldDisks, newDisks := d.GetChange("disks")
 		oldConv := oldDisks.([]interface{})
 		newConv := newDisks.([]interface{})
@@ -975,12 +1045,10 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				if diskConv["image_id"].(int) != 0 {
 					req.ImageID = uint64(diskConv["image_id"].(int))
 				}
-				diskId, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
+				_, err := c.CloudAPI().Compute().DiskAdd(ctx, req)
 				if err != nil {
 					return diag.FromErr(err)
 				}
-
-				ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
 			}
 		}
 
@@ -1244,10 +1312,11 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				req := compute.PFWDelRequest{
 					ComputeID:       computeRec.ID,
 					PublicPortStart: uint64(pfwItem["public_port_start"].(int)),
-					LocalBasePort:   uint64(pfwItem["local_port"].(int)),
 					Proto:           pfwItem["proto"].(string),
 				}
-
+				if pfwItem["local_port"].(int) != 0 {
+					req.LocalBasePort = uint64(pfwItem["local_port"].(int))
+				}
 				if pfwItem["public_port_end"].(int) == -1 {
 					req.PublicPortEnd = req.PublicPortStart
 				} else {
@@ -1269,10 +1338,11 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 					ComputeID:       computeRec.ID,
 					PublicPortStart: uint64(pfwItem["public_port_start"].(int)),
 					PublicPortEnd:   int64(pfwItem["public_port_end"].(int)),
-					LocalBasePort:   uint64(pfwItem["local_port"].(int)),
 					Proto:           pfwItem["proto"].(string),
 				}
-
+				if pfwItem["local_port"].(int) != 0 {
+					req.LocalBasePort = uint64(pfwItem["local_port"].(int))
+				}
 				_, err := c.CloudAPI().Compute().PFWAdd(ctx, req)
 				if err != nil {
 					return diag.FromErr(err)
@@ -1711,7 +1781,7 @@ func portForwardingSubresourceSchemaMake() map[string]*schema.Schema {
 		},
 		"local_port": {
 			Type:     schema.TypeInt,
-			Required: true,
+			Optional: true,
 		},
 		"proto": {
 			Type:         schema.TypeString,
@@ -1786,24 +1856,30 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 		"cpu": {
 			Type:         schema.TypeInt,
 			Required:     true,
-			ValidateFunc: validation.IntBetween(1, constants.MaxCpusPerCompute),
+			ValidateFunc: validation.IntBetween(1, constants.MAX_CPUS_PER_COMPUTE),
 			Description:  "Number of CPUs to allocate to this compute instance.",
 		},
 		"ram": {
 			Type:     schema.TypeInt,
 			Required: true,
 			ValidateFunc: validation.All(
-				validation.IntAtLeast(constants.MinRamPerCompute),
-				validators.DivisibleBy(constants.RAMDivisibility),
+				validation.IntAtLeast(constants.MIN_RAM_PER_COMPUTE),
+				validators.DivisibleBy(constants.RAM_DIVISIBILITY),
 			),
 			Description: "Amount of RAM in MB to allocate to this compute instance.",
 		},
 		"image_id": {
 			Type:     schema.TypeInt,
-			Required: true,
+			Optional: true,
 			//ForceNew:    true, //REDEPLOY
 			Description: "ID of the OS image to base this compute instance on.",
 		},
+		"without_boot_disk": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state.",
+		},
 		"boot_disk_size": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -1926,29 +2002,26 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			// ForceNew:    true,
 			Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
 		},
-
 		"extra_disks": {
 			Type:     schema.TypeSet,
 			Optional: true,
 			Computed: true,
-			MaxItems: constants.MaxExtraDisksPerCompute,
+			MaxItems: constants.MAX_EXTRA_DISKS_PER_COMPUTE,
 			Elem: &schema.Schema{
 				Type: schema.TypeInt,
 			},
 			Description: "Optional list of IDs of extra disks to attach to this compute. You may specify several extra disks.",
 		},
-
 		"network": {
 			Type:     schema.TypeSet,
 			Optional: true,
 			MinItems: 1,
-			MaxItems: constants.MaxNetworksPerCompute,
+			MaxItems: constants.MAX_NETWORKS_PER_COMPUTE,
 			Elem: &schema.Resource{
 				Schema: networkSubresourceSchemaMake(),
 			},
 			Description: "Optional network connection(s) for this compute. You may specify several network blocks, one for each connection.",
 		},
-
 		"tags": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -1956,7 +2029,6 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 				Schema: tagsSubresourceSchemaMake(),
 			},
 		},
-
 		"port_forwarding": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -1964,7 +2036,6 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 				Schema: portForwardingSubresourceSchemaMake(),
 			},
 		},
-
 		"user_access": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -1972,7 +2043,6 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 				Schema: userAccessSubresourceSchemaMake(),
 			},
 		},
-
 		"snapshot": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -1980,7 +2050,6 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 				Schema: snapshotSubresourceSchemaMake(),
 			},
 		},
-
 		"rollback": {
 			Type:     schema.TypeSet,
 			MaxItems: 1,
@@ -1989,7 +2058,6 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 				Schema: snapshotRollbackSubresourceSchemaMake(),
 			},
 		},
-
 		"cd": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -1998,50 +2066,42 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 				Schema: cdSubresourceSchemaMake(),
 			},
 		},
-
 		"pin_to_stack": {
 			Type:     schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
-
 		"description": {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Description: "Optional text description of this compute instance.",
 		},
-
 		"cloud_init": {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Description: "Optional cloud_init parameters. Applied when creating new compute instance only, ignored in all other cases.",
 		},
-
 		"enabled": {
 			Type:        schema.TypeBool,
 			Optional:    true,
 			Computed:    true,
 			Description: "If true - enable compute, else - disable",
 		},
-
 		"pause": {
 			Type:     schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
-
 		"reset": {
 			Type:     schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
-
 		"restore": {
 			Type:     schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
-
 		"auto_start": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -2093,6 +2153,26 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "compute purpose",
 		},
+		"numa_affinity": {
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "none",
+			ValidateFunc: validation.StringInSlice([]string{"none", "strict", "loose"}, false), // observe case while validating
+			Description:  "Rule for VM placement with NUMA affinity.",
+		},
+		"cpu_pin": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node.",
+		},
+		"hp_backed": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node.",
+		},
+
 		// The rest are Compute properties, which are "computed" once it is created
 		"account_id": {
 			Type:        schema.TypeInt,
@@ -2124,6 +2204,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "This compute instance boot disk ID.",
 		},
+		"cd_image_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"clone_reference": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -2202,6 +2286,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"numa_node_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"natable_vins_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -2246,6 +2334,13 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"reserved_node_cpus": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"rg_name": {
 			Type:        schema.TypeString,
 			Computed:    true,

internal/service/cloudapi/kvmvm/utility_compute_list.go

@@ -77,6 +77,9 @@ func utilityDataComputeListCheckPresence(ctx context.Context, d *schema.Resource
 	if includeDeleted, ok := d.GetOk("includedeleted"); ok {
 		req.IncludeDeleted = includeDeleted.(bool)
 	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/kvmvm/utility_compute_list_deleted.go

@@ -71,6 +71,9 @@ func utilityDataComputeListDeletedCheckPresence(ctx context.Context, d *schema.R
 	if extnetId, ok := d.GetOk("extnet_id"); ok {
 		req.ExtNetID = uint64(extnetId.(int))
 	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/kvmvm/utility_compute_pci_device_list.go

@@ -57,6 +57,9 @@ func utilityComputePCIDeviceListCheckPresence(ctx context.Context, d *schema.Res
 	if status, ok := d.GetOk("status"); ok {
 		req.Status = status.(string)
 	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/kvmvm/utility_compute_vgpu_list.go

@@ -57,6 +57,9 @@ func utilityComputeVGPUListCheckPresence(ctx context.Context, d *schema.Resource
 	if includeDeleted, ok := d.GetOk("includedeleted"); ok {
 		req.IncludeDeleted = includeDeleted.(bool)
 	}
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/lb/data_source_lb.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	lb, err := utilityLBCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.FormatUint(lb.ID, 10))
-
-	flattenLB(d, lb)
-
-	return nil
-}
-
-func DataSourceLB() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceLBRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dsLBSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	lb, err := utilityLBCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(lb.ID, 10))
+
+	flattenLB(d, lb)
+
+	return nil
+}
+
+func DataSourceLB() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceLBRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dsLBSchemaMake(),
+	}
+}

internal/service/cloudapi/lb/data_source_lb_list.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceLBListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	lbList, err := utilityLBListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenLBList(lbList))
-	d.Set("entry_count", lbList.EntryCount)
-
-	return nil
-}
-
-func DataSourceLBList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceLBListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dsLBListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceLBListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	lbList, err := utilityLBListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenLBList(lbList))
+	d.Set("entry_count", lbList.EntryCount)
+
+	return nil
+}
+
+func DataSourceLBList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceLBListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dsLBListSchemaMake(),
+	}
+}

internal/service/cloudapi/lb/data_source_lb_list_deleted.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceLBListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	lbList, err := utilityLBListDeletedCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenLBList(lbList))
-	d.Set("entry_count", lbList.EntryCount)
-
-	return nil
-}
-
-func DataSourceLBListDeleted() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceLBListDeletedRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dsLBListDeletedSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceLBListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	lbList, err := utilityLBListDeletedCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenLBList(lbList))
+	d.Set("entry_count", lbList.EntryCount)
+
+	return nil
+}
+
+func DataSourceLBListDeleted() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceLBListDeletedRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dsLBListDeletedSchemaMake(),
+	}
+}

internal/service/cloudapi/lb/flattens.go

@@ -104,6 +104,8 @@ func flattenResourceLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("frontends", flattenFrontends(lb.Frontends))
 	d.Set("gid", lb.GID)
 	d.Set("guid", lb.GUID)
+	d.Set("manager_id", lb.ManagerId)
+	d.Set("manager_type", lb.ManagerType)
 	d.Set("lb_id", lb.ID)
 	d.Set("image_id", lb.ImageID)
 	d.Set("milestones", lb.Milestones)
@@ -117,6 +119,7 @@ func flattenResourceLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("tech_status", lb.TechStatus)
 	d.Set("updated_by", lb.UpdatedBy)
 	d.Set("updated_time", lb.UpdatedTime)
+	d.Set("user_managed", lb.UserManaged)
 	d.Set("vins_id", lb.VINSID)
 
 }
@@ -136,6 +139,8 @@ func flattenLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("frontends", flattenFrontends(lb.Frontends))
 	d.Set("gid", lb.GID)
 	d.Set("guid", lb.GUID)
+	d.Set("manager_id", lb.ManagerId)
+	d.Set("manager_type", lb.ManagerType)
 	d.Set("image_id", lb.ImageID)
 	d.Set("milestones", lb.Milestones)
 	d.Set("name", lb.Name)
@@ -148,6 +153,7 @@ func flattenLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("tech_status", lb.TechStatus)
 	d.Set("updated_by", lb.UpdatedBy)
 	d.Set("updated_time", lb.UpdatedTime)
+	d.Set("user_managed", lb.UserManaged)
 	d.Set("vins_id", lb.VINSID)
 }
 
@@ -266,9 +272,12 @@ func flattenLBList(lbl *lb.ListLB) []map[string]interface{} {
 			"frontends":       flattenFrontends(lb.Frontends),
 			"gid":             lb.GID,
 			"guid":            lb.GUID,
+			"manager_id":      lb.ManagerId,
+			"manager_type":    lb.ManagerType,
 			"image_id":        lb.ImageID,
 			"milestones":      lb.Milestones,
 			"name":            lb.Name,
+			"part_k8s":        lb.PartK8s,
 			"primary_node":    flattenNode(lb.PrimaryNode),
 			"rg_id":           lb.RGID,
 			"rg_name":         lb.RGName,
@@ -277,6 +286,7 @@ func flattenLBList(lbl *lb.ListLB) []map[string]interface{} {
 			"tech_status":     lb.TechStatus,
 			"updated_by":      lb.UpdatedBy,
 			"updated_time":    lb.UpdatedTime,
+			"user_managed":    lb.UserManaged,
 			"vins_id":         lb.VINSID,
 			"lb_id":           lb.ID,
 		}

internal/service/cloudapi/lb/lb_data_subresource.go

@@ -1,186 +1,195 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-func dsLBSchemaMake() map[string]*schema.Schema {
-	sch := createLBSchema()
-	sch["lb_id"] = &schema.Schema{
-		Type:     schema.TypeInt,
-		Required: true,
-	}
-	return sch
-}
-
-func dsLBListDeletedSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"by_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by ID",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by name",
-		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by Account ID",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by RG ID",
-		},
-		"tech_status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by TechStatus",
-		},
-		"front_ip": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by FrontIP",
-		},
-		"back_ip": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by BackIP",
-		},
-		"page": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Default:  0,
-		},
-		"size": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Default:  0,
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: dsLBItemSchemaMake(),
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
-
-func dsLBListSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"by_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by ID",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by name",
-		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by Account ID",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by RG ID",
-		},
-		"tech_status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by TechStatus",
-		},
-		"status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by Status",
-		},
-		"front_ip": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by FrontIP",
-		},
-		"back_ip": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by BackIP",
-		},
-		"includedeleted": {
-			Type:     schema.TypeBool,
-			Optional: true,
-			Default:  false,
-		},
-		"page": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Default:  0,
-		},
-		"size": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Default:  0,
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: dsLBItemSchemaMake(),
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
-
-func dsLBItemSchemaMake() map[string]*schema.Schema {
-	sch := createLBSchema()
-	sch["dp_api_password"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Computed: true,
-	}
-	delete(sch, "part_k8s")
-	return sch
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dsLBSchemaMake() map[string]*schema.Schema {
+	sch := createLBSchema()
+	sch["lb_id"] = &schema.Schema{
+		Type:     schema.TypeInt,
+		Required: true,
+	}
+	return sch
+}
+
+func dsLBListDeletedSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by Account ID",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"tech_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by TechStatus",
+		},
+		"front_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by FrontIP",
+		},
+		"back_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by BackIP",
+		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
+		"page": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Default:  0,
+		},
+		"size": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Default:  0,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: dsLBItemSchemaMake(),
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func dsLBListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by Account ID",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"tech_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by TechStatus",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by Status",
+		},
+		"front_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by FrontIP",
+		},
+		"back_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by BackIP",
+		},
+		"includedeleted": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  false,
+		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
+		"page": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Default:  0,
+		},
+		"size": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Default:  0,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: dsLBItemSchemaMake(),
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func dsLBItemSchemaMake() map[string]*schema.Schema {
+	sch := createLBSchema()
+	sch["dp_api_password"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Computed: true,
+	}
+	return sch
+}

internal/service/cloudapi/lb/lb_resource_subresource.go

@@ -94,9 +94,15 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 		Type:     schema.TypeBool,
 		Optional: true,
 	}
-	sch["lb_sysctl_params"] = &schema.Schema{
-		Type:     schema.TypeString,
+	sch["sysctl_params"] = &schema.Schema{
+		Type:     schema.TypeList,
 		Optional: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeMap,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 	}
 
 	///

internal/service/cloudapi/lb/lb_schema.go

@@ -42,7 +42,7 @@ func createLBSchema() map[string]*schema.Schema {
 		},
 		"backend_haip": {
 			Type:     schema.TypeString,
-						Computed: true,
+			Computed: true,
 		},
 		"backends": {
 			Type:     schema.TypeList,
@@ -210,7 +210,7 @@ func createLBSchema() map[string]*schema.Schema {
 		},
 		"frontend_haip": {
 			Type:     schema.TypeString,
-						Computed: true,
+			Computed: true,
 		},
 		"frontends": {
 			Type:     schema.TypeList,
@@ -268,6 +268,14 @@ func createLBSchema() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"manager_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"manager_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"image_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -372,6 +380,10 @@ func createLBSchema() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"user_managed": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"vins_id": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/lb/resource_lb.go

@@ -1,470 +1,510 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
-)
-
-func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceLBCreate")
-
-	haveRGID, err := existRGID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveRGID {
-		return diag.Errorf("resourceLBCreate: can't create LB because RGID %d is not allowed or does not exist", d.Get("rg_id").(int))
-	}
-
-	haveExtNetID, err := existExtNetID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveExtNetID {
-		return diag.Errorf("resourceLBCreate: can't create LB because ExtNetID %d is not allowed or does not exist", d.Get("extnet_id").(int))
-	}
-
-	haveVins, err := existViNSID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveVins {
-		return diag.Errorf("resourceLBCreate: can't create LB because ViNSID %d is not allowed or does not exist", d.Get("vins_id").(int))
-	}
-
-	c := m.(*controller.ControllerCfg)
-	req := lb.CreateRequest{
-		Name:     d.Get("name").(string),
-		RGID:     uint64(d.Get("rg_id").(int)),
-		ExtNetID: uint64(d.Get("extnet_id").(int)),
-		VINSID:   uint64(d.Get("vins_id").(int)),
-		Start:    d.Get("start").(bool),
-	}
-
-	if desc, ok := d.GetOk("desc"); ok {
-		req.Description = desc.(string)
-	}
-
-	if haMode, ok := d.GetOk("ha_mode"); ok {
-		req.HighlyAvailable = haMode.(bool)
-	}
-
-	lbId, err := c.CloudAPI().LB().Create(ctx, req)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.FormatUint(lbId, 10))
-	d.Set("lb_id", lbId)
-
-	w := dc.Warnings{}
-
-	if enable, ok := d.GetOk("enable"); ok {
-		req := lb.DisableEnableRequest{
-			LBID: lbId,
-		}
-
-		if enable.(bool) {
-			_, err := c.CloudAPI().LB().Enable(ctx, req)
-			if err != nil {
-				w.Add(err)
-			}
-		} else {
-			_, err := c.CloudAPI().LB().Disable(ctx, req)
-			if err != nil {
-				w.Add(err)
-			}
-		}
-
-		if start, ok := d.GetOk("start"); ok && enable.(bool) {
-			if start.(bool) {
-				req := lb.StartRequest{LBID: lbId}
-				_, err := c.CloudAPI().LB().Start(ctx, req)
-				if err != nil {
-					w.Add(err)
-				}
-			} else {
-				req := lb.StopRequest{LBID: lbId}
-				_, err := c.CloudAPI().LB().Stop(ctx, req)
-				if err != nil {
-					w.Add(err)
-				}
-			}
-		}
-	}
-
-	return append(w.Get(), resourceLBRead(ctx, d, m)...)
-}
-
-func resourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceLBRead")
-
-	// c := m.(*controller.ControllerCfg)
-
-	lbRec, err := utilityLBCheckPresence(ctx, d, m)
-	if lbRec == nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	hasChanged := false
-
-	switch lbRec.Status {
-	case status.Modeled:
-		return diag.Errorf("The LB is in status: %s, please, contact support for more information", lbRec.Status)
-	case status.Creating:
-	case status.Created:
-	case status.Deleting:
-	case status.Deleted:
-		// lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
-		// restoreReq := lb.RestoreRequest{LBID: lbId}
-		// enableReq := lb.DisableEnableRequest{LBID: lbId}
-
-		// _, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
-		// if err != nil {
-		// 	return diag.FromErr(err)
-		// }
-		// _, err = c.CloudAPI().LB().Enable(ctx, enableReq)
-		// if err != nil {
-		// 	return diag.FromErr(err)
-		// }
-
-		// hasChanged = true
-	case status.Destroying:
-		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
-	case status.Destroyed:
-		d.SetId("")
-		return diag.Errorf("The resource cannot be updated because it has been destroyed")
-		// return resourceLBCreate(ctx, d, m)
-	case status.Enabled:
-	case status.Enabling:
-	case status.Disabling:
-	case status.Disabled:
-		log.Debugf("The LB is in status: %s, troubles may occur with update. Please, enable LB first.", lbRec.Status)
-	case status.Restoring:
-	}
-
-	if hasChanged {
-		lbRec, err = utilityLBCheckPresence(ctx, d, m)
-		if err != nil {
-			d.SetId("")
-			return diag.FromErr(err)
-		}
-	}
-
-	flattenResourceLB(d, lbRec)
-
-	return nil
-}
-
-func resourceLBDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceLBDelete")
-
-	c := m.(*controller.ControllerCfg)
-	lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
-	req := lb.DeleteRequest{
-		LBID: lbId,
-	}
-
-	if permanently, ok := d.GetOk("permanently"); ok {
-		req.Permanently = permanently.(bool)
-	}
-
-	_, err := c.CloudAPI().LB().Delete(ctx, req)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId("")
-
-	return nil
-}
-
-func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceLBUpdate")
-	c := m.(*controller.ControllerCfg)
-
-	haveRGID, err := existRGID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveRGID {
-		return diag.Errorf("resourceLBUpdate: can't update LB because RGID %d is not allowed or does not exist", d.Get("rg_id").(int))
-	}
-
-	haveExtNetID, err := existExtNetID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveExtNetID {
-		return diag.Errorf("resourceLBUpdate: can't update LB because ExtNetID %d is not allowed or does not exist", d.Get("extnet_id").(int))
-	}
-
-	haveVins, err := existViNSID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveVins {
-		return diag.Errorf("resourceLBUpdate: can't update LB because ViNSID %d is not allowed or does not exist", d.Get("vins_id").(int))
-	}
-
-	lbRec, err := utilityLBCheckPresence(ctx, d, m)
-	if lbRec == nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	hasChanged := false
-
-	switch lbRec.Status {
-	case status.Modeled:
-		return diag.Errorf("The LB is in status: %s, please, contact support for more information", lbRec.Status)
-	case status.Creating:
-	case status.Created:
-	case status.Deleting:
-	case status.Deleted:
-		if restore, ok := d.GetOk("restore"); ok && restore.(bool) {
-			restoreReq := lb.RestoreRequest{LBID: lbRec.ID}
-
-			_, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-		if enable, ok := d.GetOk("enable"); ok {
-			req := lb.DisableEnableRequest{
-				LBID: lbRec.ID,
-			}
-
-			if enable.(bool) {
-				_, err := c.CloudAPI().LB().Enable(ctx, req)
-				if err != nil {
-					return diag.FromErr(err)
-				}
-			} else {
-				_, err := c.CloudAPI().LB().Disable(ctx, req)
-				if err != nil {
-					return diag.FromErr(err)
-				}
-			}
-
-			if start, ok := d.GetOk("start"); ok && enable.(bool) {
-				if start.(bool) {
-					req := lb.StartRequest{LBID: lbRec.ID}
-					_, err := c.CloudAPI().LB().Start(ctx, req)
-					if err != nil {
-						return diag.FromErr(err)
-					}
-				} else {
-					req := lb.StopRequest{LBID: lbRec.ID}
-					_, err := c.CloudAPI().LB().Stop(ctx, req)
-					if err != nil {
-						return diag.FromErr(err)
-					}
-				}
-			}
-		}
-		hasChanged = true
-	case status.Destroying:
-		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
-	case status.Destroyed:
-		d.SetId("")
-		return diag.Errorf("The resource cannot be updated because it has been destroyed")
-		// return resourceLBCreate(ctx, d, m)
-	case status.Enabled:
-	case status.Enabling:
-	case status.Disabling:
-	case status.Disabled:
-		log.Debugf("The LB is in status: %s, troubles may occur with update. Please, enable LB first.", lbRec.Status)
-	case status.Restoring:
-	}
-
-	if hasChanged {
-		_, err = utilityLBCheckPresence(ctx, d, m)
-		if err != nil {
-			d.SetId("")
-			return diag.FromErr(err)
-		}
-	}
-
-	if d.HasChange("ha_mode") {
-		hamode := d.Get("ha_mode").(bool)
-		if hamode {
-			req := lb.HighlyAvailableRequest{
-				LBID: uint64(d.Get("lb_id").(int)),
-			}
-			_, err := c.CloudAPI().LB().HighlyAvailable(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
-	if d.HasChange("enable") {
-		enable := d.Get("enable").(bool)
-		req := lb.DisableEnableRequest{
-			LBID: uint64(d.Get("lb_id").(int)),
-		}
-		if enable {
-			_, err := c.CloudAPI().LB().Enable(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		} else {
-			_, err := c.CloudAPI().LB().Disable(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
-	if d.HasChange("start") {
-		start := d.Get("start").(bool)
-		lbId := uint64(d.Get("lb_id").(int))
-		if start {
-			req := lb.StartRequest{LBID: lbId}
-			_, err := c.CloudAPI().LB().Start(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		} else {
-			req := lb.StopRequest{LBID: lbId}
-			_, err := c.CloudAPI().LB().Stop(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
-	if d.HasChange("desc") {
-		req := lb.UpdateRequest{
-			LBID:        uint64(d.Get("lb_id").(int)),
-			Description: d.Get("desc").(string),
-		}
-
-		_, err := c.CloudAPI().LB().Update(ctx, req)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
-	if d.HasChange("restart") {
-		restart := d.Get("restart").(bool)
-		if restart {
-			req := lb.RestartRequest{
-				LBID: uint64(d.Get("lb_id").(int)),
-			}
-			if safe, ok:= d.GetOk("safe"); ok { 
-				req.Safe = safe.(bool)
-            }
-
-			_, err := c.CloudAPI().LB().Restart(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
-	if d.HasChange("restore") {
-		restore := d.Get("restore").(bool)
-		if restore {
-			req := lb.RestoreRequest{
-				LBID: uint64(d.Get("lb_id").(int)),
-			}
-
-			_, err := c.CloudAPI().LB().Restore(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
-	if d.HasChange("config_reset") {
-		cfgReset := d.Get("config_reset").(bool)
-		if cfgReset {
-			req := lb.ConfigResetRequest{
-				LBID: uint64(d.Get("lb_id").(int)),
-			}
-
-			_, err := c.CloudAPI().LB().ConfigReset(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
-	return resourceLBRead(ctx, d, m)
-}
-
-func ResourceLB() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		CreateContext: resourceLBCreate,
-		ReadContext:   resourceLBRead,
-		UpdateContext: resourceLBUpdate,
-		DeleteContext: resourceLBDelete,
-
-		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &constants.Timeout600s,
-			Read:    &constants.Timeout300s,
-			Update:  &constants.Timeout300s,
-			Delete:  &constants.Timeout300s,
-			Default: &constants.Timeout300s,
-		},
-
-		Schema: lbResourceSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+)
+
+func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceLBCreate")
+
+	haveRGID, err := existRGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveRGID {
+		return diag.Errorf("resourceLBCreate: can't create LB because RGID %d is not allowed or does not exist", d.Get("rg_id").(int))
+	}
+
+	haveExtNetID, err := existExtNetID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveExtNetID {
+		return diag.Errorf("resourceLBCreate: can't create LB because ExtNetID %d is not allowed or does not exist", d.Get("extnet_id").(int))
+	}
+
+	haveVins, err := existViNSID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveVins {
+		return diag.Errorf("resourceLBCreate: can't create LB because ViNSID %d is not allowed or does not exist", d.Get("vins_id").(int))
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := lb.CreateRequest{
+		Name:     d.Get("name").(string),
+		RGID:     uint64(d.Get("rg_id").(int)),
+		ExtNetID: uint64(d.Get("extnet_id").(int)),
+		VINSID:   uint64(d.Get("vins_id").(int)),
+		Start:    d.Get("start").(bool),
+	}
+
+	if desc, ok := d.GetOk("desc"); ok {
+		req.Description = desc.(string)
+	}
+	if haMode, ok := d.GetOk("ha_mode"); ok {
+		req.HighlyAvailable = haMode.(bool)
+	}
+	if sysctlParams, ok := d.GetOk("sysctl_params"); ok {
+		syscrlSliceMaps := sysctlParams.([]map[string]string)
+		res := make([]map[string]interface{}, 0, len(syscrlSliceMaps))
+		for _, syscrlMap := range syscrlSliceMaps {
+			tempMap := make(map[string]interface{})
+			for k, v := range syscrlMap {
+				if intVal, err := strconv.Atoi(v); err == nil {
+					tempMap[k] = intVal
+					continue
+				}
+				tempMap[k] = v
+			}
+			res = append(res, tempMap)
+		}
+		req.SysctlParams = res
+	}
+
+	lbId, err := c.CloudAPI().LB().Create(ctx, req)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(lbId, 10))
+	d.Set("lb_id", lbId)
+
+	w := dc.Warnings{}
+
+	if enable, ok := d.GetOk("enable"); ok {
+		req := lb.DisableEnableRequest{
+			LBID: lbId,
+		}
+
+		if enable.(bool) {
+			_, err := c.CloudAPI().LB().Enable(ctx, req)
+			if err != nil {
+				w.Add(err)
+			}
+		} else {
+			_, err := c.CloudAPI().LB().Disable(ctx, req)
+			if err != nil {
+				w.Add(err)
+			}
+		}
+
+		if start, ok := d.GetOk("start"); ok && enable.(bool) {
+			if start.(bool) {
+				req := lb.StartRequest{LBID: lbId}
+				_, err := c.CloudAPI().LB().Start(ctx, req)
+				if err != nil {
+					w.Add(err)
+				}
+			} else {
+				req := lb.StopRequest{LBID: lbId}
+				_, err := c.CloudAPI().LB().Stop(ctx, req)
+				if err != nil {
+					w.Add(err)
+				}
+			}
+		}
+	}
+
+	return append(w.Get(), resourceLBRead(ctx, d, m)...)
+}
+
+func resourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceLBRead")
+
+	// c := m.(*controller.ControllerCfg)
+
+	lbRec, err := utilityLBCheckPresence(ctx, d, m)
+	if lbRec == nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	hasChanged := false
+
+	switch lbRec.Status {
+	case status.Modeled:
+		return diag.Errorf("The LB is in status: %s, please, contact support for more information", lbRec.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Deleting:
+	case status.Deleted:
+		// lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		// restoreReq := lb.RestoreRequest{LBID: lbId}
+		// enableReq := lb.DisableEnableRequest{LBID: lbId}
+
+		// _, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
+		// _, err = c.CloudAPI().LB().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
+
+		// hasChanged = true
+	case status.Destroying:
+		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
+	case status.Destroyed:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceLBCreate(ctx, d, m)
+	case status.Enabled:
+	case status.Enabling:
+	case status.Disabling:
+	case status.Disabled:
+		log.Debugf("The LB is in status: %s, troubles may occur with update. Please, enable LB first.", lbRec.Status)
+	case status.Restoring:
+	}
+
+	if hasChanged {
+		lbRec, err = utilityLBCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+
+	flattenResourceLB(d, lbRec)
+
+	return nil
+}
+
+func resourceLBDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceLBDelete")
+
+	c := m.(*controller.ControllerCfg)
+	lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
+	req := lb.DeleteRequest{
+		LBID: lbId,
+	}
+
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err := c.CloudAPI().LB().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceLBUpdate")
+	c := m.(*controller.ControllerCfg)
+
+	haveRGID, err := existRGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveRGID {
+		return diag.Errorf("resourceLBUpdate: can't update LB because RGID %d is not allowed or does not exist", d.Get("rg_id").(int))
+	}
+
+	haveExtNetID, err := existExtNetID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveExtNetID {
+		return diag.Errorf("resourceLBUpdate: can't update LB because ExtNetID %d is not allowed or does not exist", d.Get("extnet_id").(int))
+	}
+
+	haveVins, err := existViNSID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveVins {
+		return diag.Errorf("resourceLBUpdate: can't update LB because ViNSID %d is not allowed or does not exist", d.Get("vins_id").(int))
+	}
+
+	lbRec, err := utilityLBCheckPresence(ctx, d, m)
+	if lbRec == nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	hasChanged := false
+
+	switch lbRec.Status {
+	case status.Modeled:
+		return diag.Errorf("The LB is in status: %s, please, contact support for more information", lbRec.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Deleting:
+	case status.Deleted:
+		if restore, ok := d.GetOk("restore"); ok && restore.(bool) {
+			restoreReq := lb.RestoreRequest{LBID: lbRec.ID}
+
+			_, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+		if enable, ok := d.GetOk("enable"); ok {
+			req := lb.DisableEnableRequest{
+				LBID: lbRec.ID,
+			}
+
+			if enable.(bool) {
+				_, err := c.CloudAPI().LB().Enable(ctx, req)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+			} else {
+				_, err := c.CloudAPI().LB().Disable(ctx, req)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+			}
+
+			if start, ok := d.GetOk("start"); ok && enable.(bool) {
+				if start.(bool) {
+					req := lb.StartRequest{LBID: lbRec.ID}
+					_, err := c.CloudAPI().LB().Start(ctx, req)
+					if err != nil {
+						return diag.FromErr(err)
+					}
+				} else {
+					req := lb.StopRequest{LBID: lbRec.ID}
+					_, err := c.CloudAPI().LB().Stop(ctx, req)
+					if err != nil {
+						return diag.FromErr(err)
+					}
+				}
+			}
+		}
+		hasChanged = true
+	case status.Destroying:
+		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
+	case status.Destroyed:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceLBCreate(ctx, d, m)
+	case status.Enabled:
+	case status.Enabling:
+	case status.Disabling:
+	case status.Disabled:
+		log.Debugf("The LB is in status: %s, troubles may occur with update. Please, enable LB first.", lbRec.Status)
+	case status.Restoring:
+	}
+
+	if hasChanged {
+		_, err = utilityLBCheckPresence(ctx, d, m)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("ha_mode") {
+		hamode := d.Get("ha_mode").(bool)
+		if hamode {
+			req := lb.HighlyAvailableRequest{
+				LBID: uint64(d.Get("lb_id").(int)),
+			}
+			_, err := c.CloudAPI().LB().HighlyAvailable(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
+	if d.HasChange("sysctl_params") {
+		syscrlSliceMaps := d.Get("sysctl_params").([]map[string]string)
+		res := make([]map[string]interface{}, 0, len(syscrlSliceMaps))
+		for _, syscrlMap := range syscrlSliceMaps {
+			tempMap := make(map[string]interface{})
+			for k, v := range syscrlMap {
+				if intVal, err := strconv.Atoi(v); err == nil {
+					tempMap[k] = intVal
+					continue
+				}
+				tempMap[k] = v
+			}
+			res = append(res, tempMap)
+		}
+
+		req := lb.UpdateSysctParamsRequest{
+			LBID:         uint64(d.Get("lb_id").(int)),
+			SysctlParams: res,
+		}
+		_, err := c.CloudAPI().LB().UpdateSysctlParams(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("enable") {
+		enable := d.Get("enable").(bool)
+		req := lb.DisableEnableRequest{
+			LBID: uint64(d.Get("lb_id").(int)),
+		}
+		if enable {
+			_, err := c.CloudAPI().LB().Enable(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		} else {
+			_, err := c.CloudAPI().LB().Disable(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
+	if d.HasChange("start") {
+		start := d.Get("start").(bool)
+		lbId := uint64(d.Get("lb_id").(int))
+		if start {
+			req := lb.StartRequest{LBID: lbId}
+			_, err := c.CloudAPI().LB().Start(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		} else {
+			req := lb.StopRequest{LBID: lbId}
+			_, err := c.CloudAPI().LB().Stop(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
+	if d.HasChange("desc") {
+		req := lb.UpdateRequest{
+			LBID:        uint64(d.Get("lb_id").(int)),
+			Description: d.Get("desc").(string),
+		}
+
+		_, err := c.CloudAPI().LB().Update(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("restart") {
+		restart := d.Get("restart").(bool)
+		if restart {
+			req := lb.RestartRequest{
+				LBID: uint64(d.Get("lb_id").(int)),
+			}
+			if safe, ok := d.GetOk("safe"); ok {
+				req.Safe = safe.(bool)
+			}
+
+			_, err := c.CloudAPI().LB().Restart(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
+	if d.HasChange("restore") {
+		restore := d.Get("restore").(bool)
+		if restore {
+			req := lb.RestoreRequest{
+				LBID: uint64(d.Get("lb_id").(int)),
+			}
+
+			_, err := c.CloudAPI().LB().Restore(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
+	if d.HasChange("config_reset") {
+		cfgReset := d.Get("config_reset").(bool)
+		if cfgReset {
+			req := lb.ConfigResetRequest{
+				LBID: uint64(d.Get("lb_id").(int)),
+			}
+
+			_, err := c.CloudAPI().LB().ConfigReset(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
+	return resourceLBRead(ctx, d, m)
+}
+
+func ResourceLB() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceLBCreate,
+		ReadContext:   resourceLBRead,
+		UpdateContext: resourceLBUpdate,
+		DeleteContext: resourceLBDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout600s,
+			Read:    &constants.Timeout300s,
+			Update:  &constants.Timeout300s,
+			Delete:  &constants.Timeout300s,
+			Default: &constants.Timeout300s,
+		},
+
+		Schema: lbResourceSchemaMake(),
+	}
+}

internal/service/cloudapi/lb/utility_lb_list.go

@@ -1,99 +1,103 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityLBListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*lb.ListLB, error) {
-	c := m.(*controller.ControllerCfg)
-	req := lb.ListRequest{}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if account_id, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(account_id.(int))
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-
-	if tech_status, ok := d.GetOk("tech_status"); ok {
-		req.TechStatus = tech_status.(string)
-	}
-
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-
-	if front_ip, ok := d.GetOk("front_ip"); ok {
-		req.FrontIP = front_ip.(string)
-	}
-
-	if back_ip, ok := d.GetOk("back_ip"); ok {
-		req.BackIP = back_ip.(string)
-	}
-
-	if includedeleted, ok := d.GetOk("includedeleted"); ok {
-		req.IncludeDeleted = includedeleted.(bool)
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityLBListCheckPresence: load lb list")
-	lbList, err := c.CloudAPI().LB().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return lbList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityLBListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*lb.ListLB, error) {
+	c := m.(*controller.ControllerCfg)
+	req := lb.ListRequest{}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if account_id, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(account_id.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if tech_status, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = tech_status.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if front_ip, ok := d.GetOk("front_ip"); ok {
+		req.FrontIP = front_ip.(string)
+	}
+
+	if back_ip, ok := d.GetOk("back_ip"); ok {
+		req.BackIP = back_ip.(string)
+	}
+
+	if includedeleted, ok := d.GetOk("includedeleted"); ok {
+		req.IncludeDeleted = includedeleted.(bool)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityLBListCheckPresence: load lb list")
+	lbList, err := c.CloudAPI().LB().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return lbList, nil
+}

internal/service/cloudapi/lb/utility_lb_list_deleted.go

@@ -1,91 +1,95 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package lb
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityLBListDeletedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*lb.ListLB, error) {
-	c := m.(*controller.ControllerCfg)
-	req := lb.ListDeletedRequest{}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if account_id, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(account_id.(int))
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-
-	if tech_status, ok := d.GetOk("tech_status"); ok {
-		req.TechStatus = tech_status.(string)
-	}
-
-	if front_ip, ok := d.GetOk("front_ip"); ok {
-		req.FrontIP = front_ip.(string)
-	}
-
-	if back_ip, ok := d.GetOk("back_ip"); ok {
-		req.BackIP = back_ip.(string)
-	}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityLBListDeletedCheckPresence: load lb list")
-	lbList, err := c.CloudAPI().LB().ListDeleted(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return lbList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package lb
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityLBListDeletedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*lb.ListLB, error) {
+	c := m.(*controller.ControllerCfg)
+	req := lb.ListDeletedRequest{}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if account_id, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(account_id.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if tech_status, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = tech_status.(string)
+	}
+
+	if front_ip, ok := d.GetOk("front_ip"); ok {
+		req.FrontIP = front_ip.(string)
+	}
+
+	if back_ip, ok := d.GetOk("back_ip"); ok {
+		req.BackIP = back_ip.(string)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityLBListDeletedCheckPresence: load lb list")
+	lbList, err := c.CloudAPI().LB().ListDeleted(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return lbList, nil
+}

internal/service/cloudapi/locations/data_source_locations_list.go

@@ -1,190 +1,195 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package locations
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
-)
-
-func flattenLocationsList(ll *locations.ListLocations) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len(ll.Data))
-	for _, l := range ll.Data {
-		temp := map[string]interface{}{
-			"ckey":          l.CKey,
-			"meta":          flattens.FlattenMeta(l.Meta),
-			"auth_broker":   l.AuthBroker,
-			"flag":          l.Flag,
-			"gid":           l.GID,
-			"guid":          l.GUID,
-			"id":            l.ID,
-			"location_code": l.LocationCode,
-			"name":          l.Name,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceLocationsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	locations, err := utilityLocationsListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-
-	d.Set("items", flattenLocationsList(locations))
-	d.Set("entry_count", locations.EntryCount)
-
-	return nil
-}
-
-func dataSourceLocationsListSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"flag": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by flag",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by name",
-		},
-		"by_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by ID",
-		},
-		"location_code": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Filter by location code",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "page size",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Locations list",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"ckey": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"meta": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"auth_broker": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"flag": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gid": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Grid id",
-					},
-					"guid": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "location id",
-					},
-					"id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "location id",
-					},
-					"location_code": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Location code",
-					},
-					"name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Location name",
-					},
-				},
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
-
-func DataSourceLocationsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceLocationsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceLocationsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package locations
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
+)
+
+func flattenLocationsList(ll *locations.ListLocations) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(ll.Data))
+	for _, l := range ll.Data {
+		temp := map[string]interface{}{
+			"ckey":          l.CKey,
+			"meta":          flattens.FlattenMeta(l.Meta),
+			"auth_broker":   l.AuthBroker,
+			"flag":          l.Flag,
+			"gid":           l.GID,
+			"guid":          l.GUID,
+			"id":            l.ID,
+			"location_code": l.LocationCode,
+			"name":          l.Name,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceLocationsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	locations, err := utilityLocationsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+
+	d.Set("items", flattenLocationsList(locations))
+	d.Set("entry_count", locations.EntryCount)
+
+	return nil
+}
+
+func dataSourceLocationsListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"flag": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by flag",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"location_code": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by location code",
+		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Locations list",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"ckey": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"meta": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"auth_broker": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"flag": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"gid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Grid id",
+					},
+					"guid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "location id",
+					},
+					"id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "location id",
+					},
+					"location_code": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Location code",
+					},
+					"name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Location name",
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func DataSourceLocationsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceLocationsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceLocationsListSchemaMake(),
+	}
+}

internal/service/cloudapi/locations/data_source_locations_url.go

@@ -1,85 +1,85 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package locations
-
-import (
-	"context"
-	"strings"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceLocationUrlRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	url, err := utilityLocationUrlCheckPresence(ctx, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-
-	url = strings.ReplaceAll(url, "\\", "")
-	url = strings.ReplaceAll(url, "\"", "")
-	d.Set("url", url)
-
-	return nil
-}
-
-func dataSourceLocationUrlSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"url": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "Location url",
-		},
-	}
-}
-
-func DataSourceLocationUrl() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceLocationUrlRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceLocationUrlSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package locations
+
+import (
+	"context"
+	"strings"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceLocationUrlRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	url, err := utilityLocationUrlCheckPresence(ctx, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+
+	url = strings.ReplaceAll(url, "\\", "")
+	url = strings.ReplaceAll(url, "\"", "")
+	d.Set("url", url)
+
+	return nil
+}
+
+func dataSourceLocationUrlSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"url": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Location url",
+		},
+	}
+}
+
+func DataSourceLocationUrl() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceLocationUrlRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceLocationUrlSchemaMake(),
+	}
+}

internal/service/cloudapi/locations/utility_locations_list.go

@@ -1,80 +1,84 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package locations
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityLocationsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*locations.ListLocations, error) {
-	c := m.(*controller.ControllerCfg)
-	req := locations.ListRequest{}
-
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if flag, ok := d.GetOk("flag"); ok {
-		req.Flag = flag.(string)
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if location_code, ok := d.GetOk("location_code"); ok {
-		req.LocationCode = location_code.(string)
-	}
-
-	log.Debugf("utilityLocationsListCheckPresence: load locations list")
-	locationsList, err := c.CloudAPI().Locations().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return locationsList, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package locations
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityLocationsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*locations.ListLocations, error) {
+	c := m.(*controller.ControllerCfg)
+	req := locations.ListRequest{}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if flag, ok := d.GetOk("flag"); ok {
+		req.Flag = flag.(string)
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if location_code, ok := d.GetOk("location_code"); ok {
+		req.LocationCode = location_code.(string)
+	}
+
+	log.Debugf("utilityLocationsListCheckPresence: load locations list")
+	locationsList, err := c.CloudAPI().Locations().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return locationsList, nil
+}

internal/service/cloudapi/rg/data_source_rg.go

@@ -68,7 +68,6 @@ func DataSourceResgroup() *schema.Resource {
 	}
 }
 
-
 // func sepsSchemaMake() map[string]*schema.Schema {
 // 	res := map[string]*schema.Schema{
 // 		"sep_id": {
@@ -300,6 +299,13 @@ func dataSourceRgSchemaMake() map[string]*schema.Schema {
 				Schema: aclSchemaMake(),
 			},
 		},
+		"compute_features": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"created_by": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -418,5 +424,3 @@ func dataSourceRgSchemaMake() map[string]*schema.Schema {
 	}
 	return res
 }
-
-

internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go

@@ -83,8 +83,17 @@ func dataSourceRgAffinityGroupsListSchemaMake() map[string]*schema.Schema {
 					"ids": {
 						Type:     schema.TypeList,
 						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"node_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
 						},
 					},
 				},

internal/service/cloudapi/rg/data_source_rg_list.go

@@ -1,280 +1,292 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package rg
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceRgListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	rgList, err := utilityRgListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenRgList(rgList))
-	d.Set("entry_count", rgList.EntryCount)
-
-	return nil
-}
-
-func dataSourceRgListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"by_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find by ID",
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by name",
-		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find by account ID",
-		},
-		"account_name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by account name",
-		},
-		"created_after": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find RGs created after specific time (unix timestamp)",
-		},
-		"created_before": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Find RGs created before specific time (unix timestamp)",
-		},
-		"status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by status",
-		},
-		"lock_status": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Find by lock status",
-		},
-		"includedeleted": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "included deleted resource groups",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_acl": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: aclSchemaMake(),
-						},
-					},
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"def_net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"def_net_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"dirty": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"lock_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"register_computes": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"resource_limits": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: resourceLimitsSchemaMake(),
-						},
-					},
-					"secret": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vins": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"vms": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"resource_types": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"cpu_allocation_parameter": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"cpu_allocation_ratio": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"uniq_pools": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-				},
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func DataSourceRgList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceRgListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceRgListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package rg
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceRgListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	rgList, err := utilityRgListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenRgList(rgList))
+	d.Set("entry_count", rgList.EntryCount)
+
+	return nil
+}
+
+func dataSourceRgListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by name",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by account ID",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by account name",
+		},
+		"created_after": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find RGs created after specific time (unix timestamp)",
+		},
+		"created_before": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find RGs created before specific time (unix timestamp)",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by status",
+		},
+		"lock_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by lock status",
+		},
+		"includedeleted": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "included deleted resource groups",
+		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_acl": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: aclSchemaMake(),
+						},
+					},
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compute_features": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"created_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"def_net_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"def_net_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"desc": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"dirty": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"gid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"lock_status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"milestones": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"register_computes": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"resource_limits": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: resourceLimitsSchemaMake(),
+						},
+					},
+					"secret": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"vins": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"vms": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"resource_types": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"cpu_allocation_parameter": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"cpu_allocation_ratio": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"uniq_pools": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceRgList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceRgListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceRgListSchemaMake(),
+	}
+}

internal/service/cloudapi/rg/data_source_rg_list_computes.go

@@ -135,6 +135,11 @@ func dataSourceRgListComputesSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by extnet ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/rg/data_source_rg_list_deleted.go

@@ -93,6 +93,11 @@ func dataSourceRgListDeletedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by lock status",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -123,6 +128,13 @@ func dataSourceRgListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"compute_features": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
 					"cpu_allocation_parameter": {
 						Type:     schema.TypeString,
 						Computed: true,

internal/service/cloudapi/rg/data_source_rg_list_lb.go

@@ -257,11 +257,6 @@ func dataSourceRgListLbSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by name",
 		},
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Filter by account ID",
-		},
 		"tech_status": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -282,6 +277,11 @@ func dataSourceRgListLbSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by backend IP",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/rg/data_source_rg_list_vins.go

@@ -82,6 +82,11 @@ func dataSourceRgListVinsSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by ViNS ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -129,6 +134,14 @@ func dataSourceRgListVinsSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"free_ips": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"id": {
 						Type:     schema.TypeInt,
 						Computed: true,

internal/service/cloudapi/rg/flattens.go

@@ -91,9 +91,10 @@ func flattenResgroup(d *schema.ResourceData, details rg.RecordResourceGroup) err
 	d.Set("gid", details.GID)
 	d.Set("def_net_type", details.DefNetType)
 	d.Set("name", details.Name)
-	// d.Set("resources", flattenRgResource(details.Resources))
+	d.Set("quota", flattenQuota(details.ResourceLimits))
 	d.Set("account_name", details.AccountName)
 	d.Set("acl", flattenRgAcl(details.ACL))
+	d.Set("compute_features", details.ComputeFeatures)
 	d.Set("vms", details.Computes)
 	d.Set("created_by", details.CreatedBy)
 	d.Set("created_time", details.CreatedTime)
@@ -137,6 +138,23 @@ func flattenRgSeps(seps map[string]map[string]rg.DiskUsage) []map[string]interfa
 	return res
 }
 
+func flattenQuota(resource rg.ResourceLimits) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":         resource.CUC,
+		"ram":         resource.CUM,
+		"disk":        resource.CUDM,
+		"ext_ips":     resource.CUI,
+		"ext_traffic": resource.CUNP,
+		"gpu_units":   resource.GPUUnits,
+		"cu_d":        resource.CUD,
+	}
+
+	res = append(res, temp)
+
+	return res
+}
+
 func flattenResource(resource rg.Resource) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
@@ -161,6 +179,7 @@ func flattenRg(d *schema.ResourceData, itemRg rg.RecordResourceGroup) {
 	d.Set("account_name", itemRg.AccountName)
 	d.Set("acl", flattenRgAcl(itemRg.ACL))
 	d.Set("computes", itemRg.Computes)
+	d.Set("compute_features", itemRg.ComputeFeatures)
 	d.Set("created_by", itemRg.CreatedBy)
 	d.Set("created_time", itemRg.CreatedTime)
 	d.Set("def_net_id", itemRg.DefNetID)
@@ -212,6 +231,7 @@ func flattenRgList(rgl *rg.ListResourceGroups) []map[string]interface{} {
 			"account_acl":              flattenRgAcl(rg.ACL),
 			"account_id":               rg.AccountID,
 			"account_name":             rg.AccountName,
+			"compute_features":         rg.ComputeFeatures,
 			"created_by":               rg.CreatedBy,
 			"created_time":             rg.CreatedTime,
 			"def_net_id":               rg.DefNetID,
@@ -242,7 +262,6 @@ func flattenRgList(rgl *rg.ListResourceGroups) []map[string]interface{} {
 		res = append(res, temp)
 	}
 	return res
-
 }
 
 func flattenRgAcl(rgAcls rg.ListACL) []map[string]interface{} {
@@ -491,6 +510,8 @@ func flattenRgListVins(lv *rg.ListVINS) []map[string]interface{} {
 			"deleted_by":     vins.DeletedBy,
 			"deleted_time":   vins.DeletedTime,
 			"external_ip":    vins.ExternalIP,
+			"extnet_id":      vins.ExtnetId,
+			"free_ips":       vins.FreeIPs,
 			"id":             vins.ID,
 			"name":           vins.Name,
 			"network":        vins.Network,
@@ -542,7 +563,7 @@ func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 		for label, ag := range groupVal {
 			temp := map[string]interface{}{
 				"label": label,
-				"ids":   ag,
+				"ids":   flattenRgAffinityListGroup(ag),
 			}
 			res = append(res, temp)
 		}
@@ -551,6 +572,19 @@ func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
 	return res
 }
 
+func flattenRgAffinityListGroup(list rg.ListAffinityGroup) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(list))
+	for _, ag := range list {
+		temp := map[string]interface{}{
+			"id":      ag.ID,
+			"node_id": ag.NodeID,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
 func flattenRgUsageResource(d *schema.ResourceData, usage rg.RecordResourceUsage) {
 	d.Set("cpu", usage.CPU)
 	d.Set("disk_size", usage.DiskSize)

internal/service/cloudapi/rg/resource_rg.go

@@ -92,26 +92,51 @@ func resourceResgroupCreate(ctx context.Context, d *schema.ResourceData, m inter
 		// Owner:     c.GetDecortUsername(),
 	}
 
-	setQuota := false
-	var quotaRecord QuotaRecord
-	if argValue, ok := d.GetOk("quota"); ok {
-		log.Debugf("resourceResgroupCreate: setting Quota on RG requested")
-		quotaRecord = makeQuotaRecord(argValue.([]interface{}))
-		setQuota = true
+	if quota, ok := d.GetOk("quota"); ok {
+		quotaBlocks := quota.([]interface{})[0]
+		quotaMap := quotaBlocks.(map[string]interface{})
+
+		if quotaMap["ram"] != nil {
+			maxMemCap := int64(quotaMap["ram"].(int))
+			if maxMemCap == 0 {
+				req.MaxMemoryCapacity = -1
+			} else {
+				req.MaxMemoryCapacity = maxMemCap
+			}
+		}
+		if quotaMap["disk"] != nil {
+			maxDiskCap := int64(quotaMap["disk"].(int))
+			if maxDiskCap == 0 {
+				req.MaxVDiskCapacity = -1
+			} else {
+				req.MaxVDiskCapacity = maxDiskCap
+			}
+		}
+		if quotaMap["cpu"] != nil {
+			maxCPUCap := int64(quotaMap["cpu"].(int))
+			if maxCPUCap == 0 {
+				req.MaxCPUCapacity = -1
+			} else {
+				req.MaxCPUCapacity = maxCPUCap
+			}
+		}
+		if quotaMap["ext_ips"] != nil {
+			maxNumPublicIP := int64(quotaMap["ext_ips"].(int))
+			if maxNumPublicIP == 0 {
+				req.MaxNumPublicIP = -1
+			} else {
+				req.MaxNumPublicIP = maxNumPublicIP
+			}
+		}
+		if quotaMap["ext_traffic"] != nil {
+			maxNP := int64(quotaMap["ext_traffic"].(int))
+			if maxNP == 0 {
+				req.MaxNetworkPeerTransfer = -1
+			} else {
+				req.MaxNetworkPeerTransfer = maxNP
+			}
+		}
 	}
-
-	log.Debugf("resourceResgroupCreate: called for RG name %s, account ID %d",
-		// c.GetDecortUsername(),
-		rgName.(string), d.Get("account_id").(int))
-
-	if setQuota {
-		req.MaxCPUCapacity = int64(quotaRecord.Cpu)
-		req.MaxVDiskCapacity = int64(quotaRecord.Disk)
-		req.MaxMemoryCapacity = int64(quotaRecord.Ram)
-		req.MaxNetworkPeerTransfer = int64(quotaRecord.ExtTraffic)
-		req.MaxNumPublicIP = int64(quotaRecord.ExtIPs)
-	}
-
 	if defNetType, ok := d.GetOk("def_net_type"); ok {
 		req.DefNet = defNetType.(string) // NOTE: in API default network type is set by "def_net" parameter
 	} else {
@@ -297,6 +322,7 @@ func resourceResgroupRead(ctx context.Context, d *schema.ResourceData, m interfa
 			return diag.FromErr(err)
 		}
 	}
+
 	return diag.FromErr(flattenResgroup(d, *rgData))
 }
 
@@ -557,8 +583,8 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 		},
 
 		"gid": {
-			Type:        schema.TypeInt,
-			Required:    true,
+			Type:     schema.TypeInt,
+			Required: true,
 			// ForceNew:    true,
 			Description: "Unique ID of the grid, where this resource group is deployed.",
 		},
@@ -603,57 +629,57 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 		},
 
 		"owner": {
-			Type:        schema.TypeString,
-			Optional:    true,
+			Type:     schema.TypeString,
+			Optional: true,
 		},
 
 		"quota": {
 			Type:     schema.TypeList,
 			Optional: true,
+			Computed: true,
 			MaxItems: 1,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"cpu": {
 						Type:        schema.TypeInt,
 						Optional:    true,
-						Default:     -1,
+						Computed:    true,
 						Description: "Limit on the total number of CPUs in this resource group.",
 					},
-			
 					"ram": {
 						Type:        schema.TypeInt, // NB: API expects and returns this as float in units of MB! This may be changed in the future.
 						Optional:    true,
-						Default:     -1,
+						Computed:    true,
 						Description: "Limit on the total amount of RAM in this resource group, specified in MB.",
 					},
-			
 					"disk": {
 						Type:        schema.TypeInt,
 						Optional:    true,
-						Default:     -1,
-						Description: "Limit on the total volume of storage resources in this resource group, specified in GB.",
+						Computed:    true,
+						Description: "Limit on the total volume of virtual storage resources in this resource group, specified in GB.",
 					},
-			
 					"ext_traffic": {
 						Type:        schema.TypeInt,
 						Optional:    true,
-						Default:     -1,
+						Computed:    true,
 						Description: "Limit on the total ingress network traffic for this resource group, specified in GB.",
 					},
-			
 					"ext_ips": {
 						Type:        schema.TypeInt,
 						Optional:    true,
-						Default:     -1,
+						Computed:    true,
 						Description: "Limit on the total number of external IP addresses this resource group can use.",
 					},
-			
 					"gpu_units": {
 						Type:        schema.TypeInt,
-						Optional:    true,
-						Default:     -1,
+						Computed:    true,
 						Description: "Limit on the total number of virtual GPUs this resource group can use.",
 					},
+					"cu_d": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Limit on the total volume of storage resources in this resource group, specified in GB.",
+					},
 				},
 			},
 			Description: "Quota settings for this resource group.",
@@ -771,6 +797,13 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 				Schema: aclSchemaMake(),
 			},
 		},
+		"compute_features": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"deleted_by": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudapi/rg/state_upgraders.go

@@ -8,10 +8,21 @@ import (
 
 func resourceRGStateUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
 	log.Debug("resourceRGStateUpgradeV1: upgrading state")
-	oldQuotaList := rawState["quota"].([]interface{})
-	if len(oldQuotaList) != 0 {
-		oldQuota := oldQuotaList[0].(map[string]interface{})
-		oldQuota["ram"] = int64(oldQuota["ram"].(float64))
+	quota, ok := rawState["quota"]
+	if !ok || quota == nil {
+		rawState["quota"] = QuotaRecord{
+			Cpu:        -1,
+			Ram:        -1,
+			Disk:       -1,
+			ExtTraffic: -1,
+			ExtIPs:     -1,
+			GpuUnits:   -1,
+		}
+		return rawState, nil
 	}
+
+	oldQuotaList := quota.([]interface{})
+	oldQuota := oldQuotaList[0].(map[string]interface{})
+	oldQuota["ram"] = int64(oldQuota["ram"].(float64))
 	return rawState, nil
 }

internal/service/cloudapi/rg/utility_rg.go

@@ -78,20 +78,52 @@ func utilityUpdateRG(ctx context.Context, d *schema.ResourceData, m interface{},
 
 	if d.HasChange("quota") {
 		log.Debugf("resourceResgroupUpdate: quota specified - looking for deltas from the old quota.")
-		quotaList := d.Get("quota").([]interface{})
-		if len(quotaList) != 0 {
-			quota := quotaList[0].(map[string]interface{})
-			req.MaxCPUCapacity = int64(quota["cpu"].(int))
-			req.MaxVDiskCapacity = int64(quota["disk"].(int))
-			req.MaxMemoryCapacity = int64(quota["ram"].(int))
-			req.MaxNetworkPeerTransfer = int64(quota["ext_traffic"].(int))
-			req.MaxNumPublicIP = int64(quota["ext_ips"].(int))
-		} else {
-			req.MaxCPUCapacity = -1
-			req.MaxVDiskCapacity = -1
-			req.MaxMemoryCapacity = -1
-			req.MaxNetworkPeerTransfer = -1
-			req.MaxNumPublicIP = -1
+
+		if quota, ok := d.GetOk("quota"); ok {
+			resLimits := quota.([]interface{})[0]
+			resLimitsConv := resLimits.(map[string]interface{})
+
+			if resLimitsConv["ram"] != nil {
+				maxMemCap := int64(resLimitsConv["ram"].(int))
+				if maxMemCap == 0 {
+					req.MaxMemoryCapacity = -1
+				} else {
+					req.MaxMemoryCapacity = maxMemCap
+				}
+			}
+
+			if resLimitsConv["disk"] != nil {
+				maxDiskCap := int64(resLimitsConv["disk"].(int))
+				if maxDiskCap == 0 {
+					req.MaxVDiskCapacity = -1
+				} else {
+					req.MaxVDiskCapacity = maxDiskCap
+				}
+			}
+			if resLimitsConv["cpu"] != nil {
+				maxCPUCap := int64(resLimitsConv["cpu"].(int))
+				if maxCPUCap == 0 {
+					req.MaxCPUCapacity = -1
+				} else {
+					req.MaxCPUCapacity = maxCPUCap
+				}
+			}
+			if resLimitsConv["ext_ips"] != nil {
+				maxNumPublicIP := int64(resLimitsConv["ext_ips"].(int))
+				if maxNumPublicIP == 0 {
+					req.MaxNumPublicIP = -1
+				} else {
+					req.MaxNumPublicIP = maxNumPublicIP
+				}
+			}
+			if resLimitsConv["ext_traffic"] != nil {
+				maxNP := int64(resLimitsConv["ext_traffic"].(int))
+				if maxNP == 0 {
+					req.MaxNetworkPeerTransfer = -1
+				} else {
+					req.MaxNetworkPeerTransfer = maxNP
+				}
+			}
 		}
 	}