4.6.0

internal/service/cloudbroker/account/data_source_account_audits_list.go

@@ -1,70 +1,70 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountAuditsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountAuditsList, err := utilityAccountAuditsListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountAuditsList(accountAuditsList))
-
-	return nil
-}
-
-func DataSourceAccountAuditsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountAuditsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountAuditsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountAuditsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountAuditsList, err := utilityAccountAuditsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountAuditsList(accountAuditsList))
+
+	return nil
+}
+
+func DataSourceAccountAuditsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountAuditsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountAuditsListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_available_templates_list.go

@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2019-2024 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"
+
+	"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 dataSourceAccountAvailableTemplatesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountAvailableTemplatesList, err := utilityAccountAvailableTemplatesListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", accountAvailableTemplatesList)
+
+	return nil
+}
+
+func DataSourceAccountAvailableTemplatesList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountAvailableTemplatesListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountAvailableTemplatesListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_computes_list.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountComputesList, err := utilityAccountComputesListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountComputesList(accountComputesList))
-	d.Set("entry_count", accountComputesList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountComputesList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountComputesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountComputesListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountComputesList, err := utilityAccountComputesListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountComputesList(accountComputesList))
+	d.Set("entry_count", accountComputesList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountComputesList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountComputesListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountComputesListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_deleted_list.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountDeletedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountDeletedList, err := utilityAccountDeletedListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenListDeleted(accountDeletedList))
-	d.Set("entry_count", accountDeletedList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountDeletedList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountDeletedListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountListDeletedSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountDeletedListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountDeletedList, err := utilityAccountDeletedListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenListDeleted(accountDeletedList))
+	d.Set("entry_count", accountDeletedList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountDeletedList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountDeletedListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountListDeletedSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_disks_list.go

@@ -1,70 +1,70 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountDisksListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountDisksList, err := utilityAccountDisksListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountDisksList(accountDisksList))
-	d.Set("entry_count", accountDisksList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountDisksList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountDisksListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountDisksListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountDisksListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountDisksList, err := utilityAccountDisksListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountDisksList(accountDisksList))
+	d.Set("entry_count", accountDisksList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountDisksList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountDisksListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountDisksListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_flipgroups_list.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountFlipGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountFlipGroupsList, err := utilityAccountFlipGroupsListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountFlipGroupsList(accountFlipGroupsList))
-	d.Set("entry_count", accountFlipGroupsList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountFlipGroupsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountFlipGroupsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountFlipGroupsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountFlipGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountFlipGroupsList, err := utilityAccountFlipGroupsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountFlipGroupsList(accountFlipGroupsList))
+	d.Set("entry_count", accountFlipGroupsList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountFlipGroupsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountFlipGroupsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountFlipGroupsListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_list.go

@@ -1,72 +1,72 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Nikita Sorokin, <nesorokin@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"
-
-	"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 dataSourceAccountListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountList, err := utilityAccountListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountList(accountList))
-	d.Set("entry_count", accountList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Nikita Sorokin, <nesorokin@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"
+
+	"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 dataSourceAccountListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountList, err := utilityAccountListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountList(accountList))
+	d.Set("entry_count", accountList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_rg_list.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountRGListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountRGList, err := utilityAccountRGListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountRGList(accountRGList))
-	d.Set("entry_count", accountRGList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountRGList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountRGListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountRGListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountRGListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountRGList, err := utilityAccountRGListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountRGList(accountRGList))
+	d.Set("entry_count", accountRGList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountRGList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountRGListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountRGListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/data_source_account_vins_list.go

@@ -1,71 +1,71 @@
-/*
-Copyright (c) 2019-2023 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 account
-
-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 dataSourceAccountVinsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountVinsList, err := utilityAccountVinsListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountVinsList(accountVinsList))
-	d.Set("entry_count", accountVinsList.EntryCount)
-
-	return nil
-}
-
-func DataSourceAccountVinsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountVinsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountVinsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2023 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 account
+
+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 dataSourceAccountVinsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountVinsList, err := utilityAccountVinsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountVinsList(accountVinsList))
+	d.Set("entry_count", accountVinsList.EntryCount)
+
+	return nil
+}
+
+func DataSourceAccountVinsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountVinsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountVinsListSchemaMake(),
+	}
+}

internal/service/cloudbroker/account/flattens.go

@@ -12,6 +12,7 @@ func flattenResourceAccount(d *schema.ResourceData, acc *account.RecordAccount)
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
 	d.Set("companyurl", acc.CompanyURL)
+	d.Set("compute_features", acc.ComputeFeatures)
 	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
 	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
 	d.Set("created_by", acc.CreatedBy)
@@ -39,6 +40,7 @@ func flattenDataAccount(d *schema.ResourceData, acc *account.RecordAccount) {
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
 	d.Set("companyurl", acc.CompanyURL)
+	d.Set("compute_features", acc.ComputeFeatures)
 	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
 	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
 	d.Set("created_by", acc.CreatedBy)
@@ -187,7 +189,7 @@ func flattenRgAcl(rgAcls []account.ACL) []map[string]interface{} {
 }
 
 func flattenListDeleted(al *account.ListAccounts) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len (al.Data))
+	res := make([]map[string]interface{}, 0, len(al.Data))
 	for _, acc := range al.Data {
 		temp := map[string]interface{}{
 			"dc_location":              acc.DCLocation,
@@ -196,6 +198,7 @@ func flattenListDeleted(al *account.ListAccounts) []map[string]interface{} {
 			"acl":                      flattenRgAcl(acc.ACL),
 			"company":                  acc.Company,
 			"companyurl":               acc.CompanyURL,
+			"compute_features":         acc.ComputeFeatures,
 			"cpu_allocation_parameter": acc.CPUAllocationParameter,
 			"cpu_allocation_ratio":     acc.CPUAllocationRatio,
 			"created_by":               acc.CreatedBy,
@@ -231,6 +234,7 @@ func flattenAccountList(al *account.ListAccounts) []map[string]interface{} {
 			"acl":                      flattenRgAcl(acc.ACL),
 			"company":                  acc.Company,
 			"companyurl":               acc.CompanyURL,
+			"compute_features":         acc.ComputeFeatures,
 			"cpu_allocation_parameter": acc.CPUAllocationParameter,
 			"cpu_allocation_ratio":     acc.CPUAllocationRatio,
 			"created_by":               acc.CreatedBy,
@@ -361,6 +365,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,

internal/service/cloudbroker/account/resource_account.go

@@ -123,6 +123,18 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	if compFeaturesInterface, ok := d.GetOk("compute_features"); ok {
+		compFeaturesInterfaces := compFeaturesInterface.(*schema.Set).List()
+
+		compFeatures := make([]string, 0, len(compFeaturesInterfaces))
+
+		for _, item := range compFeaturesInterfaces {
+			compFeatures = append(compFeatures, item.(string))
+		}
+
+		req.ComputeFeatures = compFeatures
+	}
+
 	accountId, err := c.CloudBroker().Account().Create(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
@@ -191,6 +203,12 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	if _, ok := d.GetOk("available_templates"); ok {
+		if err := utilityAccountAvailiableTemplatesUpdate(ctx, d, m, true); err != nil {
+			w.Add(err)
+		}
+	}
+
 	return append(resourceAccountRead(ctx, d, m), w.Get()...)
 }
 
@@ -235,6 +253,7 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, m interf
 
 func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceAccountUpdate")
+
 	c := m.(*controller.ControllerCfg)
 
 	acc, err := utilityAccountCheckPresence(ctx, d, m)
@@ -313,6 +332,18 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	if d.HasChange("available_templates") {
+		if err := utilityAccountAvailiableTemplatesUpdate(ctx, d, m, false); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("compute_features") {
+		if err := utilityAccountComputeFeaturesUpdate(ctx, d, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceAccountRead(ctx, d, m)
 }
 

internal/service/cloudbroker/account/schema.go

@@ -1,6 +1,9 @@
 package account
 
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
 
 func resourceAccountSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
@@ -66,6 +69,14 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "set cpu allocation ratio",
 		},
+		"available_templates": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+			Description: "Share images with account",
+		},
 		"restore": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -127,6 +138,14 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"compute_features": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type:         schema.TypeString,
+				ValidateFunc: validation.StringInSlice([]string{"hugepages", "numa", "cpupin", "vfnic"}, true),
+			},
+		},
 		"account_id": {
 			Type:     schema.TypeInt,
 			Optional: true,
@@ -331,6 +350,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,
@@ -455,6 +479,11 @@ func dataSourceAccountListDeletedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by ACL",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -525,6 +554,13 @@ func dataSourceAccountListDeletedSchemaMake() 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,
@@ -679,6 +715,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,
@@ -771,6 +812,11 @@ func dataSourceAccountFlipGroupsListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by flipgroup ID",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -1071,6 +1117,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,
@@ -1141,6 +1192,13 @@ func dataSourceAccountListSchemaMake() 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,
@@ -1418,6 +1476,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,
@@ -1726,6 +1789,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,
@@ -1774,6 +1842,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,
@@ -1875,6 +1951,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,
+			},
+		},
 		"cpu_allocation_parameter": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -1990,3 +2073,20 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 		},
 	}
 }
+
+func dataSourceAccountAvailableTemplatesListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+	}
+	return res
+}

internal/service/cloudbroker/account/utility_account.go

@@ -33,12 +33,14 @@ package account
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 	"strings"
 
 	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/ic"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -291,6 +293,111 @@ func utilityAccountUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	return nil
 }
 
+func utilityAccountAvailiableTemplatesUpdate(ctx context.Context, d *schema.ResourceData, m interface{}, afterCreate bool) error {
+	c := m.(*controller.ControllerCfg)
+
+	accountId, _ := strconv.ParseUint(d.Id(), 10, 64)
+
+	if afterCreate {
+		addedAT := d.Get("available_templates").(*schema.Set).List()
+		imageIds := make([]uint64, 0, len(addedAT))
+
+		for _, imageId := range addedAT {
+			imageIds = append(imageIds, uint64(imageId.(int)))
+		}
+
+		if err := ic.ExistImages(ctx, imageIds, c); err != nil {
+			return fmt.Errorf("can not grant access for available templates: %w", err)
+		}
+
+		req := account.GrantAccessTemplatesRequest{
+			AccountID: accountId,
+			ImageIDs:  imageIds,
+		}
+
+		_, err := c.CloudBroker().Account().GrantAccessTemplates(ctx, req)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+
+	oldSet, newSet := d.GetChange("available_templates")
+
+	revokeAT := (oldSet.(*schema.Set).Difference(newSet.(*schema.Set))).List()
+	if len(revokeAT) > 0 {
+		imageIds := make([]uint64, 0, len(revokeAT))
+
+		for _, imageId := range revokeAT {
+			imageIds = append(imageIds, uint64(imageId.(int)))
+		}
+
+		if err := ic.ExistImages(ctx, imageIds, c); err != nil {
+			return fmt.Errorf("can not revoke access for available templates: %w", err)
+		}
+
+		req := account.RevokeAccessTemplatesRequest{
+			AccountID: accountId,
+			ImageIDs:  imageIds,
+		}
+
+		_, err := c.CloudBroker().Account().RevokeAccessTemplates(ctx, req)
+		if err != nil {
+			return err
+		}
+	}
+
+	addedAT := (newSet.(*schema.Set).Difference(oldSet.(*schema.Set))).List()
+	if len(addedAT) > 0 {
+		imageIds := make([]uint64, 0, len(addedAT))
+
+		for _, imageId := range addedAT {
+			imageIds = append(imageIds, uint64(imageId.(int)))
+		}
+
+		if err := ic.ExistImages(ctx, imageIds, c); err != nil {
+			return fmt.Errorf("can not grant access for available templates: %w", err)
+		}
+
+		req := account.GrantAccessTemplatesRequest{
+			AccountID: accountId,
+			ImageIDs:  imageIds,
+		}
+
+		_, err := c.CloudBroker().Account().GrantAccessTemplates(ctx, req)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func utilityAccountComputeFeaturesUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+
+	accountId, _ := strconv.ParseUint(d.Id(), 10, 64)
+	compFeaturesInterface := d.Get("compute_features").(*schema.Set).List()
+
+	compFeatures := make([]string, 0, len(compFeaturesInterface))
+	for _, item := range compFeaturesInterface {
+		compFeatures = append(compFeatures, item.(string))
+	}
+
+	req := account.UpdateComputeFeaturesRequest{
+		AccountID:       accountId,
+		ComputeFeatures: compFeatures,
+	}
+
+	_, err := c.CloudBroker().Account().UpdateComputeFeatures(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func isContainsUser(els []interface{}, el interface{}) bool {
 	for _, elOld := range els {
 		elOldConv := elOld.(map[string]interface{})
@@ -313,4 +420,4 @@ func isChangedUser(els []interface{}, el interface{}) bool {
 		}
 	}
 	return false
-}
+}

internal/service/cloudbroker/account/utility_account_available_templates_list.go

@@ -0,0 +1,61 @@
+/*
+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/cloudbroker/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountAvailableTemplatesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]uint64, error) {
+	c := m.(*controller.ControllerCfg)
+
+	id := uint64(d.Get("account_id").(int))
+
+	req := account.ListAvailableTemplatesRequest{
+		AccountID: id,
+	}
+
+	log.Debugf("utilityAccountAvailableTemplatesListCheckPresence: load list")
+	accountAvailableTemplatesList, err := c.CloudBroker().Account().ListAvailableTemplates(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountAvailableTemplatesList, nil
+}

internal/service/cloudbroker/account/utility_account_computes_list.go

@@ -1,97 +1,101 @@
-/*
-Copyright (c) 2019-2022 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 account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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)
-	req := account.ListComputesRequest{
-		AccountID: uint64(d.Get("account_id").(int)),
-	}
-
-	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.CloudBroker().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>
+
+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/cloudbroker/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)
+	req := account.ListComputesRequest{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	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.CloudBroker().Account().ListComputes(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountComputesList, nil
+}

internal/service/cloudbroker/account/utility_account_deleted_list.go

@@ -1,75 +1,79 @@
-/*
-Copyright (c) 2019-2022 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 account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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.CloudBroker().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>
+
+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/cloudbroker/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 sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	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.CloudBroker().Account().ListDeleted(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountDeletedList, nil
+}

internal/service/cloudbroker/account/utility_account_disks_list.go

@@ -1,81 +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>
-
-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/cloudbroker/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)
-	req := account.ListDisksRequest{
-		AccountID: uint64(d.Get("account_id").(int)),
-	}
-
-	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))
-	}
-
-	log.Debugf("utilityAccountDisksListCheckPresence: load account list")
-	accountDisksList, err := c.CloudBroker().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>
+
+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/cloudbroker/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)
+	req := account.ListDisksRequest{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	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))
+	}
+
+	log.Debugf("utilityAccountDisksListCheckPresence: load account list")
+	accountDisksList, err := c.CloudBroker().Account().ListDisks(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountDisksList, nil
+}

internal/service/cloudbroker/account/utility_account_flip_groups.go

@@ -1,89 +1,93 @@
-/*
-Copyright (c) 2019-2022 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 account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityAccountFlipGroupsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListFLIPGroups, error) {
-	c := m.(*controller.ControllerCfg)
-	req := account.ListFLIPGroupsRequest{
-		AccountID: uint64(d.Get("account_id").(int)),
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if vins_id, ok := d.GetOk("vins_id"); ok {
-		req.VINSID = uint64(vins_id.(int))
-	}
-
-	if vins_name, ok := d.GetOk("vins_name"); ok {
-		req.VINSName = vins_name.(string)
-	}
-
-	if extnet_id, ok := d.GetOk("extnet_id"); ok {
-		req.ExtNetID = uint64(extnet_id.(int))
-	}
-
-	if by_ip, ok := d.GetOk("by_ip"); ok {
-		req.ByIP = by_ip.(string)
-	}
-
-	if flipgroup_id, ok := d.GetOk("flipgroup_id"); ok {
-		req.FLIPGroupID = uint64(flipgroup_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("utilityAccountFlipGroupsListCheckPresence")
-	accountFlipGroupsList, err := c.CloudBroker().Account().ListFLIPGroups(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountFlipGroupsList, 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>
+
+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/cloudbroker/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityAccountFlipGroupsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListFLIPGroups, error) {
+	c := m.(*controller.ControllerCfg)
+	req := account.ListFLIPGroupsRequest{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if vins_id, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vins_id.(int))
+	}
+
+	if vins_name, ok := d.GetOk("vins_name"); ok {
+		req.VINSName = vins_name.(string)
+	}
+
+	if extnet_id, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extnet_id.(int))
+	}
+
+	if by_ip, ok := d.GetOk("by_ip"); ok {
+		req.ByIP = by_ip.(string)
+	}
+
+	if flipgroup_id, ok := d.GetOk("flipgroup_id"); ok {
+		req.FLIPGroupID = uint64(flipgroup_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("utilityAccountFlipGroupsListCheckPresence")
+	accountFlipGroupsList, err := c.CloudBroker().Account().ListFLIPGroups(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountFlipGroupsList, nil
+}

internal/service/cloudbroker/account/utility_account_list.go

@@ -1,78 +1,82 @@
-/*
-Copyright (c) 2019-2022 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 account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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.CloudBroker().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>
+
+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/cloudbroker/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 sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	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.CloudBroker().Account().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountList, nil
+}

internal/service/cloudbroker/account/utility_account_rg_list.go

@@ -1,85 +1,89 @@
-/*
-Copyright (c) 2019-2022 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 account
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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)
-	req := account.ListRGRequest{
-		AccountID: uint64(d.Get("account_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 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.CloudBroker().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>
+
+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/cloudbroker/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)
+	req := account.ListRGRequest{
+		AccountID: uint64(d.Get("account_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 sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	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.CloudBroker().Account().ListRG(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountRGList, nil
+}

internal/service/cloudbroker/account/utility_account_vins_list.go

@@ -1,81 +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>
-
-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/cloudbroker/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)
-	req := account.ListVINSRequest{
-		AccountID: uint64(d.Get("account_id").(int)),
-	}
-
-	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.CloudBroker().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>
+
+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/cloudbroker/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)
+	req := account.ListVINSRequest{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	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.CloudBroker().Account().ListVINS(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountVinsList, nil
+}

internal/service/cloudbroker/audit/flattens.go

@@ -78,6 +78,7 @@ func flattenLinkedJobs(ljl *audit.ListLinkedJobs) []map[string]interface{} {
 	for _, item := range linkedJobs {
 		temp := map[string]interface{}{
 			"cmd":         item.CMD,
+			"guid":        item.GUID,
 			"nid":         item.NID,
 			"state":       item.State,
 			"time_create": item.TimeCreate,

internal/service/cloudbroker/audit/schema.go

@@ -87,10 +87,20 @@ func dataSourceAuditListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "find by api endpoint (Mongo RegExp supported)",
 		},
-		"status_code": {
+		"min_status_code": {
 			Type:        schema.TypeInt,
 			Optional:    true,
-			Description: "find by HTTP status code",
+			Description: "find by HTTP min status code",
+		},
+		"max_status_code": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find by HTTP max status code",
+		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
 		},
 		"page": {
 			Type:        schema.TypeInt,
@@ -161,6 +171,11 @@ func dataSourceLinkedJobsSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "cmd",
 					},
+					"guid": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "guid",
+					},
 					"nid": {
 						Type:        schema.TypeInt,
 						Computed:    true,

internal/service/cloudbroker/audit/utility_audit_list.go

@@ -58,8 +58,14 @@ func utilityAuditListCheckPresence(ctx context.Context, d *schema.ResourceData,
 	if call, ok := d.GetOk("call"); ok {
 		req.Call = call.(string)
 	}
-	if statusCode, ok := d.GetOk("status_code"); ok {
-		req.StatusCode = uint64(statusCode.(int))
+	if minStatusCode, ok := d.GetOk("min_status_code"); ok {
+		req.MinStatusCode = uint64(minStatusCode.(int))
+	}
+	if maxStatusCode, ok := d.GetOk("max_status_code"); ok {
+		req.MaxStatusCode = uint64(maxStatusCode.(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/cloudbroker/disks/data_source_disk_replication.go

@@ -0,0 +1,90 @@
+/*
+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 DataSourceDiskReplication() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceDiskReplicationRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceDiskReplicationSchemaMake(),
+	}
+}

internal/service/cloudbroker/disks/flattens.go

@@ -10,7 +10,6 @@ import (
 
 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))
@@ -41,6 +40,7 @@ func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 	d.Set("purge_attempts", disk.PurgeAttempts)
 	d.Set("present_to", disk.PresentTo)
 	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)
@@ -58,6 +58,71 @@ func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 	d.Set("vmid", disk.VMID)
 }
 
+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.Password)
+	d.Set("pci_slot", disk.PCISlot)
+	d.Set("pool", disk.Pool)
+	d.Set("purge_attempts", disk.PurgeAttempts)
+	d.Set("present_to", disk.PresentTo)
+	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("shareable", disk.Shareable)
+	d.Set("size_max", disk.SizeMax)
+	d.Set("size_used", disk.SizeUsed)
+	d.Set("snapshots", flattendDiskSnapshotList(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 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 flattenDiskSnapshot(d *schema.ResourceData, snapshot disks.ItemSnapshot) {
 	d.Set("timestamp", snapshot.Timestamp)
 	d.Set("guid", snapshot.GUID)
@@ -137,6 +202,7 @@ func flattenDiskList(dl *disks.ListDisks) []map[string]interface{} {
 			"pool":                  disk.Pool,
 			"purge_attempts":        disk.PurgeAttempts,
 			"purge_time":            disk.PurgeTime,
+			"replication":           flattenDiskReplication(disk.Replication),
 			"reality_device_number": disk.RealityDeviceNumber,
 			"reference_id":          disk.ReferenceID,
 			"res_id":                disk.ResID,

internal/service/cloudbroker/disks/resource_disk.go

@@ -33,6 +33,7 @@ package disks
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strconv"
 
@@ -94,6 +95,14 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 
 	w := dc.Warnings{}
 
+	if _, ok := d.GetOk("node_ids"); ok {
+		log.Debugf("resourceDiskCreate: present for disk %d", d.Get("disk_id"))
+		if err := resourceDiskChangeNodes(ctx, d, m, true); err != nil {
+			w.Add(err)
+		}
+		log.Debugf("resourceDiskCreate: finished present for disk %d", d.Get("disk_id"))
+	}
+
 	if _, ok := d.GetOk("iotune"); ok {
 		if err := resourceDiskChangeIotune(ctx, d, m); err != nil {
 			w.Add(err)
@@ -208,26 +217,34 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 		log.Debugf("resourceDiskUpdate: resizing disk ID %s - %d GB -> %d GB",
 			d.Id(), oldSize.(int), newSize.(int))
 		if err := resourceDiskChangeSize(ctx, d, m); err != nil {
-			w.Add(err)
+			return diag.FromErr(err)
 		}
 	}
 
 	if d.HasChange("disk_name") {
 		if err := resourceDiskChangeDiskName(ctx, d, m); err != nil {
-			w.Add(err)
+			return diag.FromErr(err)
 		}
 	}
 
 	if d.HasChange("iotune") {
 		if err := resourceDiskChangeIotune(ctx, d, m); err != nil {
-			w.Add(err)
+			return diag.FromErr(err)
 		}
 	}
 
 	if d.HasChange("shareable") {
 		if err := resourceDiskChangeShareable(ctx, d, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("node_ids") {
+		log.Debugf("resourceDiskUpdate: present for disk %d", d.Get("disk_id"))
+		if err := resourceDiskChangeNodes(ctx, d, m, false); err != nil {
 			w.Add(err)
 		}
+		log.Debugf("resourceDiskUpdate: finished present for disk %d", d.Get("disk_id"))
 	}
 
 	return append(w.Get(), resourceDiskRead(ctx, d, m)...)
@@ -347,6 +364,60 @@ func resourceDiskChangeSize(ctx context.Context, d *schema.ResourceData, m inter
 	return err
 }
 
+func resourceDiskChangeNodes(ctx context.Context, d *schema.ResourceData, m interface{}, afterCreate bool) error {
+	c := m.(*controller.ControllerCfg)
+	diskID := uint64(d.Get("disk_id").(int))
+	presentIDs := make([]interface{}, 0)
+	var errs error
+	var oldNodes, newNodes interface{}
+
+	if afterCreate {
+		nodeIDs := d.Get("node_ids").(*schema.Set).List()
+		presentIDs = nodeIDs
+	} else {
+		oldNodes, newNodes = d.GetChange("node_ids")
+		nodeIDs := (newNodes.(*schema.Set).Difference(oldNodes.(*schema.Set))).List()
+		presentIDs = nodeIDs
+	}
+
+	for _, presentID := range presentIDs {
+		nodeID := uint64(presentID.(int))
+
+		req := disks.PresentRequest{
+			DiskID: diskID,
+			NodeID: nodeID,
+		}
+
+		_, err := c.CloudBroker().Disks().Present(ctx, req)
+		if err != nil {
+			errs = errors.Join(err)
+		}
+	}
+
+	if afterCreate {
+		return errs
+	}
+
+	depresentIDs := (oldNodes.(*schema.Set).Difference(newNodes.(*schema.Set))).List()
+	if len(depresentIDs) > 0 {
+		for _, depresentID := range depresentIDs {
+			nodeID := uint64(depresentID.(int))
+
+			req := disks.DepresentRequest{
+				DiskID: diskID,
+				NodeID: nodeID,
+			}
+
+			_, err := c.CloudBroker().Disks().Depresent(ctx, req)
+			if err != nil {
+				errs = errors.Join(err)
+			}
+		}
+	}
+
+	return errs
+}
+
 func ResourceDisk() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,

internal/service/cloudbroker/disks/resource_disk_replication.go

@@ -0,0 +1,218 @@
+/*
+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"
+
+	"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/cloudbroker/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"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/ic"
+)
+
+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 := ic.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.CloudBroker().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.CloudBroker().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.CloudBroker().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 := ic.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.CloudBroker().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.CloudBroker().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 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/cloudbroker/disks/schema.go

@@ -201,6 +201,39 @@ func dataSourceDiskSchemaMake() 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,
@@ -350,6 +383,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,
@@ -567,6 +605,39 @@ func dataSourceDiskListSchemaMake() 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,
@@ -707,6 +778,11 @@ func dataSourceDiskListDeletedSchemaMake() 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,
@@ -924,6 +1000,39 @@ func dataSourceDiskListDeletedSchemaMake() 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,
@@ -1029,6 +1138,11 @@ func dataSourceDiskListDeletedSchemaMake() map[string]*schema.Schema {
 
 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,
@@ -1057,6 +1171,11 @@ func dataSourceDiskListTypesSchemaMake() map[string]*schema.Schema {
 
 func dataSourceDiskListTypesDetailedSchemaMake() map[string]*schema.Schema {
 	return 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,
@@ -1157,6 +1276,11 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Optional: true,
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -1716,6 +1840,13 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
+		"node_ids": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"detach": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -1935,6 +2066,39 @@ func resourceDiskSchemaMake() 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,
@@ -2015,3 +2179,714 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 
 	return rets
 }
+
+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,
+		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"acl": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"boot_partition": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"computes": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compute_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"desc": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"destruction_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"devicename": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"disk_path": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"image_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"images": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"iotune": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"read_bytes_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"read_bytes_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"read_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"read_iops_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"size_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_bytes_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_bytes_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_iops_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_bytes_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_bytes_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_iops_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"iqn": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"login": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"disk_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"order": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"params": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"parent_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"passwd": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"pci_slot": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"pool": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"purge_attempts": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"purge_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"replication": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"disk_id": {
+						Type: schema.TypeInt,
+						Computed: true,
+					},
+					"pool_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"role": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"self_volume_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"storage_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"volume_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+			Description: "Replication status",
+		},
+		"reality_device_number": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"reference_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"role": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"sep_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"sep_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"shareable": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"size_max": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"size_used": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"snapshots": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"label": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reference_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"res_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"snap_set_guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"snap_set_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"timestamp": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"vmid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+
+	return rets
+}
+
+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,
+		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"acl": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"boot_partition": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"computes": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compute_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"desc": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"destruction_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"devicename": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"disk_path": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"image_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"images": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"iotune": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"read_bytes_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"read_bytes_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"read_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"read_iops_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"size_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_bytes_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_bytes_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"total_iops_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_bytes_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_bytes_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_iops_sec": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"write_iops_sec_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"iqn": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"login": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"order": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"params": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"parent_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"passwd": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"pci_slot": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"present_to": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"purge_attempts": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"purge_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"replication": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"disk_id": {
+						Type: schema.TypeInt,
+						Computed: true,
+					},
+					"pool_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"role": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"self_volume_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"storage_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+					"volume_id": {
+						Type: schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+			Description: "Replication status",
+		},
+		"reality_device_number": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"reference_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"role": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"sep_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"shareable": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"size_max": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"size_used": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
+		"snapshots": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"label": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reference_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"res_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"snap_set_guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"snap_set_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"timestamp": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"vmid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+
+	return rets
+}

internal/service/cloudbroker/disks/utility_disk_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>
-
-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/cloudbroker/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 pool, ok := d.GetOk("pool"); ok {
-		req.Pool = pool.(string)
-	}
-	if sepID, ok := d.GetOk("sep_id"); ok {
-		req.SEPID = uint64(sepID.(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("utilityDiskListCheckPresence: load disk list")
-	diskList, err := c.CloudBroker().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>
+
+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/cloudbroker/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 pool, ok := d.GetOk("pool"); ok {
+		req.Pool = pool.(string)
+	}
+	if sepID, ok := d.GetOk("sep_id"); ok {
+		req.SEPID = uint64(sepID.(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("utilityDiskListCheckPresence: load disk list")
+	diskList, err := c.CloudBroker().Disks().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return diskList, nil
+}

internal/service/cloudbroker/disks/utility_disk_list_deleted.go

@@ -68,6 +68,9 @@ func utilityDiskListDeletedCheckPresence(ctx context.Context, d *schema.Resource
 	if typev, ok := d.GetOk("type"); ok {
 		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/cloudbroker/disks/utility_disk_list_types.go

@@ -15,6 +15,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/cloudbroker/disks/utility_disk_list_types_detailed.go

@@ -15,6 +15,9 @@ 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/cloudbroker/disks/utility_disk_list_unattached.go

@@ -37,6 +37,9 @@ func utilityDiskListUnattachedCheckPresence(ctx context.Context, d *schema.Resou
 	if pool, ok := d.GetOk("pool"); ok {
 		req.Pool = pool.(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/cloudbroker/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/cloudbroker/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.CloudBroker().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.CloudBroker().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.CloudBroker().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.CloudBroker().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.CloudBroker().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.CloudBroker().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.CloudBroker().Disks().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return disk, nil
+}

internal/service/cloudbroker/extnet/schema.go

@@ -47,6 +47,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,
@@ -718,7 +723,7 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 		"shared_with": {
 			Type:     schema.TypeSet,
 			Computed: true,
-			Optional:    true,
+			Optional: true,
 			Elem: &schema.Schema{
 				Type: schema.TypeInt,
 			},
@@ -899,4 +904,4 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 			},
 		},
 	}
-}
+}

internal/service/cloudbroker/extnet/utility_extnet_list.go

@@ -74,6 +74,10 @@ func utilityExtnetListCheckPresence(ctx context.Context, d *schema.ResourceData,
 		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/cloudbroker/flipgroup/schema.go

@@ -189,6 +189,11 @@ func dataSourceFlipgroupsListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "by_id",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -199,6 +204,29 @@ func dataSourceFlipgroupsListSchemaMake() 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/cloudbroker/flipgroup/utility_flipgroup_list.go

@@ -69,12 +69,30 @@ func utilityFlipgroupListCheckPresence(ctx context.Context, d *schema.ResourceDa
 	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 clientId, ok := d.GetOk("client_ids"); ok {
+		clientIds := clientId.([]interface{})
+		for _, elem := range clientIds {
+			req.ClientIDs = append(req.ClientIDs, uint64(elem.(int)))
+		}
+	}
+	if connId, ok := d.GetOk("conn_id"); ok {
+		req.ConnId = uint64(connId.(int))
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
 
 	log.Debugf("utilityFlipgroupListCheckPresence: load flipgroup list")
 	flipgroupList, err := c.CloudBroker().FLIPGroup().List(ctx, req)

internal/service/cloudbroker/grid/schema.go

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

internal/service/cloudbroker/grid/utility_grid_list.go

@@ -1,68 +1,71 @@
-/*
-Copyright (c) 2019-2023 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 grid
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityGridListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*grid.ListGrids, error) {
-	c := m.(*controller.ControllerCfg)
-	req := grid.ListRequest{}
-
-	if byID, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(byID.(int))
-	}
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = 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("utilityGridListCheckPresence: load grid list")
-	gridList, err := c.CloudBroker().Grid().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return gridList, nil
-}
+/*
+Copyright (c) 2019-2023 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 grid
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityGridListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*grid.ListGrids, error) {
+	c := m.(*controller.ControllerCfg)
+	req := grid.ListRequest{}
+
+	if byID, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byID.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = 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("utilityGridListCheckPresence: load grid list")
+	gridList, err := c.CloudBroker().Grid().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return gridList, nil
+}

internal/service/cloudbroker/ic/input_checks.go

@@ -7,6 +7,7 @@ import (
 
 	cb_account "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/account"
 	cb_compute "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/compute"
+	cb_disks "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/disks"
 	cb_extnet "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
 	cb_gid "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
 	cb_image "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
@@ -15,7 +16,9 @@ import (
 	cb_lb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/lb"
 	cb_rg "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
 	cb_stack "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stack"
+	cb_vfpool "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vfpool"
 	cb_vins "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vins"
+
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
@@ -37,6 +40,78 @@ func ExistRG(ctx context.Context, rgId uint64, c *controller.ControllerCfg) erro
 	return nil
 }
 
+func ExistRGs(ctx context.Context, rgIDs []uint64, c *controller.ControllerCfg) error {
+	req := cb_rg.ListRequest{}
+
+	rgList, err := c.CloudBroker().RG().List(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	if len(rgList.Data) == 0 {
+		return fmt.Errorf("you have not been granted access to any resource group")
+	}
+
+	notFound := make([]uint64, 0, len(rgIDs))
+
+	for _, rgID := range rgIDs {
+		found := false
+
+		for _, rg := range rgList.Data {
+			if rgID == rg.ID {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			notFound = append(notFound, rgID)
+		}
+	}
+
+	if len(notFound) > 0 {
+		return fmt.Errorf("RGs with ids %v not found", notFound)
+	}
+
+	return nil
+}
+
+func ExistAccouts(ctx context.Context, accountIDs []uint64, c *controller.ControllerCfg) error {
+	req := cb_account.ListRequest{}
+
+	accList, err := c.CloudBroker().Account().List(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	if len(accList.Data) == 0 {
+		return fmt.Errorf("you have not been granted access to any account")
+	}
+
+	notFound := make([]uint64, 0, len(accountIDs))
+
+	for _, accID := range accountIDs {
+		found := false
+
+		for _, acc := range accList.Data {
+			if accID == acc.ID {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			notFound = append(notFound, accID)
+		}
+	}
+
+	if len(notFound) > 0 {
+		return fmt.Errorf("Accounts with ids %v not found", notFound)
+	}
+
+	return nil
+}
+
 func ExistImage(ctx context.Context, imageId uint64, c *controller.ControllerCfg) error {
 	req := cb_image.ListRequest{
 		ByID: imageId,
@@ -54,6 +129,42 @@ func ExistImage(ctx context.Context, imageId uint64, c *controller.ControllerCfg
 	return nil
 }
 
+func ExistImages(ctx context.Context, imageIDs []uint64, c *controller.ControllerCfg) error {
+	req := cb_image.ListRequest{}
+
+	listImages, err := c.CloudBroker().Image().List(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	if len(listImages.Data) == 0 {
+		return fmt.Errorf("you have not been granted access to any images")
+	}
+
+	notFound := make([]uint64, 0, len(imageIDs))
+
+	for _, imageID := range imageIDs {
+		found := false
+
+		for _, image := range listImages.Data {
+			if imageID == image.ID {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			notFound = append(notFound, imageID)
+		}
+	}
+
+	if len(notFound) > 0 {
+		return fmt.Errorf("images with ids %v not found", notFound)
+	}
+
+	return nil
+}
+
 func ExistVins(ctx context.Context, vinsId uint64, c *controller.ControllerCfg) error {
 	req := cb_vins.ListRequest{
 		ByID:           vinsId,
@@ -132,6 +243,35 @@ func ExistExtNets(ctx context.Context, extNetIds []uint64, c *controller.Control
 	return errs
 }
 
+func ExistVFPools(ctx context.Context, vfpoolIds []uint64, c *controller.ControllerCfg) []error {
+	var errs []error
+
+	req := cb_vfpool.ListRequest{}
+
+	vfpoolList, err := c.CloudBroker().VFPool().List(ctx, req)
+	if err != nil {
+		errs = append(errs, err)
+		return errs
+	}
+
+	for _, vfpoolId := range vfpoolIds {
+		found := false
+
+		for _, vfpool := range vfpoolList.Data {
+			if vfpoolId == vfpool.ID {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			errs = append(errs, fmt.Errorf("VFPool with ID %v not found", vfpoolId))
+		}
+	}
+
+	return errs
+}
+
 func ExistExtNetInLb(ctx context.Context, extNetId uint64, c *controller.ControllerCfg) error {
 	if extNetId == 0 {
 		return nil
@@ -404,3 +544,88 @@ func ExistK8s(ctx context.Context, k8sId uint64, c *controller.ControllerCfg) er
 
 	return nil
 }
+
+func IsMoreThanOneDisksTypeB(ctx context.Context, disks interface{}) error {
+	count := 0
+
+	for _, elem := range disks.([]interface{}) {
+		diskVal := elem.(map[string]interface{})
+		if diskVal["disk_type"].(string) == "B" {
+			count++
+		}
+		if count > 1 {
+			return fmt.Errorf("block disks have more 1 disk type 'B'")
+		}
+	}
+
+	return nil
+}
+
+func ExistDiskID(ctx context.Context, diskId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+
+	req := cb_disks.ListRequest{
+		ByID: diskId,
+	}
+
+	diskList, err := c.CloudBroker().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
+}
+
+func ExistBlankCompute(ctx context.Context, computeId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+	req := cb_compute.GetRequest{ComputeID: computeId}
+
+	// check for compute existence
+	computeRecord, err := c.CloudBroker().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 ExistPlatformDisk(ctx context.Context, diskId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+
+	req := cb_disks.ListRequest{
+		ByID: diskId,
+	}
+
+	diskList, err := c.CloudBroker().Disks().List(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	if len(diskList.Data) != 1 {
+		return fmt.Errorf("DiskID %d is not allowed or does not exist", diskId)
+	}
+
+	return nil
+}

internal/service/cloudbroker/image/flattens.go

@@ -1,6 +1,7 @@
 package image
 
 import (
+	"encoding/json"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -10,17 +11,18 @@ import (
 )
 
 func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
+	cdPresentedTo, _ := json.Marshal(img.CdPresentedTo)
+
 	log.Debugf("flattenImageID %d", img.ID)
 	d.Set("image_id", img.ID)
 	d.Set("unc_path", img.UNCPath)
-	d.Set("ckey", img.CKey)
-	d.Set("meta", flattens.FlattenMeta(img.Meta))
 	d.Set("account_id", img.AccountID)
 	d.Set("acl", flattenAcl(img.ACL))
 	d.Set("architecture", img.Architecture)
 	d.Set("boot_type", img.BootType)
 	d.Set("bootable", img.Bootable)
 	d.Set("computeci_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)
@@ -33,6 +35,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("link_to", img.LinkTo)
 	d.Set("milestones", img.Milestones)
 	d.Set("name", img.Name)
+	d.Set("network_interface_naming", img.NetworkInterfaceNaming)
 	d.Set("password", img.Password)
 	d.Set("pool_name", img.Pool)
 	d.Set("present_to", img.PresentTo)
@@ -86,48 +89,50 @@ func flattenImageList(il *image.ListImages) []map[string]interface{} {
 	log.Debug("flattenImageList")
 	res := make([]map[string]interface{}, 0, len(il.Data))
 	for _, item := range il.Data {
+		cdPresentedTo, _ := json.Marshal(item.CdPresentedTo)
+
 		temp := map[string]interface{}{
-			"image_id":       item.ID,
-			"unc_path":       item.UNCPath,
-			"ckey":           item.CKey,
-			"meta":           flattens.FlattenMeta(item.Meta),
-			"account_id":     item.AccountID,
-			"acl":            flattenAcl(item.ACL),
-			"architecture":   item.Architecture,
-			"boot_type":      item.BootType,
-			"bootable":       item.Bootable,
-			"computeci_id":   item.ComputeCIID,
-			"deleted_time":   item.DeletedTime,
-			"desc":           item.Description,
-			"drivers":        item.Drivers,
-			"enabled":        item.Enabled,
-			"gid":            item.GID,
-			"guid":           item.GUID,
-			"history":        flattenHistory(item.History),
-			"hot_resize":     item.HotResize,
-			"last_modified":  item.LastModified,
-			"link_to":        item.LinkTo,
-			"milestones":     item.Milestones,
-			"name":           item.Name,
-			"password":       item.Password,
-			"pool_name":      item.Pool,
-			"present_to":     item.PresentTo,
-			"provider_name":  item.ProviderName,
-			"purge_attempts": item.PurgeAttempts,
-			"reference_id":   item.ReferenceID,
-			"res_id":         item.ResID,
-			"res_name":       item.ResName,
-			"rescuecd":       item.RescueCD,
-			"sep_id":         item.SEPID,
-			"shared_with":    item.SharedWith,
-			"size":           item.Size,
-			"status":         item.Status,
-			"tech_status":    item.TechStatus,
-			"image_type":     item.Type,
-			"url":            item.URL,
-			"username":       item.Username,
-			"version":        item.Version,
-			"virtual":        item.Virtual,
+			"image_id":        item.ID,
+			"unc_path":        item.UNCPath,
+			"account_id":      item.AccountID,
+			"acl":             flattenAcl(item.ACL),
+			"architecture":    item.Architecture,
+			"boot_type":       item.BootType,
+			"bootable":        item.Bootable,
+			"computeci_id":    item.ComputeCIID,
+			"cd_presented_to": string(cdPresentedTo),
+			"deleted_time":    item.DeletedTime,
+			"desc":            item.Description,
+			"drivers":         item.Drivers,
+			"enabled":         item.Enabled,
+			"gid":             item.GID,
+			"guid":            item.GUID,
+			"history":         flattenHistory(item.History),
+			"hot_resize":      item.HotResize,
+			"last_modified":   item.LastModified,
+			"link_to":         item.LinkTo,
+			"milestones":      item.Milestones,
+			"name":            item.Name,
+			"network_interface_naming": item.NetworkInterfaceNaming,
+			"password":        item.Password,
+			"pool_name":       item.Pool,
+			"present_to":      item.PresentTo,
+			"provider_name":   item.ProviderName,
+			"purge_attempts":  item.PurgeAttempts,
+			"reference_id":    item.ReferenceID,
+			"res_id":          item.ResID,
+			"res_name":        item.ResName,
+			"rescuecd":        item.RescueCD,
+			"sep_id":          item.SEPID,
+			"shared_with":     item.SharedWith,
+			"size":            item.Size,
+			"status":          item.Status,
+			"tech_status":     item.TechStatus,
+			"image_type":      item.Type,
+			"url":             item.URL,
+			"username":        item.Username,
+			"version":         item.Version,
+			"virtual":         item.Virtual,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/image/resource_check_input_values.go

@@ -0,0 +1,50 @@
+package image
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/ic"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func checkParamsExistenceBlankCompute(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) diag.Diagnostics {
+	var errs []error
+
+	accountID := uint64(d.Get("account_id").(int))
+	computeId := uint64(d.Get("compute_id").(int))
+
+	if err := ic.ExistBlankCompute(ctx, computeId, c); err != nil {
+		errs = append(errs, err)
+	}
+
+	if _, ok := d.GetOk("account_id"); ok {
+		if err := ic.ExistAccount(ctx, accountID, c); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	return dc.ErrorsToDiagnostics(errs)
+}
+
+func checkParamsExistencePlatformDisk(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) diag.Diagnostics {
+	var errs []error
+
+	accountID := uint64(d.Get("account_id").(int))
+	diskId := uint64(d.Get("disk_id").(int))
+
+	if err := ic.ExistPlatformDisk(ctx, diskId, c); err != nil {
+		errs = append(errs, err)
+	}
+
+	if _, ok := d.GetOk("account_id"); ok {
+		if err := ic.ExistAccount(ctx, accountID, c); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	return dc.ErrorsToDiagnostics(errs)
+}

internal/service/cloudbroker/image/resource_image.go

@@ -41,19 +41,39 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
 	"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 resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceImageCreate: called for image %s", d.Get("name").(string))
 
+	url, urlOk := d.GetOk("url")
+	filePath, fileImageOk := d.GetOk("file_path")
+
+	if !urlOk && !fileImageOk {
+		return diag.Errorf("resourceImageCreate: no valid url or file_path specified")
+	}
+
+	if urlOk && fileImageOk {
+		return diag.Errorf("resourceImageCreate: either url or resource file_path should be specified")
+	}
+
 	c := m.(*controller.ControllerCfg)
 
 	syncMode := d.Get("sync_mode").(bool)
 	var imageId uint64
 
+	if fileImageOk {
+		var err error
+		url, err = c.CloudBroker().Image().UploadImageFile(ctx, filePath.(string))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if syncMode {
-		req, err := SyncCreateRequest(ctx, d, m)
+		req, err := SyncCreateRequest(ctx, d, m, url.(string))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -62,7 +82,7 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
 			return diag.FromErr(err)
 		}
 	} else {
-		req, err := CreateRequest(ctx, d, m)
+		req, err := CreateRequest(ctx, d, m, url.(string))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -74,7 +94,15 @@ func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interfac
 
 	d.SetId(strconv.FormatUint(imageId, 10))
 
-	return resourceImageRead(ctx, d, m)
+	var w dc.Warnings
+
+	if _, ok := d.GetOk("accounts"); ok {
+		if err := resourceImageSetAccess(ctx, d, m); err != nil {
+			w.Add(err)
+		}
+	}
+
+	return append(resourceImageRead(ctx, d, m), w.Get()...)
 }
 
 func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -175,13 +203,20 @@ func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
-	if d.HasChanges("name", "username", "password", "account_id", "bootable", "hot_resize") {
+	if d.HasChanges("name", "username", "password", "account_id", "bootable", "hot_resize", "network_interface_naming") {
 		err := resourceImageEdit(ctx, d, m)
 		if err != nil {
 			return diag.FromErr(err)
 		}
 	}
 
+	if d.HasChange("accounts") {
+		err := resourceImageChangeAccess(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return nil
 }
 
@@ -307,7 +342,9 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 	if d.HasChange("hot_resize") {
 		req.HotResize = d.Get("hot_resize").(bool)
 	}
-
+	if d.HasChange("network_interface_naming") {
+		req.NetworkInterfaceNaming = d.Get("network_interface_naming").(string)
+	}
 	_, err := c.CloudBroker().Image().Edit(ctx, req)
 	if err != nil {
 		return err
@@ -315,6 +352,78 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 	return nil
 }
 
+func resourceImageChangeAccess(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourceImageChangeAccess: called for %s, id: %s", d.Get("name").(string), d.Id())
+	c := m.(*controller.ControllerCfg)
+
+	imageId, _ := strconv.ParseUint(d.Id(), 10, 64)
+
+	oldSet, newSet := d.GetChange("accounts")
+
+	revokeAccess := (oldSet.(*schema.Set).Difference(newSet.(*schema.Set))).List()
+	if len(revokeAccess) > 0 {
+		revokeAccounts := make([]uint64, 0, len(revokeAccess))
+		for _, accountId := range revokeAccess {
+			revokeAccounts = append(revokeAccounts, uint64(accountId.(int)))
+		}
+
+		req := image.RevokeAccessRequest{
+			ImageID:    imageId,
+			AccountIDs: revokeAccounts,
+		}
+
+		_, err := c.CloudBroker().Image().RevokeAccess(ctx, req)
+		if err != nil {
+			return err
+		}
+	}
+
+	addedAccess := (newSet.(*schema.Set).Difference(oldSet.(*schema.Set))).List()
+	if len(addedAccess) > 0 {
+		grantAccounts := make([]uint64, 0, len(addedAccess))
+		for _, accountId := range addedAccess {
+			grantAccounts = append(grantAccounts, uint64(accountId.(int)))
+		}
+
+		req := image.GrantAccessRequest{
+			ImageID:    imageId,
+			AccountIDs: grantAccounts,
+		}
+
+		_, err := c.CloudBroker().Image().GrantAccess(ctx, req)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func resourceImageSetAccess(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourceImageSetAccess: called for %s, id: %s", d.Get("name").(string), d.Id())
+	c := m.(*controller.ControllerCfg)
+
+	imageId, _ := strconv.ParseUint(d.Id(), 10, 64)
+
+	accounts := d.Get("accounts").([]interface{})
+	accountIDs := make([]uint64, 0, len(accounts))
+	for _, accountId := range accounts {
+		accountIDs = append(accountIDs, uint64(accountId.(int)))
+	}
+
+	req := image.GrantAccessRequest{
+		ImageID:    imageId,
+		AccountIDs: accountIDs,
+	}
+
+	_, err := c.CloudBroker().Image().GrantAccess(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func ResourceImage() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,

internal/service/cloudbroker/image/resource_image_from_blank_compute.go

@@ -0,0 +1,295 @@
+/*
+Copyright (c) 2019-2023 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 image
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"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/cloudbroker/compute"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+)
+
+func resourceImageFromBlankComputeCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromBlankComputeCreate: called for image %s", d.Get("name").(string))
+	c := m.(*controller.ControllerCfg)
+
+	if diags := checkParamsExistenceBlankCompute(ctx, d, c); diags != nil {
+		return diags
+	}
+
+	req := compute.CreateTemplateFromBlankRequest{
+		ComputeID: uint64(d.Get("compute_id").(int)),
+		Name:      d.Get("name").(string),
+		BootType:  d.Get("boot_type").(string),
+		ImageType: d.Get("image_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
+	var err error
+	asyncMode := d.Get("async_mode").(bool)
+	if !asyncMode {
+		imageId, err = c.CloudBroker().Compute().CreateTemplateFromBlank(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	} else {
+		taskId, err := c.CloudBroker().Compute().CreateTemplateFromBlankAsync(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+
+		taskReq := tasks.GetRequest{
+			AuditID: strings.Trim(taskId, `"`),
+		}
+
+		for {
+			task, err := c.CloudBroker().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)
+
+	var w dc.Warnings
+
+	if _, ok := d.GetOk("accounts"); ok {
+		if err := resourceImageSetAccess(ctx, d, m); err != nil {
+			w.Add(err)
+		}
+	}
+
+	return append(resourceImageFromBlankComputeRead(ctx, d, m), w.Get()...)
+}
+
+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 err != 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.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+	}
+
+	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 reason, ok := d.GetOk("reason"); ok {
+		req.Reason = reason.(string)
+	}
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudBroker().Image().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	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())
+
+	c := m.(*controller.ControllerCfg)
+	if diags := checkParamsExistenceBlankCompute(ctx, d, c); diags != nil {
+		return diags
+	}
+
+	// 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")
+	}
+
+	img, err := utilityImageCheckPresence(ctx, d, m)
+	if err != 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.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+	}
+
+	if d.HasChange("enabled") {
+		err := resourceImageChangeEnabled(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("shared_with") {
+		err := resourceImageShare(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("computeci_id") {
+		err := resourceImageChangeComputeci(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("enabled_stacks") {
+		err := resourceImageUpdateNodes(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChanges("name", "username", "password", "account_id", "bootable", "hot_resize", "network_interface_naming") {
+		err := resourceImageEdit(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("accounts") {
+		err := resourceImageChangeAccess(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(),
+	}
+}

internal/service/cloudbroker/image/resource_image_from_platform_disk.go

@@ -0,0 +1,302 @@
+/*
+Copyright (c) 2019-2023 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 image
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"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/cloudbroker/disks"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+)
+
+func resourceImageFromPlatformDiskCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageFromPlatformDiskCreate: called for image %s", d.Get("name").(string))
+	c := m.(*controller.ControllerCfg)
+
+	if diags := checkParamsExistencePlatformDisk(ctx, d, c); diags != nil {
+		return diags
+	}
+
+	req := disks.FromPlatformDiskRequest{
+		DiskID:       uint64(d.Get("disk_id").(int)),
+		Name:         d.Get("name").(string),
+		BootType:     d.Get("boot_type").(string),
+		ImageType:    d.Get("image_type").(string),
+		Architecture: d.Get("architecture").(string),
+		Bootable:     d.Get("bootable").(bool), // default is 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
+	var err error
+	asyncMode := d.Get("async_mode").(bool)
+	if !asyncMode {
+		imageId, err = c.CloudBroker().Disks().FromPlatformDisk(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+	} else {
+		taskId, err := c.CloudBroker().Disks().FromPlatformDiskAsync(ctx, req)
+		if err != nil {
+			d.SetId("")
+			return diag.FromErr(err)
+		}
+
+		taskReq := tasks.GetRequest{
+			AuditID: strings.Trim(taskId, `"`),
+		}
+
+		for {
+			task, err := c.CloudBroker().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)
+
+	var w dc.Warnings
+
+	if _, ok := d.GetOk("accounts"); ok {
+		if err := resourceImageSetAccess(ctx, d, m); err != nil {
+			w.Add(err)
+		}
+	}
+
+	return append(resourceImageFromPlatformDiskRead(ctx, d, m), w.Get()...)
+}
+
+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 err != 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.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 reason, ok := d.GetOk("reason"); ok {
+		req.Reason = reason.(string)
+	}
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudBroker().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())
+
+	c := m.(*controller.ControllerCfg)
+	if diags := checkParamsExistencePlatformDisk(ctx, d, c); diags != nil {
+		return diags
+	}
+
+	// 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")
+	}
+
+	img, err := utilityImageCheckPresence(ctx, d, m)
+	if err != 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.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+	}
+
+	if d.HasChange("enabled") {
+		err := resourceImageChangeEnabled(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("shared_with") {
+		err := resourceImageShare(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("computeci_id") {
+		err := resourceImageChangeComputeci(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("enabled_stacks") {
+		err := resourceImageUpdateNodes(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChanges("name", "username", "password", "account_id", "bootable", "hot_resize", "network_interface_naming") {
+		err := resourceImageEdit(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("accounts") {
+		err := resourceImageChangeAccess(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(),
+	}
+}

internal/service/cloudbroker/image/schema.go

@@ -33,6 +33,8 @@ package image
 
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
 )
 
 func dataSourceImageListStacksSchemaMake() map[string]*schema.Schema {
@@ -42,6 +44,11 @@ func dataSourceImageListStacksSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "image id",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -385,6 +392,11 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "find by bootable True or False",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -406,18 +418,6 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "unc path",
 					},
-					"ckey": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"meta": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-						Description: "meta",
-					},
 					"account_id": {
 						Type:        schema.TypeInt,
 						Computed:    true,
@@ -474,6 +474,10 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"cd_presented_to": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"deleted_time": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -550,6 +554,10 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Name of the rescue disk",
 					},
+					"network_interface_naming": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"password": {
 						Type:        schema.TypeString,
 						Computed:    true,
@@ -668,18 +676,6 @@ func dataSourceImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "unc path",
 		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "meta",
-		},
 		"account_id": {
 			Type:        schema.TypeInt,
 			Computed:    true,
@@ -736,6 +732,10 @@ func dataSourceImageSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"cd_presented_to": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"deleted_time": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -807,6 +807,10 @@ func dataSourceImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Name of the rescue disk",
 		},
+		"network_interface_naming": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"password": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1173,9 +1177,15 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 		},
 		"url": {
 			Type:        schema.TypeString,
-			Required:    true,
+			Optional:    true,
+			Computed:    true,
 			Description: "URL where to download media from",
 		},
+		"file_path": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "path to image file",
+		},
 		"gid": {
 			Type:        schema.TypeInt,
 			Required:    true,
@@ -1193,7 +1203,8 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 		},
 		"drivers": {
 			Type:     schema.TypeList,
-			Required: true,
+			Optional: true,
+			Computed: true,
 			Elem: &schema.Schema{
 				Type: schema.TypeString,
 			},
@@ -1205,6 +1216,13 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "Does this machine supports hot resize",
 		},
+		"network_interface_naming": {
+			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",
+		},
 		"username": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -1299,23 +1317,18 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Optional: true,
 		},
+		"accounts": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"unc_path": {
 			Type:        schema.TypeString,
 			Computed:    true,
 			Description: "unc path",
 		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "meta",
-		},
 		"acl": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -1350,6 +1363,10 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"cd_presented_to": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"image_id": {
 			Type:        schema.TypeInt,
 			Computed:    true,
@@ -1716,3 +1733,565 @@ func resourceVirtualImageSchemaMake() map[string]*schema.Schema {
 		},
 	}
 }
+
+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",
+		},
+		"image_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",
+		},
+		"bootable": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Computed:    true,
+			Description: "Does this image boot OS",
+		},
+		"enabled": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
+		"computeci_id": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Computed: true,
+		},
+		"enabled_stacks": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"shared_with": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"reason": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+		"accounts": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"network_interface_naming": {
+			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",
+		},
+
+		"image_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"unc_path": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"acl": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"explicit": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"right": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true},
+					"user_group_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"architecture": {
+			Type:     schema.TypeString,
+			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,
+			},
+		},
+		"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,
+		},
+		"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,
+			},
+		},
+		"reference_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rescuecd": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"size": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"url": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"version": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+}
+
+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",
+		},
+		"image_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:  "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",
+		},
+		"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\" ]",
+		},
+		"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",
+		},
+		"bootable": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Computed:    true,
+			Description: "Does this image boot OS",
+		},
+		"enabled": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
+		"computeci_id": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Computed: true,
+		},
+		"enabled_stacks": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"shared_with": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"reason": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+		"accounts": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"network_interface_naming": {
+			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",
+		},
+
+		"image_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"unc_path": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"acl": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"explicit": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"right": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true},
+					"user_group_id": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"cd_presented_to": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"desc": {
+			Type:     schema.TypeString,
+			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,
+		},
+		"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,
+			},
+		},
+		"reference_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_id": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"res_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rescuecd": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"size": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"url": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"version": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+}

internal/service/cloudbroker/image/utility_image_list.go

@@ -1,98 +1,101 @@
-/*
-Copyright (c) 2019-2023 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 image
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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 sepId, ok := d.GetOk("sep_id"); ok {
-		req.SepID = uint64(sepId.(int))
-	}
-	if byId, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(byId.(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 typeImage, ok := d.GetOk("type_image"); ok {
-		req.TypeImage = typeImage.(string)
-	}
-	if imageSize, ok := d.GetOk("image_size"); ok {
-		req.ImageSize = uint64(imageSize.(int))
-	}
-	if sepName, ok := d.GetOk("sep_name"); ok {
-		req.SEPName = sepName.(string)
-	}
-	if pool, ok := d.GetOk("pool"); ok {
-		req.Pool = pool.(string)
-	}
-	if public, ok := d.GetOk("public"); ok {
-		req.Public = public.(bool)
-	}
-	if hotResize, ok := d.GetOk("hot_resize"); ok {
-		req.HotResize = hotResize.(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.CloudBroker().Image().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return imageList, nil
-}
+/*
+Copyright (c) 2019-2023 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 image
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/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 sepId, ok := d.GetOk("sep_id"); ok {
+		req.SepID = uint64(sepId.(int))
+	}
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(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 typeImage, ok := d.GetOk("type_image"); ok {
+		req.TypeImage = typeImage.(string)
+	}
+	if imageSize, ok := d.GetOk("image_size"); ok {
+		req.ImageSize = uint64(imageSize.(int))
+	}
+	if sepName, ok := d.GetOk("sep_name"); ok {
+		req.SEPName = sepName.(string)
+	}
+	if pool, ok := d.GetOk("pool"); ok {
+		req.Pool = pool.(string)
+	}
+	if public, ok := d.GetOk("public"); ok {
+		req.Public = public.(bool)
+	}
+	if hotResize, ok := d.GetOk("hot_resize"); ok {
+		req.HotResize = hotResize.(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.CloudBroker().Image().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return imageList, nil
+}

internal/service/cloudbroker/image/utility_image_list_stacks.go

@@ -1,73 +1,76 @@
-/*
-Copyright (c) 2019-2023 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 image
-
-import (
-	"context"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityImageListStacksCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*image.ListStacks, error) {
-	c := m.(*controller.ControllerCfg)
-	req := image.ListStacksRequest{
-		ImageID: uint64(d.Get("image_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 status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-	if typeImage, ok := d.GetOk("type_image"); ok {
-		req.Type = typeImage.(string)
-	}
-
-	log.Debugf("utilityImageListStacksCheckPresence: load image list")
-	imageListStacks, err := c.CloudBroker().Image().ListStacks(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return imageListStacks, nil
-}
+/*
+Copyright (c) 2019-2023 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 image
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityImageListStacksCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*image.ListStacks, error) {
+	c := m.(*controller.ControllerCfg)
+	req := image.ListStacksRequest{
+		ImageID: uint64(d.Get("image_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 status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if typeImage, ok := d.GetOk("type_image"); ok {
+		req.Type = typeImage.(string)
+	}
+
+	log.Debugf("utilityImageListStacksCheckPresence: load image list")
+	imageListStacks, err := c.CloudBroker().Image().ListStacks(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return imageListStacks, nil
+}

internal/service/cloudbroker/image/utility_resource_create.go

@@ -40,10 +40,10 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/ic"
 )
 
-func SyncCreateRequest(ctx context.Context, d *schema.ResourceData, m interface{}) (image.SyncCreateRequest, error) {
+func SyncCreateRequest(ctx context.Context, d *schema.ResourceData, m interface{}, url string) (image.SyncCreateRequest, error) {
 	req := image.SyncCreateRequest{
 		Name:      d.Get("name").(string),
-		URL:       d.Get("url").(string),
+		URL:       url,
 		BootType:  d.Get("boot_type").(string),
 		ImageType: d.Get("image_type").(string),
 	}
@@ -56,11 +56,13 @@ func SyncCreateRequest(ctx context.Context, d *schema.ResourceData, m interface{
 
 	req.GID = uint64(d.Get("gid").(int))
 
-	drivers := []string{}
-	for _, driver := range d.Get("drivers").([]interface{}) {
-		drivers = append(drivers, driver.(string))
+	if _, ok := d.GetOk("drivers"); ok {
+		drivers := []string{}
+		for _, driver := range d.Get("drivers").([]interface{}) {
+			drivers = append(drivers, driver.(string))
+		}
+		req.Drivers = drivers
 	}
-	req.Drivers = drivers
 
 	if hotresize, ok := d.GetOk("hot_resize"); ok {
 		req.HotResize = hotresize.(bool)
@@ -92,13 +94,16 @@ func SyncCreateRequest(ctx context.Context, d *schema.ResourceData, m interface{
 	if bootable, ok := d.GetOk("bootable"); ok {
 		req.Bootable = bootable.(bool)
 	}
+	if networkInterfaceNaming, ok := d.GetOk("network_interface_naming"); ok {
+		req.NetworkInterfaceNaming = networkInterfaceNaming.(string)
+	}
 	return req, nil
 }
 
-func CreateRequest(ctx context.Context, d *schema.ResourceData, m interface{}) (image.CreateRequest, error) {
+func CreateRequest(ctx context.Context, d *schema.ResourceData, m interface{}, url string) (image.CreateRequest, error) {
 	req := image.CreateRequest{
 		Name:      d.Get("name").(string),
-		URL:       d.Get("url").(string),
+		URL:       url,
 		BootType:  d.Get("boot_type").(string),
 		ImageType: d.Get("image_type").(string),
 	}
@@ -111,11 +116,13 @@ func CreateRequest(ctx context.Context, d *schema.ResourceData, m interface{}) (
 
 	req.GID = uint64(d.Get("gid").(int))
 
-	drivers := []string{}
-	for _, driver := range d.Get("drivers").([]interface{}) {
-		drivers = append(drivers, driver.(string))
+	if _, ok := d.GetOk("drivers"); ok {
+		drivers := []string{}
+		for _, driver := range d.Get("drivers").([]interface{}) {
+			drivers = append(drivers, driver.(string))
+		}
+		req.Drivers = drivers
 	}
-	req.Drivers = drivers
 
 	if hotresize, ok := d.GetOk("hot_resize"); ok {
 		req.HotResize = hotresize.(bool)
@@ -147,5 +154,8 @@ func CreateRequest(ctx context.Context, d *schema.ResourceData, m interface{}) (
 	if bootable, ok := d.GetOk("bootable"); ok {
 		req.Bootable = bootable.(bool)
 	}
+	if networkInterfaceNaming, ok := d.GetOk("network_interface_naming"); ok {
+		req.NetworkInterfaceNaming = networkInterfaceNaming.(string)
+	}
 	return req, nil
 }

internal/service/cloudbroker/k8ci/schema.go

@@ -158,6 +158,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,
@@ -283,6 +288,11 @@ func dataSourceK8CIListDeletedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by network plugin",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudbroker/k8ci/utility_k8ci_list.go

@@ -68,6 +68,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/cloudbroker/k8ci/utility_k8ci_list_deleted.go

@@ -62,6 +62,9 @@ func utilityK8CIListDeletedCheckPresence(ctx context.Context, d *schema.Resource
 	if network_plugin, ok := d.GetOk("network_plugin"); ok {
 		req.NetworkPlugins = network_plugin.(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/cloudbroker/k8s/resource_k8s_cp.go

@@ -166,6 +166,23 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		createReq.Description = desc.(string)
 	}
 
+	if lbSysctlParams, ok := d.GetOk("lb_sysctl_params"); ok {
+		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
+	}
+
 	resp, err := c.CloudBroker().K8S().Create(ctx, createReq)
 	if err != nil {
 		return diag.FromErr(err)
@@ -188,7 +205,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
 		}
 
@@ -387,6 +408,13 @@ func resourceK8sCPUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
+	if d.HasChange("lb_sysctl_params") && d.Get("with_lb").(bool) {
+		err := handleUpdateLbSysctlParams(ctx, d, c, k8sData)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return nil
 }
 
@@ -399,7 +427,9 @@ func resourceK8sCPDelete(ctx context.Context, d *schema.ResourceData, m interfac
 	}
 
 	c := m.(*controller.ControllerCfg)
-	req := k8s.DeleteRequest{K8SID: k8sData.ID}
+	req := k8s.DeleteRequest{
+		K8SID:       k8sData.ID,
+	}
 
 	if val, ok := d.GetOk("permanently"); ok {
 		req.Permanently = val.(bool)
@@ -553,3 +583,28 @@ func handleStart(ctx context.Context, c *controller.ControllerCfg, start bool, k
 	}
 	return nil
 }
+
+func handleUpdateLbSysctlParams(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg, k8sData *k8s.RecordK8S) error {
+
+	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:         k8sData.LBID,
+		SysctlParams: res,
+	}
+
+	_, err := c.CloudBroker().LB().UpdateSysctlParams(ctx, req)
+	return err
+}

internal/service/cloudbroker/k8s/resource_k8s_wg.go

@@ -115,7 +115,12 @@ func resourceK8sWgCreate(ctx context.Context, d *schema.ResourceData, m interfac
 			if task.Error != "" {
 				return diag.FromErr(fmt.Errorf("cannot create k8sWg instance: %v", task.Error))
 			}
-			d.SetId(fmt.Sprintf("%d#%d", d.Get("k8s_id").(int), int(task.Result)))
+
+			wgId, err := task.Result.ID()
+			if err != nil {
+				return diag.FromErr(err)
+			}
+			d.SetId(fmt.Sprintf("%d#%d", d.Get("k8s_id").(int), wgId))
 			break
 		}
 

internal/service/cloudbroker/k8s/schema.go

@@ -140,6 +140,11 @@ func dataSourceK8sListDeletedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by Tech Status",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -228,7 +233,7 @@ func dataSourceK8sListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
-					"name": {
+					"k8s_name": {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
@@ -447,6 +452,11 @@ func dataSourceK8sListSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Include deleted k8s in result",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -1337,8 +1347,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 or 3 or 5",
 		},
 		"cpu": {
 			Type:        schema.TypeInt,
@@ -1351,8 +1361,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.",
 		},
@@ -1429,6 +1439,17 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "insert ssl certificate in x509 pem format",
 		},
+		"lb_sysctl_params": {
+			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,
+				},
+			},
+		},
 		"extnet_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -1743,12 +1764,12 @@ func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 		"ram": {
 			Type:     schema.TypeInt,
 			Optional: true,
-			Default:  1024,
+			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: "Worker node RAM in MB.",
+			Description: "Node RAM in MB.",
 		},
 		"disk": {
 			Type:        schema.TypeInt,

internal/service/cloudbroker/k8s/utility_k8s_list.go

@@ -70,6 +70,9 @@ func utilityK8sListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 	if includeDeleted, ok := d.GetOk("include_deleted"); 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/cloudbroker/k8s/utility_k8s_list_deleted.go

@@ -64,6 +64,9 @@ func utilityK8sListDeletedCheckPresence(ctx context.Context, d *schema.ResourceD
 	if tech_status, ok := d.GetOk("tech_status"); ok {
 		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/cloudbroker/kvmvm/data_source_compute.go

@@ -33,7 +33,6 @@ package kvmvm
 
 import (
 	"context"
-	"strconv"
 	// "net/url"
 
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
@@ -50,8 +49,10 @@ func dataSourceComputeRead(ctx context.Context, d *schema.ResourceData, m interf
 		return diag.FromErr(err)
 	}
 
-	d.SetId(strconv.Itoa(int(compFacts.ID)))
-	flattenDataCompute(d, compFacts)
+	if err = flattenDataCompute(d, compFacts); err != nil {
+		return diag.FromErr(err)
+	}
+
 	return nil
 }
 

internal/service/cloudbroker/kvmvm/flattens.go

@@ -1,8 +1,8 @@
 package kvmvm
 
 import (
-	"context"
 	"encoding/json"
+	"fmt"
 	"sort"
 	"strconv"
 
@@ -12,7 +12,7 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 )
 
-func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec *compute.RecordCompute) error {
+func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute) error {
 	log.Debugf("flattenCompute: ID %d, RG ID %d", computeRec.ID, computeRec.RGID)
 
 	customFields, _ := json.Marshal(computeRec.CustomFields)
@@ -49,7 +49,7 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec *com
 	d.Set("deleted_time", computeRec.DeletedTime)
 	d.Set("description", computeRec.Description)
 	d.Set("devices", string(devices))
-	err := d.Set("disks", flattenComputeDisks(ctx, d, computeRec.Disks, d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID))
+	err := d.Set("disks", flattenComputeDisks(computeRec.Disks, d.Get("disks").([]interface{}), d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID))
 	if err != nil {
 		return err
 	}
@@ -58,18 +58,26 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec *com
 	d.Set("guid", computeRec.GUID)
 	d.Set("compute_id", computeRec.ID)
 	d.Set("image_id", computeRec.ImageID)
+	d.Set("image_name", computeRec.ImageName)
 	d.Set("interfaces", flattenInterfaces(computeRec.Interfaces))
 	d.Set("lock_status", computeRec.LockStatus)
 	d.Set("manager_id", computeRec.ManagerID)
 	d.Set("manager_type", computeRec.ManagerType)
 	d.Set("migrationjob", computeRec.MigrationJob)
 	d.Set("milestones", computeRec.Milestones)
+	d.Set("natable_vins_id", computeRec.NatableVINSID)
+	d.Set("natable_vins_ip", computeRec.NatableVINSIP)
+	d.Set("natable_vins_name", computeRec.NatableVINSName)
+	d.Set("natable_vins_network", computeRec.NatableVINSNetwork)
+	d.Set("natable_vins_network_name", computeRec.NatableVINSNetworkName)
 	d.Set("need_reboot", computeRec.NeedReboot)
+	d.Set("numa_node_id", computeRec.NumaNodeId)
 	d.Set("os_users", flattenOSUsers(computeRec.OSUsers))
 	d.Set("pinned", computeRec.Pinned)
 	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_name", computeRec.RGName)
 	d.Set("snap_sets", flattenSnapSets(computeRec.SnapSets))
 	d.Set("stack_id", computeRec.StackID)
@@ -85,7 +93,7 @@ func flattenCompute(ctx context.Context, d *schema.ResourceData, computeRec *com
 	d.Set("user_managed", computeRec.UserManaged)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
-
+	d.Set("virtual_image_name", computeRec.VirtualImageName)
 	return nil
 }
 
@@ -140,6 +148,7 @@ func flattenInterfaces(ifaces compute.ListInterfaces) []map[string]interface{} {
 			"conn_id":       iface.ConnID,
 			"conn_type":     iface.ConnType,
 			"def_gw":        iface.DefGW,
+			"enabled":       iface.Enabled,
 			"flip_group_id": iface.FLIPGroupID,
 			"guid":          iface.GUID,
 			"ip_address":    iface.IPAddress,
@@ -149,6 +158,7 @@ func flattenInterfaces(ifaces compute.ListInterfaces) []map[string]interface{} {
 			"net_id":        iface.NetID,
 			"netmask":       iface.NetMask,
 			"net_type":      iface.NetType,
+			"node_id":       iface.NodeID,
 			"pci_slot":      iface.PCISlot,
 			"qos":           flattenQOS(iface.QOS),
 			"target":        iface.Target,
@@ -171,20 +181,30 @@ func flattenQOS(qos compute.QOS) []map[string]interface{} {
 	}
 }
 
-func flattenComputeDisks(ctx context.Context, d *schema.ResourceData, disksList compute.ListDisks, extraDisks []interface{}, bootDiskId uint64) []map[string]interface{} {
+func flattenComputeDisks(disksList compute.ListDisks, 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)
+		nodeIds := disksBlocks[indexDataDisks].(map[string]interface{})["node_ids"].(*schema.Set)
 
 		temp := map[string]interface{}{
 			"disk_name":   disk.Name,
+			"node_ids":    nodeIds,
 			"size":        disk.SizeMax,
 			"sep_id":      disk.SEPID,
 			"disk_type":   disk.Type,
@@ -195,31 +215,15 @@ func flattenComputeDisks(ctx context.Context, d *schema.ResourceData, disksList
 			"shareable":   disk.Shareable,
 			"size_used":   disk.SizeUsed,
 			"size_max":    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 findInExtraDisks(diskId uint, extraDisks []interface{}) bool {
 	for _, ExtraDisk := range extraDisks {
 		if diskId == uint(ExtraDisk.(int)) {
@@ -262,7 +266,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"arch":                computeItem.Arch,
 			"cd_image_id":         computeItem.CdImageId,
 			"boot_order":          computeItem.BootOrder,
-			"boot_disk_size":      computeItem.BootDiskSize,
+			"bootdisk_size":       computeItem.BootDiskSize,
 			"clone_reference":     computeItem.CloneReference,
 			"clones":              computeItem.Clones,
 			"computeci_id":        computeItem.ComputeCIID,
@@ -278,7 +282,9 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"driver":              computeItem.Driver,
 			"gid":                 computeItem.GID,
 			"guid":                computeItem.GUID,
+			"hp_backed":           computeItem.HPBacked,
 			"compute_id":          computeItem.ID,
+			"cpu_pin":             computeItem.CPUPin,
 			"image_id":            computeItem.ImageID,
 			"interfaces":          flattenInterfaces(computeItem.Interfaces),
 			"lock_status":         computeItem.LockStatus,
@@ -288,12 +294,15 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"milestones":          computeItem.Milestones,
 			"name":                computeItem.Name,
 			"need_reboot":         computeItem.NeedReboot,
+			"numa_affinity":       computeItem.NumaAffinity,
+			"numa_node_id":        computeItem.NumaNodeId,
 			"os_users":            flattenOSUsers(computeItem.OSUsers),
 			"pinned":              computeItem.Pinned,
 			"ram":                 computeItem.RAM,
 			"reference_id":        computeItem.ReferenceID,
 			"registered":          computeItem.Registered,
 			"res_name":            computeItem.ResName,
+			"reserved_node_cpus":  computeItem.ReservedNodeCpus,
 			"rg_id":               computeItem.RGID,
 			"rg_name":             computeItem.RGName,
 			"snap_sets":           flattenSnapSets(computeItem.SnapSets),
@@ -503,23 +512,32 @@ func flattenPCIDevice(deviceList []compute.ItemPCIDevice) []map[string]interface
 	return res
 }
 
-func flattenVGPU(m []interface{}) []string {
-	var 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 flattenNodes(m []interface{}) []string {
@@ -553,6 +571,8 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	customFields, _ := json.Marshal(compFacts.CustomFields)
 	devices, _ := json.Marshal(compFacts.Devices)
 	userData, _ := json.Marshal(compFacts.Userdata)
+	// general fields setting
+	d.SetId(fmt.Sprintf("%d", compFacts.ID))
 	d.Set("account_id", compFacts.AccountID)
 	d.Set("account_name", compFacts.AccountName)
 	d.Set("acl", flattenListACLInterface(compFacts.ACL))
@@ -562,11 +582,11 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("anti_affinity_rules", flattenAffinityRules(compFacts.AntiAffinityRules))
 	d.Set("arch", compFacts.Arch)
 	d.Set("boot_order", compFacts.BootOrder)
-	d.Set("boot_disk_size", compFacts.BootDiskSize)
 	d.Set("cd_image_id", compFacts.CdImageId)
 	d.Set("clone_reference", compFacts.CloneReference)
 	d.Set("clones", compFacts.Clones)
 	d.Set("computeci_id", compFacts.ComputeCIID)
+	d.Set("cpu_pin", compFacts.CPUPin)
 	d.Set("cpus", compFacts.CPUs)
 	d.Set("created_by", compFacts.CreatedBy)
 	d.Set("created_time", compFacts.CreatedTime)
@@ -579,7 +599,9 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("driver", compFacts.Driver)
 	d.Set("gid", compFacts.GID)
 	d.Set("guid", compFacts.GUID)
+	d.Set("hp_backed", compFacts.HPBacked)
 	d.Set("image_id", compFacts.ImageID)
+	d.Set("image_name", compFacts.ImageName)
 	d.Set("interfaces", flattenInterfaces(compFacts.Interfaces))
 	d.Set("lock_status", compFacts.LockStatus)
 	d.Set("manager_id", compFacts.ManagerID)
@@ -587,13 +609,21 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("migrationjob", compFacts.MigrationJob)
 	d.Set("milestones", compFacts.Milestones)
 	d.Set("name", compFacts.Name)
+	d.Set("natable_vins_id", compFacts.NatableVINSID)
+	d.Set("natable_vins_ip", compFacts.NatableVINSIP)
+	d.Set("natable_vins_name", compFacts.NatableVINSName)
+	d.Set("natable_vins_network", compFacts.NatableVINSNetwork)
+	d.Set("natable_vins_network_name", compFacts.NatableVINSNetworkName)
 	d.Set("need_reboot", compFacts.NeedReboot)
+	d.Set("numa_affinity", compFacts.NumaAffinity)
+	d.Set("numa_node_id", compFacts.NumaNodeId)
 	d.Set("os_users", flattenOSUsers(compFacts.OSUsers))
 	d.Set("pinned", compFacts.Pinned)
 	d.Set("ram", compFacts.RAM)
 	d.Set("reference_id", compFacts.ReferenceID)
 	d.Set("registered", compFacts.Registered)
 	d.Set("res_name", compFacts.ResName)
+	d.Set("reserved_node_cpus", compFacts.ReservedNodeCpus)
 	d.Set("rg_id", compFacts.RGID)
 	d.Set("rg_name", compFacts.RGName)
 	d.Set("snap_sets", flattenSnapSets(compFacts.SnapSets))
@@ -610,6 +640,15 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("user_managed", compFacts.UserManaged)
 	d.Set("vgpus", compFacts.VGPUs)
 	d.Set("virtual_image_id", compFacts.VirtualImageID)
+	d.Set("virtual_image_name", compFacts.VirtualImageName)
+	//extra fields setting
+	bootDisk := findBootDisk(compFacts.Disks)
+	if bootDisk != nil {
+		d.Set("boot_disk_size", bootDisk.SizeMax)
+		d.Set("boot_disk_id", bootDisk.ID) // we may need boot disk ID in resize operations
+		d.Set("sep_id", bootDisk.SEPID)
+		d.Set("pool", bootDisk.Pool)
+	}
 
 	return nil
 }
@@ -669,6 +708,7 @@ func flattenDisk(diskList compute.ListDisks) []map[string]interface{} {
 			"purge_attempts":        disk.PurgeAttempts,
 			"present_to":            disk.PresentTo,
 			"purge_time":            disk.PurgeTime,
+			"replication":           flattenDiskReplication(disk.Replication),
 			"reality_device_number": disk.RealityDeviceNumber,
 			"reference_id":          disk.ReferenceID,
 			"res_id":                disk.ResID,
@@ -689,6 +729,20 @@ func flattenDisk(diskList compute.ListDisks) []map[string]interface{} {
 	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 flattenIOTune(iot compute.IOTune) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{

internal/service/cloudbroker/kvmvm/resource_check_input_values.go

@@ -2,6 +2,7 @@ package kvmvm
 
 import (
 	"context"
+	"errors"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -25,12 +26,18 @@ func checkParamsExistence(ctx context.Context, d *schema.ResourceData, c *contro
 		errs = append(errs, netErrs...)
 	}
 
+	if disks, ok := d.GetOk("disks"); ok {
+		if err := ic.IsMoreThanOneDisksTypeB(ctx, disks); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
 	return dc.ErrorsToDiagnostics(errs)
 }
 
 func existNetworks(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) []error {
 	var errs []error
-	var vinsIds, extNetIds []uint64
+	var vinsIds, extNetIds, vfpoolIds []uint64
 
 	networksIface, ok := d.GetOk("network")
 	if !ok {
@@ -46,6 +53,11 @@ func existNetworks(ctx context.Context, d *schema.ResourceData, c *controller.Co
 			vinsIds = append(vinsIds, uint64(network["net_id"].(int)))
 		case "EXTNET":
 			extNetIds = append(extNetIds, uint64(network["net_id"].(int)))
+		case "VFNIC":
+			if d.Get("driver").(string) == "KVM_PPC" {
+				errs = append(errs, errors.New("'VFNIC' net_type is not allowed for driver 'KVM_PPC'"))
+			}
+			vfpoolIds = append(vfpoolIds, uint64(network["net_id"].(int)))
 		default:
 			continue
 		}
@@ -59,5 +71,9 @@ func existNetworks(ctx context.Context, d *schema.ResourceData, c *controller.Co
 		errs = append(errs, extNetErrs...)
 	}
 
+	if vfpoolErrs := ic.ExistVFPools(ctx, vfpoolIds, c); vfpoolErrs != nil {
+		errs = append(errs, vfpoolErrs...)
+	}
+
 	return errs
 }

internal/service/cloudbroker/kvmvm/resource_compute.go

@@ -49,9 +49,6 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
 )
 
-// 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)
@@ -114,6 +111,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			interfacesPPC := make([]kvmppc.Interface, 0)
 			for _, elem := range ns {
 				netInterfaceVal := elem.(map[string]interface{})
+
 				reqInterface := kvmx86.Interface{
 					NetType: netInterfaceVal["net_type"].(string),
 					NetID:   uint64(netInterfaceVal["net_id"].(int)),
@@ -147,6 +145,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
+	}
+
 	if cloudInit, ok := d.GetOk("cloud_init"); ok {
 		userdata := cloudInit.(string)
 		if userdata != "" && userdata != "applied" {
@@ -177,7 +226,13 @@ 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))
+
+		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)
+		}
 
 		createReqX86.Driver = driver
 
@@ -191,6 +246,12 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			createReqX86.CustomField = 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.CloudBroker().KVMX86().Create(ctx, createReqX86)
 		if err != nil {
@@ -260,6 +321,9 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		} else if ok && !start.(bool) {
 			req := compute.StopRequest{ComputeID: computeId}
+			if depresent, ok := d.Get("depresent").(bool); ok {
+				req.Depresent = depresent
+			}
 			log.Debugf("resourceComputeCreate: stoping Compute ID %d after completing its resource configuration", computeId)
 			if _, err := c.CloudBroker().Compute().Stop(ctx, req); err != nil {
 				warnings.Add(err)
@@ -280,45 +344,6 @@ 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 uint64(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.CloudBroker().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 ars, ok := d.GetOk("affinity_rules"); ok {
 			log.Debugf("resourceComputeCreate: Create affinity rules on ComputeID: %d", computeId)
 			addedAR := ars.([]interface{})
@@ -393,9 +418,11 @@ 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 int64(pfwItem["public_port_end"].(int)) != 0 {
 						req.PublicPortEnd = int64(pfwItem["public_port_end"].(int))
 					}
@@ -494,6 +521,13 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				warnings.Add(err)
 			}
 		}
+
+		if _, ok := d.GetOk("disks"); ok {
+			err := utilityComputeCreatePresentDisk(ctx, d, m)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
 	}
 
 	log.Debugf("resourceComputeCreate: new Compute ID %d, name %s creation sequence complete", computeId, d.Get("name").(string))
@@ -560,7 +594,7 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	d.SetId(strconv.FormatUint(computeRec.ID, 10))
 
-	if err = flattenCompute(ctx, d, computeRec); err != nil {
+	if err = flattenCompute(d, computeRec); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -645,7 +679,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") {
 		if err := utilityComputeUpdate(ctx, d, m); err != nil {
 			return diag.FromErr(err)
 		}

internal/service/cloudbroker/kvmvm/utility_compute.go

@@ -33,7 +33,9 @@ package kvmvm
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -98,6 +100,9 @@ func utilityComputeStarted(ctx context.Context, d *schema.ResourceData, m interf
 		if force, ok := d.Get("force_stop").(bool); ok {
 			req.Force = force
 		}
+		if depresent, ok := d.Get("depresent").(bool); ok {
+			req.Depresent = depresent
+		}
 		if _, err := c.CloudBroker().Compute().Stop(ctx, req); err != nil {
 			return err
 		}
@@ -193,20 +198,20 @@ func utilityComputeUpdateDisks(ctx context.Context, d *schema.ResourceData, m in
 	addedDisks := make([]interface{}, 0)
 	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)
-	}
+	presentNewDisks := make([]interface{}, 0)
+	presentOldDisks := make([]interface{}, 0)
 
 	oldDisks, newDisks := d.GetChange("disks")
 	oldConv := oldDisks.([]interface{})
 	newConv := newDisks.([]interface{})
 
 	for _, el := range oldConv {
+		changeNodes, newEl := isChangeNodesDisk(newConv, el)
+		if changeNodes {
+			presentNewDisks = append(presentNewDisks, newEl)
+			presentOldDisks = append(presentOldDisks, el)
+		}
+		// !isRenameDisk(newConv, el) && !isResizeDisk(newConv, el) are required in case two or more disks are being created and their disk_id is the same (=0)
 		if !isContainsDisk(newConv, el) && !isRenameDisk(newConv, el) && !isResizeDisk(newConv, el) {
 			flag := false
 			extraDisks := d.Get("extra_disks").(*schema.Set).List()
@@ -246,6 +251,10 @@ func utilityComputeUpdateDisks(ctx context.Context, d *schema.ResourceData, m in
 			Force:     false,
 		}
 
+		if depresent, ok := d.Get("depresent").(bool); ok {
+			stopReq.Depresent = depresent
+		}
+
 		_, err := c.CloudBroker().Compute().Stop(ctx, stopReq)
 		if err != nil {
 			return err
@@ -304,12 +313,30 @@ func utilityComputeUpdateDisks(ctx context.Context, d *schema.ResourceData, m in
 			if diskConv["image_id"].(int) != 0 {
 				req.ImageID = uint64(diskConv["image_id"].(int))
 			}
-			diskId, err := c.CloudBroker().Compute().DiskAdd(ctx, req)
+			diskID, err := c.CloudBroker().Compute().DiskAdd(ctx, req)
+			if err != nil {
+				return err
+			}
+			if nodeIDs, ok := diskConv["node_ids"]; ok {
+				presentIDs := nodeIDs.(*schema.Set).List()
+				if len(presentIDs) > 0 {
+					log.Debugf("resourceComputeUpdate: start presents new disk ID:%d to nodes", diskID)
+				}
+				for _, presentID := range presentIDs {
+					nodeID := uint64(presentID.(int))
+					req := disks.PresentRequest{
+						DiskID: diskID,
+						NodeID: nodeID,
+					}
+					_, err := c.CloudBroker().Disks().Present(ctx, req)
+					if err != nil {
+						return err
+					}
+				}
+			}
 			if err != nil {
 				return err
 			}
-
-			ctx = context.WithValue(ctx, DiskKey(strconv.Itoa(int(diskId))), diskConv["permanently"].(bool))
 		}
 	}
 
@@ -348,6 +375,43 @@ func utilityComputeUpdateDisks(ctx context.Context, d *schema.ResourceData, m in
 		}
 	}
 
+	for i := range presentNewDisks {
+		newDisk := presentNewDisks[i].(map[string]interface{})
+		oldDisk := presentOldDisks[i].(map[string]interface{})
+		newArr := newDisk["node_ids"]
+		oldArr := oldDisk["node_ids"]
+		diskID := uint64(newDisk["disk_id"].(int))
+		presentIDs := (newArr.(*schema.Set).Difference(oldArr.(*schema.Set))).List()
+		depresentIDs := (oldArr.(*schema.Set).Difference(newArr.(*schema.Set))).List()
+		for _, presentID := range presentIDs {
+			nodeID := uint64(presentID.(int))
+
+			req := disks.PresentRequest{
+				DiskID: diskID,
+				NodeID: nodeID,
+			}
+			log.Debugf("resourceComputeUpdate: start presents disk ID:%d from nodes %d", req.DiskID, req.NodeID)
+			_, err := c.CloudBroker().Disks().Present(ctx, req)
+			if err != nil {
+				return err
+			}
+		}
+
+		for _, depresentID := range depresentIDs {
+			nodeID := uint64(depresentID.(int))
+
+			req := disks.DepresentRequest{
+				DiskID: diskID,
+				NodeID: nodeID,
+			}
+			log.Debugf("resourceComputeUpdate: start depresents disk ID:%d from nodes %d", req.DiskID, req.NodeID)
+			_, err := c.CloudBroker().Disks().Depresent(ctx, req)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -398,6 +462,11 @@ func utilityComputeExtraDisksConfigure(ctx context.Context, d *schema.ResourceDa
 			ComputeID: computeId,
 			Force:     false,
 		}
+
+		if depresent, ok := d.Get("depresent").(bool); ok {
+			stopReq.Depresent = depresent
+		}
+
 		_, err := c.CloudBroker().Compute().Stop(ctx, stopReq)
 		if err != nil {
 			return err
@@ -481,7 +550,7 @@ func findBootDisk(disks compute.ListDisks) *compute.ItemDisk {
 			return &disk
 		}
 	}
-	return nil
+	return &compute.ItemDisk{}
 }
 
 func networkSubresIPAddreDiffSupperss(key, oldVal, newVal string, d *schema.ResourceData) bool {
@@ -560,8 +629,7 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 	needStart := false
 
 	if d.Get("network").(*schema.Set).Len() == 1 || old_set.(*schema.Set).Len() < 1 {
-		computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
-		if err := utilityComputeStop(ctx, computeId, m); err != nil {
+		if err := utilityComputeStop(ctx, d, m); err != nil {
 			apiErrCount++
 			lastSavedError = err
 		}
@@ -624,11 +692,47 @@ func utilityComputeUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	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 {
+		stopReq := compute.StopRequest{
+			ComputeID: computeId,
+			Force:     false,
+		}
+		if depresent, ok := d.Get("depresent").(bool); ok {
+			stopReq.Depresent = depresent
+		}
+		if _, err := c.CloudBroker().Compute().Stop(ctx, stopReq); err != nil {
+			return err
+		}
+	}
+
+	// perform update
 	if _, err := c.CloudBroker().Compute().Update(ctx, req); err != nil {
 		return err
 	}
 
+	// If used to be STARTED, we need to start it after update
+	if isStopRequired {
+		if _, err := c.CloudBroker().Compute().Start(ctx, compute.StartRequest{ComputeID: computeId}); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -865,11 +969,12 @@ func utilityComputeUpdatePFW(ctx context.Context, d *schema.ResourceData, m inte
 			req := compute.PFWDelRequest{
 				ComputeID:       computeId,
 				PublicPortStart: uint64(pfwItem["public_port_start"].(int)),
-				LocalBasePort:   uint64(pfwItem["local_port"].(int)),
 				Proto:           pfwItem["proto"].(string),
 				RuleID:          uint64(pfwItem["rule_id"].(int)),
 			}
-
+			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 {
@@ -894,10 +999,11 @@ func utilityComputeUpdatePFW(ctx context.Context, d *schema.ResourceData, m inte
 				ComputeID:       computeId,
 				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))
+			}
 			if pfwItem["reason"].(string) != "" {
 				req.Reason = pfwItem["reason"].(string)
 			}
@@ -1033,6 +1139,9 @@ func utilityComputeRollback(ctx context.Context, d *schema.ResourceData, m inter
 			ComputeID: computeId,
 			Force:     false,
 		}
+		if depresent, ok := d.Get("depresent").(bool); ok {
+			req.Depresent = depresent
+		}
 
 		_, err := c.CloudBroker().Compute().Stop(ctx, req)
 		if err != nil {
@@ -1194,6 +1303,9 @@ func utilityComputeUpdateImage(ctx context.Context, d *schema.ResourceData, m in
 		ComputeID: computeId,
 		Force:     false,
 	}
+	if depresent, ok := d.Get("depresent").(bool); ok {
+		stopReq.Depresent = depresent
+	}
 
 	_, err := c.CloudBroker().Compute().Stop(ctx, stopReq)
 	if err != nil {
@@ -1261,14 +1373,17 @@ func utilityComputeUpdateCustomFields(ctx context.Context, d *schema.ResourceDat
 	return nil
 }
 
-func utilityComputeStop(ctx context.Context, computeID uint64, m interface{}) error {
+func utilityComputeStop(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	c := m.(*controller.ControllerCfg)
 	req := compute.StopRequest{
-		ComputeID: computeID,
-		Force:     true,
+		Force: true,
+	}
+	req.ComputeID = uint64(d.Get("compute_id").(int))
+	if depresent, ok := d.Get("depresent").(bool); ok {
+		req.Depresent = depresent
 	}
 
-	log.Debugf("utilityComputeNetworksConfigure: stopping compute %d", computeID)
+	log.Debugf("utilityComputeNetworksConfigure: stopping compute %d", req.ComputeID)
 	_, err := c.CloudBroker().Compute().Stop(ctx, req)
 	if err != nil {
 		return err
@@ -1288,6 +1403,51 @@ func utilityComputeStart(ctx context.Context, computeID uint64, m interface{}) (
 	return 0, nil
 }
 
+func utilityComputeCreatePresentDisk(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+	var errs error
+	diskList := d.Get("disks")
+	presentArr := make([]interface{}, 0)
+	for _, elem := range diskList.([]interface{}) {
+		diskVal := elem.(map[string]interface{})
+		presentArr = append(presentArr, diskVal["node_ids"])
+	}
+
+	computeRec, err := utilityComputeCheckPresence(ctx, d, m)
+	bootDisk := findBootDisk(computeRec.Disks)
+	if err != nil {
+		errs = errors.Join(err)
+	}
+	computeDisksIDs := getComputeDiskIDs(computeRec.Disks, d.Get("disks").([]interface{}), d.Get("extra_disks").(*schema.Set).List(), bootDisk.ID)
+
+	for i, diskID := range computeDisksIDs {
+		if len(presentArr) <= i || presentArr[i] == nil {
+			continue
+		}
+		presentIDs := presentArr[i].(*schema.Set).List()
+
+		if len(presentIDs) > 0 {
+			log.Debugf("resourceComputeCreate: start presents disk ID:%d to nodes", diskID)
+		}
+
+		for _, presentID := range presentIDs {
+			nodeID := uint64(presentID.(int))
+
+			req := disks.PresentRequest{
+				DiskID: diskID.(uint64),
+				NodeID: nodeID,
+			}
+
+			_, err := c.CloudBroker().Disks().Present(ctx, req)
+			if err != nil {
+				errs = errors.Join(err)
+			}
+		}
+	}
+
+	return errs
+}
+
 func isResizeDisk(els []interface{}, el interface{}) bool {
 	for _, elOld := range els {
 		elOldConv := elOld.(map[string]interface{})
@@ -1323,6 +1483,26 @@ func isContainsDisk(els []interface{}, el interface{}) bool {
 	return false
 }
 
+// isChangeNodesDisk get slice of new disks values and current value disk,
+// if need change nodes on disk returns true and new disk value, else return false and nil
+func isChangeNodesDisk(els []interface{}, elOld interface{}) (bool, interface{}) {
+	for _, elNew := range els {
+		elNewConv := elNew.(map[string]interface{})
+		elOldConv := elOld.(map[string]interface{})
+		if elOldConv["disk_id"].(int) == elNewConv["disk_id"].(int) {
+			newArr := elNewConv["node_ids"]
+			oldArr := elOldConv["node_ids"]
+			presentID := (newArr.(*schema.Set).Difference(oldArr.(*schema.Set))).List()
+			depresentID := (oldArr.(*schema.Set).Difference(newArr.(*schema.Set))).List()
+			if len(presentID) > 0 || len(depresentID) > 0 {
+				return true, elNew
+			}
+			return false, nil
+		}
+	}
+	return false, nil
+}
+
 func isContainsAR(els []interface{}, el interface{}) bool {
 	for _, elOld := range els {
 		elOldConv := elOld.(map[string]interface{})
@@ -1337,3 +1517,25 @@ func isContainsAR(els []interface{}, el interface{}) bool {
 	}
 	return false
 }
+
+func getComputeDiskIDs(disksList compute.ListDisks, disksBlocks, extraDisks []interface{}, bootDiskId uint64) []interface{} {
+	res := make([]interface{}, 0)
+
+	if len(disksBlocks) == 0 {
+		return res
+	}
+
+	sort.Slice(disksList, func(i, j int) bool {
+		return disksList[i].ID < disksList[j].ID
+	})
+
+	for _, disk := range disksList {
+		if disk.ID == bootDiskId || findInExtraDisks(uint(disk.ID), extraDisks) { //skip main bootdisk and extraDisks
+			continue
+		}
+
+		res = append(res, disk.ID)
+	}
+
+	return res
+}

internal/service/cloudbroker/kvmvm/utility_compute_list.go

@@ -78,6 +78,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/cloudbroker/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/cloudbroker/kvmvm/utility_compute_pci_device_list.go

@@ -51,9 +51,15 @@ func utilityComputePCIDeviceListCheckPresence(ctx context.Context, d *schema.Res
 	if devId, ok := d.GetOk("device_id"); ok {
 		req.DevID = uint64(devId.(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)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudbroker/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/cloudbroker/lb/flattens.go

@@ -108,6 +108,8 @@ func flattenLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("gid", lb.GID)
 	d.Set("guid", lb.GUID)
 	d.Set("lb_id", lb.ID)
+	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)
@@ -117,6 +119,7 @@ func flattenLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("secondary_node", flattenNode(lb.SecondaryNode))
 	d.Set("status", lb.Status)
 	d.Set("tech_status", lb.TechStatus)
+	d.Set("user_managed", lb.UserManaged)
 	d.Set("vins_id", lb.VINSID)
 }
 
@@ -235,8 +238,11 @@ func flattenLBList(lbl *lb.ListLB) []map[string]interface{} {
 			"gid":             lb.GID,
 			"guid":            lb.GUID,
 			"lb_id":           lb.ID,
+			"manager_id":      lb.ManagerId,
+			"manager_type":    lb.ManagerType,
 			"milestones":      lb.Milestones,
 			"name":            lb.Name,
+			"part_k8s":        lb.PartK8s,
 			"primary_node":    flattenNode(lb.PrimaryNode),
 			"rg_id":           lb.RGID,
 			"rg_name":         lb.RGName,
@@ -245,6 +251,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,
 		}
 		res = append(res, temp)

internal/service/cloudbroker/lb/resource_lb.go

@@ -34,9 +34,10 @@ package lb
 
 import (
 	"context"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
 	"strconv"
 
+	"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"
 	log "github.com/sirupsen/logrus"
@@ -69,6 +70,22 @@ func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}
 	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.CloudBroker().LB().Create(ctx, req)
 	if err != nil {
@@ -286,6 +303,12 @@ func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}
 		}
 	}
 
+	if d.HasChange("sysctl_params") {
+		if err := resourceLbChangeSysctlParams(ctx, d, lbRec.ID, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("start") {
 		if err := resourceLbChangeStart(ctx, d, lbRec.ID, m); err != nil {
 			return diag.FromErr(err)
@@ -323,6 +346,31 @@ func resourceLbEnable(ctx context.Context, lbId uint64, m interface{}) error {
 	return err
 }
 
+func resourceLbChangeSysctlParams(ctx context.Context, d *schema.ResourceData, lbId uint64, m interface{}) error {
+	c := m.(*controller.ControllerCfg)
+
+	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:         lbId,
+		SysctlParams: res,
+	}
+	_, err := c.CloudBroker().LB().UpdateSysctlParams(ctx, req)
+	return err
+}
+
 func resourceLbDisable(ctx context.Context, lbId uint64, m interface{}) error {
 	c := m.(*controller.ControllerCfg)
 
@@ -429,6 +477,9 @@ func resourceLbChangeRestart(ctx context.Context, d *schema.ResourceData, lbId u
 		req := lb.RestartRequest{
 			LBID: lbId,
 		}
+		if safe, ok := d.GetOk("safe"); ok {
+			req.Safe = safe.(bool)
+		}
 
 		if _, err := c.CloudBroker().LB().Restart(ctx, req); err != nil {
 			return err

internal/service/cloudbroker/lb/schema.go

@@ -274,6 +274,14 @@ func dsLBSchemaMake() 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,
@@ -366,6 +374,10 @@ func dsLBSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"user_managed": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"vins_id": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -412,6 +424,11 @@ func dsLBListDeletedSchemaMake() map[string]*schema.Schema {
 			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,
@@ -663,6 +680,14 @@ func dsLBListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"manager_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"manager_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"lb_id": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -675,6 +700,10 @@ func dsLBListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"part_k8s": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"primary_node": {
 						Type:     schema.TypeList,
 						Computed: true,
@@ -763,6 +792,10 @@ func dsLBListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"user_managed": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"vins_id": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -824,6 +857,11 @@ func dsLBListSchemaMake() map[string]*schema.Schema {
 			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,
@@ -1075,6 +1113,14 @@ func dsLBListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"manager_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"manager_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"lb_id": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -1087,6 +1133,10 @@ func dsLBListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"part_k8s": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"primary_node": {
 						Type:     schema.TypeList,
 						Computed: true,
@@ -1175,6 +1225,10 @@ func dsLBListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"user_managed": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"vins_id": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -1222,7 +1276,6 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Computed: true,
 		},
-
 		"enable": {
 			Type:     schema.TypeBool,
 			Optional: true,
@@ -1231,6 +1284,11 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Optional: true,
 		},
+		"safe": {
+			Type:     schema.TypeBool,
+			Default:  true,
+			Optional: true,
+		},
 		"restore": {
 			Type:     schema.TypeBool,
 			Optional: true,
@@ -1243,7 +1301,17 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Optional: true,
 		},
-
+		"sysctl_params": {
+			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,
+				},
+			},
+		},
 		"ckey": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -1467,6 +1535,14 @@ func lbResourceSchemaMake() 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,
@@ -1551,6 +1627,10 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"user_managed": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 	}
 }
 

internal/service/cloudbroker/lb/utility_lb_list.go

@@ -82,6 +82,10 @@ func utilityLBListCheckPresence(ctx context.Context, d *schema.ResourceData, m i
 		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/cloudbroker/lb/utility_lb_list_deleted.go

@@ -74,6 +74,10 @@ func utilityLBListDeletedCheckPresence(ctx context.Context, d *schema.ResourceDa
 		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))
 	}

internal/service/cloudbroker/node/data_source_node.go

@@ -0,0 +1,70 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 node
+
+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 dataSourceNodeRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	nodeRec, err := utilityNodeCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
+	flattenNode(d, nodeRec)
+	d.SetId(strconv.Itoa(d.Get("node_id").(int)))
+
+	return nil
+}
+
+func DataSourceNode() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceNodeRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceNodeSchemaMake(),
+	}
+}

internal/service/cloudbroker/node/data_source_node_list.go

@@ -0,0 +1,72 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 node
+
+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 dataSourceNodeListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	nodeList, err := utilityNodeListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenNodeList(nodeList))
+	d.Set("entry_count", nodeList.EntryCount)
+
+	return nil
+}
+
+func DataSourceNodeList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceNodeListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceNodeListSchemaMake(),
+	}
+}

internal/service/cloudbroker/node/flattens.go

@@ -0,0 +1,239 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 node
+
+import (
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
+)
+
+func flattenNode(d *schema.ResourceData, item *node.RecordNode) {
+	log.Debugf("flattenNode: decoded node id %d", d.Get("node_id").(int))
+
+	d.Set("consumption", flattenConsumption(item.Consumption))
+	d.Set("cpu_info", flattenCpuInfo(item.CpuInfo))
+	d.Set("cpu_allocation_ratio", item.CPUAllocationRatio)
+	d.Set("gid", item.GID)
+	d.Set("ipaddr", item.IPAddr)
+	d.Set("isolated_cpus", flattenNodeItem(item.IsolatedCpus))
+	d.Set("name", item.Name)
+	d.Set("need_reboot", item.NeedReboot)
+	d.Set("nic_info", flattenNicInfo(item.NicInfo))
+	d.Set("numa_topology", flattenNumaTopology(item.NumaTopology))
+	d.Set("reserved_cpus", flattenNodeItem(item.ReservedCPUs))
+	d.Set("roles", item.Roles)
+	d.Set("sriov_enabled", item.SriovEnabled)
+	d.Set("stack_id", item.StackID)
+	d.Set("status", item.Status)
+	d.Set("version", item.Version)
+}
+
+func flattenConsumption(info node.ConsumptionInfo) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	tempRes := map[string]interface{}{
+		"hostname": info.Hostname,
+	}
+
+	tempConsumed := map[string]interface{}{
+		"ram":      info.Consumed.RAM,
+		"computes": info.Consumed.Computes,
+		"routers":  info.Consumed.Routers,
+		"vcpu":     info.Consumed.VCPU,
+	}
+	tempRes["consumed"] = []map[string]interface{}{
+		tempConsumed,
+	}
+
+	tempFree := map[string]interface{}{
+		"ram": info.Free.RAM,
+	}
+	tempRes["free"] = []map[string]interface{}{
+		tempFree,
+	}
+
+	tempReserved := map[string]interface{}{
+		"ram": info.Reserved.RAM,
+	}
+	tempRes["reserved"] = []map[string]interface{}{
+		tempReserved,
+	}
+
+	tempTotal := map[string]interface{}{
+		"ram": info.Total.RAM,
+	}
+	tempRes["total"] = []map[string]interface{}{
+		tempTotal,
+	}
+
+	res[0] = tempRes
+	return res
+}
+
+func flattenNodeList(nodes *node.ListNodes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(nodes.Data))
+	for _, item := range nodes.Data {
+		temp := map[string]interface{}{
+			"additional_pkgs": flattenNodeItem(item.AdditionalPkgs),
+			"cpu_info":        flattenCpuInfo(item.CpuInfo),
+			"description":     item.Description,
+			"gid":             item.GID,
+			"guid":            item.GUID,
+			"hostkey":         item.HostKey,
+			"node_id":         item.ID,
+			"ipaddr":          item.IPAddr,
+			"isolated_cpus":   flattenNodeItem(item.IsolatedCpus),
+			"lastcheck":       item.LastCheck,
+			"machine_guid":    item.MachineGUID,
+			"mainboard_sn":    item.MainboardSN,
+			"memory":          item.Memory,
+			"milestones":      item.Milestones,
+			"model":           item.Model,
+			"name":            item.Name,
+			"need_reboot":     item.NeedReboot,
+			"net_addr":        flattenNetAddr(item.NetAddr),
+			"network_mode":    item.NetworkMode,
+			"nic_info":        flattenNicInfo(item.NicInfo),
+			"node_uuid":       item.NodeUUID,
+			"numa_topology":   flattenNumaTopology(item.NumaTopology),
+			"peer_backup":     item.PeerBackup,
+			"peer_log":        item.PeerLog,
+			"peer_stats":      item.PeerStats,
+			"pgpus":           item.Pgpus,
+			"public_keys":     item.PublicKeys,
+			"release":         item.Release,
+			"reserved_cpus":   flattenNodeItem(item.ReservedCPUs),
+			"roles":           item.Roles,
+			"seps":            item.Seps,
+			"serial_num":      item.SerialNum,
+			"sriov_enabled":   item.SriovEnabled,
+			"stack_id":        item.StackID,
+			"status":          item.Status,
+			"tags":            item.Tags,
+			"type":            item.Type,
+			"version":         item.Version,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenNumaTopology(info node.NumaTopologyInfo) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	tempRes := map[string]interface{}{
+		"node_num": info.NodeNum,
+	}
+	resNodes := make([]map[string]interface{}, 0, len(info.Nodes))
+	for _, item := range info.Nodes {
+		memoryTemp := []map[string]interface{}{
+			{
+				"one_g": item.Memory.OneG,
+				"two_m": item.Memory.TwoM,
+				"total": item.Memory.Total,
+			},
+		}
+		temp := map[string]interface{}{
+			"cpu_list": item.CPUList,
+			"memory":   memoryTemp,
+		}
+		resNodes = append(resNodes, temp)
+	}
+	tempRes["nodes"] = resNodes
+	res[0] = tempRes
+	return res
+}
+
+func flattenNicInfo(infos node.ListNicInfo) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(infos))
+	for _, item := range infos {
+		temp := map[string]interface{}{
+			"driver":    item.Driver,
+			"max_vfs":   item.MaxVFS,
+			"numa_node": item.NumaNode,
+			"num_vfs":   item.NumVFS,
+			"os_name":   item.OSName,
+			"pci_slot":  item.PCISlot,
+			"vf_list":   flattenNodeItem(item.VFList),
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenNetAddr(adresses node.ListNetAddr) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(adresses))
+	for _, item := range adresses {
+		temp := map[string]interface{}{
+			"cidr":  item.CIDR,
+			"index": item.Index,
+			"ip":    item.IP,
+			"mac":   item.Mac,
+			"mtu":   item.MTU,
+			"name":  item.Name,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenCpuInfo(info node.CpuInfo) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	temp := map[string]interface{}{
+		"clock_speed": info.ClockSpeed,
+		"core_count":  info.CoreCount,
+		"phys_count":  info.PhysCount,
+	}
+	res[0] = temp
+	return res
+}
+
+func flattenNodeItem(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, "")
+		}
+	}
+	return output
+}

internal/service/cloudbroker/node/schema.go

@@ -0,0 +1,629 @@
+package node
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func dataSourceNodeSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"node_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "node id",
+		},
+		"consumption": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"consumed": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"ram": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"computes": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"routers": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"vcpu": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"free": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"ram": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"reserved": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"ram": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"total": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"ram": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"hostname": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"cpu_info": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"clock_speed": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"core_count": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"phys_count": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"cpu_allocation_ratio": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"ipaddr": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"isolated_cpus": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"need_reboot": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"nic_info": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"driver": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"max_vfs": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"numa_node": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"num_vfs": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"os_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"pci_slot": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+
+					"vf_list": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
+		"numa_topology": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"node_num": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"nodes": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"cpu_list": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Schema{
+										Type: schema.TypeInt,
+									},
+								},
+								"memory": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"one_g": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"two_m": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"total": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		"reserved_cpus": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"roles": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"sriov_enabled": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"stack_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"version": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+}
+
+func dataSourceNodeListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find node by id",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find node by name",
+		},
+		"version": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find node by version",
+		},
+		"release": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find node by release",
+		},
+		"sep_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find node by sepId",
+		},
+		"role": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find node by role",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find node by status",
+		},
+		"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{
+					"additional_pkgs": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"cpu_info": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"clock_speed": {
+									Type:     schema.TypeFloat,
+									Computed: true,
+								},
+								"core_count": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"phys_count": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"description": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"gid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"hostkey": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"node_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ipaddr": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"isolated_cpus": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"lastcheck": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"machine_guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"mainboard_sn": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"memory": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"milestones": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"model": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"need_reboot": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"net_addr": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"cidr": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Schema{
+										Type: schema.TypeString,
+									},
+								},
+								"index": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"ip": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Schema{
+										Type: schema.TypeString,
+									},
+								},
+								"mac": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"mtu": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"network_mode": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"nic_info": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"driver": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"max_vfs": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"numa_node": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"num_vfs": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"os_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"pci_slot": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+
+								"vf_list": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Schema{
+										Type: schema.TypeString,
+									},
+								},
+							},
+						},
+					},
+					"node_uuid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"numa_topology": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"node_num": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"nodes": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"cpu_list": {
+												Type:     schema.TypeList,
+												Computed: true,
+												Elem: &schema.Schema{
+													Type: schema.TypeInt,
+												},
+											},
+											"memory": {
+												Type:     schema.TypeList,
+												Computed: true,
+												Elem: &schema.Resource{
+													Schema: map[string]*schema.Schema{
+														"one_g": {
+															Type:     schema.TypeInt,
+															Computed: true,
+														},
+														"two_m": {
+															Type:     schema.TypeInt,
+															Computed: true,
+														},
+														"total": {
+															Type:     schema.TypeInt,
+															Computed: true,
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+					"peer_backup": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"peer_log": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"peer_stats": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"pgpus": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"public_keys": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"release": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reserved_cpus": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"roles": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"seps": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"serial_num": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"sriov_enabled": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"stack_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"tags": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"version": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "entry count",
+		},
+	}
+}

internal/service/cloudbroker/node/utility_node.go

@@ -0,0 +1,56 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 node
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityNodeCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*node.RecordNode, error) {
+	c := m.(*controller.ControllerCfg)
+	req := node.GetRequest{NID: uint64(d.Get("node_id").(int))}
+
+	log.Debugf("utilityNodeCheckPresence: load node")
+	nodeInfo, err := c.CloudBroker().Node().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return nodeInfo, nil
+}

internal/service/cloudbroker/node/utility_node_list.go

@@ -0,0 +1,87 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 node
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityNodeListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*node.ListNodes, error) {
+	c := m.(*controller.ControllerCfg)
+	req := node.ListRequest{}
+
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if version, ok := d.GetOk("version"); ok {
+		req.Version = version.(string)
+	}
+	if release, ok := d.GetOk("release"); ok {
+		req.Release = release.(string)
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.SepID = uint64(sepId.(int))
+	}
+	if role, ok := d.GetOk("role"); ok {
+		req.Role = role.(string)
+	}
+	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("utilityNodeListCheckPresence: load node list")
+	nodeList, err := c.CloudBroker().Node().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return nodeList, nil
+}

internal/service/cloudbroker/rg/flattens.go

@@ -14,6 +14,7 @@ func flattenResgroup(d *schema.ResourceData, rgData *rg.RecordRG) {
 	d.Set("account_id", rgData.AccountID)
 	d.Set("account_name", rgData.AccountName)
 	d.Set("acl", flattenRgAcl(rgData.ACL))
+	d.Set("compute_features", rgData.ComputeFeatures)
 	d.Set("cpu_allocation_parameter", rgData.CPUAllocationParameter)
 	d.Set("cpu_allocation_ratio", rgData.CPUAllocationRatio)
 	d.Set("created_by", rgData.CreatedBy)
@@ -387,6 +388,7 @@ func flattenRgList(rgl *rg.ListRG) []map[string]interface{} {
 			"account_id":               rg.AccountID,
 			"account_name":             rg.AccountName,
 			"acl":                      flattenRgAcl(rg.ACL),
+			"compute_features":         rg.ComputeFeatures,
 			"cpu_allocation_parameter": rg.CPUAllocationParameter,
 			"cpu_allocation_ratio":     rg.CPUAllocationRatio,
 			"created_by":               rg.CreatedBy,
@@ -430,6 +432,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,

internal/service/cloudbroker/rg/resource_rg.go

@@ -160,6 +160,15 @@ func resourceResgroupCreate(ctx context.Context, d *schema.ResourceData, m inter
 
 	w := dc.Warnings{}
 
+	// compute_features is not set up during create request and is updated after create on purpose:
+	// 1. to support configuration as final state in resource group,
+	// 2. not to support compute_features inheritance from account.
+	// other implementation may result in inconsistency between user configuration and state after rg creation.
+	// note that call for compute features updated required even if compute_features is null in configuration, in order not ot inherit from account.
+	if err := resourceRGChangeComputeFeatures(ctx, d, m); err != nil {
+		w.Add(err)
+	}
+
 	if _, ok := d.GetOk("access"); ok {
 		if errs := resourceRGAccessGrant(ctx, d, m); len(errs) != 0 {
 			for _, err := range errs {
@@ -482,6 +491,12 @@ func resourceResgroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		}
 	}
 
+	if d.HasChange("compute_features") {
+		if err := resourceRGChangeComputeFeatures(ctx, d, m); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceResgroupRead(ctx, d, m)
 }
 
@@ -606,7 +621,7 @@ func resourceRGSetCPUAllocationParameter(ctx context.Context, d *schema.Resource
 
 func resourceRGSetCPUAllocationRatio(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	cpuAllocationRatio := d.Get("cpu_allocation_ratio").(float64)
-	log.Debugf("resourceRGSetCPUAllocationRatio: cpuAllocationRatio %f for rg id %d", cpuAllocationRatio, uint64(d.Get("rg_id").(int)))
+	log.Debugf("resourceRGSetCPUAllocationRatio: cpuAllocationRatio %s for rg id %d", cpuAllocationRatio, uint64(d.Get("rg_id").(int)))
 
 	c := m.(*controller.ControllerCfg)
 
@@ -695,6 +710,32 @@ func resourceRGChangeEnable(ctx context.Context, d *schema.ResourceData, m inter
 	return nil
 }
 
+func resourceRGChangeComputeFeatures(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	rgId := uint64(d.Get("rg_id").(int))
+	compFeaturesInterface := d.Get("compute_features").(*schema.Set).List()
+
+	compFeatures := make([]string, 0, len(compFeaturesInterface))
+	for _, item := range compFeaturesInterface {
+		compFeatures = append(compFeatures, item.(string))
+	}
+
+	log.Debugf("resourceRGChangeComputeFeatures: compute_features %v for rg id %d", compFeatures, rgId)
+
+	c := m.(*controller.ControllerCfg)
+
+	req := rg.UpdateComputeFeaturesRequest{
+		RGID:            rgId,
+		ComputeFeatures: compFeatures,
+	}
+
+	_, err := c.CloudBroker().RG().UpdateComputeFeatures(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func ResourceResgroup() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,

internal/service/cloudbroker/rg/schema.go

@@ -55,6 +55,13 @@ func dataSourceRgSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"compute_features": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"cpu_allocation_parameter": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -841,6 +848,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,
@@ -1038,11 +1050,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,
@@ -1063,6 +1070,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,
@@ -1484,6 +1496,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,
@@ -1540,6 +1557,13 @@ func dataSourceRgListDeletedSchemaMake() map[string]*schema.Schema {
 							},
 						},
 					},
+					"compute_features": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
 					"cpu_allocation_parameter": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -1746,6 +1770,11 @@ func dataSourceRgListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Include deleted",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -1802,6 +1831,13 @@ func dataSourceRgListSchemaMake() map[string]*schema.Schema {
 							},
 						},
 					},
+					"compute_features": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
 					"cpu_allocation_parameter": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -1988,6 +2024,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,
@@ -2036,6 +2077,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,
@@ -2364,6 +2413,15 @@ func resourceRgSchemaMake() map[string]*schema.Schema {
 			Description: "flag to permanently delete resource group",
 		},
 
+		"compute_features": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Schema{
+				Type:         schema.TypeString,
+				ValidateFunc: validation.StringInSlice([]string{"hugepages", "numa", "cpupin", "vfnic"}, true),
+			},
+		},
+
 		"acl": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudbroker/rg/utility_rg_list.go

@@ -73,6 +73,10 @@ func utilityRgListCheckPresence(ctx context.Context, d *schema.ResourceData, m i
 		req.IncludeDeleted = includedeleted.(bool)
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
 	if size, ok := d.GetOk("size"); ok {
 		req.Size = uint64(size.(int))
 	}

internal/service/cloudbroker/rg/utility_rg_list_computes.go

@@ -78,6 +78,10 @@ func utilityRgListComputesCheckPresence(ctx context.Context, d *schema.ResourceD
 		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))
 	}

internal/service/cloudbroker/rg/utility_rg_list_deleted.go

@@ -72,6 +72,10 @@ func utilityRgListDeletedCheckPresence(ctx context.Context, d *schema.ResourceDa
 		req.LockStatus = lock_status.(string)
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
 	if size, ok := d.GetOk("size"); ok {
 		req.Size = uint64(size.(int))
 	}

internal/service/cloudbroker/rg/utility_rg_list_lb.go

@@ -54,10 +54,6 @@ func utilityRgListLbCheckPresence(ctx context.Context, d *schema.ResourceData, m
 		req.Name = name.(string)
 	}
 
-	if account_id, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(account_id.(int))
-	}
-
 	if tech_status, ok := d.GetOk("tech_status"); ok {
 		req.TechStatus = tech_status.(string)
 	}
@@ -74,6 +70,10 @@ func utilityRgListLbCheckPresence(ctx context.Context, d *schema.ResourceData, m
 		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))
 	}

internal/service/cloudbroker/rg/utility_rg_list_vins.go

@@ -62,6 +62,10 @@ func utilityRgListVinsCheckPresence(ctx context.Context, d *schema.ResourceData,
 		req.VINSID = uint64(vins_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))
 	}

internal/service/cloudbroker/sep/resource_sep.go

@@ -34,7 +34,6 @@ package sep
 
 import (
 	"context"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -43,6 +42,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep"
 	"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"
 )
 
 func resourceSepCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -58,14 +58,12 @@ func resourceSepCreate(ctx context.Context, d *schema.ResourceData, m interface{
 		GID:     uint64(d.Get("gid").(int)),
 		Name:    d.Get("name").(string),
 		SEPType: d.Get("type").(string),
+		Config:  d.Get("config").(string),
 	}
 
 	if desc, ok := d.GetOk("desc"); ok {
 		req.Description = desc.(string)
 	}
-	if configString, ok := d.GetOk("config"); ok {
-		req.Config = configString.(string)
-	}
 	if enable, ok := d.GetOk("enable"); ok {
 		req.Enable = enable.(bool)
 	}
@@ -119,6 +117,14 @@ func resourceSepCreate(ctx context.Context, d *schema.ResourceData, m interface{
 		}
 	}
 
+	if pools, ok := d.GetOk("pools"); ok {
+		log.Debugf("resourceSepCreate, pools: pools=%v sep_id %d after completing its resource configuration", pools, sepId)
+		err := resourceSepChangePools(ctx, d, m)
+		if err != nil {
+			warnings.Add(err)
+		}
+	}
+
 	return append(resourceSepRead(ctx, d, m), warnings.Get()...)
 }
 
@@ -236,6 +242,13 @@ func resourceSepUpdate(ctx context.Context, d *schema.ResourceData, m interface{
 		}
 	}
 
+	if d.HasChange("pools") {
+		err := resourceSepChangePools(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceSepRead(ctx, d, m)
 }
 
@@ -337,6 +350,42 @@ func resourceSepChangeAccessToPool(ctx context.Context, d *schema.ResourceData,
 	return nil
 }
 
+func resourceSepChangePools(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourceSepChangePools: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
+	c := m.(*controller.ControllerCfg)
+
+	oldPoolsInterface, newPoolsInterface := d.GetChange("pools")
+
+	oldPoolsList := oldPoolsInterface.(*schema.Set).Difference(newPoolsInterface.(*schema.Set)).List()
+	for _, pool := range oldPoolsList {
+		delPoolReq := sep.DelPoolRequest{
+			SEPID:    uint64(d.Get("sep_id").(int)),
+			PoolName: pool.(string),
+		}
+
+		_, err := c.CloudBroker().SEP().DelPool(ctx, delPoolReq)
+		if err != nil {
+			return err
+		}
+	}
+
+	newPoolsList := newPoolsInterface.(*schema.Set).Difference(oldPoolsInterface.(*schema.Set)).List()
+	for _, pool := range newPoolsList {
+		addPoolReq := sep.AddPoolRequest{
+			SEPID: uint64(d.Get("sep_id").(int)),
+			Sync:  true,
+			Pool:  pool.(string),
+		}
+
+		_, err := c.CloudBroker().SEP().AddPool(ctx, addPoolReq)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func resourceSepDecommission(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	c := m.(*controller.ControllerCfg)
 

internal/service/cloudbroker/sep/schema.go

@@ -274,6 +274,11 @@ func dataSourceSepListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "find by consumed physical node id",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -583,6 +588,14 @@ func resourceSepSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Update SEP capacity limit",
 		},
+		"pools": {
+			Type:        schema.TypeSet,
+			Optional:    true,
+			Description: "add/delete pools to/from sep",
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 		"ckey": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -598,8 +611,7 @@ func resourceSepSchemaMake() map[string]*schema.Schema {
 		},
 		"config": {
 			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
+			Required:    true,
 			Description: "sep config string",
 		},
 		"consumed_by": {

internal/service/cloudbroker/sep/utility_sep_list.go

@@ -67,6 +67,9 @@ func utilitySepListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 	if consumed_by, ok := d.GetOk("consumed_by"); ok {
 		req.ConsumedBy = uint64(consumed_by.(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/cloudbroker/stack/schema.go

@@ -289,6 +289,11 @@ func dataSourceStacksListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "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/cloudbroker/stack/utility_stack_list.go

@@ -58,6 +58,9 @@ func utilityStackListCheckPresence(ctx context.Context, d *schema.ResourceData,
 	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/cloudbroker/user/data_source_user.go

@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2019-2023 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 user
+
+import (
+	"context"
+
+	"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 dataSourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	user, err := utilityUserCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
+	flattenUserDataSource(d, user)
+	d.SetId(d.Get("user_id").(string))
+
+	return nil
+}
+
+func DataSourceUser() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceUserRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceUserSchemaMake(),
+	}
+}

internal/service/cloudbroker/user/data_source_user_get_audit.go

@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2019-2023 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 user
+
+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 dataSourceUserGetAuditRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	audits, err := utilityUserGetAuditCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenUserGetAudits(audits))
+	d.Set("entry_count", audits.EntryCount)
+
+	return nil
+}
+
+func DataSourceUserGetAudit() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceUserGetAuditRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceUserGetAuditSchemaMake(),
+	}
+}

internal/service/cloudbroker/user/data_source_user_list.go

@@ -0,0 +1,73 @@
+/*
+Copyright (c) 2019-2023 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 user
+
+import (
+	"context"
+	"github.com/google/uuid"
+	log "github.com/sirupsen/logrus"
+
+	"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 dataSourceUserListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	users, err := utilityUserListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	err = d.Set("items", flattenUserList(users))
+	log.Debug("err:", err)
+	d.Set("entry_count", users.EntryCount)
+
+	return nil
+}
+
+func DataSourceUserList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceUserListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceUserListSchemaMake(),
+	}
+}

internal/service/cloudbroker/user/flattens.go

@@ -0,0 +1,184 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 user
+
+import (
+	"strconv"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/user"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
+)
+
+func flattenUserDataSource(d *schema.ResourceData, details *user.ItemUser) {
+	log.Debugf("flattenUser: decoded User ID %s",
+		details.ID)
+
+	d.Set("user_id", details.ID)
+	d.Set("ckey", details.CKey)
+	d.Set("meta", flattens.FlattenMeta(details.Meta))
+	d.Set("api_access", details.APIAccess)
+	d.Set("active", details.Active)
+	d.Set("authkey", details.AuthKey)
+	d.Set("auth_keys", flattenItemUser(details.AuthKeys))
+	d.Set("data", details.Data)
+	d.Set("description", details.Description)
+	d.Set("domain", details.Domain)
+	d.Set("emails", details.Emails)
+	d.Set("gid", details.GID)
+	d.Set("groups", details.Groups)
+	d.Set("guid", details.GUID)
+	d.Set("last_check", details.LastCheck)
+	d.Set("mobile", flattenItemUser(details.Mobile))
+	d.Set("password", details.Password)
+	d.Set("protected", details.Protected)
+	d.Set("roles", flattenItemUser(details.Roles))
+	d.Set("service_account", details.ServiceAccount)
+	d.Set("xmpp", flattenItemUser(details.XMPP))
+}
+
+func flattenUserResource(d *schema.ResourceData, details *user.ItemUser) {
+	log.Debugf("flattenUser: decoded User ID %s",
+		details.ID)
+
+	d.Set("username", details.ID)
+	d.Set("ckey", details.CKey)
+	d.Set("meta", flattens.FlattenMeta(details.Meta))
+	d.Set("apiaccess", flattenAPIAcess(details.APIAccess))
+	d.Set("active", details.Active)
+	d.Set("authkey", details.AuthKey)
+	d.Set("auth_keys", flattenItemUser(details.AuthKeys))
+	d.Set("data", details.Data)
+	d.Set("description", details.Description)
+	d.Set("domain", details.Domain)
+	d.Set("emailaddress", details.Emails)
+	d.Set("gid", details.GID)
+	d.Set("groups", details.Groups)
+	d.Set("guid", details.GUID)
+	d.Set("last_check", details.LastCheck)
+	d.Set("mobile", flattenItemUser(details.Mobile))
+	d.Set("protected", details.Protected)
+	d.Set("roles", flattenItemUser(details.Roles))
+	d.Set("service_account", details.ServiceAccount)
+	d.Set("xmpp", flattenItemUser(details.XMPP))
+}
+
+func flattenItemUser(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, "")
+		}
+	}
+	return output
+}
+
+func flattenUserGetAudits(audits *user.ListAudits) []map[string]interface{} {
+	log.Debug("flattenUserGetAudits")
+
+	res := make([]map[string]interface{}, 0, len(audits.Data))
+	for _, item := range audits.Data {
+		temp := map[string]interface{}{
+			"call":          item.Call,
+			"response_time": item.ResponseTime,
+			"status_code":   item.StatusCode,
+			"time":          item.Time,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenUserList(users *user.ListUsers) []map[string]interface{} {
+	log.Debug("flattenUserList")
+
+	res := make([]map[string]interface{}, 0, len(users.Data))
+	for _, item := range users.Data {
+		temp := map[string]interface{}{
+			"ckey":            item.CKey,
+			"meta":            flattens.FlattenMeta(item.Meta),
+			"api_access":      item.APIAccess,
+			"active":          item.Active,
+			"authkey":         item.AuthKey,
+			"authkeys":        flattenItemUser(item.AuthKeys),
+			"data":            item.Data,
+			"description":     item.Description,
+			"domain":          item.Domain,
+			"emails":          item.Emails,
+			"gid":             item.GID,
+			"groups":          item.Groups,
+			"guid":            item.GUID,
+			"user_id":         item.ID,
+			"last_check":      item.LastCheck,
+			"mobile":          flattenItemUser(item.Mobile),
+			"password":        item.Password,
+			"protected":       item.Protected,
+			"roles":           flattenItemUser(item.Roles),
+			"service_account": item.ServiceAccount,
+			"xmpp":            flattenItemUser(item.XMPP),
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenAPIAcess(in map[string]string) []int {
+
+	res := make([]int, 0, len(in))
+
+	for i := range in {
+		num, err := strconv.Atoi(i)
+		if err != nil {
+
+			log.Errorf("flattenAPIAcess: unable to convert %s to digit %v", i, err)
+
+			return nil
+		}
+		res = append(res, num)
+	}
+	return res
+
+}

internal/service/cloudbroker/user/resource_user.go

@@ -0,0 +1,149 @@
+package user
+
+import (
+	"context"
+
+	"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/cloudbroker/user"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func resourceUserCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
+	log.Debugf("resourceUserCreate: called with username %s, emailaddress %v", d.Get("username").(string), d.Get("emailaddress").([]interface{}))
+
+	c := m.(*controller.ControllerCfg)
+
+	username := d.Get("username").(string)
+
+	emails := d.Get("emailaddress").([]interface{})
+
+	emailAddress := make([]string, 0, len(emails))
+
+	for _, v := range emails {
+
+		emailAddress = append(emailAddress, v.(string))
+	}
+
+	createReq := user.CreateRequest{
+		Username:     username,
+		EmailAddress: emailAddress,
+	}
+
+	if passwd, ok := d.GetOk("password"); ok {
+
+		createReq.Password = passwd.(string)
+	}
+
+	if aa, ok := d.GetOk("apiaccess"); ok {
+
+		apiaccess := aa.(*schema.Set)
+
+		for _, v := range apiaccess.List() {
+
+			createReq.APIAccess = append(createReq.APIAccess, uint64(v.(int)))
+		}
+	}
+
+	if groups, ok := d.GetOk("groups"); ok {
+
+		for _, v := range groups.([]interface{}) {
+
+			createReq.Groups = append(createReq.Groups, v.(string))
+		}
+	}
+
+	_, err := c.CloudBroker().User().Create(ctx, createReq)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(username)
+
+	return resourceUserRead(ctx, d, m)
+}
+
+func resourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
+	log.Debugf("resourceUserRead: called with username %s", d.Get("username").(string))
+
+	user, err := utilityUserCheckPresence(ctx, d, m)
+	if err != nil {
+
+		d.SetId("")
+
+		return diag.FromErr(err)
+	}
+	flattenUserResource(d, user)
+
+	return nil
+}
+
+func resourceUserUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
+	log.Debugf("resourceUserUpdate: called with username %s", d.Get("username").(string))
+
+	if d.HasChange("apiaccess") {
+
+		err := utilityUserAPIAccessGroupsConfigure(ctx, d, m)
+		if err != nil {
+
+			return diag.FromErr(err)
+		}
+	}
+	return resourceUserRead(ctx, d, m)
+}
+
+func resourceUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
+	log.Debugf("resourceUserDelete: called with username %s", d.Get("username").(string))
+
+	usr, err := utilityUserCheckPresence(ctx, d, m)
+	if err != nil {
+
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	c := m.(*controller.ControllerCfg)
+
+	req := user.DeleteRequest{
+		Username: usr.ID,
+	}
+
+	_, err = c.CloudBroker().User().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+	return nil
+}
+
+func ResourceUser() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceUserCreate,
+		ReadContext:   resourceUserRead,
+		UpdateContext: resourceUserUpdate,
+		DeleteContext: resourceUserDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout600s,
+			Read:    &constants.Timeout600s,
+			Update:  &constants.Timeout600s,
+			Delete:  &constants.Timeout600s,
+			Default: &constants.Timeout600s,
+		},
+
+		Schema: resourceUserSchemaMake(),
+	}
+}

internal/service/cloudbroker/user/schema.go

@@ -0,0 +1,525 @@
+package user
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+)
+
+func dataSourceUserSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"user_id": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "user_id",
+		},
+		"ckey": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "ckey",
+		},
+		"meta": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "meta",
+		},
+		"active": {
+			Type:        schema.TypeBool,
+			Computed:    true,
+			Description: "active",
+		},
+		"api_access": {
+			Type:     schema.TypeMap,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "api_access",
+		},
+		"authkey": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "authkey",
+		},
+		"authkeys": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "authkeys",
+		},
+		"data": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "data",
+		},
+		"description": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "description",
+		},
+		"domain": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "domain",
+		},
+		"emails": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "emails",
+		},
+		"gid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "gid",
+		},
+		"groups": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "groups",
+		},
+		"guid": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "guid",
+		},
+		"last_check": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "last_check",
+		},
+		"mobile": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "mobile",
+		},
+		"password": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "password",
+		},
+		"protected": {
+			Type:        schema.TypeBool,
+			Computed:    true,
+			Description: "protected",
+		},
+		"roles": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "roles",
+		},
+		"service_account": {
+			Type:        schema.TypeBool,
+			Computed:    true,
+			Description: "service_account",
+		},
+		"xmpp": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "xmpp",
+		},
+	}
+}
+
+func dataSourceUserGetAuditSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"username": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "name of user (get audits for current user if set to empty)",
+		},
+		"call": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find by api call",
+		},
+		"status_code": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find by status code",
+		},
+		"timestamp_at": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find all audits after point in time (unixtime)",
+		},
+		"timestamp_to": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find all audits before point in time (unixtime)",
+		},
+		"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{
+					"call": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"response_time": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"status_code": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"time": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "entry_count",
+		},
+	}
+}
+
+func dataSourceUserListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find by id",
+		},
+		"active": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "find by active. True or False",
+		},
+		"service_account": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "find by service account. True or False",
+		},
+		"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{
+					"ckey": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "ckey",
+					},
+					"meta": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "meta",
+					},
+					"active": {
+						Type:        schema.TypeBool,
+						Computed:    true,
+						Description: "active",
+					},
+					"apiaccess": {
+						Type:     schema.TypeMap,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "apiaccess",
+					},
+					"authkey": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "authkey",
+					},
+					"authkeys": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "authkeys",
+					},
+					"data": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "data",
+					},
+					"description": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "description",
+					},
+					"domain": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "domain",
+					},
+					"emails": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "emails",
+					},
+					"gid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "gid",
+					},
+					"groups": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "groups",
+					},
+					"guid": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "guid",
+					},
+					"user_id": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "user id",
+					},
+					"last_check": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "last_check",
+					},
+					"mobile": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "mobile",
+					},
+					"password": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "password",
+					},
+					"protected": {
+						Type:        schema.TypeBool,
+						Computed:    true,
+						Description: "protected",
+					},
+					"roles": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "roles",
+					},
+					"service_account": {
+						Type:        schema.TypeBool,
+						Computed:    true,
+						Description: "service_account",
+					},
+					"xmpp": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "xmpp",
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "entry_count",
+		},
+	}
+}
+
+func resourceUserSchemaMake() map[string]*schema.Schema {
+	log.Debugf("resourceUserSchemaMake: invoked")
+	return map[string]*schema.Schema{
+		"username": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "ID of user",
+		},
+		"emailaddress": {
+			Type:     schema.TypeList,
+			Required: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "email addresses of the user",
+		},
+		"password": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "password of user",
+		},
+		"groups": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "list of groups this user belongs to",
+		},
+		"ckey": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "ckey",
+		},
+		"meta": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "meta",
+		},
+		"active": {
+			Type:        schema.TypeBool,
+			Computed:    true,
+			Description: "active",
+		},
+		"apiaccess": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+			Description: "list of apiaccess groups this user belongs to",
+		},
+		"authkey": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "authkey",
+		},
+		"auth_keys": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "authkeys",
+		},
+		"data": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "data",
+		},
+		"description": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "description",
+		},
+		"domain": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "domain",
+		},
+		"gid": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "gid",
+		},
+		"guid": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "guid",
+		},
+		"last_check": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "last_check",
+		},
+		"mobile": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "mobile",
+		},
+		"protected": {
+			Type:        schema.TypeBool,
+			Computed:    true,
+			Description: "protected",
+		},
+		"roles": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "roles",
+		},
+		"service_account": {
+			Type:        schema.TypeBool,
+			Computed:    true,
+			Description: "service_account",
+		},
+		"xmpp": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "xmpp",
+		},
+	}
+}

internal/service/cloudbroker/user/utility_user.go

@@ -0,0 +1,108 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Sergey Kisil, <svkisil@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 user
+
+import (
+	"context"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/user"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+)
+
+func utilityUserCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*user.ItemUser, error) {
+	c := m.(*controller.ControllerCfg)
+	req := user.GetRequest{}
+
+	if d.Id() != "" {
+		req.UserID = d.Id()
+	} else {
+		req.UserID = d.Get("user_id").(string)
+	}
+
+	userInfo, err := c.CloudBroker().User().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return userInfo, nil
+}
+
+func utilityUserAPIAccessGroupsConfigure(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+
+	c := m.(*controller.ControllerCfg)
+
+	old_set, new_set := d.GetChange("apiaccess")
+
+	leave_set := old_set.(*schema.Set).Difference(new_set.(*schema.Set))
+
+	log.Debugf("utilityUserAPIAccessGroupsConfigure: leave set has %d items for Username %s", leave_set.Len(), d.Id())
+
+	if leave_set.Len() > 0 {
+
+		for _, v := range leave_set.List() {
+
+			leaveReq := user.APIAccessLeaveRequest{
+				UserID:      d.Id(),
+				APIAccessID: uint64(v.(int)),
+			}
+			_, err := c.CloudBroker().User().APIAccessLeave(ctx, leaveReq)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	join_set := new_set.(*schema.Set).Difference(old_set.(*schema.Set))
+
+	log.Debugf("utilityUserAPIAccessGroupsConfigure: join set has %d items for Username %s", join_set.Len(), d.Id())
+
+	if join_set.Len() > 0 {
+
+		for _, v := range join_set.List() {
+
+			joinReq := user.APIAccessJoinRequest{
+				UserID:      d.Id(),
+				APIAccessID: uint64(v.(int)),
+			}
+			_, err := c.CloudBroker().User().APIAccessJoin(ctx, joinReq)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}