4.8.1

.gitignore

@@ -4,4 +4,5 @@ url_scrapping/
 terraform-provider-decort*
 .vscode/
 .DS_Store
-
+vendor/
+.idea/

CHANGELOG.md

@@ -1,33 +1,32 @@
-## Version 4.7.0
+## Version 4.8.1
 
-### Feature
+### Добавлено
-- Added decort_dpdknet and decort_dpdknet_list data sources in cloudapi/dpdknet and cloudbroker/dpdknet
-- Added decort_dpdknet resource in cloudbroker/dpdknet
-- Added decort_audit data source in cloudapi/audit
-- Added decort_cb_audits_export_to_file data source in cloudbroker/audit
-- Added field uniq_pools in decort_resgroup resource in cloudapi/rg which can be used when updating resource
-- Added feature that allows to remove def_net in decort_resgroup(cloudapi/rg) and decort_cb_rg(cloudbroker/rg)
-- Added the delete_async_mode field in resources "decort_snapshot" and "kvmvm"
-- Added field guid in decort_cb_user_get_audit data source in cloudbroker/user
-- Added the pci_devices field in resources cloudbroker/kvmvm, cloudapi/kvmvm, datasources cloudbroker/kvmvm, cloudapi/kvmvm
-- Added field enabled in dataSourceImageListSchema in cloudapi/image and cloudbroker/image
-- Added fields mtu and libvirt_settings in vnfInterfaceSchema in cloudapi/vins and cloudbroker/vins
-- Added libvirt_settings filed in resources "decort_cb_kvmvm", "decort_kvmvm", datasources "decort_cb_kvmvm", "decort_cb_kvmvm_list", "decort_kvmvm", "decort_kvmvm_list"
-- Added field enabled in dataSourceImageListSchema in cloudapi/image and cloudbroker/image
-- Added fields meta and ckey in "decort_cb_grid" in cloudbroker/grid
-- Added field bus_number in data sources "decort_vins", "decort_cb_vins" and resources "decort_vins", "decort_cb_vins" in cloudapi/vins, cloudbroker/vins
-- Change drivers field from required to optional in resourceCDROMImageSchema in cloudbroker/image
-- Added chipset, bus_number fileds in resources "decort_cb_kvmvm", "decort_kvmvm", datasources "decort_cb_kvmvm", "decort_cb_kvmvm_list", "decort_kvmvm", "decort_kvmvm_list"
-- Added stack_id, image_id fileds in decort_cb_kvmvm_list
-- Added chipset field in "decort_k8s", "decort_k8s_wg", "decort_cb_k8s_cp", "decort_cb_k8s_wg"
-- Change drivers field from required to optional in decort_image_from_platform_disk and decort_cb_image_from_platform_disk
-- Change client_ids field from []int to []string in decort_flipgroup_list
-- Added feature to change IP network without stopping compute in resources "decort_cb_kvmvm", "decort_kvmvm" in cloudapi/kvmvm, cloudbroker/kvmvm
 
-### Removed
+#### kvmvm
-- Remove apitask field in dataSourceAuditSchema in cloudbroker/audit
+| Идентификатор<br>задачи | Описание |
-- The ability to interact with kvmppc has been removed
+| --- | --- |
-- Remove permanently field in resourceImageSchema, resourceVirtualImageSchema, resourceImageFromBlankComputeSchema, resourceImageFromPlatformDiskSchema in cloudapi/image and cloudbroker/image
+| BATF-692 | Опциональное поле `preferred_cpu`в resources `decort_kvmvm, decort_cb_kvmvm` в cloudapi/kvmvm и cloudbroker/kvmvm |
-- Remove recursive_delete field in resource decort_cb_account in cloudbroker/account and cloudapi/account
+| BATF-692 | Вычисляемое поле `preferred_cpu`в data_sources `decort_kvmvm, decort_kvmvm_list, decort_kvmvm_list_deleted, decort_cb_kvmvm, decort_cb_kvmvm_list, decort_cb_kvmvm_list_deleted ` в cloudapi/kvmvm и cloudbroker/kvmvm |
-- The reason field has been deleted everywhere
+
-- Remove permanently field in resourceCDROMImageSchema in cloudbroker/image
+#### node
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-686 | Вычисляемые поля `dpdk, uefi_firmware_file`в data_source `decort_cb_node_list` в cloudbroker/node |
+| BATF-687 | Вычисляемые поля `dpdk, network_mode, to_active, to_installing, to_maintenance, to_restricted` в data_source `decort_cb_node` в cloudbroker/node |
+
+#### sep
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-689 | Вычисляемое поле `multipath_num` в resource `decort_cb_sep` и data_sources `decort_cb_sep, decort_cb_sep_list` в cloudbroker/kvmvm |
+
+#### vins
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-678 | Вычисляемое поле `account_id` в блоке `reservations` в resource `decort_cb_vins` и data source `decort_cb_vins` в cloudbroker/vins |
+
+### Удалено
+
+#### sep
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-688 | Вычисляемые поля `ckey,meta` в resource `decort_cb_sep` и data_sources `decort_cb_sep, decort_cb_sep_list` в cloudbroker/kvmvm |

Makefile

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

README.md

@@ -6,6 +6,7 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 
 | Версия DECORT API | Версия провайдера Terraform |
 | ------ | ------ |
+| 4.2.0 | 4.8.x |
 | 4.1.0 | 4.7.x |
 | 4.0.0 | 4.6.x |
 | 3.8.9 | 4.5.x |

README_EN.md

