4.10.0

CHANGELOG.md

@@ -1,23 +1,137 @@
-## Version 4.9.2
+## Version 4.10.0
 
 ### Добавлено
 
-### Исправлено
-
-#### image
+#### account
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-999 | Изменен тип поля `url` с optional на required в resource `decort_cb_image` в cloudbroker/image |
+| BATF-923 | Вычисляемое поле `emails` в блоке `ACL` в datasource `decort_cb_account` и в resource `decort_cb_account` в cloudbroker/account |
+| BATF-970 | Возможное значение `trunk` в поле `compute_features` в resource `decort_cb_account` в cloudbroker/account |
+| BATF-1004 | Вычисляемое поле `emails` в блоке `ACL` в datasource `decort_account` и в resource `decort_account` в cloudapi/account |
 
 #### kvmvm
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-1002 | Ошибка при смене `ip_address` в блоке `network` приводящаяя к смене MAC адрес сети в  resource `decort_compute` и `decort_cb_compute` в cloupapi/kvmvm и cloudbroker/kvmvm |
+| BATF-960 | Вычисляемое поле `sdn_interface_id` в datasources `decort_kvmvm`, `decort_kvmvm_list`, `decort_kvmvm_list_deleted` в cloudapi/kvmvm и `decort_cb_kvmvm`, `decort_kvmvm_cb_list`, `decort_kvmvm_cb_list_deleted` в cloudbroker/kvmvm |
+| BATF-961 | Добавлена поддержка `net_type` SDN и опциональное поле `sdn_interface_id` в блоке `network` в resources `decort_kvmvm` в cloudapi/kvmvm и `decort_cb_kvmvm` в cloudbroker/kvmvm |
+| BATF-971 | Добавлена поддержка `net_type` TRUNK в блоке `network` в resources `decort_kvmvm` в cloudapi/kvmvm и `decort_cb_kvmvm` в cloudbroker/kvmvm |
+| BATF-976 | Добавлена возможность указания и изменения `mtu` в блоке `network` для сетей типа `EXTNET` и `DPDK` в resources `decort_kvmvm` в cloudapi/kvmvm и `decort_cb_kvmvm` в cloudbroker/kvmvm |
+| BATF-993 | Вычисляемые поля `live_migration_job_id` и `qemu_guest` в datasources `data_kvmvm` и `data_kvmvm_list` в cloudapi/kvmvm и в datasources `decort_cb_kvmvm` и `decort_cb_kvmvm_list` в cloudbroker/kvmvm |
+| BATF-1014 | Вычисляемое поле `trunk_tags` в блоке `interfaces` в datasources `decort_kvmvm`, `decort_kvmvm_list`, `decort_kvmvm_list_deleted` и resource `decort_kvmvm` в cloudapi/kvmvm и datasources `decort_cb_kvmvm`, `decort_kvmvm_cb_list`, `decort_kvmvm_cb_list_deleted` и resource `decort_cb_kvmvm` в cloudbroker/kvmvm |
 
-### Удалено
+#### extnet
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-972 | Опциональные поля `highly_available`, `sec_vnfdev_ip`, `mtu` в resource `decort_cb_extnet` в cloudbroker/extnet |
+| BATF-972 | Вычисляемые поля `redundant`, `sec_vnfdev_id`, `mtu` в datasource `decort_extnet` в cloudapi/extnet и в datasources `decort_cb_extnet`, `decort_cb_extnet_list` в cloudbroker/extnet |
+| BATF-972 | Вычисляемое поле `pre_reservations` в datasource `decort_extnet` в cloudapi/extnet и в datasource`decort_cb_extnet` в cloudbroker/extnet |
+
+#### grid
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-996 | Вычислительные поля `network_modes` и `sdn_support` в datasources `decort_cb_grid` и `decort_cb_grid_list` в cloudbroker/grid |
 
 #### image
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BATF-999 | Опциональное поле `file_path` в resource `decort_cb_image` в cloudbroker/image |
+| BATF-930 | Опциональное поле `sync_mode` в resource `decort_image` в cloudapi/image |
 
+#### lb
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-952 | Вычисляемое поле `account_id` в datasource `decort_lb` в cloudapi/lb и в datasource `decort_cb_lb` в cloudbroker/lb |
+
+#### locations
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-994 | Вычисляемые поля `network_modes` и `sdn_support` в datasource `decort_locations_list` в cloudbroker/locations |
+
+#### node
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-995 | Вычисляемое поле `zone_id` в datasource `decort_cb_node` и вычисляемые поля `sdn_hypervisor_name` и `zone_id`в datasource `decort_cb_node_list` в cloudbroker/node |
+
+#### rg
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-932 | Вычисляемые поле `created_by` и `created_time` в resource `decort_resgroup` в cloudapi/rg |
+| BATF-970 | Возможное значение `trunk` в поле `compute_features` в resource `decort_cb_rg` в cloudbroker/rg |
+| BATF-959 | Опциональное поле `sdn_access_group_id` в resource `decort_resgroup` в cloudapi/rg и в resource `decort_cb_rg` в cloudbroker/rg |
+| BATF-959 | Вычисляемые поле `sdn_access_group_id` в datasources `decort_resgroup`, `decort_rg_list`, в cloudapi/rg и в datasources `decort_cb_rg` и `decort_cb_rg_list` в cloudbroker/rg |
+
+#### trunk
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-973 | Resource `decort_cb_trunk` в cloudbroker/trunk |
+| BATF-974 | Datasources `decort_trunk` и `decort_trunk_list` в cloudapi/trunk и datasources `decort_cb_trunk` и `decort_cb_trunk_list` в cloudbroker/trunk |
+
+#### vins
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-997 | Вычисляемое поле `sdn_interface_id` в datasource  `decort_vins` в cloudapi/vins и в datasource  `decort_cb_vins` в cloudbroker/vins |
+
+#### user
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-958 | Опциональное поле `blocked` в блоке `ACL` в resource `resource_user` в cloudbroker/user |
+| BATF-958 | Вычисляемое поле `blocked` в блоке `ACL` в datasource `data_user` и `data_user_list` в cloudbroker/user |
+| BATF-923 | Опциональное поле `email` в datasource `decort_cb_user_list` в cloudbroker/user |
+| BATF-950 | Опциональное поле `provider_name` в resource `decort_cb_user` в cloudbroker/user |
+
+### Исправлено
+
+#### account
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-956 | Вычисляемое поле `zone_ids` представляет собой список maps в datasource `decort_account` в cloudapi/account и в datasource `decort_cb_account` в cloudbroker/account |
+
+#### kvmvm
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-1009 | Ошибка изменения полей `cpu`, `ram` в resources `decort_kvmvm` в cloudapi/kvmvm и `decort_cb_kvmvm` в cloudbroker/kvmvm |
+| BATF-1010 | Ошибка повторного включения/отключения в resources `decort_kvmvm` в cloudapi/kvmvm и `decort_cb_kvmvm` в cloudbroker/kvmvm |
+
+#### extnet
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-972 | Вычисляемое поля `network_ids` сменило тип с int на []struct в datasource `decort_extnet` в cloudapi/extnet и в datasources `decort_cb_extnet`, `decort_cb_extnet_list`, resource `decort_cb_extnet` в cloudbroker/extnet |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-930 | Опциональное поле `sync_mode` имеет значение по умолчанию false в resource `decort_cb_image` в cloudbroker/image |
+| BATF-926 | Опциональное поле `architecture` стало вычисляемым в resource `decort_image` в cloudapi/image и в resource `decort_cb_image` в cloudbroker/image |
+| BATF-926 | Обязательное поле `architecture` стало вычисляемым в resource `decort_image_from_platform_disk` в cloudapi/image и в resource `decort_cb_image_from_platform_disk` в cloudbroker/image |
+
+#### flipgroup
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-929 | Обязательное поле `client_type` стало опциональным в resource `decort_flipgroup` в cloudapi/flipgroup и в resource `decort_cb_flipgroup` в cloudbroker/flipgroup |
+
+#### user
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-950 | Опциональное поле `groups` стало вычисляемым в resource `decort_cb_user` в cloudbroker/user |
+
+### Удалено
+
+#### account
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-990 | Опциональное поле `reason` в resource `decort_account` в cloudapi/account и в resource `decort_cb_account` в cloudbroker/account |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-998 | Значение `SVA_KVM_X86` для обязательного поля `drivers` в resource `decort_image` в cloudapi/image и в resource `decort_cb_image` в cloudbroker/image |
+
+#### kvmvm
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-977 | Вычисляемые поля `order` и `vmid` в структуре `disks` в resource `decort_kvmvm` и datasource `decort_kvmvm` в cloudapi/kvmvm и в resource `decort_cb_kvmvm` и datasource `decort_cb_kvmvm` в cloudbroker/kvmvm |
+| BATF-998 | Значение `SVA_KVM_X86` для обязательного поля `drivers` в resource `decort_kvmvm` в cloudapi/kvmvm и в resource `decort_cb_kvmvm` в cloudbroker/kvmvm |
+
+#### vins
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BATF-933 | Вычисляемое поле `routes` в блоках `NAT` и `GW` в datasource `decort_vins`, resource `decort_vins` в cloudapi/vins,  datasource `decort_cb_vins`, resource `decort_cb_vins` в cloudbroker/vins |

Makefile

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

README.md

@@ -1,11 +1,14 @@
 # terraform-provider-decort
 
+Внимание! Данная версия предназначена только для версии платформы 4.4.0 build 963
+
 Terraform provider для платформы Digital Energy Cloud Orchestration Technology (DECORT)
 
 ## Соответсвие версий платформы версиям провайдера
 
 | Версия DECORT API | Версия провайдера Terraform |
 | ------ | ------ |
+| 4.4.0 | 4.10.x |
 | 4.3.0 | 4.9.x |
 | 4.2.0 | 4.8.x |
 | 4.1.0 | 4.7.x |
@@ -48,8 +51,10 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
   - Работа с resource groups,
   - Работа с snapshots,
   - Работа с stacks,
+  - Работа с trunk,
   - Работа с VINS,
-  - Работа с SEPs.
+  - Работа с SEPs,
+  - Работа с Zone.
 
 - Режим администратора:
   - Работа с accounts,