@@ -1,168 +0,0 @@
-# terraform-provider-decort
-
-Terraform provider for Digital Energy Cloud Orchestration Technology (DECORT) platform
-
-## Mapping of platform versions with provider versions
-
-|  DECORT API version | Terraform provider version |
-| ------ | ------ |
-| 3.8.5 | 3.4.x |
-| 3.8.0 - 3.8.4 | 3.3.1 |
-| 3.7.x |  rc-1.25 |
-| 3.6.x |  rc-1.10 |
-| до 3.6.0 | [terraform-provider-decs](https://github.com/rudecs/terraform-provider-decs) |
-
-## Working modes
-
-The provider support two working modes:
-
-- User mode,
-- Administator mode.
-  Use flag DECORT_ADMIN_MODE for swithcing beetwen modes.
-  See user guide at https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-
-## Features
-
-- Work with Compute instances,
-- Work with disks,
-- Work with k8s,
-- Work with image,
-- Work with reource groups,
-- Work with VINS,
-- Work with pfw,
-- Work with accounts,
-- Work with snapshots,
-- Work with pcidevice.
-- Work with sep,
-- Work with vgpu,
-- Work with bservice,
-- Work with extnets,
-- Work with locations,
-- Work with load balancers.
-
-This provider supports Import operations on pre-existing resources.
-
-See user guide at https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-
-## Get Started
-
-Two ways for starting:
-
-1. Installing via binary packages
-2. Manual installing
-
-### Installing via binary packages
-
-1. Download and install terraform: https://learn.hashicorp.com/tutorials/terraform/install-cli?in=terraform/aws-get-started
-2. Create a file `main.tf` and add to it next section.
-
-```terraform
-provider "decort" {
-  authenticator = "decs3o"
-  #controller_url = <DECORT_CONTROLLER_URL>
-  controller_url = "https://ds1.digitalenergy.online"
-  #oauth2_url = <DECORT_SSO_URL>
-  oauth2_url           = "https://sso.digitalenergy.online"
-  allow_unverified_ssl = true
-}
-```
-
-3. Execute next command
-
-```
-terraform init
-```
-
-The Provider will automatically install on your computer from the terrafrom registry.
-
-### Manual installing
-
-1. Download and install Go Programming Language: https://go.dev/dl/
-2. Download and install terraform: https://learn.hashicorp.com/tutorials/terraform/install-cli?in=terraform/aws-get-started
-3. Clone provider's repo:
-
-```bash
-git clone https://github.com/rudecs/terraform-provider-decort.git
-```
-
-4. Change directory to clone provider's and execute next command
-
-```bash
-go build -o terraform-provider-decort
-```
-
-If you have experience with _makefile_, you can change `Makefile`'s paramters and execute next command
-
-```bash
-make build
-```
-
-5. Now move compilled file to:  
-   Linux:
-
-```bash
-~/.terraform.d/plugins/${host_name}/${namespace}/${type}/${version}/${target}
-```
-
-Windows:
-
-```powershell
-%APPDATA%\terraform.d\plugins\${host_name}/${namespace}/${type}/${version}/${target}
-```
-
-NOTE: for Windows OS `%APP_DATA%` is a cataloge, where will place terraform files.
-Example:
-
-- host_name - digitalenergy.online
-- namespace - decort
-- type - decort
-- version - 1.2
-- target - windows_amd64
-
-6. After all, create a file `main.tf`.
-7. Add to the file next code section
-
-```terraform
-terraform {
-  required_providers {
-    decort = {
-      version = "1.2"
-      source  = "digitalenergy.online/decort/decort"
-    }
-  }
-}
-```
-
-`version`- field for provider's version
-Required
-String
-Note: Versions in code section and in a repository must be equal!
-
-`source` - path to repository with provider's version
-
-```bash
-${host_name}/${namespace}/${type}
-```
-
-NOTE: all paramters must be equal to the repository path!
-
-8. Execute command in your terminal
-
-```bash
-terraform init
-```
-
-9. If everything all right - you got green message in your terminal!
-
-More details about the provider's building process: https://learn.hashicorp.com/tutorials/terraform/provider-use?in=terraform/providers
-
-## Examples and Samples
-
-- Examples: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-- Samples: see in repository `samples`
-
-Terraform schemas in:
-
-- See in repository `docs`
-
-Good work!

docs/data-sources/cb_extnet.md

@@ -93,6 +93,7 @@ Read-Only:
 
 Read-Only:
 
+- `account_id` (Number)
 - `client_type` (String)
 - `desc` (String)
 - `domain_name` (String)

docs/data-sources/cb_extnet_reserved_ip_list.md

@@ -0,0 +1,61 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_cb_extnet_reserved_ip_list Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_cb_extnet_reserved_ip_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `account_id` (Number)
+
+### Optional
+
+- `extnet_id` (Number)
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `items` (List of Object) (see [below for nested schema](#nestedatt--items))
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `default` (String)
+- `read` (String)
+
+
+<a id="nestedatt--items"></a>
+### Nested Schema for `items`
+
+Read-Only:
+
+- `extnet_id` (Number)
+- `reservations` (List of Object) (see [below for nested schema](#nestedobjatt--items--reservations))
+
+<a id="nestedobjatt--items--reservations"></a>
+### Nested Schema for `items.reservations`
+
+Read-Only:
+
+- `account_id` (Number)
+- `client_type` (String)
+- `domain_name` (String)
+- `hostname` (String)
+- `ip` (String)
+- `mac` (String)
+- `type` (String)
+- `vm_id` (Number)

docs/data-sources/cb_grid_get_diagnosis.md

@@ -17,6 +17,7 @@ description: |-
 
 ### Required
 
+- `file_path` (String)
 - `gid` (Number)
 
 ### Optional
@@ -25,7 +26,6 @@ description: |-
 
 ### Read-Only
 
-- `diagnosis` (String)
 - `id` (String) The ID of this resource.
 
 <a id="nestedblock--timeouts"></a>

docs/data-sources/cb_grid_post_diagnosis.md

@@ -1,37 +0,0 @@
----
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "decort_cb_grid_post_diagnosis Data Source - terraform-provider-decort"
-subcategory: ""
-description: |-
-  
----
-
-# decort_cb_grid_post_diagnosis (Data Source)
-
-
-
-
-
-<!-- schema generated by tfplugindocs -->
-## Schema
-
-### Required
-
-- `gid` (Number)
-
-### Optional
-
-- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
-
-### Read-Only
-
-- `diagnosis` (String)
-- `id` (String) The ID of this resource.
-
-<a id="nestedblock--timeouts"></a>
-### Nested Schema for `timeouts`
-
-Optional:
-
-- `default` (String)
-- `read` (String)

docs/data-sources/cb_image.md

@@ -59,6 +59,7 @@ description: |-
 - `rescuecd` (Boolean)
 - `sep_id` (Number) storage endpoint provider ID
 - `size` (Number) image size
+- `snapshot_id` (String) snapshot id
 - `status` (String) status
 - `tech_status` (String) tech atatus
 - `unc_path` (String) unc path

docs/data-sources/cb_image_list.md

@@ -89,6 +89,7 @@ Read-Only:
 - `sep_id` (Number)
 - `shared_with` (List of Number)
 - `size` (Number)
+- `snapshot_id` (String)
 - `status` (String)
 - `tech_status` (String)
 - `unc_path` (String)

docs/data-sources/cb_kvmvm.md

@@ -33,6 +33,7 @@ description: |-
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (List of Object) (see [below for nested schema](#nestedatt--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_disk_id` (Number)
 - `boot_disk_size` (Number)
 - `boot_order` (List of String)
@@ -77,6 +78,7 @@ description: |-
 - `pci_devices` (List of Number)
 - `pinned` (Boolean)
 - `pool` (String)
+- `preferred_cpu` (List of Number)
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -100,6 +102,7 @@ description: |-
 - `vgpus` (List of Number)
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
+- `vnc_password` (String)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/cb_kvmvm_list.md

@@ -19,6 +19,7 @@ description: |-
 
 - `account_id` (Number) Find by AccountID
 - `by_id` (Number) Find by ID
+- `cd_image_id` (Number) Find by CD image ID
 - `extnet_id` (Number) Find by Extnet ID
 - `extnet_name` (String) Find by Extnet name
 - `ignore_k8s` (Boolean) If set to true, ignores any VMs associated with any k8s cluster
@@ -64,6 +65,7 @@ Read-Only:
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (List of Object) (see [below for nested schema](#nestedobjatt--items--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
@@ -99,6 +101,7 @@ Read-Only:
 - `numa_node_id` (Number)
 - `os_users` (List of Object) (see [below for nested schema](#nestedobjatt--items--os_users))
 - `pinned` (Boolean)
+- `preferred_cpu` (List of Number)
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)

docs/data-sources/cb_kvmvm_list_deleted.md

@@ -60,6 +60,7 @@ Read-Only:
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (List of Object) (see [below for nested schema](#nestedobjatt--items--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
@@ -94,6 +95,7 @@ Read-Only:
 - `numa_node_id` (Number)
 - `os_users` (List of Object) (see [below for nested schema](#nestedobjatt--items--os_users))
 - `pinned` (Boolean)
+- `preferred_cpu` (List of Number)
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)

docs/data-sources/cb_node.md

@@ -28,12 +28,15 @@ description: |-
 - `consumption` (List of Object) (see [below for nested schema](#nestedatt--consumption))
 - `cpu_allocation_ratio` (Number)
 - `cpu_info` (List of Object) (see [below for nested schema](#nestedatt--cpu_info))
+- `dpdk` (List of Object) (see [below for nested schema](#nestedatt--dpdk))
 - `gid` (Number)
 - `id` (String) The ID of this resource.
 - `ipaddr` (List of String)
 - `isolated_cpus` (List of String)
 - `name` (String)
 - `need_reboot` (Boolean)
+- `net_addr` (List of Object) (see [below for nested schema](#nestedatt--net_addr))
+- `network_mode` (String)
 - `nic_info` (List of Object) (see [below for nested schema](#nestedatt--nic_info))
 - `numa_topology` (List of Object) (see [below for nested schema](#nestedatt--numa_topology))
 - `reserved_cpus` (List of String)
@@ -41,6 +44,10 @@ description: |-
 - `sriov_enabled` (Boolean)
 - `stack_id` (Number)
 - `status` (String)
+- `to_active` (List of Object) (see [below for nested schema](#nestedatt--to_active))
+- `to_installing` (List of Object) (see [below for nested schema](#nestedatt--to_installing))
+- `to_maintenance` (List of Object) (see [below for nested schema](#nestedatt--to_maintenance))
+- `to_restricted` (List of Object) (see [below for nested schema](#nestedatt--to_restricted))
 - `version` (String)
 
 <a id="nestedblock--timeouts"></a>
@@ -109,6 +116,42 @@ Read-Only:
 - `phys_count` (Number)
 
 
+<a id="nestedatt--dpdk"></a>
+### Nested Schema for `dpdk`
+
+Read-Only:
+
+- `bridges` (List of Object) (see [below for nested schema](#nestedobjatt--dpdk--bridges))
+- `hp_memory` (Map of Number)
+- `pmd_cpu` (List of Number)
+
+<a id="nestedobjatt--dpdk--bridges"></a>
+### Nested Schema for `dpdk.bridges`
+
+Read-Only:
+
+- `backplane1` (List of Object) (see [below for nested schema](#nestedobjatt--dpdk--bridges--backplane1))
+
+<a id="nestedobjatt--dpdk--bridges--backplane1"></a>
+### Nested Schema for `dpdk.bridges.backplane1`
+
+Read-Only:
+
+- `interfaces` (List of String)
+- `numa_node` (Number)
+
+
+
+
+<a id="nestedatt--net_addr"></a>
+### Nested Schema for `net_addr`
+
+Read-Only:
+
+- `ip` (List of String)
+- `name` (String)
+
+
 <a id="nestedatt--nic_info"></a>
 ### Nested Schema for `nic_info`
 
@@ -156,3 +199,45 @@ Read-Only:
 - `one_g` (Number)
 - `total` (Number)
 - `two_m` (Number)
+
+
+
+
+<a id="nestedatt--to_active"></a>
+### Nested Schema for `to_active`
+
+Read-Only:
+
+- `actor` (String)
+- `reason` (String)
+- `time` (Number)
+
+
+<a id="nestedatt--to_installing"></a>
+### Nested Schema for `to_installing`
+
+Read-Only:
+
+- `actor` (String)
+- `reason` (String)
+- `time` (Number)
+
+
+<a id="nestedatt--to_maintenance"></a>
+### Nested Schema for `to_maintenance`
+
+Read-Only:
+
+- `actor` (String)
+- `reason` (String)
+- `time` (Number)
+
+
+<a id="nestedatt--to_restricted"></a>
+### Nested Schema for `to_restricted`
+
+Read-Only:
+
+- `actor` (String)
+- `reason` (String)
+- `time` (Number)

docs/data-sources/cb_node_list.md

@@ -52,6 +52,7 @@ Read-Only:
 - `additional_pkgs` (List of String)
 - `cpu_info` (List of Object) (see [below for nested schema](#nestedobjatt--items--cpu_info))
 - `description` (String)
+- `dpdk` (List of Object) (see [below for nested schema](#nestedobjatt--items--dpdk))
 - `gid` (Number)
 - `guid` (String)
 - `hostkey` (String)
@@ -86,6 +87,7 @@ Read-Only:
 - `status` (String)
 - `tags` (List of String)
 - `type` (String)
+- `uefi_firmware_file` (String)
 - `version` (String)
 
 <a id="nestedobjatt--items--cpu_info"></a>
@@ -98,6 +100,33 @@ Read-Only:
 - `phys_count` (Number)
 
 
+<a id="nestedobjatt--items--dpdk"></a>
+### Nested Schema for `items.dpdk`
+
+Read-Only:
+
+- `bridges` (List of Object) (see [below for nested schema](#nestedobjatt--items--dpdk--bridges))
+- `hp_memory` (Map of Number)
+- `pmd_cpu` (List of Number)
+
+<a id="nestedobjatt--items--dpdk--bridges"></a>
+### Nested Schema for `items.dpdk.bridges`
+
+Read-Only:
+
+- `backplane1` (List of Object) (see [below for nested schema](#nestedobjatt--items--dpdk--bridges--backplane1))
+
+<a id="nestedobjatt--items--dpdk--bridges--backplane1"></a>
+### Nested Schema for `items.dpdk.bridges.backplane1`
+
+Read-Only:
+
+- `interfaces` (List of String)
+- `numa_node` (Number)
+
+
+
+
 <a id="nestedobjatt--items--net_addr"></a>
 ### Nested Schema for `items.net_addr`
 

docs/data-sources/cb_sep.md

@@ -25,15 +25,14 @@ description: |-
 
 ### Read-Only
 
-- `ckey` (String) ckey
 - `config` (String) config
 - `consumed_by` (Set of Number) consumed by
 - `desc` (String) description
 - `gid` (Number) gid
 - `guid` (Number) guid
 - `id` (String) The ID of this resource.
-- `meta` (List of String) meta
 - `milestones` (Number) milestones
+- `multipath_num` (Number) multipath_num
 - `name` (String) name
 - `obj_status` (String) object status
 - `provided_by` (List of Number) provided by

docs/data-sources/cb_sep_list.md

@@ -49,14 +49,13 @@ Optional:
 
 Read-Only:
 
-- `ckey` (String)
 - `config` (String)
 - `consumed_by` (Set of Number)
 - `desc` (String)
 - `gid` (Number)
 - `guid` (Number)
-- `meta` (List of String)
 - `milestones` (Number)
+- `multipath_num` (Number)
 - `name` (String)
 - `obj_status` (String)
 - `provided_by` (List of Number)

docs/data-sources/cb_vins.md

@@ -101,6 +101,7 @@ Read-Only:
 - `tech_status` (String)
 - `type` (String)
 - `vins` (List of Number)
+- `vnc_password` (String)
 
 <a id="nestedobjatt--vnf_dev--config"></a>
 ### Nested Schema for `vnf_dev.config`
@@ -240,10 +241,7 @@ Read-Only:
 
 Read-Only:
 
-- `client_type` (String)
+- `account_id` (Number)
-- `description` (String)
-- `domain_name` (String)
-- `host_name` (String)
 - `ip` (String)
 - `mac` (String)
 - `type` (String)

docs/data-sources/extnet.md

@@ -90,6 +90,7 @@ Read-Only:
 
 Read-Only:
 
+- `account_id` (Number)
 - `client_type` (String)
 - `desc` (String)
 - `domainname` (String)

docs/data-sources/extnet_reserved_ip_list.md

@@ -0,0 +1,61 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_extnet_reserved_ip_list Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_extnet_reserved_ip_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `account_id` (Number)
+
+### Optional
+
+- `extnet_id` (Number)
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `id` (String) The ID of this resource.
+- `items` (List of Object) (see [below for nested schema](#nestedatt--items))
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `default` (String)
+- `read` (String)
+
+
+<a id="nestedatt--items"></a>
+### Nested Schema for `items`
+
+Read-Only:
+
+- `extnet_id` (Number)
+- `reservations` (List of Object) (see [below for nested schema](#nestedobjatt--items--reservations))
+
+<a id="nestedobjatt--items--reservations"></a>
+### Nested Schema for `items.reservations`
+
+Read-Only:
+
+- `account_id` (Number)
+- `client_type` (String)
+- `domain_name` (String)
+- `hostname` (String)
+- `ip` (String)
+- `mac` (String)
+- `type` (String)
+- `vm_id` (Number)

docs/data-sources/flipgroup_list.md

@@ -20,7 +20,7 @@ description: |-
 - `account_id` (Number) Account id
 - `by_id` (Number) Filter by ID
 - `by_ip` (String) Filter by IP-address
-- `client_ids` (List of String) client_ids
+- `client_ids` (List of Number) client_ids
 - `conn_id` (Number) Conn id
 - `extnet_id` (Number) Filter by ExtNetID
 - `name` (String) Filter by Name

docs/data-sources/kvmvm.md

@@ -33,6 +33,7 @@ description: |-
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (List of Object) (see [below for nested schema](#nestedatt--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
@@ -74,6 +75,7 @@ description: |-
 - `os_users` (List of Object) (see [below for nested schema](#nestedatt--os_users))
 - `pci_devices` (List of Number)
 - `pinned` (Boolean)
+- `preferred_cpu` (List of Number)
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -94,6 +96,7 @@ description: |-
 - `vgpus` (List of Number)
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
+- `vnc_password` (String)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/kvmvm_list.md

@@ -62,6 +62,7 @@ Read-Only:
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (List of Object) (see [below for nested schema](#nestedobjatt--items--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
@@ -96,6 +97,7 @@ Read-Only:
 - `numa_affinity` (String)
 - `numa_node_id` (Number)
 - `pinned` (Boolean)
+- `preferred_cpu` (List of Number)
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)

docs/data-sources/kvmvm_list_deleted.md

@@ -60,6 +60,7 @@ Read-Only:
 - `affinity_weight` (Number)
 - `anti_affinity_rules` (List of Object) (see [below for nested schema](#nestedobjatt--items--anti_affinity_rules))
 - `arch` (String)
+- `auto_start_w_node` (Boolean)
 - `boot_order` (List of String)
 - `bootdisk_size` (Number)
 - `cd_image_id` (Number)
@@ -94,6 +95,7 @@ Read-Only:
 - `numa_affinity` (String)
 - `numa_node_id` (Number)
 - `pinned` (Boolean)
+- `preferred_cpu` (List of Number)
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)

docs/data-sources/vins.md

@@ -108,6 +108,7 @@ Read-Only:
 - `tech_status` (String)
 - `type` (String)
 - `vins` (List of Number)
+- `vnc_password` (String)
 - `vnf_id` (Number)
 - `vnf_name` (String)
 
@@ -248,10 +249,7 @@ Read-Only:
 
 Read-Only:
 
-- `client_type` (String)
+- `account_id` (Number)
-- `desc` (String)
-- `domainname` (String)
-- `hostname` (String)
 - `ip` (String)
 - `mac` (String)
 - `type` (String)

docs/resources/cb_cdrom_image.md

@@ -62,6 +62,7 @@ description: |-
 - `res_name` (String)
 - `rescuecd` (Boolean)
 - `size` (Number) image size
+- `snapshot_id` (String) snapshot id
 - `status` (String) status
 - `tech_status` (String) tech atatus
 - `unc_path` (String) unc path

docs/resources/cb_extnet.md

@@ -37,6 +37,7 @@ description: |-
 - `ntp` (List of String) List of NTP addresses
 - `ovs_bridge` (String) OpenvSwith bridge name for ExtNet connection
 - `pre_reservations_num` (Number) Number of pre created reservations
+- `reserved_ip` (Block Set) (see [below for nested schema](#nestedblock--reserved_ip))
 - `restart` (Boolean) restart extnet vnf device
 - `set_default` (Boolean) Set current extnet as default (can not be undone)
 - `shared_with` (Set of Number)
@@ -88,6 +89,19 @@ Required:
 - `ip_start` (String)
 
 
+<a id="nestedblock--reserved_ip"></a>
+### Nested Schema for `reserved_ip`
+
+Required:
+
+- `account_id` (Number)
+
+Optional:
+
+- `ip_count` (Number)
+- `ips` (Set of String)
+
+
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
 
@@ -119,6 +133,7 @@ Read-Only:
 
 Read-Only:
 
+- `account_id` (Number)
 - `client_type` (String)
 - `desc` (String)
 - `domain_name` (String)

docs/resources/cb_image.md

@@ -67,6 +67,7 @@ description: |-
 - `res_name` (String)
 - `rescuecd` (Boolean)
 - `size` (Number) image size
+- `snapshot_id` (String) snapshot id
 - `status` (String) status
 - `tech_status` (String) tech atatus
 - `unc_path` (String) unc path

docs/resources/cb_image_from_blank_compute.md

@@ -64,6 +64,7 @@ description: |-
 - `res_name` (String)
 - `rescuecd` (Boolean)
 - `size` (Number)
+- `snapshot_id` (String) snapshot id
 - `status` (String)
 - `tech_status` (String)
 - `unc_path` (String)

docs/resources/cb_image_from_platform_disk.md

@@ -64,6 +64,7 @@ description: |-
 - `res_name` (String)
 - `rescuecd` (Boolean)
 - `size` (Number)
+- `snapshot_id` (String) snapshot id
 - `status` (String)
 - `tech_status` (String)
 - `unc_path` (String)

docs/resources/cb_kvmvm.md

@@ -30,6 +30,7 @@ description: |-
 - `alt_boot_id` (Number) ID of CD-ROM live image to boot
 - `anti_affinity_rules` (Block List) (see [below for nested schema](#nestedblock--anti_affinity_rules))
 - `auto_start` (Boolean) Flag for redeploy compute
+- `auto_start_w_node` (Boolean)
 - `boot_disk_size` (Number) This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.
 - `cd` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--cd))
 - `chipset` (String) Type of the emulated system.
@@ -59,6 +60,7 @@ description: |-
 - `pin_to_stack` (Boolean)
 - `pool` (String) Pool to use if sepId is set, can be also empty if needed to be chosen by system.
 - `port_forwarding` (Block Set) (see [below for nested schema](#nestedblock--port_forwarding))
+- `preferred_cpu` (List of Number) Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
 - `reset` (Boolean)
 - `restore` (Boolean)
 - `rollback` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--rollback))
@@ -128,6 +130,7 @@ description: |-
 - `vgpus` (List of Number)
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
+- `vnc_password` (String)
 
 <a id="nestedblock--affinity_rules"></a>
 ### Nested Schema for `affinity_rules`
@@ -198,7 +201,8 @@ Read-Only:
 
 Required:
 
-- `mac` (String)
+- `net_id` (Number) ID of the network
+- `net_type` (String) Type of the network
 
 Optional:
 
@@ -221,6 +225,7 @@ Required:
 Optional:
 
 - `ip_address` (String) Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.
+- `mtu` (Number) Maximum transmission unit, used only for DPDK type, must be 1-9216
 - `weight` (Number) weight the network if you need to sort network list, the smallest attach first. zero or null weight attach last
 
 Read-Only:

docs/resources/cb_sep.md

@@ -37,11 +37,10 @@ description: |-
 
 ### Read-Only
 
-- `ckey` (String) ckey
 - `guid` (Number) guid
 - `id` (String) The ID of this resource.
-- `meta` (List of String) meta
 - `milestones` (Number) milestones
+- `multipath_num` (Number) multipath_num
 - `obj_status` (String) object status
 - `tech_status` (String) tech status
 

docs/resources/cb_vins.md

@@ -167,6 +167,7 @@ Read-Only:
 - `tech_status` (String)
 - `type` (String)
 - `vins` (List of Number)
+- `vnc_password` (String)
 
 <a id="nestedobjatt--vnf_dev--config"></a>
 ### Nested Schema for `vnf_dev.config`
@@ -306,10 +307,7 @@ Read-Only:
 
 Read-Only:
 
-- `client_type` (String)
+- `account_id` (Number)
-- `description` (String)
-- `domain_name` (String)
-- `host_name` (String)
 - `ip` (String)
 - `mac` (String)
 - `type` (String)

docs/resources/cb_vins_static_route.md

@@ -24,11 +24,11 @@ description: |-
 
 ### Optional
 
-- `compute_ids` (List of Number)
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only
 
+- `compute_ids` (List of Number)
 - `guid` (String)
 - `id` (String) The ID of this resource.
 - `route_id` (Number) Unique ID of the static route

docs/resources/cb_virtual_image.md

@@ -61,6 +61,7 @@ description: |-
 - `rescuecd` (Boolean)
 - `sep_id` (Number) storage endpoint provider ID
 - `size` (Number) image size
+- `snapshot_id` (String) snapshot id
 - `status` (String) status
 - `tech_status` (String) tech atatus
 - `unc_path` (String) unc path

docs/resources/kvmvm.md

@@ -29,6 +29,7 @@ description: |-
 - `affinity_rules` (Block List) (see [below for nested schema](#nestedblock--affinity_rules))
 - `anti_affinity_rules` (Block List) (see [below for nested schema](#nestedblock--anti_affinity_rules))
 - `auto_start` (Boolean) Flag for redeploy compute
+- `auto_start_w_node` (Boolean) Flag for start compute after node exits from MAINTENANCE state
 - `boot_disk_size` (Number) This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.
 - `cd` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--cd))
 - `chipset` (String) Type of the emulated system.
@@ -55,6 +56,7 @@ description: |-
 - `pin_to_stack` (Boolean)
 - `pool` (String) Pool to use if sepId is set, can be also empty if needed to be chosen by system.
 - `port_forwarding` (Block Set) (see [below for nested schema](#nestedblock--port_forwarding))
+- `preferred_cpu` (List of Number) Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
 - `reset` (Boolean)
 - `restore` (Boolean)
 - `rollback` (Block Set, Max: 1) (see [below for nested schema](#nestedblock--rollback))
@@ -121,6 +123,7 @@ description: |-
 - `vgpus` (List of Number)
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
+- `vnc_password` (String)
 
 <a id="nestedblock--affinity_rules"></a>
 ### Nested Schema for `affinity_rules`
@@ -196,6 +199,7 @@ Required:
 Optional:
 
 - `ip_address` (String) Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.
+- `mtu` (Number) Maximum transmission unit, used only for DPDK type, must be 1-9216
 - `weight` (Number) weight the network if you need to sort network list, the smallest attach first. zero or null weight attach last
 
 Read-Only:

docs/resources/vins.md

@@ -163,6 +163,7 @@ Read-Only:
 - `tech_status` (String)
 - `type` (String)
 - `vins` (List of Number)
+- `vnc_password` (String)
 - `vnf_id` (Number)
 - `vnf_name` (String)
 
@@ -303,10 +304,7 @@ Read-Only:
 
 Read-Only:
 
-- `client_type` (String)
+- `account_id` (Number)
-- `desc` (String)
-- `domainname` (String)
-- `hostname` (String)
 - `ip` (String)
 - `mac` (String)
 - `type` (String)

docs/resources/vins_static_route.md

@@ -24,12 +24,12 @@ description: |-
 
 ### Optional
 
-- `compute_ids` (List of Number)
 - `route_id` (Number)
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only
 
+- `compute_ids` (List of Number)
 - `guid` (String)
 - `id` (String) The ID of this resource.
 

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
 	github.com/sirupsen/logrus v1.9.0
 	golang.org/x/net v0.23.0
-	repository.basistech.ru/BASIS/decort-golang-sdk v1.9.0
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.10.1
 )
 
 require (

go.sum

@@ -273,5 +273,5 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.9.0 h1:RLOWSc7EJ6O37aPHQI9gkJ2JfuZMzGonF2PKeWN6sXw=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.10.1 h1:Z6drv1seHY6nkyEdjGp2LoNKbne1ihrNRs32q93UhcM=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.9.0/go.mod h1:OaUynHHuSjWMzpfyoL4au6oLcUogqUkPPBKA15pbHWo=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.10.1/go.mod h1:OaUynHHuSjWMzpfyoL4au6oLcUogqUkPPBKA15pbHWo=

internal/provider/data_sources_map.go

@@ -137,6 +137,7 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_extnet_computes_list":              extnet.DataSourceExtnetComputesList(),
 		"decort_extnet":                            extnet.DataSourceExtnet(),
 		"decort_extnet_default":                    extnet.DataSourceExtnetDefault(),
+		"decort_extnet_reserved_ip_list":           extnet.DataSourceExtnetReservedIp(),
 		"decort_locations_list":                    locations.DataSourceLocationsList(),
 		"decort_location_url":                      locations.DataSourceLocationUrl(),
 		"decort_image_list":                        image.DataSourceImageList(),
@@ -180,6 +181,7 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_cb_extnet":                            cb_extnet.DataSourceExtnetCB(),
 		"decort_cb_extnet_list":                       cb_extnet.DataSourceExtnetListCB(),
 		"decort_cb_extnet_default":                    cb_extnet.DataSourceExtnetDefaultCB(),
+		"decort_cb_extnet_reserved_ip_list":           cb_extnet.DataSourceExtnetReservedIp(),
 		"decort_cb_extnet_static_route_list":          cb_extnet.DataSourceStaticRouteList(),
 		"decort_cb_extnet_static_route":               cb_extnet.DataSourceStaticRoute(),
 		"decort_cb_image":                             cb_image.DataSourceImage(),
@@ -187,7 +189,6 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_cb_grid_get_status":                   cb_grid.DataSourceGridGetStatus(),
 		"decort_cb_grid_post_status":                  cb_grid.DataSourceGridPostStatus(),
 		"decort_cb_grid_get_diagnosis":                cb_grid.DataSourceGridGetDiagnosis(),
-		"decort_cb_grid_post_diagnosis":               cb_grid.DataSourceGridPostDiagnosis(),
 		"decort_cb_grid_get_settings":                 cb_grid.DataSourceGridGetSettings(),
 		"decort_cb_grid_list":                         cb_grid.DataSourceGridList(),
 		"decort_cb_grid_list_emails":                  cb_grid.DataSourceGridListEmails(),

internal/service/cloudapi/extnet/data_source_extnet.go

@@ -204,6 +204,10 @@ func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"client_type": {
 						Type:     schema.TypeString,
 						Computed: true,

internal/service/cloudapi/extnet/data_source_extnet_reserved_ip.go

@@ -0,0 +1,137 @@
+/*
+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>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	"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 dataSourceExtnetReservedIpRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	reservedList, err := utilityExtnetReservedIpCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenExtnetReservedIp(reservedList))
+
+	return nil
+}
+
+func dataSourceExtnetReservedIpSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"extnet_id": {
+			Type:     schema.TypeInt,
+			Optional: true,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"reservations": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"account_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"client_type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"domain_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"hostname": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"ip": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"mac": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"vm_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	return res
+}
+
+func DataSourceExtnetReservedIp() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceExtnetReservedIpRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceExtnetReservedIpSchemaMake(),
+	}
+}

internal/service/cloudapi/extnet/flattens.go

@@ -54,6 +54,7 @@ func flattenExtnetReservations(ers extnet.ListReservations) []map[string]interfa
 	res := make([]map[string]interface{}, 0, len(ers))
 	for _, er := range ers {
 		temp := map[string]interface{}{
+			"account_id":  er.AccountID,
 			"client_type": er.ClientType,
 			"domainname":  er.DomainName,
 			"hostname":    er.Hostname,
@@ -135,3 +136,29 @@ func flattenExtnetList(el *extnet.ListExtNets) []map[string]interface{} {
 	}
 	return res
 }
+
+func flattenExtnetReservedIp(el []extnet.RecordReservedIP) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(el))
+	for _, e := range el {
+		reservations := make([]map[string]interface{}, 0, len(e.Reservations))
+		for _, r := range e.Reservations {
+			temp := map[string]interface{}{
+				"account_id":  r.AccountID,
+				"client_type": r.ClientType,
+				"domain_name": r.DomainName,
+				"hostname":    r.Hostname,
+				"ip":          r.IP,
+				"mac":         r.Mac,
+				"type":        r.Type,
+				"vm_id":       r.VMID,
+			}
+			reservations = append(reservations, temp)
+		}
+		item := map[string]interface{}{
+			"extnet_id":    e.ExtnetID,
+			"reservations": reservations,
+		}
+		res = append(res, item)
+	}
+	return res
+}

internal/service/cloudapi/extnet/utility_extnet_reserved_ip.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 extnet
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityExtnetReservedIpCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]extnet.RecordReservedIP, error) {
+	c := m.(*controller.ControllerCfg)
+	req := extnet.GetReservedIP{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	if extNetID, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extNetID.(int))
+	}
+
+	log.Debugf("utilityExtnetReservedIpCheckPresence")
+	res, err := c.CloudAPI().ExtNet().GetReservedIP(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go

@@ -124,7 +124,7 @@ func dataSourceFlipgroupListSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Optional: true,
 			Elem: &schema.Schema{
-				Type: schema.TypeString,
+				Type: schema.TypeInt,
 			},
 			Description: "client_ids",
 		},

internal/service/cloudapi/flipgroup/utility_flipgroup.go

@@ -189,7 +189,7 @@ func utilityFlipgroupListCheckPresence(ctx context.Context, d *schema.ResourceDa
 	if cliensId, ok := d.GetOk("client_ids"); ok {
 		cliensIds := cliensId.([]interface{})
 		for _, elem := range cliensIds {
-			req.ClientIDs = append(req.ClientIDs, (elem.(string)))
+			req.ClientIDs = append(req.ClientIDs, uint64(elem.(int)))
 		}
 	}
 	if status, ok := d.GetOk("status"); ok {

internal/service/cloudapi/k8s/resource_k8s_wg.go

@@ -37,6 +37,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -44,6 +45,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/validators"
@@ -105,7 +107,33 @@ func resourceK8sWgCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
-	d.SetId(fmt.Sprintf("%d#%d", d.Get("k8s_id").(int), resp))
+	taskReq := tasks.GetRequest{
+		AuditID: strings.Trim(resp, `"`),
+	}
+
+	for {
+		task, err := c.CloudAPI().Tasks().Get(ctx, taskReq)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		log.Debugf("resourceK8sWgCreate: instance creating - %s", task.Stage)
+
+		if task.Completed {
+			if task.Error != "" {
+				return diag.FromErr(fmt.Errorf("cannot create k8s wg instance: %v", task.Error))
+			}
+
+			id, err := task.Result.ID()
+			if err != nil {
+				return diag.FromErr(err)
+			}
+			d.SetId(fmt.Sprint(d.Get("k8s_id").(int), "#", strconv.Itoa(id)))
+			break
+		}
+
+		time.Sleep(time.Second * 20)
+	}
 
 	return resourceK8sWgRead(ctx, d, m)
 }

internal/service/cloudapi/kvmvm/data_source_compute.go

@@ -703,6 +703,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"chipset": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -881,6 +885,13 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"preferred_cpu": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"ram": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -950,6 +961,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/kvmvm/data_source_compute_list.go

@@ -121,6 +121,10 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"boot_order": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -269,6 +273,13 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"preferred_cpu": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"ram": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/kvmvm/flattens.go

@@ -183,6 +183,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"affinity_weight":     compute.AffinityWeight,
 			"anti_affinity_rules": flattenListRules(compute.AntiAffinityRules),
 			"arch":                compute.Architecture,
+			"auto_start_w_node":   compute.AutoStart,
 			"boot_order":          compute.BootOrder,
 			"bootdisk_size":       compute.BootDiskSize,
 			"chipset":             compute.Chipset,
@@ -217,6 +218,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"numa_affinity":       compute.NumaAffinity,
 			"numa_node_id":        compute.NumaNodeId,
 			"pinned":              compute.Pinned,
+			"preferred_cpu":       compute.PreferredCPU,
 			"ram":                 compute.RAM,
 			"reference_id":        compute.ReferenceID,
 			"registered":          compute.Registered,
@@ -316,6 +318,7 @@ func flattenNetwork(networks []interface{}, interfaces compute.ListInterfaces) [
 			"net_type":   network.NetType,
 			"ip_address": network.IPAddress,
 			"mac":        network.MAC,
+			"mtu":        network.MTU,
 			"weight":     flattenNetworkWeight(networks, network.NetID, network.NetType),
 		}
 		res = append(res, temp)
@@ -361,6 +364,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("account_name", computeRec.AccountName)
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("arch", computeRec.Architecture)
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("boot_order", computeRec.BootOrder)
 	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
 	d.Set("boot_disk_size", bootDisk.SizeMax)
@@ -412,6 +416,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 		return err
 	}
 	d.Set("pinned", computeRec.Pinned)
+	d.Set("preferred_cpu", computeRec.PreferredCPU)
 	d.Set("ram", computeRec.RAM)
 	d.Set("reference_id", computeRec.ReferenceID)
 	d.Set("registered", computeRec.Registered)
@@ -428,6 +433,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("updated_by", computeRec.UpdatedBy)
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)
@@ -612,6 +618,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("affinity_rules", flattenAffinityRules(computeRec.AffinityRules))
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("anti_affinity_rules", flattenListRules(computeRec.AntiAffinityRules))
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("arch", computeRec.Architecture)
 	d.Set("chipset", computeRec.Chipset)
 	d.Set("boot_order", computeRec.BootOrder)
@@ -654,6 +661,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("natable_vins_network_name", computeRec.NatableVINSNetworkName)
 	d.Set("os_users", flattenOsUsers(computeRec.OSUsers))
 	d.Set("pinned", computeRec.Pinned)
+	d.Set("preferred_CPU", computeRec.PreferredCPU)
 	d.Set("ram", computeRec.RAM)
 	d.Set("reference_id", computeRec.ReferenceID)
 	d.Set("registered", computeRec.Registered)
@@ -671,6 +679,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_managed", computeRec.UserManaged)
 	d.Set("userdata", string(userdata))
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)

internal/service/cloudapi/kvmvm/network_subresource.go

@@ -158,6 +158,15 @@ func networkSubresourceSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "weight the network if you need to sort network list, the smallest attach first. zero or null weight attach last",
 		},
+
+		"mtu": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Computed: true,
+			//Default:      1500,
+			ValidateFunc: validation.IntBetween(1, 9216),
+			Description:  "Maximum transmission unit, used only for DPDK type, must be 1-9216",
+		},
 	}
 	return rets
 }

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -162,6 +162,10 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 					NetID:   uint64(netInterfaceVal["net_id"].(int)),
 				}
 
+				if reqInterface.NetType == "DPDK" {
+					reqInterface.MTU = uint64(netInterfaceVal["mtu"].(int))
+				}
+
 				ipaddr, ipSet := netInterfaceVal["ip_address"]
 				if ipSet {
 					reqInterface.IPAddr = ipaddr.(string)
@@ -244,6 +248,16 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 	createReqX86.HPBacked = d.Get("hp_backed").(bool)
 	createReqX86.Chipset = d.Get("chipset").(string)
 
+	if preferredCPU, ok := d.GetOk("preferred_cpu"); ok {
+		preferredList := preferredCPU.([]interface{})
+		if len(preferredList) > 0 {
+			for _, v := range preferredList {
+				cpuNum := v.(int)
+				createReqX86.PreferredCPU = append(createReqX86.PreferredCPU, int64(cpuNum))
+			}
+		}
+	}
+
 	log.Debugf("resourceComputeCreate: creating Compute of type KVM VM x86")
 	apiResp, err := c.CloudAPI().KVMX86().Create(ctx, createReqX86)
 	if err != nil {
@@ -303,6 +317,17 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
+		if d.Get("pin_to_stack").(bool) {
+			req := compute.PinToStackRequest{
+				ComputeID: computeId,
+			}
+			req.AutoStart = d.Get("auto_start_w_node").(bool)
+			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+
 		// Note bene: we created compute in a STOPPED state (this is required to properly attach 1st network interface),
 		// now we need to start it before we report the sequence complete
 		if start, ok := d.GetOk("started"); ok {
@@ -483,11 +508,14 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
-		if d.Get("pin_to_stack").(bool) {
+		if !d.Get("pin_to_stack").(bool) && d.Get("auto_start_w_node").(bool) {
-			req := compute.PinToStackRequest{
+			req := compute.UpdateRequest{
 				ComputeID: computeId,
+				AutoStart: d.Get("auto_start_w_node").(bool),
+				CPUPin:    d.Get("cpu_pin").(bool),
+				HPBacked:  d.Get("hp_backed").(bool),
 			}
-			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
+			_, err := c.CloudAPI().Compute().Update(ctx, req)
 			if err != nil {
 				warnings.Add(err)
 			}
@@ -615,7 +643,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	if !hasRG {
-		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause rgID %d not allowed or does not exist", d.Get("rg_id").(int))
+		return diag.Errorf("resourceComputeUpdate: can't update Compute because rgID %d not allowed or does not exist", d.Get("rg_id").(int))
 	}
 
 	hasImage, err := existImageId(ctx, d, m)
@@ -624,7 +652,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	if !hasImage {
-		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause imageID %d not allowed or does not exist", d.Get("image_id").(int))
+		return diag.Errorf("resourceComputeUpdate: can't update Compute because imageID %d not allowed or does not exist", d.Get("image_id").(int))
 	}
 
 	if disks, ok := d.GetOk("disks"); ok {
@@ -798,6 +826,22 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		resizeReq.CPU = 0
 	}
 
+	if resizeReq.CPU != 0 {
+		if preferredCPU, ok := d.GetOk("preferred_cpu"); ok {
+			preferredList := preferredCPU.([]interface{})
+			if len(preferredList) > 0 {
+				for _, v := range preferredList {
+					cpuNum := v.(int)
+					resizeReq.PreferredCPU = append(resizeReq.PreferredCPU, int64(cpuNum))
+				}
+			}
+		}
+		oldPCPU, newPCPU := d.GetChange("preferred_cpu")
+		if len(oldPCPU.([]interface{})) != 0 && len(newPCPU.([]interface{})) == 0 {
+			resizeReq.PreferredCPU = []int64{-1}
+		}
+	}
+
 	oldRam, newRam := d.GetChange("ram")
 	if oldRam.(int) != newRam.(int) {
 		resizeReq.RAM = uint64(newRam.(int))
@@ -851,14 +895,31 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("network") {
+	if d.HasChange("pin_to_stack") {
-		err = utilityComputeNetworksConfigure(ctx, d, m)
+		oldPin, newPin := d.GetChange("pin_to_stack")
-		if err != nil {
+		if !newPin.(bool) {
-			return diag.FromErr(err)
+			req := compute.UnpinFromStackRequest{
+				ComputeID: computeRec.ID,
+			}
+
+			_, err := c.CloudAPI().Compute().UnpinFromStack(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+		if !oldPin.(bool) {
+			req := compute.PinToStackRequest{
+				ComputeID: computeRec.ID,
+			}
+			req.AutoStart = d.Get("auto_start_w_node").(bool)
+			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
 		}
 	}
 
-	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed") {
+	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed", "chipset", "auto_start_w_node", "preferred_cpu") {
 		req := compute.UpdateRequest{
 			ComputeID: computeRec.ID,
 		}
@@ -872,21 +933,32 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		if d.HasChange("numa_affinity") {
 			req.NumaAffinity = d.Get("numa_affinity").(string)
 		}
-		if d.HasChange("cpu_pin") {
-			req.CPUPin = d.Get("cpu_pin").(bool)
-		}
-		if d.HasChange("hp_backed") {
-			req.HPBacked = d.Get("hp_backed").(bool)
-		}
-
 		if d.HasChange("chipset") {
 			req.Chipset = d.Get("chipset").(string)
 		}
+		if d.HasChange("preferred_cpu") {
+			if preferredCPU, ok := d.GetOk("preferred_cpu"); ok {
+				preferredList := preferredCPU.([]interface{})
+				if len(preferredList) > 0 {
+					for _, v := range preferredList {
+						cpuNum := v.(int)
+						req.PreferredCPU = append(req.PreferredCPU, int64(cpuNum))
+					}
+				}
+			}
+			oldPCPU, newPCPU := d.GetChange("preferred_cpu")
+			if len(oldPCPU.([]interface{})) != 0 && len(newPCPU.([]interface{})) == 0 {
+				req.PreferredCPU = []int64{-1}
+			}
+		}
+		req.CPUPin = d.Get("cpu_pin").(bool)
+		req.HPBacked = d.Get("hp_backed").(bool)
+		req.AutoStart = d.Get("auto_start_w_node").(bool)
 
 		// Note bene: numa_affinity, cpu_pin and hp_backed are not allowed to be changed for compute in STARTED tech status.
 		// If STARTED, we need to stop it before update
 		var isStopRequired bool
-		if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed") && d.Get("started").(bool) {
+		if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset", "preferred_cpu") && d.Get("started").(bool) {
 			isStopRequired = true
 		}
 		if isStopRequired {
@@ -908,6 +980,13 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	if d.HasChange("network") {
+		err = utilityComputeNetworksConfigure(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("disks") {
 		deletedDisks := make([]interface{}, 0)
 		addedDisks := make([]interface{}, 0)
@@ -1461,30 +1540,6 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("pin_to_stack") {
-		oldPin, newPin := d.GetChange("pin_to_stack")
-		if !newPin.(bool) {
-			req := compute.UnpinFromStackRequest{
-				ComputeID: computeRec.ID,
-			}
-
-			_, err := c.CloudAPI().Compute().UnpinFromStack(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-		if !oldPin.(bool) {
-			req := compute.PinToStackRequest{
-				ComputeID: computeRec.ID,
-			}
-
-			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
-			if err != nil {
-				return diag.FromErr(err)
-			}
-		}
-	}
-
 	if d.HasChange("pause") {
 		oldPause, newPause := d.GetChange("pause")
 		if !newPause.(bool) {
@@ -1881,10 +1936,11 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Description: "ID of the OS image to base this compute instance on.",
 		},
 		"chipset": {
-			Type:        schema.TypeString,
+			Type:         schema.TypeString,
-			Optional:    true,
+			Optional:     true,
-			Computed:    true,
+			Computed:     true,
-			Description: "Type of the emulated system.",
+			ValidateFunc: validation.StringInSlice([]string{"Q35", "i440fx"}, false), // observe case while validating
+			Description:  "Type of the emulated system.",
 		},
 		"without_boot_disk": {
 			Type:        schema.TypeBool,
@@ -2118,6 +2174,12 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Default:  false,
 		},
+		"auto_start_w_node": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Computed:    true,
+			Description: "Flag for start compute after node exits from MAINTENANCE state",
+		},
 		"auto_start": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -2188,6 +2250,15 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node.",
 		},
+		"preferred_cpu": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+			Description: "Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False",
+		},
 		"pci_devices": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -2406,6 +2477,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -2438,6 +2513,18 @@ func ResourceCompute() *schema.Resource {
 			StateContext: schema.ImportStatePassthroughContext,
 		},
 
+		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
+			if diff.HasChanges() || diff.HasChanges("chipset", "pin_to_stack", "auto_start_w_node", "network", "affinity_rules", "anti_affinity_rules",
+				"disks", "extra_disks", "tags", "port_forwarding", "user_access", "snapshot", "pci_devices", "preferred_cpu") {
+				diff.SetNewComputed("updated_time")
+				diff.SetNewComputed("updated_by")
+			}
+			if diff.HasChanges("pin_to_stack") {
+				diff.SetNewComputed("pinned")
+			}
+			return nil
+		},
+
 		Timeouts: &schema.ResourceTimeout{
 			Create:  &constants.Timeout600s,
 			Read:    &constants.Timeout300s,

internal/service/cloudapi/kvmvm/utility_compute.go

@@ -224,7 +224,7 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 
 	needStart := false
 
-	if oldSet.(*schema.Set).Len() == len(detachMap) || oldSet.(*schema.Set).Len() == 0 {
+	if oldSet.(*schema.Set).Len() == len(detachMap) || oldSet.(*schema.Set).Len() == 0 || hasDPDKnetwork(attachMap) {
 		computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 		if err := utilityComputeStop(ctx, computeId, m); err != nil {
 			apiErrCount++
@@ -259,6 +259,10 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 			req.IPAddr = netData["ip_address"].(string)
 		}
 
+		if req.NetType == "DPDK" {
+			req.MTU = uint64(netData["mtu"].(int))
+		}
+
 		_, err := c.CloudAPI().Compute().NetAttach(ctx, req)
 		if err != nil {
 			log.Errorf("utilityComputeNetworksConfigure: failed to attach net ID %d of type %s to Compute ID %s: %s",
@@ -285,6 +289,15 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 	return nil
 }
 
+func hasDPDKnetwork(networkAttachMap []map[string]interface{}) bool {
+	for _, elem := range networkAttachMap {
+		if elem["net_type"].(string) == "DPDK" {
+			return true
+		}
+	}
+	return false
+}
+
 func utilityComputeCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (compute.RecordCompute, error) {
 	c := m.(*controller.ControllerCfg)
 	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
@@ -374,12 +387,12 @@ func differenceNetwork(oldList, newList []interface{}) (detachMap, changeIpMap,
 		found := false
 		for _, newNetwork := range newList {
 			newMap := newNetwork.(map[string]interface{})
-			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] {
+			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] && (newMap["mtu"] == oldMap["mtu"] || newMap["mtu"].(int) == 0) {
-				if (newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") && newMap["ip_address"] != oldMap["ip_address"] {
+				if (newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") && (newMap["ip_address"] != oldMap["ip_address"] && newMap["ip_address"].(string) != "") {
 					changeIpMap = append(changeIpMap, newMap)
 					found = true
 					break
-				} else if newMap["ip_address"] == oldMap["ip_address"] {
+				} else if newMap["ip_address"] == oldMap["ip_address"] || newMap["ip_address"].(string) == "" {
 					found = true
 					break
 				}
@@ -396,8 +409,10 @@ func differenceNetwork(oldList, newList []interface{}) (detachMap, changeIpMap,
 		found := false
 		for _, oldNetwork := range oldList {
 			oldMap := oldNetwork.(map[string]interface{})
-			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] {
+			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] && (newMap["mtu"] == oldMap["mtu"] || newMap["mtu"].(int) == 0) {
-				if newMap["ip_address"] == oldMap["ip_address"] || ((newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") && newMap["ip_address"] != oldMap["ip_address"]) {
+				if newMap["ip_address"] == oldMap["ip_address"] || newMap["ip_address"].(string) == "" ||
+					((newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") &&
+						newMap["ip_address"] != oldMap["ip_address"] && newMap["ip_address"].(string) != "") {
 					found = true
 					break
 				}

internal/service/cloudapi/vins/data_source_vins.go

@@ -347,6 +347,10 @@ func vnfDevSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vins": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -372,20 +376,8 @@ func vinsComputeSchemaMake() map[string]*schema.Schema {
 
 func reservationSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
-		"client_type": {
+		"account_id": {
-			Type:     schema.TypeString,
+			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"domainname": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"hostname": {
-			Type:     schema.TypeString,
 			Computed: true,
 		},
 		"ip": {

internal/service/cloudapi/vins/flattens.go

@@ -151,6 +151,7 @@ func flattenVNFDev(vnfDev vins.RecordVNFDev) []map[string]interface{} {
 		"status":         vnfDev.Status,
 		"tech_status":    vnfDev.TechStatus,
 		"type":           vnfDev.Type,
+		"vnc_password":   vnfDev.VNCPassword,
 		"vins":           vnfDev.VINS,
 	}
 
@@ -176,14 +177,11 @@ func flattenReservations(reservations vins.ListReservations) []map[string]interf
 	res := make([]map[string]interface{}, 0, len(reservations))
 	for _, reservation := range reservations {
 		temp := map[string]interface{}{
-			"client_type": reservation.ClientType,
+			"account_id": reservation.AccountID,
-			"desc":        reservation.Description,
+			"ip":         reservation.IP,
-			"domainname":  reservation.DomainName,
+			"mac":        reservation.MAC,
-			"hostname":    reservation.Hostname,
+			"type":       reservation.Type,
-			"ip":          reservation.IP,
+			"vm_id":      reservation.VMID,
-			"mac":         reservation.MAC,
-			"type":        reservation.Type,
-			"vm_id":       reservation.VMID,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudapi/vins/resource_static_route.go

@@ -1,277 +1,194 @@
-/*
+/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
+Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
+Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
-
+
-Licensed under the Apache License, Version 2.0 (the "License");
+Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
+you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at
-
+
-    http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
-
+
-Unless required by applicable law or agreed to in writing, software
+Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
+distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
+See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
-*/
+*/
-
+
-/*
+/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
+Orchestration Technology) with Terraform by Hashicorp.
-
+
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
+
-Please see README.md to learn where to place source code so that it
+Please see README.md to learn where to place source code so that it
-builds seamlessly.
+builds seamlessly.
-
+
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
+*/
-
+
-package vins
+package vins
-
+
-import (
+import (
-	"context"
+	"context"
-	"fmt"
+	"fmt"
-	"strconv"
+	"strconv"
-	"strings"
+	"strings"
-
+
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"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/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
-
+
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
+)
-
+
-func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	c := m.(*controller.ControllerCfg)
+	c := m.(*controller.ControllerCfg)
-
+
-	if _, ok := d.GetOk("vins_id"); ok {
+	if _, ok := d.GetOk("vins_id"); ok {
-		haveVinsID, err := existVinsID(ctx, d, m)
+		haveVinsID, err := existVinsID(ctx, d, m)
-		if err != nil {
+		if err != nil {
-			return diag.FromErr(err)
+			return diag.FromErr(err)
-		}
+		}
-
+
-		if !haveVinsID {
+		if !haveVinsID {
-			return diag.Errorf("resourceStaticRouteCreate: can't create Static Route because Vins ID %d is not allowed or does not exist", d.Get("vins_id").(int))
+			return diag.Errorf("resourceStaticRouteCreate: can't create Static Route because Vins ID %d is not allowed or does not exist", d.Get("vins_id").(int))
-		}
+		}
-	}
+	}
-
+
-	req := vins.StaticRouteAddRequest{
+	req := vins.StaticRouteAddRequest{
-		VINSID:      uint64(d.Get("vins_id").(int)),
+		VINSID:      uint64(d.Get("vins_id").(int)),
-		Destination: d.Get("destination").(string),
+		Destination: d.Get("destination").(string),
-		Netmask:     d.Get("netmask").(string),
+		Netmask:     d.Get("netmask").(string),
-		Gateway:     d.Get("gateway").(string),
+		Gateway:     d.Get("gateway").(string),
-	}
+	}
-
+
-	if computesIDS, ok := d.GetOk("compute_ids"); ok {
+	_, err := c.CloudAPI().VINS().StaticRouteAdd(ctx, req)
-		ids := computesIDS.([]interface{})
+	if err != nil {
-
+		return diag.FromErr(err)
-		res := make([]uint64, 10)
+	}
-
+
-		for _, id := range ids {
+	staticRouteData, err := getStaticRouteData(ctx, d, m)
-			computeId := uint64(id.(int))
+	if err != nil {
-			res = append(res, computeId)
+		d.SetId("")
-		}
+		return diag.FromErr(err)
-
+	}
-		req.ComputeIds = res
+
-	}
+	d.SetId(fmt.Sprintf("%d#%d", req.VINSID, staticRouteData.ID))
-
+
-	_, err := c.CloudAPI().VINS().StaticRouteAdd(ctx, req)
+	return resourceStaticRouteRead(ctx, d, m)
-	if err != nil {
+}
-		return diag.FromErr(err)
+
-	}
+func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-
+	warnings := dc.Warnings{}
-	staticRouteData, err := getStaticRouteData(ctx, d, m)
+
-	if err != nil {
+	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
-		d.SetId("")
+	if err != nil {
-		return diag.FromErr(err)
+		d.SetId("")
-	}
+		return diag.FromErr(err)
-
+	}
-	d.SetId(fmt.Sprintf("%d#%d", req.VINSID, staticRouteData.ID))
+
-
+	flattenStaticRouteData(d, staticRouteData)
-	return resourceStaticRouteRead(ctx, d, m)
+
-}
+	return warnings.Get()
-
+}
-func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
-	warnings := dc.Warnings{}
+func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-
+	return nil
-	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+}
-	if err != nil {
+
-		d.SetId("")
+func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-		return diag.FromErr(err)
+	c := m.(*controller.ControllerCfg)
-	}
+	arr := strings.Split(d.Id(), "#")
-
+	if len(arr) != 2 {
-	flattenStaticRouteData(d, staticRouteData)
+		return diag.FromErr(fmt.Errorf("broken state id"))
-
+	}
-	return warnings.Get()
+
-}
+	vinsId, _ := strconv.ParseUint(arr[0], 10, 64)
-
+	routeId, _ := strconv.ParseUint(arr[1], 10, 64)
-func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+
-	c := m.(*controller.ControllerCfg)
+	req := vins.StaticRouteDelRequest{
-	warnings := dc.Warnings{}
+		VINSID:  vinsId,
-
+		RouteId: routeId,
-	if _, ok := d.GetOk("vins_id"); ok {
+	}
-		haveVinsID, err := existVinsID(ctx, d, m)
+
-		if err != nil {
+	_, err := c.CloudAPI().VINS().StaticRouteDel(ctx, req)
-			return diag.FromErr(err)
+	if err != nil {
-		}
+		return diag.FromErr(err)
-
+	}
-		if !haveVinsID {
+
-			return diag.Errorf("resourceVinsUpdate: can't update Static Route because VinsID %d is not allowed or does not exist", d.Get("vins_id").(int))
+	d.SetId("")
-		}
+
-	}
+	return nil
-
+}
-	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+
-	if err != nil {
+func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
-		d.SetId("")
+	rets := dataSourceStaticRouteSchemaMake()
-		return diag.FromErr(err)
+	rets["route_id"] = &schema.Schema{
-	}
+		Type:     schema.TypeInt,
-
+		Computed: true,
-	if d.HasChange("compute_ids") {
+		Optional: true,
-		deletedIds := make([]uint64, 0)
+	}
-		addedIds := make([]uint64, 0)
+	rets["compute_ids"] = &schema.Schema{
-
+		Type:     schema.TypeList,
-		oldComputeIds, newComputeIds := d.GetChange("compute_ids")
+		Computed: true,
-		oldComputeIdsSlice := oldComputeIds.([]interface{})
+		Elem: &schema.Schema{
-		newComputeIdsSlice := newComputeIds.([]interface{})
+			Type: schema.TypeInt,
-
+		},
-		for _, el := range oldComputeIdsSlice {
+	}
-			if !isContainsIds(newComputeIdsSlice, el) {
+	rets["destination"] = &schema.Schema{
-				convertedEl := uint64(el.(int))
+		Type:     schema.TypeString,
-				deletedIds = append(deletedIds, convertedEl)
+		Required: true,
-			}
+	}
-		}
+
-
+	rets["gateway"] = &schema.Schema{
-		for _, el := range newComputeIdsSlice {
+		Type:     schema.TypeString,
-			if !isContainsIds(oldComputeIdsSlice, el) {
+		Required: true,
-				convertedEl := uint64(el.(int))
+	}
-				addedIds = append(addedIds, convertedEl)
+	rets["netmask"] = &schema.Schema{
-			}
+		Type:     schema.TypeString,
-		}
+		Required: true,
-
+	}
-		if len(deletedIds) > 0 {
+
-			req := vins.StaticRouteAccessRevokeRequest{
+	return rets
-				VINSID:     uint64(d.Get("vins_id").(int)),
+}
-				RouteId:    staticRouteData.ID,
+
-				ComputeIds: deletedIds,
+func isContainsIds(els []interface{}, el interface{}) bool {
-			}
+	convEl := el.(int)
-
+	for _, elOld := range els {
-			_, err := c.CloudAPI().VINS().StaticRouteAccessRevoke(ctx, req)
+		if convEl == elOld.(int) {
-			if err != nil {
+			return true
-				warnings.Add(err)
+		}
-			}
+	}
-		}
+	return false
-
+}
-		if len(addedIds) > 0 {
+
-			req := vins.StaticRouteAccessGrantRequest{
+func ResourceStaticRoute() *schema.Resource {
-				VINSID:     uint64(d.Get("vins_id").(int)),
+	return &schema.Resource{
-				RouteId:    staticRouteData.ID,
+		SchemaVersion: 1,
-				ComputeIds: addedIds,
+
-			}
+		CreateContext: resourceStaticRouteCreate,
-
+		ReadContext:   resourceStaticRouteRead,
-			_, err := c.CloudAPI().VINS().StaticRouteAccessGrant(ctx, req)
+		UpdateContext: resourceStaticRouteUpdate,
-			if err != nil {
+		DeleteContext: resourceStaticRouteDelete,
-				warnings.Add(err)
+
-			}
+		Importer: &schema.ResourceImporter{
-		}
+			StateContext: schema.ImportStatePassthroughContext,
-	}
+		},
-
+
-	return append(warnings.Get(), resourceStaticRouteRead(ctx, d, m)...)
+		Timeouts: &schema.ResourceTimeout{
-}
+			Create:  &constants.Timeout20m,
-
+			Read:    &constants.Timeout600s,
-func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+			Update:  &constants.Timeout20m,
-	c := m.(*controller.ControllerCfg)
+			Delete:  &constants.Timeout600s,
-	arr := strings.Split(d.Id(), "#")
+			Default: &constants.Timeout600s,
-	if len(arr) != 2 {
+		},
-		return diag.FromErr(fmt.Errorf("broken state id"))
+
-	}
+		Schema: resourceStaticRouteSchemaMake(),
-
+	}
-	vinsId, _ := strconv.ParseUint(arr[0], 10, 64)
+}
-	routeId, _ := strconv.ParseUint(arr[1], 10, 64)
-
-	req := vins.StaticRouteDelRequest{
-		VINSID:  vinsId,
-		RouteId: routeId,
-	}
-
-	_, err := c.CloudAPI().VINS().StaticRouteDel(ctx, req)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId("")
-
-	return nil
-}
-
-func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
-	rets := dataSourceStaticRouteSchemaMake()
-	rets["route_id"] = &schema.Schema{
-		Type:     schema.TypeInt,
-		Computed: true,
-		Optional: true,
-	}
-	rets["compute_ids"] = &schema.Schema{
-		Type:     schema.TypeList,
-		Optional: true,
-		Computed: true,
-		Elem: &schema.Schema{
-			Type: schema.TypeInt,
-		},
-	}
-	rets["destination"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-	}
-
-	rets["gateway"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-	}
-	rets["netmask"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-	}
-
-	return rets
-}
-
-func isContainsIds(els []interface{}, el interface{}) bool {
-	convEl := el.(int)
-	for _, elOld := range els {
-		if convEl == elOld.(int) {
-			return true
-		}
-	}
-	return false
-}
-
-func ResourceStaticRoute() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		CreateContext: resourceStaticRouteCreate,
-		ReadContext:   resourceStaticRouteRead,
-		UpdateContext: resourceStaticRouteUpdate,
-		DeleteContext: resourceStaticRouteDelete,
-
-		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &constants.Timeout20m,
-			Read:    &constants.Timeout600s,
-			Update:  &constants.Timeout20m,
-			Delete:  &constants.Timeout600s,
-			Default: &constants.Timeout600s,
-		},
-
-		Schema: resourceStaticRouteSchemaMake(),
-	}
-}

internal/service/cloudbroker/extnet/data_source_extnet_reserved_ip.go

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

internal/service/cloudbroker/extnet/flattens.go

@@ -133,7 +133,6 @@ func flattenRecordExtnetResource(d *schema.ResourceData, recNet *extnet.RecordEx
 	d.Set("routes", flattenStaticRouteList(staticRouteList))
 }
 
-
 func flattenExtnetExcluded(ers extnet.ListReservations) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, er := range ers {
@@ -157,6 +156,7 @@ func flattenExtnetReservations(ers extnet.ListReservations) []map[string]interfa
 	res := make([]map[string]interface{}, 0)
 	for _, er := range ers {
 		temp := map[string]interface{}{
+			"account_id":  er.AccountID,
 			"client_type": er.ClientType,
 			"domain_name": er.DomainName,
 			"hostname":    er.Hostname,
@@ -217,4 +217,30 @@ func flattenStaticRouteData(d *schema.ResourceData, route *extnet.ItemRoutes) {
 	d.Set("netmask", route.Netmask)
 	d.Set("compute_ids", route.ComputeIds)
 	d.Set("route_id", route.ID)
-}
+}
+
+func flattenExtnetReservedIp(el []extnet.RecordReservedIP) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(el))
+	for _, e := range el {
+		reservations := make([]map[string]interface{}, 0, len(e.Reservations))
+		for _, r := range e.Reservations {
+			temp := map[string]interface{}{
+				"account_id":  r.AccountID,
+				"client_type": r.ClientType,
+				"domain_name": r.DomainName,
+				"hostname":    r.Hostname,
+				"ip":          r.IP,
+				"mac":         r.Mac,
+				"type":        r.Type,
+				"vm_id":       r.VMID,
+			}
+			reservations = append(reservations, temp)
+		}
+		item := map[string]interface{}{
+			"extnet_id":    e.ExtnetID,
+			"reservations": reservations,
+		}
+		res = append(res, item)
+	}
+	return res
+}

internal/service/cloudbroker/extnet/resource_extnet.go

@@ -54,6 +54,9 @@ func resourceExtnetCreate(ctx context.Context, d *schema.ResourceData, m interfa
 	if err := ic.ExistGID(ctx, uint64(d.Get("gid").(int)), c); err != nil {
 		return diag.FromErr(err)
 	}
+	if err := checkReserveIp(ctx, d, c); err != nil {
+		return diag.FromErr(err)
+	}
 
 	req := extnet.CreateRequest{
 		Name:   d.Get("name").(string),
@@ -191,6 +194,34 @@ func resourceExtnetCreate(ctx context.Context, d *schema.ResourceData, m interfa
 		}
 	}
 
+	// for reserve IP extnet must be enabled
+	if d.Get("reserved_ip").(*schema.Set).Len() > 0 {
+		for _, reservedIP := range d.Get("reserved_ip").(*schema.Set).List() {
+			reservedIPMap := reservedIP.(map[string]interface{})
+			req := extnet.AddReserveIPRequest{
+				AccountID: uint64(reservedIPMap["account_id"].(int)),
+				ExtNetID:  netID,
+			}
+			if ipCount, ok := reservedIPMap["ip_count"]; ok {
+				req.IPCount = uint64(ipCount.(int))
+			}
+			if reservedIPMap["ips"].(*schema.Set).Len() > 0 {
+				ips := reservedIPMap["ips"].(*schema.Set).List()
+				for i, ip := range ips {
+					if i >= int(req.IPCount) {
+						break
+					}
+					req.IPs = append(req.IPs, ip.(string))
+				}
+			}
+
+			_, err := c.CloudBroker().ExtNet().AddReserveIP(ctx, req)
+			if err != nil {
+				w.Add(err)
+			}
+		}
+	}
+
 	return resourceExtnetRead(ctx, d, m)
 }
 
@@ -215,6 +246,10 @@ func resourceExtnetUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	log.Debugf("cloudbroker: resourceExtnetUpdate called with id %s", d.Id())
 	c := m.(*controller.ControllerCfg)
 
+	if err := checkReserveIp(ctx, d, c); err != nil {
+		return diag.FromErr(err)
+	}
+
 	recNet, err := utilityExtnetCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
@@ -267,6 +302,12 @@ func resourceExtnetUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 		}
 	}
 
+	if d.HasChange("reserved_ip") {
+		if err := reservedIPsUpdate(ctx, d, c, recNet); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("shared_with") {
 		if err := handleSharedWithUpdate(ctx, d, c); err != nil {
 			return diag.FromErr(err)
@@ -330,6 +371,8 @@ func ResourceExtnetCB() *schema.Resource {
 			Default: &constants.Timeout300s,
 		},
 
+		CustomizeDiff: validateReserveIPs,
+
 		Schema: resourceExtnetSchemaMake(),
 	}
 }

internal/service/cloudbroker/extnet/schema.go

@@ -1,6 +1,9 @@
 package extnet
 
-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 dataSourceExtnetDefaultSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
@@ -474,6 +477,10 @@ func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"client_type": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -728,6 +735,30 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"reserved_ip": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Required: true,
+					},
+					"ip_count": {
+						Type:         schema.TypeInt,
+						Optional:     true,
+						ValidateFunc: validation.IntBetween(1, 255),
+					},
+					"ips": {
+						Type:     schema.TypeSet,
+						Optional: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
 		"ckey": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -868,6 +899,10 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"client_type": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -905,3 +940,69 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 		},
 	}
 }
+
+func dataSourceExtnetReservedIpSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"extnet_id": {
+			Type:     schema.TypeInt,
+			Optional: true,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"reservations": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"account_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"client_type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"domain_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"hostname": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"ip": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"mac": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"vm_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	return res
+}

internal/service/cloudbroker/extnet/utility_extnet_reserved_ip.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 extnet
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityExtnetReservedIpCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]extnet.RecordReservedIP, error) {
+	c := m.(*controller.ControllerCfg)
+	req := extnet.GetReservedIP{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	if extNetID, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extNetID.(int))
+	}
+
+	log.Debugf("utilityExtnetReservedIpCheckPresence")
+	res, err := c.CloudBroker().ExtNet().GetReservedIP(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

internal/service/cloudbroker/extnet/utility_extnet_resource.go

@@ -35,6 +35,8 @@ package extnet
 
 import (
 	"context"
+	"errors"
+	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
@@ -341,3 +343,255 @@ func handleMigrateUpdate(ctx context.Context, d *schema.ResourceData, c *control
 	return nil
 }
 
+func checkReserveIp(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) error {
+	var err error
+	if d.Get("reserved_ip").(*schema.Set).Len() > 0 {
+		reservedIPList := d.Get("reserved_ip").(*schema.Set).List()
+		accountMap := make(map[int]struct{}, len(reservedIPList))
+		for _, reservedIP := range reservedIPList {
+			reservedIPMap := reservedIP.(map[string]interface{})
+			accountId := reservedIPMap["account_id"].(int)
+			if _, ok := accountMap[accountId]; ok {
+				err = errors.Join(err, fmt.Errorf("checkReserveIp: you must have only one block with id %d", accountId))
+			}
+			accountMap[accountId] = struct{}{}
+			_, okCount := reservedIPMap["ip_count"]
+			if !okCount && reservedIPMap["ips"].(*schema.Set).Len() == 0 {
+				err = errors.Join(err, fmt.Errorf("checkReserveIp: either ip_count or set of ips must be specified"))
+			}
+			existErr := ic.ExistAccount(ctx, uint64(accountId), c)
+			if existErr != nil {
+				err = errors.Join(err, existErr)
+			}
+		}
+	}
+
+	return err
+}
+
+func reservedIPsUpdate(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg, recNet *extnet.RecordExtNet) error {
+
+	addSet, delSet, err := differenceIPReserved(ctx, d, c)
+	if err != nil {
+		return err
+	}
+
+	if len(delSet) > 0 {
+		for _, del := range delSet {
+			delMap := del.(map[string]interface{})
+
+			log.Debugf("reservedIPsUpdate: removing reserved IPs for account %d", delMap["account_id"].(int))
+
+			req := extnet.DelReserveIPRequest{
+				AccountID: uint64(delMap["account_id"].(int)),
+				ExtNetID:  recNet.ID,
+			}
+			if ipCount, ok := delMap["ip_count"]; ok {
+				req.IPCount = uint64(ipCount.(int))
+			}
+			if delIPs, ok := delMap["ips"]; ok {
+				ips := delIPs.(*schema.Set).List()
+				for _, ip := range ips {
+					req.IPs = append(req.IPs, ip.(string))
+				}
+			}
+
+			_, err := c.CloudBroker().ExtNet().DelReserveIP(ctx, req)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(addSet) > 0 {
+		for _, add := range addSet {
+			addMap := add.(map[string]interface{})
+
+			log.Debugf("reservedIPsUpdate: add reserved IPs for account %d", addMap["account_id"].(int))
+
+			req := extnet.AddReserveIPRequest{
+				AccountID: uint64(addMap["account_id"].(int)),
+				ExtNetID:  recNet.ID,
+			}
+			if ipCount, ok := addMap["ip_count"]; ok {
+				req.IPCount = uint64(ipCount.(int))
+			}
+			if addIPs, ok := addMap["ips"]; ok {
+				ips := addIPs.(*schema.Set).List()
+				for _, ip := range ips {
+					req.IPs = append(req.IPs, ip.(string))
+				}
+			}
+
+			_, err := c.CloudBroker().ExtNet().AddReserveIP(ctx, req)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func differenceIPReserved(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) (addList, delList []interface{}, errs error) {
+	addList = make([]interface{}, 0)
+	delList = make([]interface{}, 0)
+	oldSet, newSet := d.GetChange("reserved_ip")
+	oldList := oldSet.(*schema.Set).List()
+	newList := newSet.(*schema.Set).List()
+	for _, oldReservedIP := range oldList {
+		oldMap := oldReservedIP.(map[string]interface{})
+		found := false
+		for _, newReservedIP := range newList {
+			newMap := newReservedIP.(map[string]interface{})
+			if newMap["account_id"] == oldMap["account_id"] && newMap["ip_count"] == oldMap["ip_count"] && newMap["ips"] == oldMap["ips"] {
+				found = true
+				break
+			}
+			if newMap["account_id"] == oldMap["account_id"] {
+				add := make(map[string]interface{}, 0)
+				del := make(map[string]interface{}, 0)
+				delSet := oldMap["ips"].(*schema.Set).Difference(newMap["ips"].(*schema.Set))
+				addSet := newMap["ips"].(*schema.Set).Difference(oldMap["ips"].(*schema.Set))
+				if delSet.Len() > 0 {
+					del["account_id"] = oldMap["account_id"].(int)
+					del["ips"] = delSet
+					if oldMap["ip_count"].(int)-newMap["ip_count"].(int) >= delSet.Len() {
+						del["ip_count"] = oldMap["ip_count"].(int) - newMap["ip_count"].(int)
+					} else {
+						del["ip_count"] = delSet.Len()
+						newMap["ip_count"] = newMap["ip_count"].(int) + delSet.Len()
+					}
+				} else if newMap["ip_count"].(int) < oldMap["ip_count"].(int) {
+					del["account_id"] = oldMap["account_id"].(int)
+					del["ip_count"] = oldMap["ip_count"].(int) - newMap["ip_count"].(int)
+				}
+				if addSet.Len() > 0 {
+					add["account_id"] = oldMap["account_id"].(int)
+					add["ips"] = addSet
+					add["ip_count"] = newMap["ip_count"].(int) - oldMap["ip_count"].(int)
+					if add["ip_count"].(int) < 0 {
+						add["ip_count"] = 0
+					}
+					if add["ip_count"].(int)-addSet.Len() < 0 {
+						del["account_id"] = oldMap["account_id"].(int)
+						if _, ok := del["ip_count"]; ok {
+							del["ip_count"] = del["ip_count"].(int) + addSet.Len()
+						} else {
+							del["ip_count"] = addSet.Len()
+						}
+					}
+				} else if newMap["ip_count"].(int)-oldMap["ip_count"].(int) > 0 {
+					add["account_id"] = oldMap["account_id"].(int)
+					add["ip_count"] = newMap["ip_count"].(int) - oldMap["ip_count"].(int)
+				}
+				if _, ok := add["account_id"]; ok {
+					addList = append(addList, add)
+				}
+				if _, ok := del["account_id"]; ok {
+					ipsLen := 0
+					if _, ok := del["ips"]; ok {
+						ipsLen = del["ips"].(*schema.Set).Len()
+					}
+					freeCount := del["ip_count"].(int) - ipsLen
+					if freeCount > 0 {
+						req := extnet.GetReservedIP{
+							AccountID: uint64(del["account_id"].(int)),
+							ExtNetID:  uint64(d.Get("extnet_id").(int)),
+						}
+						resIpsList, err := c.CloudBroker().ExtNet().GetReservedIP(ctx, req)
+						if err != nil {
+							errs = errors.Join(errs, err)
+						}
+						freeIPs := getFreeIps(resIpsList[0].Reservations, newMap["ips"], del["ips"])
+						if _, ok := del["ips"]; !ok {
+							del["ips"] = schema.NewSet(schema.HashString, []interface{}{})
+						}
+						for i := 0; i < freeCount; i++ {
+							del["ips"].(*schema.Set).Add(freeIPs[i])
+						}
+					}
+					delList = append(delList, del)
+				}
+				found = true
+				break
+			}
+		}
+		if found {
+			continue
+		}
+		delList = append(delList, oldReservedIP)
+	}
+
+	for _, newReservedIP := range newList {
+		newMap := newReservedIP.(map[string]interface{})
+		found := false
+		for _, oldReservedIP := range oldList {
+			oldMap := oldReservedIP.(map[string]interface{})
+			if newMap["account_id"] == oldMap["account_id"] {
+				found = true
+				break
+			}
+		}
+		if found {
+			continue
+		}
+		addList = append(addList, newReservedIP)
+	}
+
+	if errs != nil {
+		d.Set("reserved_ip", oldSet)
+	}
+
+	return
+}
+
+// getFreeIps returns array IPs which can be deleted
+func getFreeIps(reserved []extnet.Reservations, newIps, delIps interface{}) []string {
+	newIpsList := make([]interface{}, 0)
+	delIpsList := make([]interface{}, 0)
+	if newIps != nil {
+		newIpsList = newIps.(*schema.Set).List()
+	}
+	if delIps != nil {
+		delIpsList = delIps.(*schema.Set).List()
+	}
+	newIpsMap := make(map[string]struct{}, len(newIpsList))
+	delIpsMap := make(map[string]struct{}, len(delIpsList))
+	freeIPs := make([]string, 0)
+	for _, ip := range newIpsList {
+		newIpsMap[ip.(string)] = struct{}{}
+	}
+	for _, ip := range delIpsList {
+		delIpsMap[ip.(string)] = struct{}{}
+	}
+	for _, item := range reserved {
+		if _, ok := newIpsMap[item.IP]; ok {
+			continue
+		}
+		if _, ok := delIpsMap[item.IP]; ok {
+			continue
+		}
+		freeIPs = append(freeIPs, item.IP)
+	}
+	return freeIPs
+}
+
+func validateReserveIPs(ctx context.Context, d *schema.ResourceDiff, m interface{}) error {
+	list := d.Get("reserved_ip").(*schema.Set).List()
+	var errs error
+	for _, reservedIP := range list {
+		reservedIPMap := reservedIP.(map[string]interface{})
+		var countIP, ipsLen int
+		if _, ok := reservedIPMap["ip_count"]; ok {
+			countIP = reservedIPMap["ip_count"].(int)
+		}
+		if _, ok := reservedIPMap["ips"]; ok {
+			ipsLen = reservedIPMap["ips"].(*schema.Set).Len()
+		}
+		if ipsLen > countIP {
+			errs = errors.Join(errs, fmt.Errorf("for the reserved_ip block with account_id %d the count parameter must be greater than or equal to len the ips array", reservedIPMap["account_id"].(int)))
+		}
+	}
+	return errs
+}

internal/service/cloudbroker/grid/data_source_grid_get_post_diagnosis.go

@@ -34,21 +34,45 @@ package grid
 
 import (
 	"context"
-	"strconv"
+	"os"
 
+	"github.com/google/uuid"
 	"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/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceGridGetDiagnosisRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	filePath := "diagnosis.tar.gz"
+	if userPath, ok := d.GetOk("file_path"); ok {
+		filePath = userPath.(string)
+	}
+
+	log.Debugf("dataSourceGridGetDiagnosisRead: create file with name: %s", filePath)
+	file, err := os.Create(filePath)
+	defer file.Close()
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
 	diagnosis, err := utilityGridGetDiagnosisCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
 	}
-	d.SetId(strconv.Itoa(d.Get("gid").(int)))
+
-	d.Set("diagnosis", diagnosis)
+	log.Debugf("dataSourceGridGetDiagnosisRead: write data to file with name: %s", filePath)
+	_, err = file.WriteString(diagnosis)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+
 	return nil
 }
 
@@ -66,29 +90,3 @@ func DataSourceGridGetDiagnosis() *schema.Resource {
 		Schema: dataSourceGridGetDiagnosisSchemaMake(),
 	}
 }
-
-func dataSourceGridPostDiagnosisRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	diagnosis, err := utilityGridPostDiagnosisCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-	d.SetId(strconv.Itoa(d.Get("gid").(int)))
-	d.Set("diagnosis", diagnosis)
-	return nil
-}
-
-func DataSourceGridPostDiagnosis() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceGridPostDiagnosisRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceGridPostDiagnosisSchemaMake(),
-	}
-}

internal/service/cloudbroker/grid/schema.go

@@ -586,23 +586,10 @@ func dataSourceGridGetDiagnosisSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Required: true,
 		},
-		"diagnosis": {
+		"file_path": {
 			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourceGridPostDiagnosisSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"gid": {
-			Type:     schema.TypeInt,
 			Required: true,
 		},
-		"diagnosis": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
 	}
 }
 

internal/service/cloudbroker/grid/utility_grid_get_post_diagnosis.go

@@ -62,23 +62,3 @@ func utilityGridGetDiagnosisCheckPresence(ctx context.Context, d *schema.Resourc
 
 	return gridGetDiagnosis, nil
 }
-
-func utilityGridPostDiagnosisCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
-	c := m.(*controller.ControllerCfg)
-	req := grid.GetDiagnosisRequest{}
-
-	if d.Id() != "" {
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
-		req.GID = id
-	} else {
-		req.GID = uint64(d.Get("gid").(int))
-	}
-
-	log.Debugf("utilityGridPostDiagnosisCheckPresence: load grid post diagnosis")
-	gridPostDiagnosis, err := c.CloudBroker().Grid().GetDiagnosis(ctx, req)
-	if err != nil {
-		return "", err
-	}
-
-	return gridPostDiagnosis, nil
-}

internal/service/cloudbroker/image/flattens.go

@@ -48,6 +48,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("sep_id", img.SEPID)
 	d.Set("shared_with", img.SharedWith)
 	d.Set("size", img.Size)
+	d.Set("snapshot_id", img.SnapshotID)
 	d.Set("status", img.Status)
 	d.Set("tech_status", img.TechStatus)
 	d.Set("image_type", img.Type)
@@ -92,47 +93,48 @@ func flattenImageList(il *image.ListImages) []map[string]interface{} {
 		cdPresentedTo, _ := json.Marshal(item.CdPresentedTo)
 
 		temp := map[string]interface{}{
-			"image_id":        item.ID,
+			"image_id":                 item.ID,
-			"unc_path":        item.UNCPath,
+			"unc_path":                 item.UNCPath,
-			"account_id":      item.AccountID,
+			"account_id":               item.AccountID,
-			"acl":             flattenAcl(item.ACL),
+			"acl":                      flattenAcl(item.ACL),
-			"architecture":    item.Architecture,
+			"architecture":             item.Architecture,
-			"boot_type":       item.BootType,
+			"boot_type":                item.BootType,
-			"bootable":        item.Bootable,
+			"bootable":                 item.Bootable,
-			"computeci_id":    item.ComputeCIID,
+			"computeci_id":             item.ComputeCIID,
-			"cd_presented_to": string(cdPresentedTo),
+			"cd_presented_to":          string(cdPresentedTo),
-			"deleted_time":    item.DeletedTime,
+			"deleted_time":             item.DeletedTime,
-			"desc":            item.Description,
+			"desc":                     item.Description,
-			"drivers":         item.Drivers,
+			"drivers":                  item.Drivers,
-			"enabled":         item.Enabled,
+			"enabled":                  item.Enabled,
-			"gid":             item.GID,
+			"gid":                      item.GID,
-			"guid":            item.GUID,
+			"guid":                     item.GUID,
-			"history":         flattenHistory(item.History),
+			"history":                  flattenHistory(item.History),
-			"hot_resize":      item.HotResize,
+			"hot_resize":               item.HotResize,
-			"last_modified":   item.LastModified,
+			"last_modified":            item.LastModified,
-			"link_to":         item.LinkTo,
+			"link_to":                  item.LinkTo,
-			"milestones":      item.Milestones,
+			"milestones":               item.Milestones,
-			"name":            item.Name,
+			"name":                     item.Name,
 			"network_interface_naming": item.NetworkInterfaceNaming,
-			"password":        item.Password,
+			"password":                 item.Password,
-			"pool_name":       item.Pool,
+			"pool_name":                item.Pool,
-			"present_to":      item.PresentTo,
+			"present_to":               item.PresentTo,
-			"provider_name":   item.ProviderName,
+			"provider_name":            item.ProviderName,
-			"purge_attempts":  item.PurgeAttempts,
+			"purge_attempts":           item.PurgeAttempts,
-			"reference_id":    item.ReferenceID,
+			"reference_id":             item.ReferenceID,
-			"res_id":          item.ResID,
+			"res_id":                   item.ResID,
-			"res_name":        item.ResName,
+			"res_name":                 item.ResName,
-			"rescuecd":        item.RescueCD,
+			"rescuecd":                 item.RescueCD,
-			"sep_id":          item.SEPID,
+			"sep_id":                   item.SEPID,
-			"shared_with":     item.SharedWith,
+			"shared_with":              item.SharedWith,
-			"size":            item.Size,
+			"size":                     item.Size,
-			"status":          item.Status,
+			"snapshot_id":              item.SnapshotID,
-			"tech_status":     item.TechStatus,
+			"status":                   item.Status,
-			"image_type":      item.Type,
+			"tech_status":              item.TechStatus,
-			"url":             item.URL,
+			"image_type":               item.Type,
-			"username":        item.Username,
+			"url":                      item.URL,
-			"version":         item.Version,
+			"username":                 item.Username,
-			"virtual":         item.Virtual,
+			"version":                  item.Version,
+			"virtual":                  item.Virtual,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/image/schema.go

@@ -622,6 +622,11 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "image size",
 					},
+					"snapshot_id": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "snapshot id",
+					},
 					"status": {
 						Type:        schema.TypeString,
 						Computed:    true,
@@ -875,6 +880,11 @@ func dataSourceImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "image size",
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1124,6 +1134,11 @@ func resourceCDROMImageSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1415,6 +1430,11 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1689,6 +1709,11 @@ func resourceVirtualImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "image size",
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1967,6 +1992,11 @@ func resourceImageFromBlankComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -2241,6 +2271,11 @@ func resourceImageFromPlatformDiskSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudbroker/kvmvm/flattens.go

@@ -34,6 +34,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("affinity_rules", flattenAffinityRules(computeRec.AffinityRules))
 	d.Set("anti_affinity_rules", flattenAffinityRules(computeRec.AntiAffinityRules))
 	d.Set("arch", computeRec.Arch)
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("boot_order", computeRec.BootOrder)
 	d.Set("boot_disk_id", bootDisk.ID)
 	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
@@ -75,6 +76,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("numa_node_id", computeRec.NumaNodeId)
 	d.Set("os_users", flattenOSUsers(computeRec.OSUsers))
 	d.Set("pinned", computeRec.Pinned)
+	d.Set("preferred_cpu", computeRec.PreferredCPU)
 	d.Set("reference_id", computeRec.ReferenceID)
 	d.Set("registered", computeRec.Registered)
 	d.Set("res_name", computeRec.ResName)
@@ -92,6 +94,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_data", string(userData))
 	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)
@@ -294,6 +297,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"affinity_weight":     computeItem.AffinityWeight,
 			"anti_affinity_rules": flattenListRules(computeItem.AntiAffinityRules),
 			"arch":                computeItem.Arch,
+			"auto_start_w_node":   computeItem.AutoStart,
 			"chipset":             computeItem.Chipset,
 			"cd_image_id":         computeItem.CdImageId,
 			"boot_order":          computeItem.BootOrder,
@@ -329,6 +333,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"numa_node_id":        computeItem.NumaNodeId,
 			"os_users":            flattenOSUsers(computeItem.OSUsers),
 			"pinned":              computeItem.Pinned,
+			"preferred_cpu":       computeItem.PreferredCPU,
 			"ram":                 computeItem.RAM,
 			"reference_id":        computeItem.ReferenceID,
 			"registered":          computeItem.Registered,
@@ -613,6 +618,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("affinity_weight", compFacts.AffinityWeight)
 	d.Set("anti_affinity_rules", flattenAffinityRules(compFacts.AntiAffinityRules))
 	d.Set("arch", compFacts.Arch)
+	d.Set("auto_start_w_node", compFacts.AutoStart)
 	d.Set("boot_order", compFacts.BootOrder)
 	d.Set("chipset", compFacts.Chipset)
 	d.Set("cd_image_id", compFacts.CdImageId)
@@ -652,6 +658,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("numa_node_id", compFacts.NumaNodeId)
 	d.Set("os_users", flattenOSUsers(compFacts.OSUsers))
 	d.Set("pinned", compFacts.Pinned)
+	d.Set("preferred_cpu", compFacts.PreferredCPU)
 	d.Set("ram", compFacts.RAM)
 	d.Set("reference_id", compFacts.ReferenceID)
 	d.Set("registered", compFacts.Registered)
@@ -671,6 +678,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("updated_time", compFacts.UpdatedTime)
 	d.Set("user_data", string(userData))
 	d.Set("user_managed", compFacts.UserManaged)
+	d.Set("vnc_password", compFacts.VNCPassword)
 	d.Set("vgpus", compFacts.VGPUs)
 	d.Set("virtual_image_id", compFacts.VirtualImageID)
 	d.Set("virtual_image_name", compFacts.VirtualImageName)
@@ -695,7 +703,6 @@ func parseComputeInterfacesToNetworks(networks []interface{}, ifaces compute.Lis
 	log.Debugf("parseComputeInterfacesToNetworks: called for %d ifaces", length)
 
 	result := []interface{}{}
-
 	for _, value := range ifaces {
 		elem := make(map[string]interface{})
 		// Keys in this map should correspond to the Schema definition for "network"
@@ -703,6 +710,7 @@ func parseComputeInterfacesToNetworks(networks []interface{}, ifaces compute.Lis
 		elem["net_type"] = value.NetType
 		elem["ip_address"] = value.IPAddress
 		elem["mac"] = value.MAC
+		elem["mtu"] = value.MTU
 		elem["weight"] = flattenNetworkWeight(networks, value.NetID, value.NetType)
 
 		result = append(result, elem)

internal/service/cloudbroker/kvmvm/resource_compute.go

@@ -75,10 +75,6 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		createReqX86.StackID = uint64(stackID.(int))
 	}
 
-	if start, ok := d.GetOk("started"); ok {
-		createReqX86.Start = start.(bool)
-	}
-
 	if ipaType, ok := d.GetOk("ipa_type"); ok {
 		createReqX86.IPAType = ipaType.(string)
 	}
@@ -116,6 +112,10 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 					NetID:   uint64(netInterfaceVal["net_id"].(int)),
 				}
 
+				if reqInterface.NetType == "DPDK" {
+					reqInterface.MTU = uint64(netInterfaceVal["mtu"].(int))
+				}
+
 				ipaddr, ipSet := netInterfaceVal["ip_address"]
 				if ipSet {
 					reqInterface.IPAddr = ipaddr.(string)
@@ -197,6 +197,16 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 	createReqX86.HPBacked = d.Get("hp_backed").(bool)
 	createReqX86.Chipset = d.Get("chipset").(string)
 
+	if preferredCPU, ok := d.GetOk("preferred_cpu"); ok {
+		preferredList := preferredCPU.([]interface{})
+		if len(preferredList) > 0 {
+			for _, v := range preferredList {
+				cpuNum := v.(int)
+				createReqX86.PreferredCPU = append(createReqX86.PreferredCPU, int64(cpuNum))
+			}
+		}
+	}
+
 	log.Debugf("resourceComputeCreate: creating Compute of type KVM VM x86")
 	apiResp, err := c.CloudBroker().KVMX86().Create(ctx, createReqX86)
 	if err != nil {
@@ -208,6 +218,11 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 
 	warnings := dc.Warnings{}
 
+	simpleCompRec, err := utilityComputeCheckPresence(ctx, d, m)
+	if err != nil {
+		warnings.Add(err)
+	}
+
 	cleanup := false
 	defer func() {
 		if cleanup {
@@ -255,6 +270,61 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
+		if pin, ok := d.GetOk("pin_to_stack"); ok && pin.(bool) {
+			req := compute.PinToStackRequest{
+				ComputeID:     computeId,
+				TargetStackID: uint64(d.Get("target_stack_id").(int)),
+			}
+
+			if force, ok := d.Get("force_pin").(bool); ok {
+				req.Force = force
+			}
+
+			if autoStart, ok := d.Get("auto_start_w_node").(bool); ok {
+				req.AutoStart = autoStart
+			}
+
+			_, err := c.CloudBroker().Compute().PinToStack(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+
+		if libvirtSettings, ok := d.GetOk("libvirt_settings"); ok {
+			if libvirtSettings.(*schema.Set).Len() > 0 {
+				lvs := libvirtSettings.(*schema.Set).List()
+				for _, elem := range lvs {
+					netLibvirtMap := elem.(map[string]interface{})
+
+					netType := netLibvirtMap["net_type"].(string)
+					netId := uint64(netLibvirtMap["net_id"].(int))
+					var mac string
+					for _, iface := range simpleCompRec.Interfaces {
+						if iface.NetID == netId && iface.NetType == netType {
+							mac = iface.MAC
+							break
+						}
+					}
+					log.Debugf("resourceComputeCreate: Configure libvirt virtio interface parameters on Network with type %s and id %d", netType, netId)
+					req := compute.SetNetConfigRequest{
+						ComputeID:   computeId,
+						MAC:         mac,
+						TXMode:      netLibvirtMap["txmode"].(string),
+						IOEventFD:   netLibvirtMap["ioeventfd"].(string),
+						EventIDx:    netLibvirtMap["event_idx"].(string),
+						Queues:      uint64(netLibvirtMap["queues"].(int)),
+						RXQueueSize: uint64(netLibvirtMap["rx_queue_size"].(int)),
+						TXQueueSize: uint64(netLibvirtMap["tx_queue_size"].(int)),
+					}
+
+					_, err := c.CloudBroker().Compute().SetNetConfig(ctx, req)
+					if err != nil {
+						warnings.Add(err)
+					}
+				}
+			}
+		}
+
 		if start, ok := d.GetOk("started"); ok && start.(bool) {
 			req := compute.StartRequest{ComputeID: computeId}
 			log.Debugf("resourceComputeCreate: starting Compute ID %d after completing its resource configuration", computeId)
@@ -434,17 +504,14 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			}
 		}
 
-		if pin, ok := d.GetOk("pin_to_stack"); ok && pin.(bool) {
+		if !d.Get("pin_to_stack").(bool) && d.Get("auto_start_w_node").(bool) {
-			req := compute.PinToStackRequest{
+			req := compute.UpdateRequest{
-				ComputeID:     computeId,
+				ComputeID: computeId,
-				TargetStackID: uint64(d.Get("target_stack_id").(int)),
+				AutoStart: d.Get("auto_start_w_node").(bool),
+				CPUPin:    d.Get("cpu_pin").(bool),
+				HPBacked:  d.Get("hp_backed").(bool),
 			}
-
+			_, err := c.CloudBroker().Compute().Update(ctx, req)
-			if force, ok := d.Get("force_pin").(bool); ok {
-				req.Force = force
-			}
-
-			_, err := c.CloudBroker().Compute().PinToStack(ctx, req)
 			if err != nil {
 				warnings.Add(err)
 			}
@@ -485,31 +552,6 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				}
 			}
 		}
-
-		if ars, ok := d.GetOk("libvirt_settings"); ok {
-			log.Debugf("resourceComputeCreate: Configure libvirt virtio interface parameters on ComputeID: %d", computeId)
-			settings := ars.(*schema.Set).List()
-			if len(settings) > 0 {
-				for _, v := range settings {
-					settingsConv := v.(map[string]interface{})
-					req := compute.SetNetConfigRequest{
-						ComputeID:   computeId,
-						MAC:         settingsConv["mac"].(string),
-						TXMode:      settingsConv["txmode"].(string),
-						IOEventFD:   settingsConv["ioeventfd"].(string),
-						EventIDx:    settingsConv["event_idx"].(string),
-						Queues:      uint64(settingsConv["queues"].(int)),
-						RXQueueSize: uint64(settingsConv["rx_queue_size"].(int)),
-						TXQueueSize: uint64(settingsConv["tx_queue_size"].(int)),
-					}
-
-					_, err := c.CloudBroker().Compute().SetNetConfig(ctx, req)
-					if err != nil {
-						warnings.Add(err)
-					}
-				}
-			}
-		}
 	}
 
 	log.Debugf("resourceComputeCreate: new Compute ID %d, name %s creation sequence complete", computeId, d.Get("name").(string))
@@ -664,19 +706,25 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("network") {
+	if d.HasChange("pin_to_stack") {
-		err = utilityComputeNetworksConfigure(ctx, d, m) // pass do_delta = true to apply changes, if any
+		if err := utilityComputePinToStack(ctx, d, m); err != nil {
-		if err != nil {
 			return diag.FromErr(err)
 		}
 	}
 
-	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed") {
+	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed", "chipset", "auto_start_w_node", "preferred_cpu") {
 		if err := utilityComputeUpdate(ctx, d, m); err != nil {
 			return diag.FromErr(err)
 		}
 	}
 
+	if d.HasChanges("network", "libvirt_settings") {
+		err = utilityComputeNetworksConfigure(ctx, d, m) // pass do_delta = true to apply changes, if any
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("disks") {
 		if err := utilityComputeUpdateDisks(ctx, d, m); err != nil {
 			return diag.FromErr(err)
@@ -737,12 +785,6 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("pin_to_stack") {
-		if err := utilityComputePinToStack(ctx, d, m); err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
 	if d.HasChange("pause") {
 		if err := utilityComputePause(ctx, d, m); err != nil {
 			return diag.FromErr(err)
@@ -773,12 +815,6 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChange("libvirt_settings") {
-		if err := utilityComputeUpdateLibvirtSettings(ctx, d, m); err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
 	return append(resourceComputeRead(ctx, d, m), warnings.Get()...)
 }
 
@@ -829,6 +865,18 @@ func ResourceCompute() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
 
+		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
+			if diff.HasChanges() || diff.HasChanges("chipset", "pin_to_stack", "auto_start_w_node", "libvirt_settings", "network", "affinity_rules", "anti_affinity_rules",
+				"disks", "extra_disks", "tags", "port_forwarding", "user_access", "snapshot", "pci_devices", "preferred_cpu") {
+				diff.SetNewComputed("updated_time")
+				diff.SetNewComputed("updated_by")
+			}
+			if diff.HasChanges("pin_to_stack") {
+				diff.SetNewComputed("pinned")
+			}
+			return nil
+		},
+
 		CreateContext: resourceComputeCreate,
 		ReadContext:   resourceComputeRead,
 		UpdateContext: resourceComputeUpdate,

internal/service/cloudbroker/kvmvm/schema.go

@@ -134,6 +134,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"boot_order": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -788,6 +792,13 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"preferred_cpu": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
 		"ram": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -902,6 +913,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -990,6 +1005,11 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Find by image ID",
 		},
+		"cd_image_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by CD image ID",
+		},
 		"extnet_name": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -1145,6 +1165,10 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"auto_start_w_node": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"boot_order": {
 						Type:     schema.TypeList,
 						Computed: true,
@@ -1474,6 +1498,13 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeBool,
 						Computed: true,
 					},
+					"preferred_cpu": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
 					"ram": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -1802,6 +1833,10 @@ func dataSourceComputeListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"auto_start_w_node": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"boot_order": {
 						Type:     schema.TypeList,
 						Computed: true,
@@ -2083,6 +2118,13 @@ func dataSourceComputeListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"preferred_cpu": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
 					"reference_id": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -2918,10 +2960,11 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Description: "ID of the OS image to base this compute instance on.",
 		},
 		"chipset": {
-			Type:        schema.TypeString,
+			Type:         schema.TypeString,
-			Optional:    true,
+			Optional:     true,
-			Computed:    true,
+			Computed:     true,
-			Description: "Type of the emulated system.",
+			ValidateFunc: validation.StringInSlice([]string{"Q35", "i440fx"}, false), // observe case while validating
+			Description:  "Type of the emulated system.",
 		},
 		"without_boot_disk": {
 			Type:        schema.TypeBool,
@@ -3011,13 +3054,11 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 						ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS", "VFNIC", "DPDK"}, false), // observe case while validating
 						Description:  "Type of the network for this connection, either EXTNET or VINS.",
 					},
-
 					"net_id": {
 						Type:        schema.TypeInt,
 						Required:    true,
 						Description: "ID of the network for this connection.",
 					},
-
 					"ip_address": {
 						Type:             schema.TypeString,
 						Optional:         true,
@@ -3025,24 +3066,82 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 						DiffSuppressFunc: networkSubresIPAddreDiffSupperss,
 						Description:      "Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.",
 					},
-
 					"mac": {
 						Type:        schema.TypeString,
 						Computed:    true,
 						Description: "MAC address associated with this connection. MAC address is assigned automatically.",
 					},
-
 					"weight": {
 						Type:        schema.TypeInt,
 						Optional:    true,
 						Computed:    true,
 						Description: "weight the network if you need to sort network list, the smallest attach first. zero or null weight attach last",
 					},
+					"mtu": {
+						Type:     schema.TypeInt,
+						Optional: true,
+						Computed: true,
+						//Default:      1500,
+						ValidateFunc: validation.IntBetween(1, 9216),
+						Description:  "Maximum transmission unit, used only for DPDK type, must be 1-9216",
+					},
 				},
 			},
 			Description: "Optional network connection(s) for this compute. You may specify several network blocks, one for each connection.",
 		},
 
+		"libvirt_settings": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"net_type": {
+						Type:         schema.TypeString,
+						Required:     true,
+						StateFunc:    statefuncs.StateFuncToUpper,
+						ValidateFunc: validation.StringInSlice([]string{"VINS", "VFNIC", "DPDK"}, false), // observe case while validating
+						Description:  "Type of the network",
+					},
+					"net_id": {
+						Type:        schema.TypeInt,
+						Required:    true,
+						Description: "ID of the network",
+					},
+					"txmode": {
+						Type:     schema.TypeString,
+						Default:  "",
+						Optional: true,
+					},
+					"ioeventfd": {
+						Type:     schema.TypeString,
+						Default:  "",
+						Optional: true,
+					},
+					"event_idx": {
+						Type:     schema.TypeString,
+						Default:  "",
+						Optional: true,
+					},
+					"queues": {
+						Type:     schema.TypeInt,
+						Default:  0,
+						Optional: true,
+					},
+					"rx_queue_size": {
+						Type:     schema.TypeInt,
+						Default:  0,
+						Optional: true,
+					},
+					"tx_queue_size": {
+						Type:     schema.TypeInt,
+						Default:  0,
+						Optional: true,
+					},
+				},
+			},
+			Description: "Configure libvirt virtio interface parameters. You can only delete values locally. Data on the platform cannot be deleted.",
+		},
+
 		"affinity_label": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -3318,6 +3417,11 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Default:  false,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
 		"target_stack_id": {
 			Type:     schema.TypeInt,
 			Optional: true,
@@ -3402,6 +3506,15 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node.",
 		},
+		"preferred_cpu": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+			Description: "Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False",
+		},
 		"pci_devices": {
 			Type:     schema.TypeSet,
 			Optional: true,
@@ -3411,43 +3524,6 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			},
 			Description: "ID of the connected pci devices",
 		},
-		"libvirt_settings": {
-			Type:     schema.TypeSet,
-			Optional: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"mac": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"txmode": {
-						Type:     schema.TypeString,
-						Optional: true,
-					},
-					"ioeventfd": {
-						Type:     schema.TypeString,
-						Optional: true,
-					},
-					"event_idx": {
-						Type:     schema.TypeString,
-						Optional: true,
-					},
-					"queues": {
-						Type:     schema.TypeInt,
-						Optional: true,
-					},
-					"rx_queue_size": {
-						Type:     schema.TypeInt,
-						Optional: true,
-					},
-					"tx_queue_size": {
-						Type:     schema.TypeInt,
-						Optional: true,
-					},
-				},
-			},
-			Description: "Configure libvirt virtio interface parameters. You can only delete values locally. Data on the platform cannot be deleted.",
-		},
 		// Computed properties
 		"account_id": {
 			Type:        schema.TypeInt,
@@ -3886,6 +3962,10 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudbroker/kvmvm/utility_compute.go

@@ -135,6 +135,22 @@ func utilityComputeResize(ctx context.Context, d *schema.ResourceData, m interfa
 		resizeReq.CPU = 0
 	}
 
+	if resizeReq.CPU != 0 {
+		if preferredCPU, ok := d.GetOk("preferred_cpu"); ok {
+			preferredList := preferredCPU.([]interface{})
+			if len(preferredList) > 0 {
+				for _, v := range preferredList {
+					cpuNum := v.(int)
+					resizeReq.PreferredCPU = append(resizeReq.PreferredCPU, int64(cpuNum))
+				}
+			}
+		}
+		oldPCPU, newPCPU := d.GetChange("preferred_cpu")
+		if len(oldPCPU.([]interface{})) != 0 && len(newPCPU.([]interface{})) == 0 {
+			resizeReq.PreferredCPU = []int64{-1}
+		}
+	}
+
 	oldRam, newRam := d.GetChange("ram")
 	if oldRam.(int) != newRam.(int) {
 		resizeReq.RAM = uint64(newRam.(int))
@@ -629,7 +645,11 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 
 	needStart := false
 
-	if oldSet.(*schema.Set).Len() == len(detachMap) || oldSet.(*schema.Set).Len() == 0 {
+	oldLibvirtSet, newLibvirtSet := d.GetChange("libvirt_settings")
+	addedLibvirtSettings := (newLibvirtSet.(*schema.Set).Difference(oldLibvirtSet.(*schema.Set))).List()
+	libvirtSettingsMap := addAttachedNetwork(addedLibvirtSettings, newLibvirtSet.(*schema.Set).List(), attachMap)
+
+	if oldSet.(*schema.Set).Len() == len(detachMap) || oldSet.(*schema.Set).Len() == 0 || len(libvirtSettingsMap) > 0 || hasDPDKnetwork(attachMap) {
 		if err := utilityComputeStop(ctx, d, m); err != nil {
 			apiErrCount++
 			lastSavedError = err
@@ -659,6 +679,10 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 			NetID:     uint64(netData["net_id"].(int)),
 		}
 
+		if req.NetType == "DPDK" {
+			req.MTU = uint64(netData["mtu"].(int))
+		}
+
 		if netData["ip_address"].(string) != "" {
 			req.IPAddr = netData["ip_address"].(string)
 		}
@@ -672,6 +696,51 @@ func utilityComputeNetworksConfigure(ctx context.Context, d *schema.ResourceData
 		}
 	}
 
+	if len(libvirtSettingsMap) > 0 {
+		computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		computeRec, err := utilityComputeCheckPresence(ctx, d, m)
+		if err != nil {
+			log.Errorf("utilityComputeNetworksConfigure: failed to read information about compute with ID %s: %s",
+				d.Id(), err)
+			apiErrCount++
+			lastSavedError = err
+		}
+
+		if computeRec != nil {
+			log.Debugf("utilityComputeNetworksConfigure: libvirt virtio set has %d items for Compute ID %s", len(attachMap), d.Id())
+			for _, libvirtSetting := range libvirtSettingsMap {
+				netType := libvirtSetting["net_type"].(string)
+				netId := uint64(libvirtSetting["net_id"].(int))
+				var mac string
+				for _, iface := range computeRec.Interfaces {
+					if iface.NetID == netId && iface.NetType == netType {
+						mac = iface.MAC
+						break
+					}
+				}
+				log.Debugf("utilityComputeNetworksConfigure: Configure libvirt virtio interface parameters on Network with type %s and id %d", netType, netId)
+				req := compute.SetNetConfigRequest{
+					ComputeID:   computeId,
+					MAC:         mac,
+					TXMode:      libvirtSetting["txmode"].(string),
+					IOEventFD:   libvirtSetting["ioeventfd"].(string),
+					EventIDx:    libvirtSetting["event_idx"].(string),
+					Queues:      uint64(libvirtSetting["queues"].(int)),
+					RXQueueSize: uint64(libvirtSetting["rx_queue_size"].(int)),
+					TXQueueSize: uint64(libvirtSetting["tx_queue_size"].(int)),
+				}
+
+				_, err := c.CloudBroker().Compute().SetNetConfig(ctx, req)
+				if err != nil {
+					log.Errorf("utilityComputeNetworksConfigure: failed to set net config to net ID %d of type %s to Compute ID %s: %s",
+						netId, netType, d.Id(), err)
+					apiErrCount++
+					lastSavedError = err
+				}
+			}
+		}
+	}
+
 	if needStart {
 		computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
 		if numErr, err := utilityComputeStart(ctx, computeId, m); err != nil {
@@ -698,12 +767,12 @@ func differenceNetwork(oldList, newList []interface{}) (detachMap, changeIpMap,
 		found := false
 		for _, newNetwork := range newList {
 			newMap := newNetwork.(map[string]interface{})
-			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] {
+			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] && (newMap["mtu"] == oldMap["mtu"] || newMap["mtu"].(int) == 0) {
-				if (newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") && newMap["ip_address"] != oldMap["ip_address"] {
+				if (newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") && (newMap["ip_address"] != oldMap["ip_address"] && newMap["ip_address"].(string) != "") {
 					changeIpMap = append(changeIpMap, newMap)
 					found = true
 					break
-				} else if newMap["ip_address"] == oldMap["ip_address"] {
+				} else if newMap["ip_address"] == oldMap["ip_address"] || newMap["ip_address"].(string) == "" {
 					found = true
 					break
 				}
@@ -720,8 +789,10 @@ func differenceNetwork(oldList, newList []interface{}) (detachMap, changeIpMap,
 		found := false
 		for _, oldNetwork := range oldList {
 			oldMap := oldNetwork.(map[string]interface{})
-			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] {
+			if newMap["net_type"] == oldMap["net_type"] && newMap["net_id"] == oldMap["net_id"] && newMap["weight"] == oldMap["weight"] && (newMap["mtu"] == oldMap["mtu"] || newMap["mtu"].(int) == 0) {
-				if newMap["ip_address"] == oldMap["ip_address"] || ((newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") && newMap["ip_address"] != oldMap["ip_address"]) {
+				if newMap["ip_address"] == oldMap["ip_address"] || newMap["ip_address"].(string) == "" ||
+					((newMap["net_type"].(string) == "EXTNET" || newMap["net_type"].(string) == "VINS") &&
+						newMap["ip_address"] != oldMap["ip_address"] && newMap["ip_address"].(string) != "") {
 					found = true
 					break
 				}
@@ -736,6 +807,49 @@ func differenceNetwork(oldList, newList []interface{}) (detachMap, changeIpMap,
 	return
 }
 
+func hasDPDKnetwork(networkAttachMap []map[string]interface{}) bool {
+	for _, elem := range networkAttachMap {
+		if elem["net_type"].(string) == "DPDK" {
+			return true
+		}
+	}
+	return false
+}
+
+// addAttachedNetwork adds libvirt_settings of attached networks to the libvirt_settings settings list
+func addAttachedNetwork(addedLibvirtSettings []interface{}, newLibvirtSettings []interface{}, networkAttachMap []map[string]interface{}) (addedLibvirtSettingsMap []map[string]interface{}) {
+	addedLibvirtSettingsMap = make([]map[string]interface{}, 0)
+
+	for _, attach := range networkAttachMap {
+		found := false
+		for _, elem := range addedLibvirtSettings {
+			addedLVSMap := elem.(map[string]interface{})
+			if attach["net_id"] == addedLVSMap["net_id"] && attach["net_type"] == addedLVSMap["net_type"] {
+				found = true
+				break
+			}
+		}
+		if found {
+			continue
+		}
+		for _, elem := range newLibvirtSettings {
+			newVirtSettingMap := elem.(map[string]interface{})
+			if attach["net_id"] == newVirtSettingMap["net_id"] && attach["net_type"] == newVirtSettingMap["net_type"] {
+				addedLibvirtSettingsMap = append(addedLibvirtSettingsMap, newVirtSettingMap)
+				found = true
+				break
+			}
+		}
+	}
+
+	for _, elem := range addedLibvirtSettings {
+		addedLVSMap := elem.(map[string]interface{})
+		addedLibvirtSettingsMap = append(addedLibvirtSettingsMap, addedLVSMap)
+	}
+
+	return
+}
+
 func utilityComputeUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	c := m.(*controller.ControllerCfg)
 
@@ -754,21 +868,33 @@ func utilityComputeUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	if d.HasChange("numa_affinity") {
 		req.NumaAffinity = d.Get("numa_affinity").(string)
 	}
-	if d.HasChange("cpu_pin") {
-		req.CPUPin = d.Get("cpu_pin").(bool)
-	}
-	if d.HasChange("hp_backed") {
-		req.HPBacked = d.Get("hp_backed").(bool)
-	}
-
 	if d.HasChange("chipset") {
 		req.Chipset = d.Get("chipset").(string)
 	}
+	req.CPUPin = d.Get("cpu_pin").(bool)
+	req.HPBacked = d.Get("hp_backed").(bool)
+	req.AutoStart = d.Get("auto_start_w_node").(bool)
+
+	if d.HasChange("preferred_cpu") {
+		if preferredCPU, ok := d.GetOk("preferred_cpu"); ok {
+			preferredList := preferredCPU.([]interface{})
+			if len(preferredList) > 0 {
+				for _, v := range preferredList {
+					cpuNum := v.(int)
+					req.PreferredCPU = append(req.PreferredCPU, int64(cpuNum))
+				}
+			}
+		}
+		oldPCPU, newPCPU := d.GetChange("preferred_cpu")
+		if len(oldPCPU.([]interface{})) != 0 && len(newPCPU.([]interface{})) == 0 {
+			req.PreferredCPU = []int64{-1}
+		}
+	}
 
 	// Note bene: numa_affinity, cpu_pin and hp_backed are not allowed to be changed for compute in STARTED tech status.
 	// If STARTED, we need to stop it before update
 	var isStopRequired bool
-	if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed") && d.Get("started").(bool) {
+	if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset", "preferred_cpu") && d.Get("started").(bool) {
 		isStopRequired = true
 	}
 	if isStopRequired {
@@ -1015,36 +1141,6 @@ func utilityComputeUpdatePciDevices(ctx context.Context, d *schema.ResourceData,
 	return nil
 }
 
-func utilityComputeUpdateLibvirtSettings(ctx context.Context, d *schema.ResourceData, m interface{}) error {
-	c := m.(*controller.ControllerCfg)
-	computeId, _ := strconv.ParseUint(d.Id(), 10, 64)
-	oldSet, newSet := d.GetChange("libvirt_settings")
-
-	added := (newSet.(*schema.Set).Difference(oldSet.(*schema.Set))).List()
-	if len(added) > 0 {
-		for _, v := range added {
-			settingsConv := v.(map[string]interface{})
-			req := compute.SetNetConfigRequest{
-				ComputeID:   computeId,
-				MAC:         settingsConv["mac"].(string),
-				TXMode:      settingsConv["txmode"].(string),
-				IOEventFD:   settingsConv["ioeventfd"].(string),
-				EventIDx:    settingsConv["event_idx"].(string),
-				Queues:      uint64(settingsConv["queues"].(int)),
-				RXQueueSize: uint64(settingsConv["rx_queue_size"].(int)),
-				TXQueueSize: uint64(settingsConv["tx_queue_size"].(int)),
-			}
-
-			_, err := c.CloudBroker().Compute().SetNetConfig(ctx, req)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
 func utilityComputeUpdateTags(ctx context.Context, d *schema.ResourceData, m interface{}) error {
 	c := m.(*controller.ControllerCfg)
 
@@ -1366,6 +1462,11 @@ func utilityComputePinToStack(ctx context.Context, d *schema.ResourceData, m int
 		if force, ok := d.Get("force_pin").(bool); ok {
 			req.Force = force
 		}
+
+		if autoStart, ok := d.Get("auto_start_w_node").(bool); ok {
+			req.AutoStart = autoStart
+		}
+
 		_, err := c.CloudBroker().Compute().PinToStack(ctx, req)
 		if err != nil {
 			return err
@@ -1510,7 +1611,7 @@ func utilityComputeStop(ctx context.Context, d *schema.ResourceData, m interface
 		req.Depresent = depresent
 	}
 
-	log.Debugf("utilityComputeNetworksConfigure: stopping compute %d", req.ComputeID)
+	log.Debugf("utilityComputeStop: stopping compute %d", req.ComputeID)
 	_, err := c.CloudBroker().Compute().Stop(ctx, req)
 	if err != nil {
 		return err
@@ -1522,7 +1623,7 @@ func utilityComputeStart(ctx context.Context, computeID uint64, m interface{}) (
 	c := m.(*controller.ControllerCfg)
 	startReq := compute.StartRequest{ComputeID: computeID}
 
-	log.Debugf("utilityComputeNetworksConfigure: starting compute %d", computeID)
+	log.Debugf("utilityComputeStart: starting compute %d", computeID)
 	_, err := c.CloudBroker().Compute().Start(ctx, startReq)
 	if err != nil {
 		return 1, err

internal/service/cloudbroker/kvmvm/utility_compute_list.go

@@ -75,6 +75,9 @@ func utilityDataComputeListCheckPresence(ctx context.Context, d *schema.Resource
 	if imageID, ok := d.GetOk("image_id"); ok {
 		req.ImageID = imageID.(uint64)
 	}
+	if cdImageID, ok := d.GetOk("cd_image_id"); ok {
+		req.CDImageID = cdImageID.(uint64)
+	}
 	if extNetName, ok := d.GetOk("extnet_name"); ok {
 		req.ExtNetName = extNetName.(string)
 	}

internal/service/cloudbroker/node/flattens.go

@@ -46,11 +46,14 @@ func flattenNode(d *schema.ResourceData, item *node.RecordNode) {
 	d.Set("consumption", flattenConsumption(item.Consumption))
 	d.Set("cpu_info", flattenCpuInfo(item.CpuInfo))
 	d.Set("cpu_allocation_ratio", item.CPUAllocationRatio)
+	d.Set("dpdk", flattenDPDKItem(item.DPDK))
 	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("net_addr", flattenGetNetAddr(item.NetAddr))
+	d.Set("network_mode", item.NetworkMode)
 	d.Set("nic_info", flattenNicInfo(item.NicInfo))
 	d.Set("numa_topology", flattenNumaTopology(item.NumaTopology))
 	d.Set("reserved_cpus", flattenNodeItem(item.ReservedCPUs))
@@ -58,6 +61,10 @@ func flattenNode(d *schema.ResourceData, item *node.RecordNode) {
 	d.Set("sriov_enabled", item.SriovEnabled)
 	d.Set("stack_id", item.StackID)
 	d.Set("status", item.Status)
+	d.Set("to_active", flattenRole(item.ToActive))
+	d.Set("to_installing", flattenRole(item.ToInstalling))
+	d.Set("to_maintenance", flattenRole(item.ToMaintenance))
+	d.Set("to_restricted", flattenRole(item.ToRestricted))
 	d.Set("version", item.Version)
 }
 
@@ -106,44 +113,46 @@ 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),
+			"additional_pkgs":    flattenNodeItem(item.AdditionalPkgs),
-			"cpu_info":        flattenCpuInfo(item.CpuInfo),
+			"cpu_info":           flattenCpuInfo(item.CpuInfo),
-			"description":     item.Description,
+			"description":        item.Description,
-			"gid":             item.GID,
+			"dpdk":               flattenDPDKItem(item.DPDK),
-			"guid":            item.GUID,
+			"gid":                item.GID,
-			"hostkey":         item.HostKey,
+			"guid":               item.GUID,
-			"node_id":         item.ID,
+			"hostkey":            item.HostKey,
-			"ipaddr":          item.IPAddr,
+			"node_id":            item.ID,
-			"isolated_cpus":   flattenNodeItem(item.IsolatedCpus),
+			"ipaddr":             item.IPAddr,
-			"lastcheck":       item.LastCheck,
+			"isolated_cpus":      flattenNodeItem(item.IsolatedCpus),
-			"machine_guid":    item.MachineGUID,
+			"lastcheck":          item.LastCheck,
-			"mainboard_sn":    item.MainboardSN,
+			"machine_guid":       item.MachineGUID,
-			"memory":          item.Memory,
+			"mainboard_sn":       item.MainboardSN,
-			"milestones":      item.Milestones,
+			"memory":             item.Memory,
-			"model":           item.Model,
+			"milestones":         item.Milestones,
-			"name":            item.Name,
+			"model":              item.Model,
-			"need_reboot":     item.NeedReboot,
+			"name":               item.Name,
-			"net_addr":        flattenNetAddr(item.NetAddr),
+			"need_reboot":        item.NeedReboot,
-			"network_mode":    item.NetworkMode,
+			"net_addr":           flattenNetAddr(item.NetAddr),
-			"nic_info":        flattenNicInfo(item.NicInfo),
+			"network_mode":       item.NetworkMode,
-			"node_uuid":       item.NodeUUID,
+			"nic_info":           flattenNicInfo(item.NicInfo),
-			"numa_topology":   flattenNumaTopology(item.NumaTopology),
+			"node_uuid":          item.NodeUUID,
-			"peer_backup":     item.PeerBackup,
+			"numa_topology":      flattenNumaTopology(item.NumaTopology),
-			"peer_log":        item.PeerLog,
+			"peer_backup":        item.PeerBackup,
-			"peer_stats":      item.PeerStats,
+			"peer_log":           item.PeerLog,
-			"pgpus":           item.Pgpus,
+			"peer_stats":         item.PeerStats,
-			"public_keys":     item.PublicKeys,
+			"pgpus":              item.Pgpus,
-			"release":         item.Release,
+			"public_keys":        item.PublicKeys,
-			"reserved_cpus":   flattenNodeItem(item.ReservedCPUs),
+			"release":            item.Release,
-			"roles":           item.Roles,
+			"reserved_cpus":      flattenNodeItem(item.ReservedCPUs),
-			"seps":            item.Seps,
+			"roles":              item.Roles,
-			"serial_num":      item.SerialNum,
+			"seps":               item.Seps,
-			"sriov_enabled":   item.SriovEnabled,
+			"serial_num":         item.SerialNum,
-			"stack_id":        item.StackID,
+			"sriov_enabled":      item.SriovEnabled,
-			"status":          item.Status,
+			"stack_id":           item.StackID,
-			"tags":            item.Tags,
+			"status":             item.Status,
-			"type":            item.Type,
+			"tags":               item.Tags,
-			"version":         item.Version,
+			"type":               item.Type,
+			"uefi_firmware_file": item.UEFIFirmwareFile,
+			"version":            item.Version,
 		}
 		res = append(res, temp)
 	}
@@ -205,9 +214,9 @@ func flattenVFList(vfList []interface{}) []map[string]interface{} {
 	return res
 }
 
-func flattenNetAddr(adresses node.ListNetAddr) []map[string]interface{} {
+func flattenNetAddr(addresses node.ListNetAddr) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len(adresses))
+	res := make([]map[string]interface{}, 0, len(addresses))
-	for _, item := range adresses {
+	for _, item := range addresses {
 		temp := map[string]interface{}{
 			"cidr":  item.CIDR,
 			"index": item.Index,
@@ -221,6 +230,16 @@ func flattenNetAddr(adresses node.ListNetAddr) []map[string]interface{} {
 	return res
 }
 
+func flattenGetNetAddr(address node.NetAddr) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	temp := map[string]interface{}{
+		"ip":   address.IP,
+		"name": address.Name,
+	}
+	res[0] = temp
+	return res
+}
+
 func flattenCpuInfo(info node.CpuInfo) []map[string]interface{} {
 	res := make([]map[string]interface{}, 1)
 	temp := map[string]interface{}{
@@ -250,3 +269,36 @@ func flattenNodeItem(m []interface{}) []string {
 	}
 	return output
 }
+
+func flattenDPDKItem(dpdk node.DPDK) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	bridges := make([]map[string]interface{}, 1)
+	backplane := make([]map[string]interface{}, 1)
+	backplane[0] = map[string]interface{}{
+		"interfaces": dpdk.Bridges.Backplane1.Interfaces,
+		"numa_node":  dpdk.Bridges.Backplane1.NumaNode,
+	}
+
+	bridges[0] = map[string]interface{}{
+		"backplane1": backplane,
+	}
+
+	res[0] = map[string]interface{}{
+		"bridges":   bridges,
+		"hp_memory": dpdk.HPMemory,
+		"pmd_cpu":   dpdk.PMDCPU,
+	}
+
+	return res
+}
+
+func flattenRole(role node.Role) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	temp := map[string]interface{}{
+		"actor":  role.Actor,
+		"reason": role.Reason,
+		"time":   role.Time,
+	}
+	res[0] = temp
+	return res
+}

internal/service/cloudbroker/node/schema.go

@@ -105,6 +105,55 @@ func dataSourceNodeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"dpdk": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"bridges": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"backplane1": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"interfaces": {
+												Type:     schema.TypeList,
+												Computed: true,
+												Elem: &schema.Schema{
+													Type: schema.TypeString,
+												},
+											},
+											"numa_node": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+					"hp_memory": {
+						Type:     schema.TypeMap,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"pmd_cpu": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+				},
+			},
+		},
 		"gid": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -131,6 +180,29 @@ func dataSourceNodeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"net_addr": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"ip": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"network_mode": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"nic_info": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -253,6 +325,86 @@ func dataSourceNodeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"to_active": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"actor": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reason": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"to_installing": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"actor": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reason": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"to_maintenance": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"actor": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reason": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"to_restricted": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"actor": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"reason": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
 		"version": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -349,6 +501,55 @@ func dataSourceNodeListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"dpdk": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"bridges": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"backplane1": {
+												Type:     schema.TypeList,
+												Computed: true,
+												Elem: &schema.Resource{
+													Schema: map[string]*schema.Schema{
+														"interfaces": {
+															Type:     schema.TypeList,
+															Computed: true,
+															Elem: &schema.Schema{
+																Type: schema.TypeString,
+															},
+														},
+														"numa_node": {
+															Type:     schema.TypeInt,
+															Computed: true,
+														},
+													},
+												},
+											},
+										},
+									},
+								},
+								"hp_memory": {
+									Type:     schema.TypeMap,
+									Computed: true,
+									Elem: &schema.Schema{
+										Type: schema.TypeInt,
+									},
+								},
+								"pmd_cpu": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Schema{
+										Type: schema.TypeInt,
+									},
+								},
+							},
+						},
+					},
 					"gid": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -631,6 +832,10 @@ func dataSourceNodeListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"uefi_firmware_file": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"version": {
 						Type:     schema.TypeString,
 						Computed: true,

internal/service/cloudbroker/pcidevice/resource_check_input_vales.go

@@ -45,13 +45,13 @@ func checkParamsExistence(ctx context.Context, d *schema.ResourceData, c *contro
 	var errs []error
 
 	stackId := uint64(d.Get("stack_id").(int))
-	rgId := uint64(d.Get("rd_id").(int))
+	rgId := uint64(d.Get("rg_id").(int))
 
 	if err := ic.ExistRG(ctx, rgId, c); err != nil {
 		errs = append(errs, err)
 	}
 
-	if err := ic.ExistStackInPcidevice(ctx, stackId, rgId, c); err != nil {
+	if err := ic.ExistStack(ctx, stackId, c); err != nil {
 		errs = append(errs, err)
 	}
 

internal/service/cloudbroker/pcidevice/resource_pcidevice.go

@@ -33,9 +33,10 @@ package pcidevice
 
 import (
 	"context"
-	log "github.com/sirupsen/logrus"
 	"strconv"
 
+	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/decort-golang-sdk/pkg/cloudbroker/pcidevice"

internal/service/cloudbroker/sep/flattens.go

@@ -37,18 +37,16 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
 )
 
 func flattenSep(d *schema.ResourceData, desSep *sep.RecordSEP) {
-	d.Set("ckey", desSep.CKey)
-	d.Set("meta", flattens.FlattenMeta(desSep.Meta))
 	d.Set("consumed_by", desSep.ConsumedBy)
 	d.Set("desc", desSep.Description)
 	d.Set("gid", desSep.GID)
 	d.Set("guid", desSep.GUID)
 	d.Set("sep_id", desSep.ID)
 	d.Set("milestones", desSep.Milestones)
+	d.Set("multipath_num", desSep.MultipathNum)
 	d.Set("name", desSep.Name)
 	d.Set("obj_status", desSep.ObjStatus)
 	d.Set("provided_by", desSep.ProvidedBy)
@@ -64,21 +62,20 @@ func flattenSepListItems(sl *sep.ListSEP) []map[string]interface{} {
 	for _, item := range sl.Data {
 		data, _ := json.Marshal(item.Config)
 		temp := map[string]interface{}{
-			"ckey":        item.CKey,
+			"consumed_by":   item.ConsumedBy,
-			"meta":        flattens.FlattenMeta(item.Meta),
+			"desc":          item.Description,
-			"consumed_by": item.ConsumedBy,
+			"gid":           item.GID,
-			"desc":        item.Description,
+			"guid":          item.GUID,
-			"gid":         item.GID,
+			"sep_id":        item.ID,
-			"guid":        item.GUID,
+			"milestones":    item.Milestones,
-			"sep_id":      item.ID,
+			"name":          item.Name,
-			"milestones":  item.Milestones,
+			"multipath_num": item.MultipathNum,
-			"name":        item.Name,
+			"obj_status":    item.ObjStatus,
-			"obj_status":  item.ObjStatus,
+			"provided_by":   item.ProvidedBy,
-			"provided_by": item.ProvidedBy,
+			"shared_with":   item.SharedWith,
-			"shared_with": item.SharedWith,
+			"tech_status":   item.TechStatus,
-			"tech_status": item.TechStatus,
+			"type":          item.Type,
-			"type":        item.Type,
+			"config":        string(data),
-			"config":      string(data),
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/sep/schema.go

@@ -9,19 +9,6 @@ func dataSourceSepCSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "sep type des id",
 		},
-		"ckey": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "ckey",
-		},
-		"meta": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "meta",
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
 		"config": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -50,6 +37,11 @@ func dataSourceSepCSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "guid",
 		},
+		"multipath_num": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "multipath_num",
+		},
 		"milestones": {
 			Type:        schema.TypeInt,
 			Computed:    true,
@@ -295,19 +287,6 @@ func dataSourceSepListSchemaMake() map[string]*schema.Schema {
 			Description: "sep list",
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
-					"ckey": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "ckey",
-					},
-					"meta": {
-						Type:        schema.TypeList,
-						Computed:    true,
-						Description: "meta",
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
 					"config": {
 						Description: "config",
 						Type:        schema.TypeString,
@@ -346,6 +325,11 @@ func dataSourceSepListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "milestones",
 					},
+					"multipath_num": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "multipath_num",
+					},
 					"name": {
 						Type:        schema.TypeString,
 						Computed:    true,
@@ -607,19 +591,6 @@ func resourceSepSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
-		"ckey": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "ckey",
-		},
-		"meta": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "meta",
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
 		"config": {
 			Type:             schema.TypeString,
 			Required:         true,
@@ -651,6 +622,11 @@ func resourceSepSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "milestones",
 		},
+		"multipath_num": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "multipath_num",
+		},
 		"obj_status": {
 			Type:        schema.TypeString,
 			Computed:    true,

internal/service/cloudbroker/vins/flattens.go

@@ -150,6 +150,7 @@ func flattenVinsVNFDev(vd vins.VNFDev) []map[string]interface{} {
 		"status":        vd.Status,
 		"tech_status":   vd.TechStatus,
 		"type":          vd.Type,
+		"vnc_password":  vd.VNCPassword,
 		"vins":          vd.VINS,
 	}
 	res = append(res, temp)
@@ -371,14 +372,11 @@ func flattenVinsListReservations(li vins.ListReservations) []map[string]interfac
 	res := make([]map[string]interface{}, 0, len(li))
 	for _, v := range li {
 		temp := map[string]interface{}{
-			"client_type": v.ClientType,
+			"account_id": v.AccountID,
-			"description": v.Description,
+			"ip":         v.IP,
-			"domain_name": v.DomainName,
+			"mac":        v.MAC,
-			"host_name":   v.Hostname,
+			"type":       v.Type,
-			"ip":          v.IP,
+			"vm_id":      v.VMID,
-			"mac":         v.MAC,
-			"type":        v.Type,
-			"vm_id":       v.VMID,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/vins/resource_vins_static_route.go

@@ -38,14 +38,12 @@ import (
 	"strconv"
 	"strings"
 
+	"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/vins"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -64,19 +62,6 @@ func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m in
 		Gateway:     d.Get("gateway").(string),
 	}
 
-	if computesIDS, ok := d.GetOk("compute_ids"); ok {
-		ids := computesIDS.([]interface{})
-
-		res := make([]uint64, 10)
-
-		for _, id := range ids {
-			computeId := uint64(id.(int))
-			res = append(res, computeId)
-		}
-
-		req.ComputeIds = res
-	}
-
 	_, err := c.CloudBroker().VINS().StaticRouteAdd(ctx, req)
 	if err != nil {
 		d.SetId("")
@@ -108,30 +93,7 @@ func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m inte
 }
 
 func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceStaticRouteUpdate: called for static route id %s", d.Id())
+	return nil
-
-	c := m.(*controller.ControllerCfg)
-
-	if diags := checkParamsExistenceStaticRoute(ctx, d, c); diags != nil {
-		return diags
-	}
-
-	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	warnings := dc.Warnings{}
-	if d.HasChange("compute_ids") {
-		if errs := resourceStaticRouteChangeComputeIds(ctx, d, m, staticRouteData); len(errs) != 0 {
-			for _, err := range errs {
-				warnings.Add(err)
-			}
-		}
-	}
-
-	return append(warnings.Get(), resourceStaticRouteRead(ctx, d, m)...)
 }
 
 func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -158,61 +120,6 @@ func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m in
 	return nil
 }
 
-func resourceStaticRouteChangeComputeIds(ctx context.Context, d *schema.ResourceData, m interface{}, staticRouteData *vins.ItemRoutes) []error {
-	c := m.(*controller.ControllerCfg)
-
-	var errs []error
-
-	vinsId := uint64(d.Get("vins_id").(int))
-
-	deletedIds := make([]uint64, 0)
-	addedIds := make([]uint64, 0)
-
-	oldComputeIds, newComputeIds := d.GetChange("compute_ids")
-	oldComputeIdsSlice := oldComputeIds.([]interface{})
-	newComputeIdsSlice := newComputeIds.([]interface{})
-
-	for _, el := range oldComputeIdsSlice {
-		if !isContainsIds(newComputeIdsSlice, el) {
-			convertedEl := uint64(el.(int))
-			deletedIds = append(deletedIds, convertedEl)
-		}
-	}
-
-	for _, el := range newComputeIdsSlice {
-		if !isContainsIds(oldComputeIdsSlice, el) {
-			convertedEl := uint64(el.(int))
-			addedIds = append(addedIds, convertedEl)
-		}
-	}
-
-	if len(deletedIds) > 0 {
-		req := vins.StaticRouteAccessRevokeRequest{
-			VINSID:     vinsId,
-			RouteId:    staticRouteData.ID,
-			ComputeIds: deletedIds,
-		}
-
-		if _, err := c.CloudBroker().VINS().StaticRouteAccessRevoke(ctx, req); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(addedIds) > 0 {
-		req := vins.StaticRouteAccessGrantRequest{
-			VINSID:     vinsId,
-			RouteId:    staticRouteData.ID,
-			ComputeIds: addedIds,
-		}
-
-		if _, err := c.CloudBroker().VINS().StaticRouteAccessGrant(ctx, req); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	return errs
-}
-
 func isContainsIds(els []interface{}, el interface{}) bool {
 	convEl := el.(int)
 	for _, elOld := range els {

internal/service/cloudbroker/vins/schema.go

@@ -341,6 +341,10 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "type",
 					},
+					"vnc_password": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"vins": {
 						Type:        schema.TypeList,
 						Computed:    true,
@@ -586,26 +590,11 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 												Description: "reservations",
 												Elem: &schema.Resource{
 													Schema: map[string]*schema.Schema{
-														"client_type": {
+														"account_id": {
-															Type:        schema.TypeString,
+															Type:        schema.TypeInt,
 															Computed:    true,
 															Description: "client type",
 														},
-														"description": {
-															Type:        schema.TypeString,
-															Computed:    true,
-															Description: "description",
-														},
-														"domain_name": {
-															Type:        schema.TypeString,
-															Computed:    true,
-															Description: "domain name",
-														},
-														"host_name": {
-															Type:        schema.TypeString,
-															Computed:    true,
-															Description: "host name",
-														},
 														"ip": {
 															Type:        schema.TypeString,
 															Computed:    true,
@@ -2509,6 +2498,10 @@ func resourceVinsSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "type",
 					},
+					"vnc_password": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"vins": {
 						Type:        schema.TypeList,
 						Computed:    true,
@@ -2699,26 +2692,11 @@ func resourceVinsSchemaMake() map[string]*schema.Schema {
 												Description: "reservations",
 												Elem: &schema.Resource{
 													Schema: map[string]*schema.Schema{
-														"client_type": {
+														"account_id": {
-															Type:        schema.TypeString,
+															Type:        schema.TypeInt,
 															Computed:    true,
 															Description: "client type",
 														},
-														"description": {
-															Type:        schema.TypeString,
-															Computed:    true,
-															Description: "description",
-														},
-														"domain_name": {
-															Type:        schema.TypeString,
-															Computed:    true,
-															Description: "domain name",
-														},
-														"host_name": {
-															Type:        schema.TypeString,
-															Computed:    true,
-															Description: "host name",
-														},
 														"ip": {
 															Type:        schema.TypeString,
 															Computed:    true,
@@ -2745,7 +2723,6 @@ func resourceVinsSchemaMake() map[string]*schema.Schema {
 										},
 									},
 								},
-
 								"created_time": {
 									Type:        schema.TypeInt,
 									Computed:    true,
@@ -3389,7 +3366,6 @@ func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
 		"compute_ids": {
 			Type:     schema.TypeList,
 			Computed: true,
-			Optional: true,
 			Elem: &schema.Schema{
 				Type: schema.TypeInt,
 			},

samples/README.md

@@ -43,6 +43,7 @@
     - extnet_computes_list
     - extnet_default
     - extnet_list
+    - extnet_reserved_ip_list
     - flipgroup
     - flipgroup_list
     - image
@@ -157,6 +158,7 @@
     - cb_extnet
     - cb_extnet_default
     - cb_extnet_list
+    - cb_extnet_reserved_ip_list
     - cb_extnet_static_route
     - cb_extnet_static_route_list
     - cb_flipgroup
@@ -169,7 +171,6 @@
     - cb_grid_list
     - cb_grid_list_consumption
     - cb_grid_list_emails
-    - cb_grid_post_diagnosis
     - cb_grid_post_status
     - cb_image
     - cb_image_list

samples/cloudapi/extnet/data_extnet_reserved_ip_list/main.tf

@@ -1,6 +1,6 @@
 /*
 Пример использования
-Получение снимка платформы с дополнительной диагностической информацией, такой как журналы и т.д.
+Получение информации о зарезервированных IP адресах или пуле адресов
 */
 
 #Расскомментируйте этот код,
@@ -26,14 +26,18 @@ provider "decort" {
   allow_unverified_ssl = true
 }
 
-data "decort_cb_grid_post_diagnosis" "grid" {
+data "decort_extnet_reserved_ip_list" "ex_reserved_ip" {
-  #id grid для получения информации
+  #идентификатор аккаунта, для которого зарезервированны ресурсы
-  #обязательный параметр 
+  #обязательный параметр
   #тип - целое число
-  gid = 215
+  account_id = 1111
 
+  #идентификатор сети
+  #опциональный параметр
+  #тип - целое число
+  #extnet_id = 1111
 }
 
 output "test" {
-  value = data.decort_cb_grid_post_diagnosis.grid
+  value = data.decort_extnet_reserved_ip_list.ex_reserved_ip
 }

samples/cloudapi/flipgroup/data_flipgroup_list/main.tf

@@ -93,8 +93,8 @@ data "decort_flipgroup_list" "fg" {
 
   #фильтр по id клиентов
   #опциональный параметр
-  #тип - массив строк
+  #тип - массив целых чисел
-  #client_ids = ["10","11"]
+  #client_ids = [10,11]
 
   #фильтр по статусу
   #опциональный параметр

samples/cloudapi/kvmvm/resource_kvmvm/main.tf

@@ -45,6 +45,7 @@ resource "decort_kvmvm" "comp" {
   #тип драйвера для compute
   #обязательный параметр
   #тип - строка
+  #возможные значения: "SVA_KVM_X86", "KVM_X86"
   driver = "KVM_X86"
 
   #число cpu
@@ -60,6 +61,7 @@ resource "decort_kvmvm" "comp" {
   #тип эмулируемой системы
   #опциональный параметр
   #тип - строка
+  #возможные значения: "i440fx", "Q35"
   chipset = "i440fx"
 
   #размер загрузочного диска
@@ -264,9 +266,10 @@ resource "decort_kvmvm" "comp" {
   #опциональный параметр
   #тип - блок сетей
   network {
-    #тип сети VINS/EXTNET/DPDK (для любого драйвера) и VFNIC (для KVM_X86)
+    #тип сети
     #обязательный параметр
     #тип - строка
+    #возможные значения - "VINS", "EXTNET", "VFNIC", "DPDK" (при выборе типа DPDK, необходимо указать hp_backed = true)
     net_type = "VINS"
 
     #id сети
@@ -285,6 +288,13 @@ resource "decort_kvmvm" "comp" {
     #опциональный параметр
     #тип - целое число
     weight = 15
+
+    #максимальный объём данных, который может быть передан за одну итерацию
+    #используется только с сетями типа "DPDK"
+    #возможные значения - 1-9216
+    #опциональный параметр
+    #тип - целое число
+    mtu = 1500
   }
 
   #добавление и удаление тэгов
@@ -386,6 +396,17 @@ resource "decort_kvmvm" "comp" {
   #тип - булев
   pin_to_stack = true
 
+  #список ядер для использования в механизме vcpupinning. Количество указанных ядер должно быть равно количеству виртуальных процессоров ВМ
+  #игнорируется если cpu_pin=false или pin_to_stack=false
+  #опциональный параметр
+  #тип - массив целых чисел
+  preferred_cpu = [1234, 456]
+
+  #флаг для старта компьюта при рестарте ноды
+  #опциональный параметр
+  #тип - булев
+  auto_start_w_node = true
+
   #флаг доступности компьюта для проведения с ним операций
   #опциональный параметр
   #тип - булев

samples/cloudapi/vins/resource_vins_static_route/main.tf

@@ -52,12 +52,6 @@ resource "decort_vins_static_route" "sr" {
   #обязательный параметр
   #тип - строка
   gateway = "192.168.201.40"
-
-  #список виртуальных машин, которым будет предоставлен доступ к роуту
-  #опциональный параметр
-  #тип - массив целых чисел
-  compute_ids = [111, 222]
-  
 }
 
 output "sr" {

samples/cloudbroker/extnet/data_extnet_reserved_ip_list/main.tf

@@ -0,0 +1,43 @@
+/*
+Пример использования
+Получение информации о зарезервированных IP адресах или пуле адресов
+*/
+
+#Расскомментируйте этот код,
+#и внесите необходимые правки в версию и путь,
+#чтобы работать с установленным вручную (не через hashicorp provider registry) провайдером
+/*
+terraform {
+  required_providers {
+    decort = {
+      source  = "basis/decort/decort"
+      version = "<VERSION>"
+    }
+  }
+}
+*/
+
+provider "decort" {
+  authenticator = "decs3o"
+  #controller_url = <DECORT_CONTROLLER_URL>
+  controller_url = "https://ds1.digitalenergy.online"
+  #oauth2_url = <DECORT_SSO_URL>
+  oauth2_url           = "https://sso.digitalenergy.online"
+  allow_unverified_ssl = true
+}
+
+data "decort_cb_extnet_reserved_ip_list" "ex_reserved_ip" {
+  #идентификатор аккаунта, для которого зарезервированны ресурсы
+  #обязательный параметр
+  #тип - целое число
+  account_id = 1111
+
+  #идентификатор сети
+  #опциональный параметр
+  #тип - целое число
+  #extnet_id = 1111
+}
+
+output "test" {
+  value = data.decort_cb_extnet_reserved_ip_list.ex_reserved_ip
+}

samples/cloudbroker/extnet/resource_extnet/main.tf

@@ -168,6 +168,26 @@ resource "decort_cb_extnet" "new_extnet" {
   #e_rate = 0
   }
 
+  #список зарезервированных IP или пула адресов
+  #опциональный параметр
+  #тип - блок
+  reserved_ip {
+    #идентификатор аккаунта, для которого резервируются ресурсы
+    #обязательный параметр
+    #тип - целое число
+    account_id = 11111
+
+    #количество резервируемых IP
+    #опциональный параметр
+    #тип - целое число
+    ip_count = 15
+
+    #список резервируемых IP
+    #опциональный параметр
+    #тип - массив строк
+    ips = ["192.168.10.10", "192.168.10.20"]
+  }
+
   #ID stack на который происходит миграция
   #опциональный параметр
   #тип - целое число

samples/cloudbroker/grid/decort_cb_grid_get_diagnosis/main.tf

@@ -32,6 +32,10 @@ data "decort_cb_grid_get_diagnosis" "grid" {
   #тип - целое число
   gid = 215
 
+  #путь, где будет создан архив, если не указан, создается в директории с main.tf с именем "diagnosis.tar.gz"
+  #обязательный параметр
+  #тип - строка
+  file_path = "abcdefg.tar.gz"
 }
 
 output "test" {

samples/cloudbroker/kvmvm/data_kvmvm_list/main.tf

@@ -66,6 +66,21 @@ data "decort_cb_kvmvm_list" "compute_list" {
   #тип - строка
   #ip_address = "test"
 
+  #фильтр по stack id
+  #опциональный параметр
+  #тип - целое число
+  #stack_id = 123
+
+  #фильтр по image id
+  #опциональный параметр
+  #тип - целое число
+  #image_id = 123
+
+  #фильтр по cd image id
+  #опциональный параметр
+  #тип - целое число
+  #cd_image_id = 123
+
   #фильтр по имени extnet
   #опциональный параметр
   #тип - строка

samples/cloudbroker/kvmvm/resource_kvmvm/main.tf

@@ -45,6 +45,7 @@ resource "decort_cb_kvmvm" "comp" {
   #тип драйвера для compute
   #обязательный параметр
   #тип - строка
+  #возможные значения: "SVA_KVM_X86", "KVM_X86"
   driver = "KVM_X86"
 
   #число cpu
@@ -60,6 +61,7 @@ resource "decort_cb_kvmvm" "comp" {
   #тип эмулируемой системы
   #опциональный параметр
   #тип - строка
+  #возможные значения: "i440fx", "Q35"
   #chipset = "i440fx"
 
   #id образа диска для создания compute
@@ -277,8 +279,9 @@ resource "decort_cb_kvmvm" "comp" {
   #опциональный параметр
   #тип - блок
     #network {
-      #тип сети VINS/EXTNET/DPDK (для любого драйвера) и VFNIC (для KVM_X86)
+      #тип сети
       #обязательный параметр
+      #возможные значения - "VINS", "EXTNET", "VFNIC", "DPDK" (при выборе типа DPDK, необходимо указать hp_backed = true)
       #тип - строка
       #net_type = "VINS"
 
@@ -298,6 +301,13 @@ resource "decort_cb_kvmvm" "comp" {
       #опциональный параметр
       #тип - целое число
       #weight = 15
+
+      #максимальный объём данных, который может быть передан за одну итерацию
+      #используется только с сетями типа "DPDK"
+      #возможные значения - 1-9216
+      #опциональный параметр
+      #тип - целое число
+      #mtu = 1500
     #}
 
   #добавление и удаление тэгов
@@ -399,6 +409,17 @@ resource "decort_cb_kvmvm" "comp" {
   #тип - булев
   #pin_to_stack = true
 
+  #список ядер для использования в механизме vcpupinning. Количество указанных ядер должно быть равно количеству виртуальных процессоров ВМ
+  #игнорируется если cpu_pin=false или pin_to_stack=false
+  #опциональный параметр
+  #тип - массив целых чисел
+  #preferred_cpu = [1234, 456]
+
+  #флаг для старта компьюта при рестарте ноды
+  #опциональный параметр
+  #тип - булев
+  #auto_start_w_node = true
+
   #id stack для добавления компьюта на этот стэк
   #опциональный параметр
   #тип - целое число
@@ -481,10 +502,16 @@ resource "decort_cb_kvmvm" "comp" {
   #удаление блока удалит настройки только локально, состояние на платформе не изменится
   #тип - блок
   #libvirt_settings {
-      #mac адреc
+      #тип сети
       #обязательный параметр
+      #возможные значения - "VINS", "VFNIC", "DPDK"
       #тип - строка
-      #mac = "52:54:00:00:19:e1"
+      #net_type = "VINS"
+
+      #ID сети
+      #обязательный параметр
+      #тип - целое число
+      #net_id = 1234
 
       #tx mode
       #опциональный параметр

samples/cloudbroker/sep/resource_sep/main.tf

@@ -42,7 +42,7 @@ resource "decort_cb_sep" "s" {
 
   #тип sep
   #обязательный параметр
-  #возможные значения - des, dorado, tatlin, hitachi
+  #возможные значения - des, dorado, tatlin, hitachi, ovs, local, shared
   #тип - строка
   type = "des"
 

samples/cloudbroker/vins/resource_vins_static_route/main.tf

@@ -51,12 +51,6 @@ resource "decort_cb_vins_static_route" "sr" {
   #обязательный параметр
   #тип - строка
   gateway = "192.168.201.40"
-
-  #список виртуальных машин, которым будет предоставлен доступ к роуту
-  #опциональный параметр
-  #тип - массив целых чисел
-  #compute_ids = [111,222]
-  
 }
 
 output "sr" {

wiki/4.7.0/07.01.01-Resource_decort_kvmvm.md

@@ -112,6 +112,16 @@ resource "decort_kvmvm" "compute1" {
 
 **Конфигурация cloud_init применяется только при создании компьюта, во всех остальных случаях - игнорируется**
 
+### Работа с полем weight в блоке network
+
+В версии 4.7.0 в блоке network добавлено опциональное поле weight, которое можно использовать, в случае, когда необходимо указать порядок подключения сетей, т.к. по умолчанию сети подключаются в случайном порядке.
+Сети с наименьшим весом будут подключены в первую очередь. Сети с неуказанным или нулевым значением будут подключены в последнюю очередь (иметь наименьший приоритет)
+В случае, если все сети не имеют параметра весов, подключение будет производится как и раньше.
+При выполнении update сортироваться будут только вновь подключаемые сети, порядок уже подключенных сетей остается без изменения.
+Так же следует обратить внимание, что если при update была отключена какая либо сеть, то вновь подключаемые сети с наименьшим весом сети займут ранее освобожденные интерфейсы, и только после будут добавляться в конец списка подключенных сетей.
+При изменении или удалении данного поля, в уже созданном ресурсе, сеть будет считаться вновь подключаемой и следовательно будет отключена от VM и подключена по новой, с учетом веса подключаемых сетей.
+
+
 ## Аргументы
 
 _Resource_ функция **decort_kvmvm** принимает следующие аргументы:
@@ -122,8 +132,8 @@ _Resource_ функция **decort_kvmvm** принимает следующие
 | name | string | :heavy_check_mark: | Имя виртуальной машины. Обратите внимание, что имя должно быть уникальным в рамках ресурсной группы |
 | rg_id | int | :heavy_check_mark: | Идентификатор ресурсной группы, которой принадлежит данная виртуальная машина |
 | ram | int | :heavy_check_mark: | Объём оперативной памяти в МБ.<br/> |
-| chipset | string | Тип эмулируемой системы |
 | boot_disk_size | int | :x: | Размер загрузочного диска виртуальной машины в ГБ |
+| chipset | string | :x: | Тип эмулируемой системы |
 | custom_fields | string (json-encoded) | :x: | Управление XML виртуальной машины |
 | extra_disks | []int | :x: | Список идентификаторов дополнительных дисков, которые требуется подключить к данной виртуальной машине помимо загрузочного диска |
 | image_id | int | :x: | Идентификатор образа, на базе которого создаётся загрузочный диск виртуальной машины.<br/> |
@@ -181,8 +191,9 @@ _Resource_ функция **decort_kvmvm** принимает следующие
 | Аргумент | Тип | Обязательный | Описание |
 | --- | --- | --- | --- |
 | net_type | string | :heavy_check_mark: | тип сети, соответствующей данному подключению. "EXTNET" в случае прямого подключения во внешнюю сеть, "VINS" в случае подключения к Virtual Network Segment. |
-| net_id | int | :heavy_check_mark: | идентификатор соответствующего сетевого сегмента: внешней сети в случае `net_type = "EXTNET"`,  ViNS в случае `net_type = "VINS"`, и VFNIC в случае `net_type="VFNIC` |
+| net_id | int | :heavy_check_mark: | идентификатор соответствующего сетевого сегмента: внешней сети в случае `net_type = "EXTNET"`,  ViNS в случае `net_type = "VINS"`, VFNIC в случае `net_type="VFNIC`, и DPDK в случае `net_type = "DPDK"` |
 | ip_address | string | :x: | IP адрес, выделенный данному подключению. |
+| weight | int | :x: | Вес сети, указывается при необходимости указания порядка подключения сетей. Первой подключается сеть с наименьшим весом. Сеть с нулевым или неуказанным весом имеет наименьший приоритет |
 
 ### Описание блока affinity_rules
 
@@ -302,7 +313,7 @@ _Resource_ функция **decort_kvmvm** принимает следующие
 | need_reboot | bool | Флаг, указывающий, что требуется перезагрузка |
 | numa_affinity | string | Необходимость выравнивать ВМ по NUMA |
 | numa_node_id | int | ID узла  NUMA |
-| network | list of dicts | Характеристики сетевых сегментов, к которым подключен данный сервер. Формат структуры:<br/>_ (string) `net_type` - тип сети, соответствующей данному подключению. "EXTNET" в случае прямого подключения во внешнюю сеть, "VINS" в случае подключения к Virtual Network Segment.<br/>_ (int) `net_id` - идентификатор соответствующего сетевого сегмента: внешней сети в случае `net_type = "EXTNET"` и ViNS в случае `net_type = "VINS"`<br/>_ (string) `ip_address` - IP адрес, выделенный данному подключению.<br/>_ (string) `mac` - MAC адрес, назначенный соответствующему сетевому интерфейсу виртуальной машины. |
+| network | []Struct [см. ниже](#описание-структуры-networks) | Параметры сетевого подключения |
 | os_users | []Struct [см. ниже](#описание-структуры-os-users) | Имена и пароли пользователей гостевой ОС, установленные платформой при создании виртуального сервера. Формат структуры:<br/>_ (string) `login` - учётная запись в гостевой ОС.<br/>_ (string) `password` - пароль к этой учётной записи. |
 | permanently | bool | Мгновенное удаление виртуальной машины, минуя корзину. Параметр считывается только при использовании команды `terraform destroy`, то есть только при удалении ресурса |
 | pinned | bool | добавлен ли компьют на стек |
@@ -335,6 +346,7 @@ _Resource_ функция **decort_kvmvm** принимает следующие
 
 | Параметр | Тип | Описание |
 | --- | --- | --- |
+| bus_number | int | Номер шины |
 | conn_id | int | ID connect |
 | conn_type | string | Тип connect |
 | def_gw | string | Шлюз по умолчанию |
@@ -369,6 +381,16 @@ _Resource_ функция **decort_kvmvm** принимает следующие
 | rx_queue_size | int | Длина очереди RX |
 | tx_queue_size | int | Длина очереди TX |
 
+### Описание структуры networks
+
+| Параметр | Тип | Описание |
+| --- | --- | --- |
+| net_type | string | тип сети, соответствующей данному подключению. "EXTNET" в случае прямого подключения во внешнюю сеть, "VINS" в случае подключения к Virtual Network Segment. |
+| net_id | int | идентификатор соответствующего сетевого сегмента: внешней сети в случае `net_type = "EXTNET"`,  ViNS в случае `net_type = "VINS"`, VFNIC в случае `net_type="VFNIC`, и DPDK в случае `net_type = "DPDK"` |
+| ip_address | string | IP адрес, выделенный данному подключению. |
+| mac | string | MAC адрес, назначенный соответствующему сетевому интерфейсу виртуальной машины. |
+| weight | int | Вес сети, указывается при необходимости указания порядка подключения сетей. Первой подключается сеть с наименьшим весом. Сеть с нулевым или неуказанным весом имеет наименьший приоритет |
+
 ### Описание структуры qos
 
 | Параметр | Тип | Описание |
@@ -456,6 +478,7 @@ resource "decort_kvmvm" "comp" {
   #тип драйвера для compute
   #обязательный параметр
   #тип - строка
+  #возможные значения: "SVA_KVM_X86", "KVM_X86"
   driver = "KVM_X86"
 
   #число cpu
@@ -471,6 +494,7 @@ resource "decort_kvmvm" "comp" {
   #тип эмулируемой системы
   #опциональный параметр
   #тип - строка
+  #возможные значения: "i440fx", "Q35"
   chipset = "i440fx"
 
   #размер загрузочного диска
@@ -675,9 +699,10 @@ resource "decort_kvmvm" "comp" {
   #опциональный параметр
   #тип - блок сетей
   network {
-    #тип сети VINS/EXTNET/DPDK (для любого драйвера) и VFNIC (для KVM_X86)
+    #тип сети 
     #обязательный параметр
     #тип - строка
+    #возможные значения - "VINS", "EXTNET", "VFNIC", "DPDK"
     net_type = "VINS"
 
     #id сети

wiki/4.7.0/07.02.11-Resource_decort_cb_kvmvm.md

@@ -4,6 +4,16 @@ _Resource_ функция **decort_cb_kvmvm** служит для управле
 
 Важно: при удалении в конфигурационном файле Terraform любого блока disks, на платформе будет удален последний. При необходимости удалить не последний блок, рекомендуем пользоваться web интерфейсом платформы. Поведение будет исправлено в следующих версиях.
 
+### Работа с полем weight в блоке network
+
+В версии 4.7.0 в блоке network добавлено опциональное поле weight, которое можно использовать, в случае, когда необходимо указать порядок подключения сетей, т.к. по умолчанию сети подключаются в случайном порядке.
+Сети с наименьшим весом будут подключены в первую очередь. Сети с неуказанным или нулевым значением будут подключены в последнюю очередь (иметь наименьший приоритет)
+В случае, если все сети не имеют параметра весов, подключение будет производится как и раньше.
+При выполнении update сортироваться будут только вновь подключаемые сети, порядок уже подключенных сетей остается без изменения.
+Так же следует обратить внимание, что если при update была отключена какая либо сеть, то вновь подключаемые сети с наименьшим весом сети займут ранее освобожденные интерфейсы, и только после будут добавляться в конец списка подключенных сетей.
+При изменении или удалении данного поля, в уже созданном ресурсе, сеть будет считаться вновь подключаемой и следовательно будет отключена от VM и подключена по новой, с учетом веса подключаемых сетей.
+
+
 ## Аргументы
 _Resource_ функция **decort_cb_kvmvm** принимает следующие аргументы:
 
@@ -79,9 +89,10 @@ _Resource_ функция **decort_cb_kvmvm** принимает следующ
 | Аргумент | Тип | Обязательный | Описание |
 | --- | --- | --- | --- |
 | net_type | string | :heavy_check_mark: | тип сети, соответствующей данному подключению. "EXTNET" в случае прямого подключения во внешнюю сеть, "VINS" в случае подключения к Virtual Network Segment. |
-| net_id | int | :heavy_check_mark: | идентификатор соответствующего сетевого сегмента: внешней сети в случае `net_type = "EXTNET"`,  ViNS в случае `net_type = "VINS"`, и VFNIC в случае `net_type="VFNIC` |
+| net_id | int | :heavy_check_mark: | идентификатор соответствующего сетевого сегмента: внешней сети в случае `net_type = "EXTNET"`,  ViNS в случае `net_type = "VINS"`, VFNIC в случае `net_type="VFNIC`, и DPDK в случае `net_type = "DPDK"` |
 | ip_address | string | :x: | IP адрес, выделенный данному подключению. |
 | mac | string | :x: | MAC адрес, назначенный соответствующему сетевому интерфейсу виртуальной машины. |
+| weight | int | :x: | Вес сети, указывается при необходимости указания порядка подключения сетей. Первой подключается сеть с наименьшим весом. Сеть с нулевым или неуказанным весом имеет наименьший приоритет |
 
 ### Описание блока affinity_rules args
 
@@ -243,6 +254,7 @@ _Resource_ функция **decort_cb_kvmvm** принимает следующ
 | net_type | string | Тип сети |
 | ip_address | string | IP адрес |
 | mac | string | MAC адрес |
+| weight | int | Вес сети |
 
 ### Описание структуры os users
 | Параметр | Тип | Описание |
@@ -380,6 +392,7 @@ resource "decort_cb_kvmvm" "my_new_vm" {
   #тип драйвера для compute
   #обязательный параметр
   #тип - строка
+  #возможные значения: "SVA_KVM_X86", "KVM_X86"
   driver = "KVM_X86"
 
   #число cpu
@@ -395,6 +408,7 @@ resource "decort_cb_kvmvm" "my_new_vm" {
   #тип эмулируемой системы
   #опциональный параметр
   #тип - строка
+  #возможные значения: "i440fx", "Q35"
   #chipset = "i440fx"
 
   #id образа диска для создания compute
@@ -618,10 +632,11 @@ resource "decort_cb_kvmvm" "my_new_vm" {
   #опциональный параметр
   #тип - блок
   #network {
-  #тип сети VINS/EXTNET/DPDK (для любого драйвера) и VFNIC (для KVM_X86)
+  #тип сети 
   #обязательный параметр
   #тип - строка
-  #net_type = "VINS"
+  #возможные значения - "VINS", "EXTNET", "VFNIC", "DPDK"
+  net_type = "VINS"
 
   #id сети
   #обязательный параметр

wiki/4.7.0/Home.md

@@ -33,7 +33,7 @@ Terraform провайдер версии 4.7.0, для платформы DECOR
      - [**decort_vins**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.04-Data_decort_vins.md) - получение информации о виртуальном сетевом сегменте (Virtual Network Segment, "ViNS")
      - [**decort_account**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.05-Data_decort_account.md) - получение информации об аккаунте
      - [**decort_image_list**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.06-Data_decort_image_list.md) - получение информации об образах (_image_)
-     - [**decort_image**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.07-Datadecort_image.md) - получение информации об образе (_image_)
+     - [**decort_image**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.07-Data_decort_image.md) - получение информации об образе (_image_)
      - [**decort_locations_list**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.08-Data_decort_locations_list.md) - получение списка доступных площадок (_gid/grid_id_)
      - [**decort_location_url**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.09-Data_decort_location_url.md) - получение url площадки
      - [**decort_snapshot_list**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/06.01.11-Data_decort_snapshot_list.md) - получение информации о snapshots
@@ -265,7 +265,7 @@ Terraform провайдер версии 4.7.0, для платформы DECOR
      - [**decort_disk_snapshot**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.01.19-Resource_decort_disk_snapshot.md) - управление снимком диска
      - [**decort_flipgroup**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.01.20-Resource_decort_flipgroup.md) - управление плавающей группой
      - [**decort_image_from_blank_compute**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.01.23-Resource_decort_image_from_blank_compute.md) - управление образом, созданным из blank ВМ
-     - [**decort_image_from_platform_disk**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.02.24-Resource_decort_image_from_platform_disk.md) - управление образом, созданным из платформенного диска
+     - [**decort_image_from_platform_disk**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.01.24-Resource_decort_image_from_platform_disk.md) - управление образом, созданным из платформенного диска
      <!-- - [**decort_disk_replication**](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.01.25-Resource_decort_disk_replication.md) - управление репликой диска -->
 
    - [Административная группа API](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.0/07.02-Административная-группа-API.md)

wiki/4.7.1/01.-Введение.md

@@ -0,0 +1,7 @@
+DECORT Terraform Provider версии 4.7.x позволяет управлять облачными ресурсами на платформе Digital Energy Cloud Orchestration Technology (DECORT) версии 4.1.x и выше посредством Terraform.
+
+С помощью данного провайдера можно организовать программное управление вычислительными ресурсами (_compute_), ресурсными группами, сетевыми и дисковыми ресурсами, образами дисков, кластером, а также другими параметрами облачной платформы DECORT.
+
+Если вы хорошо знакомы с инструментом Terraform и хотите максимально быстро начать использовать платформу DECORT в своих Terraform-проектах, то можете сразу перейти к разделу [Пример работы](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.1/02.-Пример-работы.md), где приведён подробно откомментированный пример работы с основными видами ресурсов платформы. Если у вас всё же возникнут вопросы по облачной платформе DECORT и порядку авторизации в ней, то обратитесь к главе [«Обзор облачной платформы DECORT»](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.1/03.-Обзор-облачной-платформы-DECORT.md). Также может оказаться полезной глава [«Инициализация Terraform провайдера DECORT»](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.1/04.02-Инициализация-Terraform-провайдера-DECORT.md).
+
+Если вы только начинаете использовать инструмент Terraform и облачную платформу DECORT, то рекомендуем вам начать с главы [«Обзор облачной платформы DECORT»](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.1/03.-Обзор-облачной-платформы-DECORT.md), после чего изучить главы [«_Data source_ функции Terraform провайдера DECORT»](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.1/06.-Data-source-функции-Terraform-провайдера-DECORT.md) и [«_Resource_ функции Terraform провайдера DECORT»](https://repository.basistech.ru/BASIS/terraform-provider-decort/src/branch/main/wiki/4.7.1/07.-Resource-функции-Terraform-провайдера-DECORT.md). Примеры, приведенные в этих разделах, помогут вам быстро освоить базовые приёмы работы с инструментом Terraform и провайдером DECORT.