@@ -69,7 +74,9 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
   - Работа с seps,
   - Работа с user,
   - Работа с stacks,
-  - Работа с VINS.
+  - Работа с trunk,
+  - Работа с VINS,
+  - Работа с Zone.
 
 Со списком и описанием функционала всех групп можно ознамоиться на Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
@@ -87,13 +94,13 @@ chmod u+x install.sh
 ```
 6. Дождаться сообщения об успешной установке. Установщик выведет актуальный блок конфигурации провайдера, скопируйте его
 ```bash
-DECORT provider version 4.3.0 has been successfully installed
+DECORT provider version 4.10.0 has been successfully installed
 
 Copy this provider configuration to main.tf file:
 terraform {
   required_providers {
     decort = {
-      version = "4.3.0"
+      version = "4.10.0"
       source  = "basis/decort/decort"
     }
   }
@@ -109,7 +116,7 @@ terraform {
 terraform {
   required_providers {
     decort = {
-      version = "4.3.0"
+      version = "4.10.0"
       source  = "basis/decort/decort"
     }
   }
@@ -152,13 +159,13 @@ Windows:
 - host_name - имя хоста, держателя провайдера, например, basis
 - namespace - пространство имен хоста, например decort 
 - type - тип провайдера, может совпадать с пространством имен, например, decort
-- version - версия провайдера, например 4.3.0
+- version - версия провайдера, например 4.10.0
 - target - архитектура операционной системы, например windows_amd64
 
 В примере ниже используется путь до провайдера на машине с ОС Linux:
 
 ```bash
-~/.terraform.d/plugins/basis/decort/decort/4.3.0/linux_amd64/tf-provider
+~/.terraform.d/plugins/basis/decort/decort/4.10.0/linux_amd64/tf-provider
                         ^     ^      ^     ^       ^          ^
               host_name |     |      |     |       |          |
                               |      |     |       |          |
@@ -183,7 +190,7 @@ Windows:
 terraform {
   required_providers {
     decort = {
-      version = "4.3.0"
+      version = "4.10.0"
       source  = "basis/decort/decort"
     }
   }

docs/data-sources/account.md

@@ -38,6 +38,7 @@ description: |-
 - `created_time` (Number)
 - `dc_location` (String)
 - `deactivation_time` (Number)
+- `default_zone_id` (Number)
 - `deleted_by` (String)
 - `deleted_time` (Number)
 - `desc` (String)
@@ -54,6 +55,7 @@ description: |-
 - `version` (Number)
 - `vins` (List of Number)
 - `vinses` (Number)
+- `zone_ids` (List of Object) (see [below for nested schema](#nestedatt--zone_ids))
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -70,6 +72,7 @@ Optional:
 Read-Only:
 
 - `can_be_deleted` (Boolean)
+- `emails` (List of String)
 - `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)
@@ -108,3 +111,12 @@ Read-Only:
 - `cu_m` (Number)
 - `cu_np` (Number)
 - `gpu_units` (Number)
+
+
+<a id="nestedatt--zone_ids"></a>
+### Nested Schema for `zone_ids`
+
+Read-Only:
+
+- `id` (Number)
+- `name` (String)

docs/data-sources/bservice.md

@@ -54,6 +54,7 @@ description: |-
 - `updated_by` (String)
 - `updated_time` (Number)
 - `user_managed` (Boolean)
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/bservice_deleted_list.md

@@ -66,3 +66,4 @@ Read-Only:
 - `updated_by` (String)
 - `updated_time` (Number)
 - `user_managed` (Boolean)
+- `zone_id` (Number)

docs/data-sources/bservice_list.md

@@ -72,3 +72,4 @@ Read-Only:
 - `updated_by` (String)
 - `updated_time` (Number)
 - `user_managed` (Boolean)
+- `zone_id` (Number)

docs/data-sources/cb_account.md

@@ -37,6 +37,7 @@ description: |-
 - `created_time` (Number)
 - `dc_location` (String)
 - `deactivation_time` (Number)
+- `default_zone_id` (Number)
 - `deleted_by` (String)
 - `deleted_time` (Number)
 - `desc` (String)
@@ -51,6 +52,7 @@ description: |-
 - `updated_time` (Number)
 - `version` (Number)
 - `vins` (List of Number)
+- `zone_ids` (List of Object) (see [below for nested schema](#nestedatt--zone_ids))
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -66,6 +68,7 @@ Optional:
 
 Read-Only:
 
+- `emails` (List of String)
 - `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)
@@ -86,3 +89,12 @@ Read-Only:
 - `cu_m` (Number)
 - `cu_np` (Number)
 - `gpu_units` (Number)
+
+
+<a id="nestedatt--zone_ids"></a>
+### Nested Schema for `zone_ids`
+
+Read-Only:
+
+- `id` (Number)
+- `name` (String)

docs/data-sources/cb_account_list.md

@@ -59,6 +59,7 @@ Read-Only:
 - `created_time` (Number)
 - `dc_location` (String)
 - `deactivation_time` (Number)
+- `default_zone_id` (Number)
 - `deleted_by` (String)
 - `deleted_time` (Number)
 - `desc` (String)
@@ -73,6 +74,7 @@ Read-Only:
 - `updated_time` (Number)
 - `version` (Number)
 - `vins` (List of Number)
+- `zone_ids` (List of Number)
 
 <a id="nestedobjatt--items--acl"></a>
 ### Nested Schema for `items.acl`

docs/data-sources/cb_account_list_deleted.md

@@ -58,6 +58,7 @@ Read-Only:
 - `created_time` (Number)
 - `dc_location` (String)
 - `deactivation_time` (Number)
+- `default_zone_id` (Number)
 - `deleted_by` (String)
 - `deleted_time` (Number)
 - `desc` (String)
@@ -72,6 +73,7 @@ Read-Only:
 - `updated_time` (Number)
 - `version` (Number)
 - `vins` (List of Number)
+- `zone_ids` (List of Number)
 
 <a id="nestedobjatt--items--acl"></a>
 ### Nested Schema for `items.acl`

docs/data-sources/cb_extnet.md

@@ -40,19 +40,24 @@ description: |-
 - `ipcidr` (String)
 - `meta` (List of String) meta
 - `milestones` (Number)
+- `mtu` (Number)
 - `name` (String)
 - `network` (String)
-- `network_id` (Number)
+- `network_ids` (List of Object) (see [below for nested schema](#nestedatt--network_ids))
 - `ntp` (List of String)
 - `ovs_bridge` (String)
+- `pre_reservations` (List of Object) (see [below for nested schema](#nestedatt--pre_reservations))
 - `pre_reservations_num` (Number)
 - `prefix` (Number)
 - `pri_vnfdev_id` (Number)
+- `redundant` (Boolean)
 - `reservations` (List of Object) (see [below for nested schema](#nestedatt--reservations))
+- `sec_vnfdev_id` (Number)
 - `shared_with` (List of Number)
 - `status` (String)
 - `vlan_id` (Number)
 - `vnfs` (List of Object) (see [below for nested schema](#nestedatt--vnfs))
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -89,6 +94,31 @@ Read-Only:
 - `vm_id` (Number)
 
 
+<a id="nestedatt--network_ids"></a>
+### Nested Schema for `network_ids`
+
+Read-Only:
+
+- `primary` (Number)
+- `secondary` (Number)
+
+
+<a id="nestedatt--pre_reservations"></a>
+### Nested Schema for `pre_reservations`
+
+Read-Only:
+
+- `account_id` (Number)
+- `client_type` (String)
+- `desc` (String)
+- `domain_name` (String)
+- `hostname` (String)
+- `ip` (String)
+- `mac` (String)
+- `type` (String)
+- `vm_id` (Number)
+
+
 <a id="nestedatt--reservations"></a>
 ### Nested Schema for `reservations`
 

docs/data-sources/cb_extnet_list.md

@@ -61,15 +61,19 @@ Read-Only:
 - `ipcidr` (String)
 - `meta` (List of String)
 - `milestones` (Number)
+- `mtu` (Number)
 - `name` (String)
-- `network_id` (Number)
+- `network_ids` (List of Object) (see [below for nested schema](#nestedobjatt--items--network_ids))
 - `ovs_bridge` (String)
 - `pre_reservations_num` (Number)
 - `pri_vnfdev_id` (Number)
+- `redundant` (Boolean)
+- `sec_vnfdev_id` (Number)
 - `shared_with` (List of Number)
 - `status` (String)
 - `vlan_id` (Number)
 - `vnfs` (List of Object) (see [below for nested schema](#nestedobjatt--items--vnfs))
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--default_qos"></a>
 ### Nested Schema for `items.default_qos`
@@ -82,6 +86,15 @@ Read-Only:
 - `in_rate` (Number)
 
 
+<a id="nestedobjatt--items--network_ids"></a>
+### Nested Schema for `items.network_ids`
+
+Read-Only:
+
+- `primary` (Number)
+- `secondary` (Number)
+
+
 <a id="nestedobjatt--items--vnfs"></a>
 ### Nested Schema for `items.vnfs`
 

docs/data-sources/cb_grid.md

@@ -34,6 +34,8 @@ description: |-
 - `location_code` (String)
 - `meta` (List of String) meta
 - `name` (String)
+- `network_modes` (List of String)
+- `sdn_support` (Boolean)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/cb_grid_list.md

@@ -51,7 +51,9 @@ Read-Only:
 - `id` (Number)
 - `location_code` (String)
 - `name` (String)
+- `network_modes` (List of String)
 - `resources` (List of Object) (see [below for nested schema](#nestedobjatt--items--resources))
+- `sdn_support` (Boolean)
 
 <a id="nestedobjatt--items--resources"></a>
 ### Nested Schema for `items.resources`

docs/data-sources/cb_k8s.md

@@ -56,6 +56,7 @@ description: |-
 - `updated_by` (String)
 - `updated_time` (Number)
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/cb_k8s_list.md

@@ -80,6 +80,7 @@ Read-Only:
 - `updated_time` (Number)
 - `vins_id` (Number)
 - `workers_groups` (List of Object) (see [below for nested schema](#nestedobjatt--items--workers_groups))
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--service_account"></a>
 ### Nested Schema for `items.service_account`

docs/data-sources/cb_k8s_list_deleted.md

@@ -78,6 +78,7 @@ Read-Only:
 - `updated_time` (Number)
 - `vins_id` (Number)
 - `workers_groups` (List of Object) (see [below for nested schema](#nestedobjatt--items--workers_groups))
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--service_account"></a>
 ### Nested Schema for `items.service_account`

docs/data-sources/cb_kvmvm.md

@@ -62,6 +62,7 @@ description: |-
 - `image_id` (Number)
 - `image_name` (String)
 - `interfaces` (List of Object) (see [below for nested schema](#nestedatt--interfaces))
+- `live_migration_job_id` (Number)
 - `loader_type` (String)
 - `lock_status` (String)
 - `manager_id` (Number)
@@ -83,6 +84,7 @@ description: |-
 - `pinned` (Number)
 - `pool` (String)
 - `preferred_cpu` (List of Number)
+- `qemu_guest` (List of Object) (see [below for nested schema](#nestedatt--qemu_guest))
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -107,6 +109,7 @@ description: |-
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
 - `vnc_password` (String)
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -122,7 +125,7 @@ Optional:
 
 Read-Only:
 
-- `explicit` (String)
+- `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)
 - `status` (String)
@@ -181,7 +184,6 @@ Read-Only:
 - `meta` (List of String)
 - `milestones` (Number)
 - `name` (String)
-- `order` (Number)
 - `params` (String)
 - `parent_id` (Number)
 - `passwd` (String)
@@ -205,7 +207,6 @@ Read-Only:
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
-- `vmid` (Number)
 
 <a id="nestedobjatt--disks--iotune"></a>
 ### Nested Schema for `disks.iotune`
@@ -278,7 +279,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 
@@ -319,6 +322,18 @@ Read-Only:
 - `public_key` (String)
 
 
+<a id="nestedatt--qemu_guest"></a>
+### Nested Schema for `qemu_guest`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `enabled_agent_features` (List of String)
+- `guid` (String)
+- `last_update` (Number)
+- `user` (String)
+
+
 <a id="nestedatt--snap_sets"></a>
 ### Nested Schema for `snap_sets`
 

docs/data-sources/cb_kvmvm_list.md

@@ -93,6 +93,7 @@ Read-Only:
 - `hp_backed` (Boolean)
 - `image_id` (Number)
 - `interfaces` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces))
+- `live_migration_job_id` (Number)
 - `loader_type` (String)
 - `lock_status` (String)
 - `manager_id` (Number)
@@ -108,6 +109,7 @@ Read-Only:
 - `os_users` (List of Object) (see [below for nested schema](#nestedobjatt--items--os_users))
 - `pinned` (Number)
 - `preferred_cpu` (List of Number)
+- `qemu_guest` (List of Object) (see [below for nested schema](#nestedobjatt--items--qemu_guest))
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -131,13 +133,14 @@ Read-Only:
 - `vgpus` (List of Number)
 - `vins_connected` (Number)
 - `virtual_image_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--acl"></a>
 ### Nested Schema for `items.acl`
 
 Read-Only:
 
-- `explicit` (String)
+- `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)
 - `status` (String)
@@ -205,7 +208,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 
@@ -246,6 +251,18 @@ Read-Only:
 - `public_key` (String)
 
 
+<a id="nestedobjatt--items--qemu_guest"></a>
+### Nested Schema for `items.qemu_guest`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `enabled_agent_features` (List of String)
+- `guid` (String)
+- `last_update` (Number)
+- `user` (String)
+
+
 <a id="nestedobjatt--items--snap_sets"></a>
 ### Nested Schema for `items.snap_sets`
 

docs/data-sources/cb_kvmvm_list_deleted.md

@@ -124,13 +124,14 @@ Read-Only:
 - `vgpus` (List of Number)
 - `vins_connected` (Number)
 - `virtual_image_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--acl"></a>
 ### Nested Schema for `items.acl`
 
 Read-Only:
 
-- `explicit` (String)
+- `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)
 - `status` (String)
@@ -197,7 +198,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 

docs/data-sources/cb_lb.md

@@ -22,9 +22,11 @@ description: |-
 ### Optional
 
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `zone_id` (Number)
 
 ### Read-Only
 
+- `account_id` (Number)
 - `acl` (String)
 - `backend_haip` (String)
 - `backends` (List of Object) (see [below for nested schema](#nestedatt--backends))

docs/data-sources/cb_lb_list.md

@@ -83,6 +83,7 @@ Read-Only:
 - `updated_time` (Number)
 - `user_managed` (Boolean)
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--backends"></a>
 ### Nested Schema for `items.backends`

docs/data-sources/cb_lb_list_deleted.md

@@ -81,6 +81,7 @@ Read-Only:
 - `updated_time` (Number)
 - `user_managed` (Boolean)
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--backends"></a>
 ### Nested Schema for `items.backends`
@@ -92,6 +93,7 @@ Read-Only:
 - `name` (String)
 - `server_default_settings` (List of Object) (see [below for nested schema](#nestedobjatt--items--backends--server_default_settings))
 - `servers` (List of Object) (see [below for nested schema](#nestedobjatt--items--backends--servers))
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--backends--server_default_settings"></a>
 ### Nested Schema for `items.backends.server_default_settings`

docs/data-sources/cb_node.md

@@ -49,6 +49,7 @@ description: |-
 - `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)
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/cb_node_list.md

@@ -80,6 +80,7 @@ Read-Only:
 - `release` (String)
 - `reserved_cpus` (List of String)
 - `roles` (List of String)
+- `sdn_hypervisor_name` (String)
 - `seps` (List of Number)
 - `serial_num` (String)
 - `sriov_enabled` (Boolean)
@@ -89,6 +90,7 @@ Read-Only:
 - `type` (String)
 - `uefi_firmware_file` (String)
 - `version` (String)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--cpu_info"></a>
 ### Nested Schema for `items.cpu_info`

docs/data-sources/cb_rg.md

@@ -48,6 +48,7 @@ description: |-
 - `name` (String)
 - `resource_limits` (List of Object) (see [below for nested schema](#nestedatt--resource_limits))
 - `resource_types` (List of String)
+- `sdn_access_group_id` (String)
 - `secret` (String)
 - `status` (String)
 - `uniq_pools` (List of String)

docs/data-sources/cb_rg_list.md

@@ -73,6 +73,7 @@ Read-Only:
 - `resource_limits` (List of Object) (see [below for nested schema](#nestedobjatt--items--resource_limits))
 - `resource_types` (List of String)
 - `rg_id` (Number)
+- `sdn_access_group_id` (String)
 - `secret` (String)
 - `status` (String)
 - `uniq_pools` (List of String)

docs/data-sources/cb_trunk.md

@@ -0,0 +1,51 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_cb_trunk Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_cb_trunk (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `trunk_id` (Number) trunk id
+
+### Optional
+
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `account_ids` (Set of Number) List of account IDs with access to this trunk
+- `created_at` (Number) when the trunk was created
+- `created_by` (String) who created the trunk
+- `deleted_at` (Number) when the trunk was updated
+- `deleted_by` (String) who updated the trunk
+- `description` (String) Description of the trunk
+- `guid` (Number) GUID
+- `id` (String) The ID of this resource.
+- `mac` (String) MAC address
+- `name` (String) Name of the trunk
+- `native_vlan_id` (Number) Native VLAN ID
+- `ovs_bridge` (String) OVS bridge name
+- `status` (String) if the trunk is enabled
+- `trunk_tags` (String) List of trunk tags (values between 1-4095)
+- `updated_at` (Number) when the trunk was updated
+- `updated_by` (String) who updated the trunk
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `default` (String)
+- `read` (String)

docs/data-sources/cb_trunk_list.md

@@ -0,0 +1,64 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_cb_trunk_list Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_cb_trunk_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `account_ids` (List of Number) Account access ID(s) to filter by
+- `page` (Number) Page number.
+- `size` (Number) Page size.
+- `sort_by` (String) Sort by one of supported fields, format ±<field>
+- `status` (String) find by status
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `trunk_ids` (List of Number) ID of the trunk(s) to filter by
+- `trunk_tags` (String) Trunk tags to filter by (value between 1-4095)
+
+### Read-Only
+
+- `entry_count` (Number)
+- `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:
+
+- `account_ids` (Set of Number)
+- `created_at` (Number)
+- `created_by` (String)
+- `deleted_at` (Number)
+- `deleted_by` (String)
+- `description` (String)
+- `guid` (Number)
+- `id` (Number)
+- `mac` (String)
+- `name` (String)
+- `native_vlan_id` (Number)
+- `ovs_bridge` (String)
+- `status` (String)
+- `trunk_tags` (String)
+- `updated_at` (Number)
+- `updated_by` (String)

docs/data-sources/cb_user.md

@@ -29,6 +29,7 @@ description: |-
 - `api_access` (Map of String) api_access
 - `authkey` (String) authkey
 - `authkeys` (List of String) authkeys
+- `blocked` (Boolean) is the user blocked
 - `ckey` (String) ckey
 - `data` (String) data
 - `description` (String) description

docs/data-sources/cb_user_list.md

@@ -19,6 +19,7 @@ description: |-
 
 - `active` (Boolean) find by active. True or False
 - `by_id` (String) find by id
+- `email` (String) find by email
 - `page` (Number) Page number
 - `service_account` (Boolean) find by service account. True or False
 - `size` (Number) Page size
@@ -49,6 +50,7 @@ Read-Only:
 - `apiaccess` (Map of String)
 - `authkey` (String)
 - `authkeys` (List of String)
+- `blocked` (Boolean)
 - `ckey` (String)
 - `data` (String)
 - `description` (String)

docs/data-sources/cb_vins.md

@@ -56,6 +56,7 @@ description: |-
 - `vnf_dev` (List of Object) vnf dev (see [below for nested schema](#nestedatt--vnf_dev))
 - `vnfs` (List of Object) vnfs (see [below for nested schema](#nestedatt--vnfs))
 - `vxlan_id` (Number) vxlan id
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -158,6 +159,7 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--vnf_dev--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
 - `type` (String)
 - `vnfs` (List of Number)
@@ -300,7 +302,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--gw--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -346,19 +347,6 @@ Read-Only:
 
 
 
-<a id="nestedobjatt--vnfs--gw--routes"></a>
-### Nested Schema for `vnfs.gw.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)
-
-
 
 <a id="nestedobjatt--vnfs--nat"></a>
 ### Nested Schema for `vnfs.nat`
@@ -379,7 +367,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--nat--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -424,17 +411,3 @@ Read-Only:
 - `dev_id` (Number)
 - `iface01` (String)
 - `iface02` (String)
-
-
-
-<a id="nestedobjatt--vnfs--nat--routes"></a>
-### Nested Schema for `vnfs.nat.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)

docs/data-sources/cb_vins_list.md

@@ -84,6 +84,7 @@ Read-Only:
 - `vins_id` (Number)
 - `vnfs` (List of Object) (see [below for nested schema](#nestedobjatt--items--vnfs))
 - `vxlan_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--default_qos"></a>
 ### Nested Schema for `items.default_qos`

docs/data-sources/cb_vins_list_deleted.md

@@ -80,6 +80,7 @@ Read-Only:
 - `vins_id` (Number)
 - `vnfs` (List of Object) (see [below for nested schema](#nestedobjatt--items--vnfs))
 - `vxlan_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--default_qos"></a>
 ### Nested Schema for `items.default_qos`

docs/data-sources/cb_zone.md

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

docs/data-sources/cb_zone_list.md

@@ -0,0 +1,61 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_cb_zone_list Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_cb_zone_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `by_id` (Number) Find by ID
+- `deletable` (Boolean) Find by deletable
+- `description` (String) Find by description
+- `gid` (Number) Find by Grid ID
+- `name` (String) Find by name
+- `node_id` (Number) Find by nodeId
+- `page` (Number) Page number
+- `size` (Number) Page size
+- `sort_by` (String) sort by one of supported fields, format +|-(field)
+- `status` (String) Find by status
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `entry_count` (Number)
+- `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:
+
+- `created_time` (Number)
+- `deletable` (Boolean)
+- `description` (String)
+- `gid` (Number)
+- `guid` (Number)
+- `name` (String)
+- `node_ids` (List of Number)
+- `status` (String)
+- `updated_time` (Number)
+- `zone_id` (Number)

docs/data-sources/disk.md

@@ -40,7 +40,7 @@ description: |-
 - `gid` (Number) ID of the grid (platform)
 - `id` (String) The ID of this resource.
 - `image_id` (Number) Image ID
-- `images` (List of String) IDs of images using the disk
+- `images` (List of Number) IDs of images using the disk
 - `iotune` (List of Object) (see [below for nested schema](#nestedatt--iotune))
 - `machine_id` (Number)
 - `machine_name` (String)

docs/data-sources/disk_list.md

@@ -67,7 +67,7 @@ Read-Only:
 - `disk_name` (String)
 - `gid` (Number)
 - `image_id` (Number)
-- `images` (List of String)
+- `images` (List of Number)
 - `iotune` (List of Object) (see [below for nested schema](#nestedobjatt--items--iotune))
 - `machine_id` (Number)
 - `machine_name` (String)

docs/data-sources/disk_list_deleted.md

@@ -64,7 +64,7 @@ Read-Only:
 - `disk_name` (String)
 - `gid` (Number)
 - `image_id` (Number)
-- `images` (List of String)
+- `images` (List of Number)
 - `iotune` (List of Object) (see [below for nested schema](#nestedobjatt--items--iotune))
 - `machine_id` (Number)
 - `machine_name` (String)

docs/data-sources/disk_list_unattached.md

@@ -66,7 +66,7 @@ Read-Only:
 - `gid` (Number)
 - `guid` (Number)
 - `image_id` (Number)
-- `images` (List of String)
+- `images` (List of Number)
 - `iotune` (List of Object) (see [below for nested schema](#nestedobjatt--items--iotune))
 - `iqn` (String)
 - `login` (String)

docs/data-sources/disk_replication.md

@@ -39,7 +39,7 @@ description: |-
 - `gid` (Number) ID of the grid (platform)
 - `id` (String) The ID of this resource.
 - `image_id` (Number) Image ID
-- `images` (List of String) IDs of images using the disk
+- `images` (List of Number) IDs of images using the disk
 - `iotune` (List of Object) (see [below for nested schema](#nestedatt--iotune))
 - `order` (Number) Disk order
 - `params` (String) Disk params

docs/data-sources/extnet.md

@@ -40,18 +40,23 @@ description: |-
 - `ipcidr` (String)
 - `meta` (List of String) meta
 - `milestones` (Number)
+- `mtu` (Number)
 - `net_name` (String)
 - `network` (String)
-- `network_id` (Number)
+- `network_ids` (List of Object) (see [below for nested schema](#nestedatt--network_ids))
 - `ntp` (List of String)
+- `pre_reservations` (List of Object) (see [below for nested schema](#nestedatt--pre_reservations))
 - `pre_reservations_num` (Number)
 - `prefix` (Number)
 - `pri_vnf_dev_id` (Number)
+- `redundant` (Boolean)
 - `reservations` (List of Object) (see [below for nested schema](#nestedatt--reservations))
+- `sec_vnfdev_id` (Number)
 - `shared_with` (List of Number)
 - `status` (String)
 - `vlan_id` (Number)
 - `vnfs` (List of Object) (see [below for nested schema](#nestedatt--vnfs))
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -86,6 +91,31 @@ Read-Only:
 - `vm_id` (Number)
 
 
+<a id="nestedatt--network_ids"></a>
+### Nested Schema for `network_ids`
+
+Read-Only:
+
+- `primary` (Number)
+- `secondary` (Number)
+
+
+<a id="nestedatt--pre_reservations"></a>
+### Nested Schema for `pre_reservations`
+
+Read-Only:
+
+- `account_id` (Number)
+- `client_type` (String)
+- `desc` (String)
+- `domain_name` (String)
+- `hostname` (String)
+- `ip` (String)
+- `mac` (String)
+- `type` (String)
+- `vm_id` (Number)
+
+
 <a id="nestedatt--reservations"></a>
 ### Nested Schema for `reservations`
 

docs/data-sources/k8s.md

@@ -52,6 +52,7 @@ description: |-
 - `updated_time` (Number)
 - `vins_id` (Number)
 - `workers` (List of Object) (see [below for nested schema](#nestedatt--workers))
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`

docs/data-sources/k8s_list.md

@@ -79,6 +79,7 @@ Read-Only:
 - `updated_time` (Number)
 - `vins_id` (Number)
 - `workers_groups` (List of Object) (see [below for nested schema](#nestedobjatt--items--workers_groups))
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--service_account"></a>
 ### Nested Schema for `items.service_account`

docs/data-sources/k8s_list_deleted.md

@@ -77,6 +77,7 @@ Read-Only:
 - `updated_time` (Number)
 - `vins_id` (Number)
 - `workers_groups` (List of Object) (see [below for nested schema](#nestedobjatt--items--workers_groups))
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--service_account"></a>
 ### Nested Schema for `items.service_account`

docs/data-sources/kvmvm.md

@@ -60,6 +60,7 @@ description: |-
 - `id` (String) The ID of this resource.
 - `image_id` (Number)
 - `interfaces` (List of Object) (see [below for nested schema](#nestedatt--interfaces))
+- `live_migration_job_id` (Number)
 - `loader_type` (String)
 - `lock_status` (String)
 - `manager_id` (Number)
@@ -80,6 +81,7 @@ description: |-
 - `pci_devices` (List of Number)
 - `pinned` (Boolean)
 - `preferred_cpu` (List of Number)
+- `qemu_guest` (List of Object) (see [below for nested schema](#nestedatt--qemu_guest))
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -101,6 +103,7 @@ description: |-
 - `virtual_image_id` (Number)
 - `virtual_image_name` (String)
 - `vnc_password` (String)
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -212,7 +215,6 @@ Read-Only:
 - `login` (String)
 - `milestones` (Number)
 - `name` (String)
-- `order` (Number)
 - `params` (String)
 - `parent_id` (Number)
 - `passwd` (String)
@@ -233,7 +235,6 @@ Read-Only:
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
-- `vmid` (Number)
 
 <a id="nestedobjatt--disks--iotune"></a>
 ### Nested Schema for `disks.iotune`
@@ -307,7 +308,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 
@@ -348,6 +351,18 @@ Read-Only:
 - `public_key` (String)
 
 
+<a id="nestedatt--qemu_guest"></a>
+### Nested Schema for `qemu_guest`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `enabled_agent_features` (List of String)
+- `guid` (String)
+- `last_update` (Number)
+- `user` (String)
+
+
 <a id="nestedatt--snap_sets"></a>
 ### Nested Schema for `snap_sets`
 

docs/data-sources/kvmvm_list.md

@@ -89,6 +89,7 @@ Read-Only:
 - `hp_backed` (Boolean)
 - `image_id` (Number)
 - `interfaces` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces))
+- `live_migration_job_id` (Number)
 - `loader_type` (String)
 - `lock_status` (String)
 - `manager_id` (Number)
@@ -102,6 +103,7 @@ Read-Only:
 - `numa_node_id` (Number)
 - `pinned` (Boolean)
 - `preferred_cpu` (List of Number)
+- `qemu_guest` (List of Object) (see [below for nested schema](#nestedobjatt--items--qemu_guest))
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -122,6 +124,7 @@ Read-Only:
 - `vgpus` (List of Number)
 - `vins_connected` (Number)
 - `virtual_image_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--acl"></a>
 ### Nested Schema for `items.acl`
@@ -196,7 +199,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 
@@ -226,6 +231,18 @@ Read-Only:
 
 
 
+<a id="nestedobjatt--items--qemu_guest"></a>
+### Nested Schema for `items.qemu_guest`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `enabled_agent_features` (List of String)
+- `guid` (String)
+- `last_update` (Number)
+- `user` (String)
+
+
 <a id="nestedobjatt--items--snap_sets"></a>
 ### Nested Schema for `items.snap_sets`
 

docs/data-sources/kvmvm_list_deleted.md

@@ -87,6 +87,7 @@ Read-Only:
 - `hp_backed` (Boolean)
 - `image_id` (Number)
 - `interfaces` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces))
+- `live_migration_job_id` (Number)
 - `loader_type` (String)
 - `lock_status` (String)
 - `manager_id` (Number)
@@ -100,6 +101,7 @@ Read-Only:
 - `numa_node_id` (Number)
 - `pinned` (Boolean)
 - `preferred_cpu` (List of Number)
+- `qemu_guest` (List of Object) (see [below for nested schema](#nestedobjatt--items--qemu_guest))
 - `ram` (Number)
 - `reference_id` (String)
 - `registered` (Boolean)
@@ -120,6 +122,7 @@ Read-Only:
 - `vgpus` (List of Number)
 - `vins_connected` (Number)
 - `virtual_image_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--acl"></a>
 ### Nested Schema for `items.acl`
@@ -194,7 +197,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--items--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 
@@ -224,6 +229,18 @@ Read-Only:
 
 
 
+<a id="nestedobjatt--items--qemu_guest"></a>
+### Nested Schema for `items.qemu_guest`
+
+Read-Only:
+
+- `enabled` (Boolean)
+- `enabled_agent_features` (List of String)
+- `guid` (String)
+- `last_update` (Number)
+- `user` (String)
+
+
 <a id="nestedobjatt--items--snap_sets"></a>
 ### Nested Schema for `items.snap_sets`
 

docs/data-sources/lb.md

@@ -22,9 +22,11 @@ description: |-
 ### Optional
 
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `zone_id` (Number)
 
 ### Read-Only
 
+- `account_id` (Number)
 - `backend_haip` (String)
 - `backends` (List of Object) (see [below for nested schema](#nestedatt--backends))
 - `created_by` (String)

docs/data-sources/lb_list.md

@@ -51,6 +51,7 @@ Optional:
 
 Read-Only:
 
+- `account_id` (Number)
 - `backend_haip` (String)
 - `backends` (List of Object) (see [below for nested schema](#nestedobjatt--items--backends))
 - `created_by` (String)
@@ -83,6 +84,7 @@ Read-Only:
 - `updated_time` (Number)
 - `user_managed` (Boolean)
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--backends"></a>
 ### Nested Schema for `items.backends`

docs/data-sources/lb_list_deleted.md

@@ -49,6 +49,7 @@ Optional:
 
 Read-Only:
 
+- `account_id` (Number)
 - `backend_haip` (String)
 - `backends` (List of Object) (see [below for nested schema](#nestedobjatt--items--backends))
 - `created_by` (String)
@@ -81,6 +82,7 @@ Read-Only:
 - `updated_time` (Number)
 - `user_managed` (Boolean)
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedobjatt--items--backends"></a>
 ### Nested Schema for `items.backends`

docs/data-sources/locations_list.md

@@ -55,4 +55,5 @@ Read-Only:
 - `location_code` (String)
 - `meta` (List of String)
 - `name` (String)
+- `network_modes` (List of String)
 - `sdn_support` (Boolean)

docs/data-sources/resgroup.md

@@ -48,6 +48,7 @@ description: |-
 - `name` (String)
 - `res_types` (List of String)
 - `resource_limits` (List of Object) (see [below for nested schema](#nestedatt--resource_limits))
+- `sdn_access_group_id` (String)
 - `secret` (String)
 - `status` (String)
 - `uniq_pools` (List of String)

docs/data-sources/rg_list.md

@@ -73,6 +73,7 @@ Read-Only:
 - `resource_limits` (List of Object) (see [below for nested schema](#nestedobjatt--items--resource_limits))
 - `resource_types` (List of String)
 - `rg_id` (Number)
+- `sdn_access_group_id` (String)
 - `secret` (String)
 - `status` (String)
 - `uniq_pools` (List of String)

docs/data-sources/trunk.md

@@ -0,0 +1,51 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_trunk Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_trunk (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `trunk_id` (Number) trunk id
+
+### Optional
+
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `account_ids` (Set of Number) List of account IDs with access to this trunk
+- `created_at` (Number) when the trunk was created
+- `created_by` (String) who created the trunk
+- `deleted_at` (Number) when the trunk was updated
+- `deleted_by` (String) who updated the trunk
+- `description` (String) Description of the trunk
+- `guid` (Number) GUID
+- `id` (String) The ID of this resource.
+- `mac` (String) MAC address
+- `name` (String) Name of the trunk
+- `native_vlan_id` (Number) Native VLAN ID
+- `ovs_bridge` (String) OVS bridge name
+- `status` (String) if the trunk is enabled
+- `trunk_tags` (String) List of trunk tags (values between 1-4095)
+- `updated_at` (Number) when the trunk was updated
+- `updated_by` (String) who updated the trunk
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `default` (String)
+- `read` (String)

docs/data-sources/trunk_list.md

@@ -0,0 +1,64 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_trunk_list Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_trunk_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `account_ids` (List of Number) Account access ID(s) to filter by
+- `page` (Number) Page number.
+- `size` (Number) Page size.
+- `sort_by` (String) Sort by one of supported fields, format ±<field>
+- `status` (String) find by status
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `trunk_ids` (List of Number) ID of the trunk(s) to filter by
+- `trunk_tags` (String) Trunk tags to filter by (value between 1-4095)
+
+### Read-Only
+
+- `entry_count` (Number)
+- `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:
+
+- `account_ids` (Set of Number)
+- `created_at` (Number)
+- `created_by` (String)
+- `deleted_at` (Number)
+- `deleted_by` (String)
+- `description` (String)
+- `guid` (Number)
+- `id` (Number)
+- `mac` (String)
+- `name` (String)
+- `native_vlan_id` (Number)
+- `ovs_bridge` (String)
+- `status` (String)
+- `trunk_tags` (String)
+- `updated_at` (Number)
+- `updated_by` (String)

docs/data-sources/vins.md

@@ -57,6 +57,7 @@ description: |-
 - `vnf_dev` (List of Object) (see [below for nested schema](#nestedatt--vnf_dev))
 - `vnfs` (List of Object) (see [below for nested schema](#nestedatt--vnfs))
 - `vxlan_id` (Number)
+- `zone_id` (Number)
 
 <a id="nestedblock--timeouts"></a>
 ### Nested Schema for `timeouts`
@@ -167,6 +168,7 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--vnf_dev--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
 - `type` (String)
 - `vnfs` (List of Number)
@@ -307,7 +309,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--gw--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -353,19 +354,6 @@ Read-Only:
 
 
 
-<a id="nestedobjatt--vnfs--gw--routes"></a>
-### Nested Schema for `vnfs.gw.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)
-
-
 
 <a id="nestedobjatt--vnfs--nat"></a>
 ### Nested Schema for `vnfs.nat`
@@ -385,7 +373,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--nat--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -430,17 +417,3 @@ Read-Only:
 - `dev_id` (Number)
 - `iface01` (String)
 - `iface02` (String)
-
-
-
-<a id="nestedobjatt--vnfs--nat--routes"></a>
-### Nested Schema for `vnfs.nat.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)

docs/data-sources/zone.md

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

docs/data-sources/zone_list.md

@@ -0,0 +1,61 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_zone_list Data Source - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_zone_list (Data Source)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Optional
+
+- `by_id` (Number) Find by ID
+- `deletable` (Boolean) Find by deletable
+- `description` (String) Find by description
+- `gid` (Number) Find by Grid ID
+- `name` (String) Find by name
+- `node_id` (Number) Find by nodeId
+- `page` (Number) Page number
+- `size` (Number) Page size
+- `sort_by` (String) sort by one of supported fields, format +|-(field)
+- `status` (String) Find by status
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `entry_count` (Number)
+- `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:
+
+- `created_time` (Number)
+- `deletable` (Boolean)
+- `description` (String)
+- `gid` (Number)
+- `guid` (Number)
+- `name` (String)
+- `node_ids` (List of Number)
+- `status` (String)
+- `updated_time` (Number)
+- `zone_id` (Number)

docs/resources/account.md

@@ -21,16 +21,17 @@ description: |-
 
 ### Optional
 
+- `default_zone_id` (Number) email
 - `desc` (String) description
 - `emailaddress` (String) email
 - `enable` (Boolean) enable/disable account
 - `permanently` (Boolean) whether to completely delete the account
-- `reason` (String) reason for deactivation
 - `resource_limits` (Block List, Max: 1) (see [below for nested schema](#nestedblock--resource_limits))
 - `restore` (Boolean) restore a deleted account
 - `send_access_emails` (Boolean) if true send emails when a user is granted access to resources
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `users` (Block List) (see [below for nested schema](#nestedblock--users))
+- `zone_ids` (List of Number)
 
 ### Read-Only
 
@@ -100,6 +101,7 @@ Required:
 Read-Only:
 
 - `can_be_deleted` (Boolean)
+- `emails` (List of String)
 - `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)

docs/resources/bservice.md

@@ -31,6 +31,7 @@ description: |-
 - `ssh_user` (String) name of the user to deploy SSH key for. Pass empty string if no SSH key deployment is required
 - `start` (Boolean) Start service. Starting a service technically means starting computes from all service groups according to group relations
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+- `zone_id` (Number) ID of the zone where this service will be placed
 
 ### Read-Only
 

docs/resources/cb_account.md

@@ -27,17 +27,18 @@ description: |-
 - `compute_features` (Set of String)
 - `cpu_allocation_parameter` (String) set cpu allocation parameter
 - `cpu_allocation_ratio` (Number) set cpu allocation ratio
+- `default_zone_id` (Number) email
 - `desc` (String) description
 - `emailaddress` (String) email
 - `enable` (Boolean) enable/disable account
 - `permanently` (Boolean) whether to completely delete the account
-- `reason` (String) reason for restore or deactivation
 - `resource_limits` (Block List, Max: 1) (see [below for nested schema](#nestedblock--resource_limits))
 - `restore` (Boolean) restore a deleted account
 - `send_access_emails` (Boolean) if true send emails when a user is granted access to resources
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `uniq_pools` (List of String)
 - `users` (Block List) (see [below for nested schema](#nestedblock--users))
+- `zone_ids` (List of Number)
 
 ### Read-Only
 
@@ -103,6 +104,7 @@ Required:
 
 Read-Only:
 
+- `emails` (List of String)
 - `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)

docs/resources/cb_disk.md

@@ -53,7 +53,7 @@ description: |-
 - `guid` (Number)
 - `id` (String) The ID of this resource.
 - `image_id` (Number)
-- `images` (List of String)
+- `images` (List of Number)
 - `iqn` (String)
 - `login` (String)
 - `machine_id` (Number)

docs/resources/cb_extnet.md

@@ -33,18 +33,22 @@ description: |-
 - `excluded_ips` (Set of String) IPs to exclude in current extnet pool
 - `excluded_ips_range` (Block Set) Range of IPs to exclude in current extnet pool (see [below for nested schema](#nestedblock--excluded_ips_range))
 - `gateway` (String) External network gateway IP address
+- `highly_available` (Boolean)
 - `migrate` (Number)
+- `mtu` (Number)
 - `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
+- `sec_vnfdev_ip` (String)
 - `set_default` (Boolean) Set current extnet as default (can not be undone)
 - `shared_with` (Set of Number)
 - `start_ip` (String) Start of IP range to be explicitly included
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `virtual` (Boolean) If true - platform DHCP server will not be created
 - `vnfdev_ip` (String) IP to create VNFDev with
+- `zone_id` (Number)
 
 ### Read-Only
 
@@ -58,7 +62,7 @@ description: |-
 - `meta` (List of String) meta
 - `milestones` (Number)
 - `network` (String)
-- `network_id` (Number)
+- `network_ids` (List of Object) (see [below for nested schema](#nestedatt--network_ids))
 - `prefix` (Number)
 - `pri_vnfdev_id` (Number)
 - `reservations` (List of Object) (see [below for nested schema](#nestedatt--reservations))
@@ -128,6 +132,15 @@ Read-Only:
 - `vm_id` (Number)
 
 
+<a id="nestedatt--network_ids"></a>
+### Nested Schema for `network_ids`
+
+Read-Only:
+
+- `primary` (Number)
+- `secondary` (Number)
+
+
 <a id="nestedatt--reservations"></a>
 ### Nested Schema for `reservations`
 

docs/resources/cb_flipgroup.md

@@ -18,7 +18,6 @@ description: |-
 ### Required
 
 - `account_id` (Number) Account ID
-- `client_type` (String) Type of client, 'compute' ('vins' will be later)
 - `name` (String) Flipgroup name
 - `net_id` (Number) EXTNET or ViNS ID
 - `net_type` (String) Network type, EXTNET or VINS
@@ -26,6 +25,7 @@ description: |-
 ### Optional
 
 - `client_ids` (List of Number) List of clients attached to this Flipgroup instance
+- `client_type` (String) Type of client, 'compute' ('vins' will be later)
 - `desc` (String) Text description of this Flipgroup instance
 - `ip` (String) IP address to associate with this group. If empty, the platform will autoselect IP address
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))

docs/resources/cb_image.md

@@ -25,7 +25,6 @@ description: |-
 ### Optional
 
 - `account_id` (Number) AccountId to make the image exclusive
-- `architecture` (String) binary architecture of this image, one of X86_64
 - `bootable` (Boolean) Does this image boot OS
 - `computeci_id` (Number)
 - `drivers` (List of String) List of types of compute suitable for image. Example: [ "KVM_X86" ]
@@ -46,6 +45,7 @@ description: |-
 ### Read-Only
 
 - `acl` (List of Object) (see [below for nested schema](#nestedatt--acl))
+- `architecture` (String) binary architecture of this image, one of X86_64
 - `cd_presented_to` (String)
 - `deleted_time` (Number)
 - `desc` (String)

docs/resources/cb_image_from_platform_disk.md

@@ -17,7 +17,6 @@ description: |-
 
 ### Required
 
-- `architecture` (String) Image type linux, windows or other
 - `boot_type` (String) Boot type of image BIOS or UEFI
 - `disk_id` (Number) Disk Id
 - `drivers` (List of String) List of types of compute suitable for image. Example: [ "KVM_X86" ]
@@ -43,6 +42,7 @@ description: |-
 ### Read-Only
 
 - `acl` (List of Object) (see [below for nested schema](#nestedatt--acl))
+- `architecture` (String)
 - `cd_presented_to` (String)
 - `deleted_time` (Number)
 - `desc` (String)

docs/resources/cb_k8s_cp.md

@@ -50,6 +50,7 @@ description: |-
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `vins_id` (Number) ID of default vins for this instace.
 - `with_lb` (Boolean) Create k8s with load balancer if true.
+- `zone_id` (Number)
 
 ### Read-Only
 

docs/resources/cb_kvmvm.md

@@ -73,6 +73,7 @@ description: |-
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `user_access` (Block Set) (see [below for nested schema](#nestedblock--user_access))
 - `without_boot_disk` (Boolean) If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state.
+- `zone_id` (Number)
 
 ### Read-Only
 
@@ -221,13 +222,14 @@ Optional:
 Required:
 
 - `net_id` (Number) ID of the network for this connection.
-- `net_type` (String) Type of the network for this connection, either EXTNET or VINS.
+- `net_type` (String) Type of the network for this connection
 
 Optional:
 
 - `ip_address` (String) Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.
 - `mac` (String) MAC address associated with this connection. MAC address is assigned automatically.
 - `mtu` (Number) Maximum transmission unit, used only for DPDK type, must be 1-9216
+- `sdn_interface_id` (String) unique_identifier of LogicalPort on SDN side
 - `weight` (Number) weight the network if you need to sort network list, the smallest attach first. zero or null weight attach last
 
 
@@ -300,7 +302,7 @@ Required:
 
 Read-Only:
 
-- `explicit` (String)
+- `explicit` (Boolean)
 - `guid` (String)
 - `right` (String)
 - `status` (String)
@@ -332,7 +334,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 

docs/resources/cb_lb.md

@@ -35,6 +35,7 @@ description: |-
 - `sysctl_params` (List of Map of String) Custom sysctl values for Load Balancer instance. Applied on boot
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 ### Read-Only
 

docs/resources/cb_rg.md

@@ -39,6 +39,7 @@ description: |-
 - `permanently` (Boolean) flag to permanently delete resource group
 - `resource_limits` (Block List, Max: 1) (see [below for nested schema](#nestedblock--resource_limits))
 - `restore` (Boolean) restore deleted rg
+- `sdn_access_group_id` (String) ID of the SDN access group
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `uniq_pools` (List of String)
 

docs/resources/cb_trunk.md

@@ -0,0 +1,55 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_cb_trunk Resource - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_cb_trunk (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String) Name of the trunk
+- `ovs_bridge` (String) OVS bridge name
+- `trunk_tags` (String) List of trunk tags (values between 1-4095)
+
+### Optional
+
+- `account_ids` (Set of Number) List of account IDs with access to this trunk
+- `description` (String) Description of the trunk
+- `enable` (Boolean) Whether the trunk should be enabled
+- `native_vlan_id` (Number) Native VLAN ID
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `created_at` (Number) when the trunk was created
+- `created_by` (String) who created the trunk
+- `deleted_at` (Number) when the trunk was updated
+- `deleted_by` (String) who updated the trunk
+- `guid` (Number) GUID
+- `id` (String) The ID of this resource.
+- `mac` (String) MAC address
+- `status` (String) if the trunk is enabled
+- `trunk_id` (Number) trunk id
+- `updated_at` (Number) when the trunk was updated
+- `updated_by` (String) who updated the trunk
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `create` (String)
+- `default` (String)
+- `delete` (String)
+- `read` (String)
+- `update` (String)

docs/resources/cb_user.md

@@ -23,8 +23,9 @@ description: |-
 ### Optional
 
 - `apiaccess` (Set of Number) list of apiaccess groups this user belongs to
-- `groups` (List of String) list of groups this user belongs to
+- `blocked` (Boolean) is the user blocked
 - `password` (String) password of user
+- `provider_name` (String) provider
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 
 ### Read-Only
@@ -37,6 +38,7 @@ description: |-
 - `description` (String) description
 - `domain` (String) domain
 - `gid` (Number) gid
+- `groups` (List of String) list of groups this user belongs to
 - `guid` (String) guid
 - `id` (String) The ID of this resource.
 - `last_check` (Number) last_check

docs/resources/cb_vins.md

@@ -42,6 +42,7 @@ description: |-
 - `vnfdev_reset` (Boolean)
 - `vnfdev_restart` (Boolean)
 - `vnfdev_start` (Boolean) true to start vnfdev, false to stop vnfdev
+- `zone_id` (Number) zone id
 
 ### Read-Only
 
@@ -283,7 +284,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--dhcp--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -333,19 +333,6 @@ Read-Only:
 
 
 
-<a id="nestedobjatt--vnfs--dhcp--routes"></a>
-### Nested Schema for `vnfs.dhcp.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)
-
-
 
 <a id="nestedobjatt--vnfs--gw"></a>
 ### Nested Schema for `vnfs.gw`
@@ -366,7 +353,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--gw--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -412,19 +398,6 @@ Read-Only:
 
 
 
-<a id="nestedobjatt--vnfs--gw--routes"></a>
-### Nested Schema for `vnfs.gw.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)
-
-
 
 <a id="nestedobjatt--vnfs--nat"></a>
 ### Nested Schema for `vnfs.nat`
@@ -445,7 +418,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--nat--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -490,17 +462,3 @@ Read-Only:
 - `dev_id` (Number)
 - `iface01` (String)
 - `iface02` (String)
-
-
-
-<a id="nestedobjatt--vnfs--nat--routes"></a>
-### Nested Schema for `vnfs.nat.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)

docs/resources/cb_zone.md

@@ -0,0 +1,48 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "decort_cb_zone Resource - terraform-provider-decort"
+subcategory: ""
+description: |-
+  
+---
+
+# decort_cb_zone (Resource)
+
+
+
+
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String)
+
+### Optional
+
+- `description` (String)
+- `node_ids` (List of Number)
+- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
+
+### Read-Only
+
+- `created_time` (Number)
+- `deletable` (Boolean)
+- `gid` (Number)
+- `guid` (Number)
+- `id` (String) The ID of this resource.
+- `status` (String)
+- `updated_time` (Number)
+- `zone_id` (Number)
+
+<a id="nestedblock--timeouts"></a>
+### Nested Schema for `timeouts`
+
+Optional:
+
+- `create` (String)
+- `default` (String)
+- `delete` (String)
+- `read` (String)
+- `update` (String)

docs/resources/disk.md

@@ -47,7 +47,7 @@ description: |-
 - `gid` (Number) ID of the grid (platform)
 - `id` (String) The ID of this resource.
 - `image_id` (Number) Image ID
-- `images` (List of String) IDs of images using the disk
+- `images` (List of Number) IDs of images using the disk
 - `machine_id` (Number)
 - `machine_name` (String)
 - `order` (Number) Disk order

docs/resources/flipgroup.md

@@ -18,7 +18,6 @@ description: |-
 ### Required
 
 - `account_id` (Number) Account ID
-- `client_type` (String) Type of client, 'compute' ('vins' will be later)
 - `name` (String) Flipgroup name
 - `net_id` (Number) EXTNET or ViNS ID
 - `net_type` (String) Network type, EXTNET or VINS
@@ -26,6 +25,7 @@ description: |-
 ### Optional
 
 - `client_ids` (List of Number) List of clients attached to this Flipgroup instance
+- `client_type` (String) Type of client, 'compute' ('vins' will be later)
 - `desc` (String) Text description of this Flipgroup instance
 - `ip` (String) IP address to associate with this group. If empty, the platform will autoselect IP address
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))

docs/resources/image.md

@@ -26,7 +26,6 @@ description: |-
 
 ### Optional
 
-- `architecture` (String) binary architecture of this image, one of X86_64
 - `hot_resize` (Boolean) Does this machine supports hot resize
 - `image_id` (Number) image id
 - `network_interface_naming` (String) select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming
@@ -34,6 +33,7 @@ description: |-
 - `password_dl` (String) password for upload binary media
 - `pool_name` (String) pool for image create
 - `sep_id` (Number) storage endpoint provider ID
+- `sync_mode` (Boolean) Create image from a media identified by URL (in synchronous mode)
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `username` (String) Optional username for the image
 - `username_dl` (String) username for upload binary media
@@ -41,6 +41,7 @@ description: |-
 ### Read-Only
 
 - `acl` (String)
+- `architecture` (String)
 - `bootable` (Boolean)
 - `cd_presented_to` (String)
 - `ckey` (String)

docs/resources/image_from_platform_disk.md

@@ -17,7 +17,6 @@ description: |-
 
 ### Required
 
-- `architecture` (String) binary architecture of this image, one of X86_64
 - `boot_type` (String) Boot type of image BIOS or UEFI
 - `disk_id` (Number) Disk Id
 - `drivers` (List of String) List of types of compute suitable for image. Example: [ "KVM_X86" ]
@@ -38,6 +37,7 @@ description: |-
 ### Read-Only
 
 - `acl` (String)
+- `architecture` (String)
 - `cd_presented_to` (String)
 - `ckey` (String)
 - `compute_ci_id` (Number)

docs/resources/k8s.md

@@ -49,6 +49,7 @@ description: |-
 - `vins_id` (Number) ID of default vins for this instace.
 - `with_lb` (Boolean) Create k8s with load balancer if true.
 - `workers` (Block List) Worker node(s) configuration. (see [below for nested schema](#nestedblock--workers))
+- `zone_id` (Number) ID of the zone to put the cluster into.
 
 ### Read-Only
 

docs/resources/k8s_cp.md

@@ -48,6 +48,7 @@ description: |-
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `vins_id` (Number) ID of default vins for this instace.
 - `with_lb` (Boolean) Create k8s with load balancer if true.
+- `zone_id` (Number) ID of the zone to put the cluster into.
 
 ### Read-Only
 

docs/resources/kvmvm.md

@@ -70,6 +70,7 @@ description: |-
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `user_access` (Block Set) (see [below for nested schema](#nestedblock--user_access))
 - `without_boot_disk` (Boolean) If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state.
+- `zone_id` (Number)
 
 ### Read-Only
 
@@ -196,13 +197,14 @@ Read-Only:
 Required:
 
 - `net_id` (Number) ID of the network for this connection.
-- `net_type` (String) Type of the network for this connection, either EXTNET or VINS.
+- `net_type` (String) Type of the network for this connection
 
 Optional:
 
 - `ip_address` (String) Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.
 - `mac` (String) MAC address associated with this connection. MAC address is assigned automatically.
 - `mtu` (Number) Maximum transmission unit, used only for DPDK type, must be 1-9216
+- `sdn_interface_id` (String) unique_identifier of LogicalPort on SDN side
 - `weight` (Number) weight the network if you need to sort network list, the smallest attach first. zero or null weight attach last
 
 
@@ -310,7 +312,9 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
+- `trunk_tags` (String)
 - `type` (String)
 - `vnfs` (List of Number)
 

docs/resources/lb.md

@@ -35,9 +35,11 @@ description: |-
 - `sysctl_params` (List of Map of String)
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `vins_id` (Number)
+- `zone_id` (Number)
 
 ### Read-Only
 
+- `account_id` (Number)
 - `backend_haip` (String)
 - `backends` (List of Object) (see [below for nested schema](#nestedatt--backends))
 - `created_by` (String)

docs/resources/resgroup.md

@@ -36,6 +36,7 @@ description: |-
 - `permanently` (Boolean) Set to True if you want force delete non-empty RG
 - `quota` (Block List, Max: 1) Quota settings for this resource group. (see [below for nested schema](#nestedblock--quota))
 - `restore` (Boolean)
+- `sdn_access_group_id` (String) ID of the SDN access group
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `uniq_pools` (List of String)
 
@@ -46,6 +47,8 @@ description: |-
 - `compute_features` (List of String)
 - `cpu_allocation_parameter` (String)
 - `cpu_allocation_ratio` (Number)
+- `created_by` (String)
+- `created_time` (Number)
 - `def_net_id` (Number) ID of the default network for this resource group (if any).
 - `deleted_by` (String)
 - `deleted_time` (Number)

docs/resources/vins.md

@@ -40,6 +40,7 @@ description: |-
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))
 - `vnfdev_redeploy` (Boolean)
 - `vnfdev_restart` (Boolean)
+- `zone_id` (Number) ID of the Zone to put ViNS into
 
 ### Read-Only
 
@@ -222,6 +223,7 @@ Read-Only:
 - `node_id` (Number)
 - `pci_slot` (Number)
 - `qos` (List of Object) (see [below for nested schema](#nestedobjatt--vnf_dev--interfaces--qos))
+- `sdn_interface_id` (String)
 - `target` (String)
 - `type` (String)
 - `vnfs` (List of Number)
@@ -362,7 +364,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--gw--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -408,19 +409,6 @@ Read-Only:
 
 
 
-<a id="nestedobjatt--vnfs--gw--routes"></a>
-### Nested Schema for `vnfs.gw.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)
-
-
 
 <a id="nestedobjatt--vnfs--nat"></a>
 ### Nested Schema for `vnfs.nat`
@@ -440,7 +428,6 @@ Read-Only:
 - `owner_id` (Number)
 - `owner_type` (String)
 - `pure_virtual` (Boolean)
-- `routes` (List of Object) (see [below for nested schema](#nestedobjatt--vnfs--nat--routes))
 - `status` (String)
 - `tech_status` (String)
 - `type` (String)
@@ -485,17 +472,3 @@ Read-Only:
 - `dev_id` (Number)
 - `iface01` (String)
 - `iface02` (String)
-
-
-
-<a id="nestedobjatt--vnfs--nat--routes"></a>
-### Nested Schema for `vnfs.nat.routes`
-
-Read-Only:
-
-- `compute_ids` (List of Number)
-- `destination` (String)
-- `gateway` (String)
-- `guid` (String)
-- `netmask` (String)
-- `route_id` (Number)

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.11.6
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.12.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.11.6 h1:CTcMkUJgwDsUA+Az8FI5iLpZDk4ubOO4JnAfbOwDnM0=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.11.6/go.mod h1:OaUynHHuSjWMzpfyoL4au6oLcUogqUkPPBKA15pbHWo=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.12.1 h1:kd7P/A53hsIW2BttrbQ1fuHAYOsbWv8EKfElkPfl9qQ=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.12.1/go.mod h1:OaUynHHuSjWMzpfyoL4au6oLcUogqUkPPBKA15pbHWo=

internal/provider/data_sources_map.go

@@ -38,8 +38,10 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/sep"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/snapshot"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/stack"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/trunk"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vfpool"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/zone"
 
 	cb_account "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
 	cb_audit "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/audit"
@@ -58,9 +60,11 @@ import (
 	cb_rg "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/rg"
 	cb_sep "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/sep"
 	cb_stack "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/stack"
+	cb_trunk "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/trunk"
 	cb_user "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/user"
 	cb_vfpool "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vfpool"
 	cb_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
+	cb_zone "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/zone"
 	// cb_vgpu "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vgpu"
 )
 
@@ -161,6 +165,10 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_rg_resource_consumption_list":      rg.DataSourceRGResourceConsumptionList(),
 		"decort_rg_resource_consumption_get":       rg.DataSourceRGResourceConsumptionGet(),
 		"decort_sep_and_pools_available_list":      sep.DataSourceAvailableSEPAndPoolsList(),
+		"decort_trunk":                             trunk.DataSourceTrunk(),
+		"decort_trunk_list":                        trunk.DataSourceTrunkList(),
+		"decort_zone":                              zone.DataSourceZone(),
+		"decort_zone_list":                         zone.DataSourceZoneList(),
 
 		"decort_cb_account":                           cb_account.DataSourceAccount(),
 		"decort_cb_account_list":                      cb_account.DataSourceAccountList(),
@@ -256,6 +264,8 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_cb_flipgroup":                         cb_flipgroup.DataSourceFlipgroup(),
 		"decort_cb_stack_list":                        cb_stack.DataSourceStacksList(),
 		"decort_cb_stack":                             cb_stack.DataSourceStack(),
+		"decort_cb_trunk":                             cb_trunk.DataSourceTrunk(),
+		"decort_cb_trunk_list":                        cb_trunk.DataSourceTrunkList(),
 		"decort_cb_user":                              cb_user.DataSourceUser(),
 		"decort_cb_user_get_audit":                    cb_user.DataSourceUserGetAudit(),
 		"decort_cb_user_list":                         cb_user.DataSourceUserList(),
@@ -280,5 +290,7 @@ func newDataSourcesMap() map[string]*schema.Resource {
 		"decort_cb_k8s_wg_cloud_init":                 cb_k8s.DataSourceK8sWgCloudInit(),
 		"decort_cb_k8s_wg_list":                       cb_k8s.DataSourceK8sWgList(),
 		"decort_cb_k8s_computes":                      cb_k8s.DataSourceK8sComputes(),
+		"decort_cb_zone":                              cb_zone.DataSourceZone(),
+		"decort_cb_zone_list":                         cb_zone.DataSourceZoneList(),
 	}
 }

internal/provider/resource_map.go

@@ -48,9 +48,11 @@ import (
 	cb_pcidevice "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
 	cb_rg "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/rg"
 	cb_sep "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/sep"
+	cb_trunk "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/trunk"
 	cb_user "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/user"
 	cb_vfpool "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vfpool"
 	cb_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
+	cb_zone "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/zone"
 )
 
 func newResourcesMap() map[string]*schema.Resource {
@@ -109,7 +111,9 @@ func newResourcesMap() map[string]*schema.Resource {
 		"decort_cb_lb_frontend":              cb_lb.ResourceLBFrontend(),
 		"decort_cb_lb_frontend_bind":         cb_lb.ResourceLBFrontendBind(),
 		"decort_cb_rg":                       cb_rg.ResourceResgroup(),
+		"decort_cb_trunk":                    cb_trunk.ResourceTrunk(),
 		"decort_cb_user":                     cb_user.ResourceUser(),
 		"decort_cb_vfpool":                   cb_vfpool.ResourceVFPool(),
+		"decort_cb_zone":                     cb_zone.ResourceZone(),
 	}
 }

internal/service/cloudapi/account/data_source_account.go

@@ -85,6 +85,13 @@ func aclSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"emails": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
 	}
 
 	return res
@@ -292,6 +299,26 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeString,
 			},
 		},
+		"zone_ids": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"default_zone_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"acl": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/account/data_source_account_list.go

@@ -61,7 +61,7 @@ func flattenAccountList(al *account.ListAccounts) []map[string]interface{} {
 	return res
 }
 
-func flattenRgAcl(rgAcls []account.RecordACL) []map[string]interface{} {
+func flattenRgAcl(rgAcls []account.ListRecordACL) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, rgAcl := range rgAcls {
 		temp := map[string]interface{}{

internal/service/cloudapi/account/flattens.go

@@ -36,6 +36,8 @@ func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	d.Set("machines", flattenAccMachines(acc.Machines))
 	d.Set("cpu_allocation_parameter", acc.CPUAllocationParameter)
 	d.Set("cpu_allocation_ratio", acc.CPUAllocationRatio)
+	d.Set("default_zone_id", acc.DefaultZoneID)
+	d.Set("zone_ids", flattenZones(acc.ZoneIDs))
 
 	if username, ok := d.GetOk("username"); ok {
 		d.Set("username", username)
@@ -80,6 +82,7 @@ func flattenAccAcl(acls []account.RecordACL) []map[string]interface{} {
 			"right":          acls.Rights,
 			"status":         acls.Status,
 			"type":           acls.Type,
+			"emails":         acls.Emails,
 			"user_group_id":  acls.UgroupID,
 		}
 		res = append(res, temp)
@@ -165,3 +168,15 @@ func flattenAccResourceConsumption(lrc *account.ListResourceConsumption) []map[s
 	}
 	return res
 }
+
+func flattenZones(zones []account.ZoneID) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, zone := range zones {
+		temp := map[string]interface{}{
+			"id":   zone.ID,
+			"name": zone.Name,
+		}
+		res = append(res, temp)
+	}
+	return res
+}

internal/service/cloudapi/account/resource_account.go

@@ -34,13 +34,16 @@ package account
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
@@ -116,11 +119,32 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, m interf
 		Permanently: d.Get("permanently").(bool),
 	}
 
-	_, err = c.CloudAPI().Account().Delete(ctx, req)
+	taskID, err := c.CloudAPI().Account().Delete(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	taskReq := tasks.GetRequest{
+		AuditID: strings.Trim(taskID, `"`),
+	}
+
+	for {
+		time.Sleep(time.Second * 5)
+		task, err := c.CloudAPI().Tasks().Get(ctx, taskReq)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		log.Debugf("resourceAccountDelete: delete account - %s", task.Stage)
+
+		if task.Completed {
+			if task.Error != "" {
+				return diag.FromErr(fmt.Errorf("cannot delete account: %v", task.Error))
+			}
+			break
+		}
+	}
+
 	d.SetId("")
 
 	return nil
@@ -153,11 +177,32 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 				AccountID: accountId,
 			}
 
-			_, err := c.CloudAPI().Account().Restore(ctx, req)
+			taskID, err := c.CloudAPI().Account().Restore(ctx, req)
 			if err != nil {
 				return diag.FromErr(err)
 			}
 
+			taskReq := tasks.GetRequest{
+				AuditID: strings.Trim(taskID, `"`),
+			}
+
+			for {
+				time.Sleep(time.Second * 5)
+				task, err := c.CloudAPI().Tasks().Get(ctx, taskReq)
+				if err != nil {
+					return diag.FromErr(err)
+				}
+
+				log.Debugf("resourceAccountUpdate: restore account - %s", task.Stage)
+
+				if task.Completed {
+					if task.Error != "" {
+						return diag.FromErr(fmt.Errorf("cannot restore account: %v", task.Error))
+					}
+					break
+				}
+			}
+
 			hasChanged = true
 		}
 	case status.Disabled:
@@ -176,7 +221,6 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	if d.HasChange("enable") {
 		reqSwitch := account.DisableEnableRequest{
 			AccountID: accountId,
-			Reason:    d.Get("reason").(string),
 		}
 		enable := d.Get("enable").(bool)
 
@@ -285,6 +329,18 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
+	if d.HasChange("default_zone_id") {
+		req.DefaultZoneID = uint64(d.Get("default_zone_id").(int))
+		updated = true
+	}
+
+	if updated {
+		_, err := c.CloudAPI().Account().Update(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("users") {
 		deletedUsers := make([]interface{}, 0)
 		addedUsers := make([]interface{}, 0)
@@ -431,10 +487,19 @@ func resourceAccountSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
-		"reason": {
-			Type:        schema.TypeString,
+		"default_zone_id": {
+			Type:        schema.TypeInt,
 			Optional:    true,
-			Description: "reason for deactivation",
+			Computed:    true,
+			Description: "email",
+		},
+		"zone_ids": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
 		},
 		"restore": {
 			Type:        schema.TypeBool,

internal/service/cloudapi/bservice/data_source_bservice.go

@@ -73,6 +73,10 @@ func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"zone_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"computes": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/bservice/data_source_bservice_list.go

@@ -68,6 +68,7 @@ func flattenBasicServiceList(bsl *bservice.ListBasicServices) []map[string]inter
 			"updated_by":      bs.UpdatedBy,
 			"updated_time":    bs.UpdatedTime,
 			"user_managed":    bs.UserManaged,
+			"zone_id":         bs.ZoneID,
 		}
 		res = append(res, temp)
 	}
@@ -183,6 +184,10 @@ func dataSourceBasicServiceListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeInt,
 						Computed: true,
 					},
+					"zone_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"groups": {
 						Type:     schema.TypeList,
 						Computed: true,

internal/service/cloudapi/bservice/flattens.go

@@ -86,6 +86,7 @@ func flattenService(d *schema.ResourceData, bs *bservice.RecordBasicService) {
 	d.Set("updated_by", bs.UpdatedBy)
 	d.Set("updated_time", bs.UpdatedTime)
 	d.Set("user_managed", bs.UserManaged)
+	d.Set("zone_id", bs.ZoneID)
 }
 
 func flattenBasicServiceComputes(bscs bservice.ListComputes) []map[string]interface{} {

internal/service/cloudapi/bservice/resource_bservice.go

@@ -64,6 +64,9 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 	req.Name = d.Get("service_name").(string)
 	req.RGID = uint64(d.Get("rg_id").(int))
 
+	if zoneID, ok := d.GetOk("zone_id"); ok {
+		req.ZoneID = uint64(zoneID.(int))
+	}
 	if sshKey, ok := d.GetOk("ssh_key"); ok {
 		req.SSHKey = sshKey.(string)
 	}
@@ -314,6 +317,43 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 		}
 	}
 
+	if d.HasChange("zone_id") {
+		zoneID := uint64(d.Get("zone_id").(int))
+
+		start := d.Get("start").(bool)
+		if start {
+			reqStop := bservice.StopRequest{
+				ServiceID: uint64(d.Get("service_id").(int)),
+			}
+
+			_, err := c.CloudAPI().BService().Stop(ctx, reqStop)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+
+		req := bservice.MigrateToZoneRequest{
+			ServiceID: uint64(d.Get("service_id").(int)),
+			ZoneID:    zoneID,
+		}
+
+		_, err = c.CloudAPI().BService().MigrateToZone(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if start {
+			startReq := bservice.StartRequest{
+				ServiceID: uint64(d.Get("service_id").(int)),
+			}
+
+			_, err = c.CloudAPI().BService().Start(ctx, startReq)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
 	if d.HasChange("start") {
 		if d.Get("start").(bool) {
 			req := bservice.StartRequest{
@@ -444,6 +484,12 @@ func resourceBasicServiceSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "ID of the Resource Group where this service will be placed",
 		},
+		"zone_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "ID of the zone where this service will be placed",
+		},
 		"ssh_key": {
 			Type:        schema.TypeString,
 			Optional:    true,

internal/service/cloudapi/disks/data_source_disk.go

@@ -158,7 +158,7 @@ func dataSourceDiskSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Schema{
-				Type: schema.TypeString,
+				Type: schema.TypeInt,
 			},
 			Description: "IDs of images using the disk",
 		},

internal/service/cloudapi/disks/data_source_disk_list.go

@@ -221,7 +221,7 @@ func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeList,
 						Computed: true,
 						Elem: &schema.Schema{
-							Type: schema.TypeString,
+							Type: schema.TypeInt,
 						},
 						Description: "IDs of images using the disk",
 					},

internal/service/cloudapi/disks/data_source_disk_list_unattached.go

@@ -214,7 +214,7 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeList,
 						Computed: true,
 						Elem: &schema.Schema{
-							Type: schema.TypeString,
+							Type: schema.TypeInt,
 						},
 						Description: "IDs of images using the disk",
 					},