4.5.2

.gitignore

@@ -3,3 +3,5 @@ examples/
 url_scrapping/
 terraform-provider-decort*
 .vscode/
+.DS_Store
+

CHANGELOG.md

@@ -1,30 +1,36 @@
-## Version 4.0.0
+## Version 4.5.2
 
-### Features
-- Updated provider to the newest DECORT version (3.8.6):
-	- resource_k8s now has "network_plugin" required field
-	- Added "start" argument to resource_k8s
-	- data_source_bservice, resource_bservice "computes" and "groups" fields now have more in-depth information
-	- resource_compute now has full boot disk information
-	- data_source_extnet now has additional field "e_burst" inside "default_qos" substructure
-	- data_source_rg_list, data_source_rg, resource_rg, resource_account and data_source_account now have two additional fields:
-		- cpu_allocation_parameter
-		- cpu_allocation_ratio
-	- unnecessary fields were removed from all disks data sources && resources (except for unattached disks), to be exact:
-		- boot_partition
-		- guid
-		- disk_path
-		- iqn
-		- login
-		- milestones
-		- password
-		- purge_attempts
-		- reality_device_number
-		- reference_id
-- Removed automatic switch between cloudbroker/cloudapi (admin/user modes)
-
-## Bug Fix
-- Fixed resource_compute error when creating a new instance with EXTNET type network
-- Fixed quota record marshalling in decort_resgroup resource
-- Fixed GID validation for multiple resources
-- Fixed possible 'addUser' error when importing resource_account with already added user
+### Bugfix
+- Added resource_limits.cu_dm string field for account, account_consumed_units and account_reserved_units data sources in cloudapi/account
+- Fixed restore of account resource in cloudapi/account, it happens if restore parameter is set to true
+- Fixed restore of bservice resource in cloudapi/bservice, it happens if restore parameter is set to true and only once
+- Fixed enable of bservice resource in cloudapi/bservice, it happens if enable parameter is set to true
+- Fixed terraform state update for bservice resource update in cloudapi/bservice
+- Fixed terraform state update for bservice_group resource update in cloudapi/bservice
+- Added entry_count field for bservice_snapshot_list data source in cloudapi/bservice
+- Added items.shareable boolean field for disk_list_unattached data source in cloudapi/disks
+- Added items.status string field for extnet_list data source in cloudapi/extnet
+- Fixed multiple minor typos in samples/cloudapi
+- Added account_name string, created_by string, created_time int, deleted_by string, deleted_time int, network string, rg_id int, rg_name string, updated_by string, updated_by int fields for flipgroup data source and resource in cloudapi/flipgroup
+- Removed net_mask string, ckey string fields for flipgroup data source and resource in cloudapi/flipgroup
+- Add meta list field for flipgroup_list data source in cloudapi/flipgroup
+- Fixed net_mask string field for fligroup_list data source in cloudapi/flipgroup
+- Fixed id string field for image data source in cloudapi/image
+- Fix account_name string field for k8s_list data source in cloudapi/k8s
+- Add network_plugin string field for k8s and k8s_list data sources in cloudapi/k8s
+- Fixed terraform state update for k8s, k8_cp and k8s_wg resources update in cloudapi/k8s
+- Add image_name string, interfaces.enabled boolean fields for compute data source in cloudapi/kvmvm
+- Add the interfaces field to the creation request in cloudapi/kvmvm
+- Fixed restore of kvmvm resource in cloudapi/kvmvm, it happens if restore parameter is set to true
+- The logic of network connection has been changed, only the first network connects to the kvmvm in the stopped status, the subsequent ones connect without stopping
+- Token receipt has been removed from the controller
+- Add start/stop function after create for lb in cloudapi/lb
+- Fixed restore of lb resource in cloudapi/lb, it happens if restore parameter is set to true
+- Add field auth_broker in data source location list in cloudapi/location
+- Add fields cpu_allocation_parameter and cpu_allocation_ratio in data source rg list lb deleted in cloudapi/rg
+- Add fields backend_haip and frontend_haip in data source rg list in cloudapi/rg
+- Change type field Ram QuotaRecord struct in cloudapi/rg/models
+- Add state upgrader for rg in cloudapi/rg
+- Add field owner to the creation request in cloudapi/rg
+- Fixed restore of rg resource in cloudapi/rg, it happens if restore parameter is set to true
+- Add fields enabled and routesroutes in data source vins in cloudapi/vins

Makefile

@@ -1,30 +1,29 @@
 TEST?=$$(go list ./... | grep -v 'vendor')
-HOSTNAME=digitalenergy.online
+HOSTNAME=basis
 NAMESPACE=decort
 NAME=terraform-provider-decort
 BINDIR = ./bin
 ZIPDIR = ./zip
-#BINARY=terraform-provider-${NAME}
-BINARY=${NAME}.exe
+BINARY=${NAME}
 WORKPATH= ./examples/terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAMESPACE}/${VERSION}/${OS_ARCH} 
 MAINPATH = ./cmd/decort/
-VERSION=4.0.0
-#OS_ARCH=darwin_amd64
-OS_ARCH=windows_amd64
-#OS_ARCH=linux_amd64
+VERSION=4.5.2
+OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 
-FILES= 	${BINARY}_${VERSION}_darwin_amd64\
+FILES = ${BINARY}_${VERSION}_darwin_amd64\
+		${BINARY}_${VERSION}_darwin_arm64\
 		${BINARY}_${VERSION}_freebsd_386\
 		${BINARY}_${VERSION}_freebsd_amd64\
 		${BINARY}_${VERSION}_freebsd_arm\
 		${BINARY}_${VERSION}_linux_386\
 		${BINARY}_${VERSION}_linux_amd64\
 		${BINARY}_${VERSION}_linux_arm\
+		${BINARY}_${VERSION}_linux_arm64\
 		${BINARY}_${VERSION}_openbsd_386\
 		${BINARY}_${VERSION}_openbsd_amd64\
 		${BINARY}_${VERSION}_solaris_amd64\
-		${BINARY}_${VERSION}_windows_386  \
-		${BINARY}_${VERSION}_windows_amd64\
+		${BINARY}_${VERSION}_windows_386.exe\
+		${BINARY}_${VERSION}_windows_amd64.exe\
 
 BINS = $(addprefix bin/, $(FILES))
 
@@ -50,6 +49,7 @@ release: $(FILES)
 
 $(FILES) : $(BINDIR) $(ZIPDIR) $(BINS)
 	zip -r $(ZIPDIR)/$@.zip $(BINDIR)/$@
+	zip -rj $(ZIPDIR)/$@.zip scripts/install.bat scripts/install.sh
 
 $(BINDIR):
 	mkdir $@
@@ -59,25 +59,27 @@ $(ZIPDIR):
 
 $(BINS):
 	GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64 $(MAINPATH)
+	GOOS=darwin GOARCH=arm64 go build -o ./bin/${BINARY}_${VERSION}_darwin_arm64 $(MAINPATH)
 	GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386 $(MAINPATH)
 	GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64 $(MAINPATH)
 	GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm $(MAINPATH)
 	GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386 $(MAINPATH)
 	GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64 $(MAINPATH)
 	GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm $(MAINPATH)
+	GOOS=linux GOARCH=arm64 go build -o ./bin/${BINARY}_${VERSION}_linux_arm64 ${MAINPATH}
 	GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386 $(MAINPATH)
 	GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64 $(MAINPATH)
 	GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64 $(MAINPATH)
-	GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386 $(MAINPATH)
-	GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64 $(MAINPATH)
+	GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386.exe $(MAINPATH)
+	GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64.exe $(MAINPATH)
 
 install: build
 	mkdir -p ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
 	mv ${BINARY} ~/.terraform.d/plugins/${HOSTNAME}/${NAMESPACE}/${NAME}/${VERSION}/${OS_ARCH}
 
-test: 
-	go test -i $(TEST) || exit 1                                                   
-	echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4                    
+test:
+	go test -i $(TEST) || exit 1
+	echo $(TEST) | xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
-testacc: 
+testacc:
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m

README.md

@@ -6,7 +6,10 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 
 | Версия DECORT API | Версия провайдера Terraform |
 | ------ | ------ |
-| 3.8.6 | 4.x.x |
+| 3.8.9 | 4.5.x |
+| 3.8.8 | 4.4.x |
+| 3.8.7 | 4.3.x |
+| 3.8.6 | 4.0.x, 4.1.x, 4.2.x |
 | 3.8.5 | 3.4.x |
 | 3.8.0 - 3.8.4 | 3.3.1 |
 | 3.7.x |  rc-1.25 |
@@ -24,118 +27,162 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 
 ## Возможности провайдера
 
-- Работа с Compute instances,
-- Работа с disks,
-- Работа с k8s,
-- Работа с image,
-- Работа с reource groups,
-- Работа с VINS,
-- Работа с pfw,
-- Работа с accounts,
-- Работа с snapshots,
-- Работа с pcidevice,
-- Работа с sep,
-- Работа с vgpu,
-- Работа с bservice,
-- Работа с extnets,
-- Работа с locations,
-- Работа с load balancer.
+- Режим пользователя:
+  - Работа с accounts,
+  - Работа с bservice,
+  - Работа с disks,
+  - Работа с extnets,
+  - Работа с flipgroups,
+  - Работа с image,
+  - Работа с k8s,
+  - Работа с Compute instances,
+  - Работа с load balancer,
+  - Работа с locations,
+  - Работа с pfw,
+  - Работа с resource groups,
+  - Работа с snapshots,
+  - Работа с stacks,
+  - Работа с VINS.
 
-Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+- Режим администратора:
+  - Работа с accounts,
+  - Работа с audits,
+  - Работа с disks,
+  - Работа с extnets,
+  - Работа с flipgroups,
+  - Работа с grids,
+  - Работа с images,
+  - Работа с k8ci,
+  - Работа с k8s,
+  - Работа с Compute instances,
+  - Работа с load balancer,
+  - Работа с pci device,
+  - Работа с resource groups,
+  - Работа с seps,
+  - Работа с stacks,
+  - Работа с VINS.
 
-## Начало
+Со списком и описанием функционала всех групп можно ознамоиться на Вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 
-Старт возможен по двум путям:
-
-1. Установка через собранные пакеты.
-2. Ручная установка.
-
-### Установка через собранные пакеты.
-
-1. Скачайте и установите terraform по ссылке: https://learn.hashicorp.com/tutorials/terraform/install-cli?in=terraform/aws-get-started
-2. Создайте файл `main.tf` и добавьте в него следующий блок.
+## Установка
+Начиная с версии провайдера `4.3.0` в релизном архиве находятся скрипты-инсталляторы.
+Чтобы выполнить установку, необходимо:
+1. Перейти по адресу: https://repository.basistech.ru/BASIS/terraform-provider-decort/releases
+2. Выбрать необходимую версию провайдера подходящую под операционную систему.
+3. Скачать архив.
+4. Распаковать архив.
+5. Выполнить скрипт установщика, `install.sh` или `install.bat` для Windows.<br/>
+*Для запуска `install.sh` не забудьте изменить права доступа к файлу*
+```bash
+chmod u+x install.sh
+```
+6. Дождаться сообщения об успешной установке. Установщик выведет актуальный блок конфигурации провайдера, скопируйте его
+```bash
+DECORT provider version 4.3.0 has been successfully installed
 
+Copy this provider configuration to main.tf file:
+terraform {
+  required_providers {
+    decort = {
+      version = "4.3.0"
+      source  = "basis/decort/decort"
+    }
+  }
+}
+```
+7. После этого, создайте файл `main.tf` в рабочей директории, которая может находится в любом удобном для пользователя месте.
+В данном примере, рабочая директория с файлом main.tf находится по пути:
+```bash
+~/work/tfdir/main.tf
+```
+8. Вставьте в `main.tf` блок конфигурации провайдера, который был выведен на экран установщиком:
+```terraform
+terraform {
+  required_providers {
+    decort = {
+      version = "4.3.0"
+      source  = "basis/decort/decort"
+    }
+  }
+}
+```
+9. Добавьте в файл блок с инициализацией провайдера.
 ```terraform
 provider "decort" {
-  authenticator = "oauth2"
-  #controller_url = <DECORT_CONTROLLER_URL>
-  controller_url = "https://ds1.digitalenergy.online"
-  #oauth2_url = <DECORT_SSO_URL>
+  authenticator        = "decs3o"
+  controller_url       = "https://mr4.digitalenergy.online"
   oauth2_url           = "https://sso.digitalenergy.online"
   allow_unverified_ssl = true
 }
 ```
 
-3. Выполните команду
-
-```
+10. В консоли выполните команду 
+```bash
 terraform init
 ```
 
-Провайдер автоматически будет установлен на ваш компьютер из terraform registry.
-
-### Ручная установка
-
-1. Скачайте и установите Go по ссылке: https://go.dev/dl/
-2. Скачайте и установите terraform по ссылке: https://learn.hashicorp.com/tutorials/terraform/install-cli?in=terraform/aws-get-started
-3. Склонируйте репозиторий с провайдером, выполнив команду:
-
-```bash
-git clone https://repository.basistech.ru/BASIS/terraform-provider-decort
-```
-
-4. Перейдите в скачанную папку с провайдером и выполните команду
-
-```bash
-go build -o terraform-provider-decort
-```
-
-Если вы знаете как устроен _makefile_, то можно изменить в файле `Makefile` параметры под вашу ОС и выполнить команду
-
-```bash
-make build
-```
-
-5. Полученный файл необходимо поместить:  
-   Linux:
+11. В случае успешной установки, Terraform инициализирует провайдер и будет готов к дальнейшей работе.
 
+## Установка из релизов
+Terraform провайдер DECORT имеет скомпилированные релизные версии, которые расположены по адресу: [Релизы](https://repository.basistech.ru/BASIS/terraform-provider-decort/releases).  
+Чтобы выполнить установку из релиза, необходимо:
+1. Перейти по адресу: https://repository.basistech.ru/BASIS/terraform-provider-decort/releases
+2. Выбрать необходимую версию провайдера подходящую под операционную систему.
+3. Скачать архив.
+4. Распаковать архив.
+5. Полученный файл (в директории `bin/`) необходимо поместить:  
+Linux:
 ```bash
 ~/.terraform.d/plugins/${host_name}/${namespace}/${type}/${version}/${target}
 ```
-
 Windows:
-
 ```powershell
 %APPDATA%\terraform.d\plugins\${host_name}\${namespace}\${type}\${version}\${target}
 ```
-
-ВНИМАНИЕ: для ОС Windows `%APP_DATA%` является каталогом, в котором будут помещены будущие файлы terraform.
 Где:
-
-- host_name - имя хоста, держателя провайдера, например, digitalenergy.online
-- namespace - пространство имен хоста, например decort
+- host_name - имя хоста, держателя провайдера, например, basis
+- namespace - пространство имен хоста, например decort 
 - type - тип провайдера, может совпадать с пространством имен, например, decort
-- version - версия провайдера, например 1.2
-- target - версия ОС, например windows_amd64
+- version - версия провайдера, например 4.3.0
+- target - архитектура операционной системы, например windows_amd64
 
-6. После этого, создайте файл `main.tf`.
-7. Добавьте в него следующий блок
+В примере ниже используется путь до провайдера на машине с ОС Linux:
 
+```bash
+~/.terraform.d/plugins/basis/decort/decort/4.3.0/linux_amd64/tf-provider
+                        ^     ^      ^     ^       ^          ^
+              host_name |     |      |     |       |          |
+                              |      |     |       |          |
+                    namespace |      |     |       |          |
+                                     |     |       |          |
+                               type  |     |       |          |
+                                           |       |          |
+                                   version |       |          | 
+                                                   |          |
+                                            target |          |
+                                                              |
+                                             исполняемый файл |
+```
+
+6. После этого, создайте файл `main.tf` в рабочей директории, которая может находится в любом удобном для пользователя месте.
+В данном примере, рабочая директория с файлом main.tf находится по пути:
+```bash
+~/work/tfdir/main.tf
+```
+7. Добавьте в `main.tf` следующий блок
 ```terraform
 terraform {
   required_providers {
     decort = {
-      version = "1.2"
-      source  = "digitalenergy.online/decort/decort"
+      version = "4.3.0"
+      source  = "basis/decort/decort"
     }
   }
 }
 ```
-
-В поле `version` указывается версия провайдера.  
-Обязательный параметр  
-Тип поля - строка  
-ВНИМАНИЕ: Версии в блоке и в репозитории, в который был помещен провайдер должны совпадать!
+В поле `version` указывается версия провайдера.
+<br/>
+**ВНИМАНИЕ: Версии в блоке и в пути к исполняемому файлу провайдера должны совпадать!**
 
 В поле `source` помещается путь до репозитория с версией вида:
 
@@ -143,17 +190,24 @@ terraform {
 ${host_name}/${namespace}/${type}
 ```
 
-ВНИМАНИЕ: все параметры должны совпадать с путем репозитория, в котором помещен провайдер.
+**ВНИМАНИЕ: Версии в блоке и в пути к исполняемому файлу провайдера должны совпадать!**
 
-8. В консоле выполнить команду
+8. Добавьте в файл блок с инициализацией провайдера.
+```terraform
+provider "decort" {
+  authenticator        = "decs3o"
+  controller_url       = "https://mr4.digitalenergy.online"
+  oauth2_url           = "https://sso.digitalenergy.online"
+  allow_unverified_ssl = true
+}
+```
 
+9. В консоли выполните команду 
 ```bash
 terraform init
 ```
 
-9. Если все прошло хорошо - ошибок не будет.
-
-Более подробно о сборке провайдера можно найти по ссылке: https://learn.hashicorp.com/tutorials/terraform/provider-use?in=terraform/providers
+10. В случае успешной установки, Terraform инициализирует провайдер и будет готов к дальнейшей работе.
 
 ## Примеры работы
 
@@ -162,8 +216,4 @@ terraform init
 - На вики проекта: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 - В папке `samples`
 
-Схемы к terraform'у доступны:
-
-- В папке `docs`
-
 Хорошей работы!

README_EN.md

@@ -58,7 +58,7 @@ Two ways for starting:
 
 ```terraform
 provider "decort" {
-  authenticator = "oauth2"
+  authenticator = "decs3o"
   #controller_url = <DECORT_CONTROLLER_URL>
   controller_url = "https://ds1.digitalenergy.online"
   #oauth2_url = <DECORT_SSO_URL>

cmd/decort/main.go

@@ -4,6 +4,7 @@ Authors:
 Petr Krutov, <petr.krutov@digitalenergy.online>
 Stanislav Solovev, <spsolovev@digitalenergy.online>
 Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

go.mod

@@ -3,13 +3,12 @@ module repository.basistech.ru/BASIS/terraform-provider-decort
 go 1.18
 
 require (
-	github.com/golang-jwt/jwt/v4 v4.4.3
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/terraform-plugin-docs v0.13.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	github.com/sirupsen/logrus v1.9.0
-	golang.org/x/net v0.5.0
-	repository.basistech.ru/BASIS/decort-golang-sdk v1.4.0
+	golang.org/x/net v0.16.0
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.7.3
 )
 
 require (
@@ -21,10 +20,11 @@ require (
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.11.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/go-playground/validator/v10 v10.15.4 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -48,7 +48,7 @@ require (
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mitchellh/cli v1.1.5 // indirect
@@ -66,12 +66,12 @@ require (
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
 	github.com/vmihailenco/tagparser v0.1.2 // indirect
 	github.com/zclconf/go-cty v1.12.1 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
 	google.golang.org/grpc v1.51.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -39,6 +39,8 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
 github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
@@ -53,18 +55,16 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
-github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
+github.com/go-playground/validator/v10 v10.15.4 h1:zMXza4EpOdooxPel5xDqXEdXG5r+WggpvnAKMsalBjs=
+github.com/go-playground/validator/v10 v10.15.4/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
-github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU=
-github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -152,8 +152,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -191,7 +191,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
 github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
@@ -208,14 +208,19 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
@@ -242,8 +247,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -258,8 +263,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -286,8 +291,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -297,8 +302,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
@@ -315,8 +320,8 @@ google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
 google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -332,5 +337,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0/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.4.0 h1:y8F3bzEb8mROEYnoG495AxpbSTEkfSpFh97sZe42cJE=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.4.0/go.mod h1:YP57mpXh60xeRERVaCehn+l0S7Qe24trVll1EvrKzds=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.7.3 h1:NtvW72WsAezk0XYKE5+ag+xauIgKWKcbKLy7YTp5Fuc=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.7.3/go.mod h1:7fj8sgGZFiiExewQeqckCS4WxwOmU0oP6BO6mi1Lpkw=

internal/constants/api.go

@@ -1,27 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package constants
-
-//CloudApi - a part of url for cloudapi
-const CloudApi = "/restmachine/cloudapi"
-
-//CloudBroker - a part of url for cloudbroker
-const CloudBroker = "/restmachine/cloudbroker"

internal/controller/controller.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
 Authors:
 Petr Krutov, <petr.krutov@digitalenergy.online>
 Stanislav Solovev, <spsolovev@digitalenergy.online>
@@ -21,18 +21,14 @@ limitations under the License.
 package controller
 
 import (
-	"bytes"
-	"context"
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
+
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
-	"time"
-
-	// "time"
 
 	log "github.com/sirupsen/logrus"
 	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
@@ -41,31 +37,37 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 
-	jwt "github.com/golang-jwt/jwt/v4"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 // enumerated constants that define authentication modes
 const (
-	MODE_UNDEF  = iota // this is the invalid mode - it should never be seen
-	MODE_LEGACY = iota
-	MODE_OAUTH2 = iota
-	MODE_JWT    = iota
+	MODE_UNDEF = iota // this is the invalid mode - it should never be seen
+	MODE_LEGACY
+	MODE_DECS3O
+	MODE_JWT
+	MODE_BVS
 )
 
 type ControllerCfg struct {
 	controller_url  string       // always required
 	auth_mode_code  int          // always required
 	auth_mode_txt   string       // always required, it is a text representation of auth mode
+	bvs_user        string       // required for bvs mode
+	bvs_password    string       // required for bvs mode
+	domain          string       // required for bvs mode
+	token           config.Token // obtained from BVS provider on successful login in bvs mode
+	path_cfg        string       // the path of the configuration file entry
+	path_token      string       // the path of the token file entry
+	time_to_refresh int64        // the number of minutes before the expiration of the token, a refresh will be made
 	legacy_user     string       // required for legacy mode
 	legacy_password string       // required for legacy mode
 	legacy_sid      string       // obtained from DECORT controller on successful login in legacy mode
-	jwt             string       // obtained from Outh2 provider on successful login in oauth2 mode, required in jwt mode
-	app_id          string       // required for oauth2 mode
-	app_secret      string       // required for oauth2 mode
-	oauth2_url      string       // always required
-	decort_username string       // assigned to either legacy_user (legacy mode) or Oauth2 user (oauth2 mode) upon successful verification
+	jwt             string       // obtained from Outh2 provider on successful login in decs3o mode, required in jwt mode
+	app_id          string       // required for decs3o and bvs mode
+	app_secret      string       // required for decs3o and bvs mode
+	oauth2_url      string       // required for decs3o and bvs mode
+	decort_username string       // assigned to either legacy_user (legacy mode) or Oauth2 user (decs3o mode) upon successful verification
 	cc_client       *http.Client // assigned when all initial checks successfully passed
 	caller          interfaces.Caller
 }
@@ -88,17 +90,24 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		legacy_user:     d.Get("user").(string),
 		legacy_password: d.Get("password").(string),
 		legacy_sid:      "",
+		bvs_user:        d.Get("bvs_user").(string),
+		bvs_password:    d.Get("bvs_password").(string),
+		domain:          d.Get("domain").(string),
 		jwt:             d.Get("jwt").(string),
 		app_id:          d.Get("app_id").(string),
 		app_secret:      d.Get("app_secret").(string),
 		oauth2_url:      d.Get("oauth2_url").(string),
 		decort_username: "",
+		token:           config.Token{},
+		path_cfg:        d.Get("path_cfg").(string),
+		path_token:      d.Get("path_token").(string),
+		time_to_refresh: int64(d.Get("time_to_refresh").(int)),
 	}
 
 	allow_unverified_ssl := d.Get("allow_unverified_ssl").(bool)
 
 	if ret_config.controller_url == "" {
-		return nil, fmt.Errorf("Empty DECORT cloud controller URL provided.")
+		return nil, fmt.Errorf("empty DECORT cloud controller URL provided")
 	}
 
 	// this should have already been done by StateFunc defined in Schema, but we want to be sure
@@ -107,33 +116,53 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 	switch ret_config.auth_mode_txt {
 	case "jwt":
 		if ret_config.jwt == "" {
-			return nil, fmt.Errorf("Authenticator mode 'jwt' specified but no JWT provided.")
+			return nil, fmt.Errorf("authenticator mode 'jwt' specified but no JWT provided")
 		}
 		ret_config.auth_mode_code = MODE_JWT
-	case "oauth2":
+	case "decs3o":
 		if ret_config.oauth2_url == "" {
-			return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no OAuth2 URL provided.")
+			return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no OAuth2 URL provided")
 		}
 		if ret_config.app_id == "" {
-			return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no Application ID provided.")
+			return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no Application ID provided")
 		}
 		if ret_config.app_secret == "" {
-			return nil, fmt.Errorf("Authenticator mode 'oauth2' specified but no Secret ID provided.")
+			return nil, fmt.Errorf("authenticator mode 'decs3o' specified but no Secret ID provided")
 		}
-		ret_config.auth_mode_code = MODE_OAUTH2
+		ret_config.auth_mode_code = MODE_DECS3O
 	case "legacy":
 		//
 		ret_config.legacy_user = d.Get("user").(string)
 		if ret_config.legacy_user == "" {
-			return nil, fmt.Errorf("Authenticator mode 'legacy' specified but no user provided.")
+			return nil, fmt.Errorf("authenticator mode 'legacy' specified but no user provided")
 		}
 		ret_config.legacy_password = d.Get("password").(string)
 		if ret_config.legacy_password == "" {
-			return nil, fmt.Errorf("Authenticator mode 'legacy' specified but no password provided.")
+			return nil, fmt.Errorf("authenticator mode 'legacy' specified but no password provided")
 		}
 		ret_config.auth_mode_code = MODE_LEGACY
+	case "bvs":
+		if ret_config.bvs_user == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no user provided")
+		}
+		if ret_config.bvs_password == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no password provided")
+		}
+		if ret_config.oauth2_url == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no bvs URL provided")
+		}
+		if ret_config.app_id == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Application ID provided")
+		}
+		if ret_config.app_secret == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Secret ID provided")
+		}
+		if ret_config.domain == "" {
+			return nil, fmt.Errorf("authenticator mode 'bvs' specified but no Domain provided")
+		}
+		ret_config.auth_mode_code = MODE_BVS
 	default:
-		return nil, fmt.Errorf("Unknown authenticator mode %q provided.", ret_config.auth_mode_txt)
+		return nil, fmt.Errorf("unknown authenticator mode %q provided", ret_config.auth_mode_txt)
 	}
 
 	if allow_unverified_ssl {
@@ -158,7 +187,6 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 			Username:      ret_config.legacy_user,
 			Password:      ret_config.legacy_password,
 			DecortURL:     ret_config.controller_url,
-			Retries:       0,
 			SSLSkipVerify: allow_unverified_ssl,
 		}
 
@@ -170,30 +198,30 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		if !ok {
 			return nil, err
 		}
-	case MODE_OAUTH2:
-		// on success getOAuth2JWT will set config.jwt to the obtained JWT, so there is no
+	case MODE_DECS3O:
+		// on success getDECS3OJWT will set config.jwt to the obtained JWT, so there is no
 		// need to set it once again here
-		_, err := ret_config.getOAuth2JWT()
-		if err != nil {
-			return nil, err
-		}
+		// _, err := ret_config.getDECS3OJWT()
+		// if err != nil {
+		// 	return nil, err
+		// }
 		// we are not verifying the JWT when parsing because actual verification is done on the
 		// OVC controller side. Here we do parsing solely to extract Oauth2 user name (claim "user")
 		// and JWT issuer name (claim "iss")
-		parser := jwt.Parser{}
-		token, _, err := parser.ParseUnverified(ret_config.jwt, jwt.MapClaims{})
-		if err != nil {
-			return nil, err
-		}
-		if claims, ok := token.Claims.(jwt.MapClaims); ok {
-			var tbuf bytes.Buffer
-			tbuf.WriteString(claims["username"].(string))
-			tbuf.WriteString("@")
-			tbuf.WriteString(claims["iss"].(string))
-			ret_config.decort_username = tbuf.String()
-		} else {
-			return nil, fmt.Errorf("Failed to extract user and iss fields from JWT token in oauth2 mode.")
-		}
+		// parser := jwt.Parser{}
+		// token, _, err := parser.ParseUnverified(ret_config.jwt, jwt.MapClaims{})
+		// if err != nil {
+		// 	return nil, err
+		// }
+		// if claims, ok := token.Claims.(jwt.MapClaims); ok {
+		// 	var tbuf bytes.Buffer
+		// 	tbuf.WriteString(claims["username"].(string))
+		// 	tbuf.WriteString("@")
+		// 	tbuf.WriteString(claims["iss"].(string))
+		// 	ret_config.decort_username = tbuf.String()
+		// } else {
+		// 	return nil, fmt.Errorf("failed to extract user and iss fields from JWT token in oauth2 mode")
+		// }
 
 		sdkConf := config.Config{
 			AppID:         ret_config.app_id,
@@ -204,10 +232,27 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		}
 
 		ret_config.caller = decort.New(sdkConf)
+	case MODE_BVS:
 
+		sdkConf := config.BVSConfig{
+			AppID:         ret_config.app_id,
+			AppSecret:     ret_config.app_secret,
+			SSOURL:        ret_config.oauth2_url,
+			DecortURL:     ret_config.controller_url,
+			SSLSkipVerify: allow_unverified_ssl,
+			Username:      ret_config.bvs_user,
+			Password:      ret_config.bvs_password,
+			Domain:        ret_config.domain,
+			Token:         ret_config.token,
+			PathCfg:       ret_config.path_cfg,
+			PathToken:     ret_config.path_token,
+			TimeToRefresh: ret_config.time_to_refresh,
+		}
+
+		ret_config.caller = decort.NewBVS(sdkConf)
 	default:
 		// FYI, this should never happen due to all above checks, but we want to be fool proof
-		return nil, fmt.Errorf("Unknown authenticator mode code %d provided.", ret_config.auth_mode_code)
+		return nil, fmt.Errorf("unknown authenticator mode code %d provided", ret_config.auth_mode_code)
 	}
 
 	// All checks passed successfully, credentials corresponding to the selected authenticator mode
@@ -215,57 +260,57 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 	return ret_config, nil
 }
 
-func (config *ControllerCfg) GetDecortUsername() string {
-	return config.decort_username
-}
+// func (config *ControllerCfg) GetDecortUsername() string {
+// 	return config.decort_username
+// }
 
-func (config *ControllerCfg) getOAuth2JWT() (string, error) {
-	// 	Obtain JWT from the Oauth2 provider using application ID and application secret provided in config.
-	if config.auth_mode_code == MODE_UNDEF {
-		return "", fmt.Errorf("getOAuth2JWT method called for undefined authorization mode.")
-	}
-	if config.auth_mode_code != MODE_OAUTH2 {
-		return "", fmt.Errorf("getOAuth2JWT method called for incompatible authorization mode %q.", config.auth_mode_txt)
-	}
+// func (config *ControllerCfg) getDECS3OJWT() (string, error) {
+// 	// 	Obtain JWT from the Oauth2 provider using application ID and application secret provided in config.
+// 	if config.auth_mode_code == MODE_UNDEF {
+// 		return "", fmt.Errorf("getOAuth2JWT method called for undefined authorization mode")
+// 	}
+// 	if config.auth_mode_code != MODE_DECS3O {
+// 		return "", fmt.Errorf("getOAuth2JWT method called for incompatible authorization mode %q", config.auth_mode_txt)
+// 	}
 
-	params := url.Values{}
-	params.Add("grant_type", "client_credentials")
-	params.Add("client_id", config.app_id)
-	params.Add("client_secret", config.app_secret)
-	params.Add("response_type", "id_token")
-	params.Add("validity", "3600")
-	params_str := params.Encode()
+// 	params := url.Values{}
+// 	params.Add("grant_type", "client_credentials")
+// 	params.Add("client_id", config.app_id)
+// 	params.Add("client_secret", config.app_secret)
+// 	params.Add("response_type", "id_token")
+// 	params.Add("validity", "3600")
+// 	params_str := params.Encode()
 
-	req, err := http.NewRequest("POST", config.oauth2_url+"/v1/oauth/access_token", strings.NewReader(params_str))
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Content-Length", strconv.Itoa(len(params_str)))
+// 	req, err := http.NewRequest("POST", config.oauth2_url+"/v1/oauth/access_token", strings.NewReader(params_str))
+// 	if err != nil {
+// 		return "", err
+// 	}
+// 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+// 	req.Header.Set("Content-Length", strconv.Itoa(len(params_str)))
 
-	resp, err := config.cc_client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	if resp.StatusCode != http.StatusOK {
-		// fmt.Println("response Status:", resp.Status)
-		// fmt.Println("response Headers:", resp.Header)
-		// fmt.Println("response Headers:", req.URL)
-		return "", fmt.Errorf("getOauth2JWT: unexpected status code %d when obtaining JWT from %q for APP_ID %q, request Body %q",
-			resp.StatusCode, req.URL, config.app_id, params_str)
-	}
-	defer resp.Body.Close()
+// 	resp, err := config.cc_client.Do(req)
+// 	if err != nil {
+// 		return "", err
+// 	}
+// 	if resp.StatusCode != http.StatusOK {
+// 		// fmt.Println("response Status:", resp.Status)
+// 		// fmt.Println("response Headers:", resp.Header)
+// 		// fmt.Println("response Headers:", req.URL)
+// 		return "", fmt.Errorf("getOauth2JWT: unexpected status code %d when obtaining JWT from %q for APP_ID %q, request Body %q",
+// 			resp.StatusCode, req.URL, config.app_id, params_str)
+// 	}
+// 	defer resp.Body.Close()
 
-	responseData, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
+// 	responseData, err := io.ReadAll(resp.Body)
+// 	if err != nil {
+// 		return "", err
+// 	}
 
-	// validation successful - store JWT in the corresponding field of the ControllerCfg structure
-	config.jwt = strings.TrimSpace(string(responseData))
+// 	// validation successful - store JWT in the corresponding field of the ControllerCfg structure
+// 	config.jwt = strings.TrimSpace(string(responseData))
 
-	return config.jwt, nil
-}
+// 	return config.jwt, nil
+// }
 
 func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 	/*
@@ -276,13 +321,13 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 	*/
 	if jwt == "" {
 		if config.jwt == "" {
-			return false, fmt.Errorf("validateJWT method called, but no meaningful JWT provided.")
+			return false, fmt.Errorf("validateJWT method called, but no meaningful JWT provided")
 		}
 		jwt = config.jwt
 	}
 
 	if config.oauth2_url == "" {
-		return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided.")
+		return false, fmt.Errorf("validateJWT method called, but no OAuth2 URL provided")
 	}
 
 	req, err := http.NewRequest("POST", config.controller_url+"/restmachine/cloudapi/account/list", nil)
@@ -299,7 +344,7 @@ func (config *ControllerCfg) validateJWT(jwt string) (bool, error) {
 		return false, err
 	}
 	if resp.StatusCode != http.StatusOK {
-		return false, fmt.Errorf("validateJWT: unexpected status code %d when validating JWT against %q.",
+		return false, fmt.Errorf("validateJWT: unexpected status code %d when validating JWT against %q",
 			resp.StatusCode, req.URL)
 	}
 	defer resp.Body.Close()
@@ -315,10 +360,10 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 		    reason, the method will return false and error.
 	*/
 	if config.auth_mode_code == MODE_UNDEF {
-		return false, fmt.Errorf("validateLegacyUser method called for undefined authorization mode.")
+		return false, fmt.Errorf("validateLegacyUser method called for undefined authorization mode")
 	}
 	if config.auth_mode_code != MODE_LEGACY {
-		return false, fmt.Errorf("validateLegacyUser method called for incompatible authorization mode %q.", config.auth_mode_txt)
+		return false, fmt.Errorf("validateLegacyUser method called for incompatible authorization mode %q", config.auth_mode_txt)
 	}
 
 	params := url.Values{}
@@ -339,12 +384,12 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 		return false, err
 	}
 	if resp.StatusCode != http.StatusOK {
-		return false, fmt.Errorf("validateLegacyUser: unexpected status code %d when validating legacy user %q against %q.",
+		return false, fmt.Errorf("validateLegacyUser: unexpected status code %d when validating legacy user %q against %q",
 			resp.StatusCode, config.legacy_user, config.controller_url)
 	}
 	defer resp.Body.Close()
 
-	responseData, err := ioutil.ReadAll(resp.Body)
+	responseData, err := io.ReadAll(req.Body)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -356,100 +401,32 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 }
 
 func (config *ControllerCfg) CloudAPI() *cloudapi.CloudAPI {
-	if config.auth_mode_code == MODE_LEGACY {
+	switch config.auth_mode_code {
+	case MODE_LEGACY:
 		client, _ := config.caller.(*decort.LegacyDecortClient)
 		return client.CloudAPI()
+	case MODE_DECS3O:
+		client, _ := config.caller.(*decort.DecortClient)
+		return client.CloudAPI()
+	case MODE_BVS:
+		client, _ := config.caller.(*decort.BVSDecortClient)
+		return client.CloudAPI()
+	default:
+		return &cloudapi.CloudAPI{}
 	}
-
-	client, _ := config.caller.(*decort.DecortClient)
-	return client.CloudAPI()
 }
-
 func (config *ControllerCfg) CloudBroker() *cloudbroker.CloudBroker {
-	if config.auth_mode_code == MODE_LEGACY {
+	switch config.auth_mode_code {
+	case MODE_LEGACY:
 		client, _ := config.caller.(*decort.LegacyDecortClient)
 		return client.CloudBroker()
+	case MODE_DECS3O:
+		client, _ := config.caller.(*decort.DecortClient)
+		return client.CloudBroker()
+	case MODE_BVS:
+		client, _ := config.caller.(*decort.BVSDecortClient)
+		return client.CloudBroker()
+	default:
+		return &cloudbroker.CloudBroker{}
 	}
-
-	client, _ := config.caller.(*decort.DecortClient)
-	return client.CloudBroker()
-}
-
-func (config *ControllerCfg) DecortAPICall(ctx context.Context, method string, api_name string, url_values *url.Values) (json_resp string, err error) { //nolint:unparam
-	// This is a convenience wrapper around standard HTTP request methods that is aware of the
-	// authorization mode for which the provider was initialized and compiles request accordingly.
-
-	if config.cc_client == nil {
-		// this should never happen if ClientConfig was properly called prior to decortAPICall
-		return "", fmt.Errorf("decortAPICall method called with unconfigured DECORT cloud controller HTTP client.")
-	}
-
-	// Example: to create api_params, one would generally do the following:
-	//
-	// data := []byte(`{"machineId": "2638"}`)
-	// api_params := bytes.NewBuffer(data))
-	//
-	// Or:
-	//
-	// params := url.Values{}
-	// params.Add("machineId", "2638")
-	// params.Add("username", "u")
-	// params.Add("password", "b")
-	// req, _ := http.NewRequest(method, url, strings.NewReader(params.Encode()))
-	//
-
-	if config.auth_mode_code == MODE_UNDEF {
-		return "", fmt.Errorf("decortAPICall method called for unknown authorization mode.")
-	}
-
-	if config.auth_mode_code == MODE_LEGACY {
-		url_values.Add("authkey", config.legacy_sid)
-	}
-	params_str := url_values.Encode()
-
-	req, err := http.NewRequest(method, config.controller_url+api_name, strings.NewReader(params_str))
-	if err != nil {
-		return "", err
-	}
-
-	req = req.WithContext(ctx)
-
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Content-Length", strconv.Itoa(len(params_str)))
-	req.Header.Set("Accept", "application/json")
-
-	if config.auth_mode_code == MODE_OAUTH2 || config.auth_mode_code == MODE_JWT {
-		req.Header.Set("Authorization", fmt.Sprintf("bearer %s", config.jwt))
-	}
-
-	var resp *http.Response
-	var body []byte
-	for i := 0; i < 5; i++ {
-		resp, err = config.cc_client.Do(req)
-		if err != nil {
-			return "", err
-		}
-
-		body, err = ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return "", err
-		}
-		resp.Body.Close()
-		log.Debugf("decortAPICall: %s %s\n %s", method, api_name, body)
-
-		if resp.StatusCode == http.StatusOK {
-			return string(body), nil
-		} else {
-			if resp.StatusCode == http.StatusInternalServerError {
-				log.Warnf("got 500, retrying %d/5", i+1)
-				time.Sleep(time.Second * 5)
-				continue
-			}
-			return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
-				resp.StatusCode, req.URL, params_str, body)
-		}
-	}
-
-	return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
-		resp.StatusCode, req.URL, params_str, body)
 }

internal/dc/utils.go

@@ -1,36 +1,65 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package pfw
-
-const ComputePfwListAPI = "/restmachine/cloudbroker/compute/pfwList"
-const ComputePfwAddAPI = "/restmachine/cloudbroker/compute/pfwAdd"
-const ComputePfwDelAPI = "/restmachine/cloudbroker/compute/pfwDel"
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Nikita Sorokin, <nesorokin@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package dc
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+
+func ErrorsToDiagnostics(errs []error) diag.Diagnostics {
+	if len(errs) == 0 {
+		return nil
+	}
+
+	diags := diag.Diagnostics{}
+
+	for _, err := range errs {
+		diags = append(diags, diag.Diagnostic{
+			Severity: diag.Error,
+			Summary:  err.Error(),
+		})
+	}
+
+	return diags
+}
+
+func ErrorsToWarnings(errs []error) Warnings {
+	w := Warnings{}
+
+	for _, err := range errs {
+		w.Add(err)
+	}
+
+	return w
+}

internal/location/location.go

@@ -41,13 +41,13 @@ func UtilityLocationGetDefaultGridID(ctx context.Context, m interface{}) (int, e
 		return 0, err
 	}
 
-	if len(locList) == 0 {
+	if len(locList.Data) == 0 {
 		DefaultGridID = 0
 		return 0, fmt.Errorf("utilityLocationGetDefaultGridID: retrieved 0 length locations list")
 	}
 
-	DefaultGridID = int(locList[0].GID)
-	log.Debugf("utilityLocationGetDefaultGridID: default location GridID %d, name %s", DefaultGridID, locList[0].Name)
+	DefaultGridID = int(locList.Data[0].GID)
+	log.Debugf("utilityLocationGetDefaultGridID: default location GridID %d, name %s", DefaultGridID, locList.Data[0].Name)
 
 	return DefaultGridID, nil
 }

internal/provider/data_sources_map.go

@@ -1,150 +1,254 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package provider
-
-import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/bservice"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/disks"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/extnet"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/image"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/k8s"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/kvmvm"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/lb"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/locations"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/rg"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/snapshot"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
-
-	cb_account "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
-	cb_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
-	cb_grid "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/grid"
-	cb_image "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
-	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_vgpu "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vgpu"
-)
-
-func newDataSourcesMap() map[string]*schema.Resource {
-	return map[string]*schema.Resource{
-		"decort_account":                        account.DataSourceAccount(),
-		"decort_resgroup":                       rg.DataSourceResgroup(),
-		"decort_kvmvm":                          kvmvm.DataSourceCompute(),
-		"decort_kvmvm_list":                     kvmvm.DataSourceComputeList(),
-		"decort_kvmvm_audits":                   kvmvm.DataSourceComputeAudits(),
-		"decort_kvmvm_get_audits":               kvmvm.DataSourceComputeGetAudits(),
-		"decort_kvmvm_get_console_url":          kvmvm.DataSourceComputeGetConsoleUrl(),
-		"decort_kvmvm_get_log":                  kvmvm.DataSourceComputeGetLog(),
-		"decort_kvmvm_pfw_list":                 kvmvm.DataSourceComputePfwList(),
-		"decort_kvmvm_user_list":                kvmvm.DataSourceComputeUserList(),
-		"decort_kvmvm_snapshot_usage":           kvmvm.DataSourceComputeSnapshotUsage(),
-		"decort_k8s":                            k8s.DataSourceK8s(),
-		"decort_k8s_list":                       k8s.DataSourceK8sList(),
-		"decort_k8s_list_deleted":               k8s.DataSourceK8sListDeleted(),
-		"decort_k8s_wg":                         k8s.DataSourceK8sWg(),
-		"decort_k8s_wg_list":                    k8s.DataSourceK8sWgList(),
-		"decort_vins":                           vins.DataSourceVins(),
-		"decort_vins_list":                      vins.DataSourceVinsList(),
-		"decort_vins_audits":                    vins.DataSourceVinsAudits(),
-		"decort_vins_ip_list":                   vins.DataSourceVinsIpList(),
-		"decort_vins_list_deleted":              vins.DataSourceVinsListDeleted(),
-		"decort_vins_ext_net_list":              vins.DataSourceVinsExtNetList(),
-		"decort_vins_nat_rule_list":             vins.DataSourceVinsNatRuleList(),
-		"decort_snapshot_list":                  snapshot.DataSourceSnapshotList(),
-		"decort_disk":                           disks.DataSourceDisk(),
-		"decort_disk_list":                      disks.DataSourceDiskList(),
-		"decort_rg_list":                        rg.DataSourceRgList(),
-		"decort_rg_affinity_group_computes":     rg.DataSourceRgAffinityGroupComputes(),
-		"decort_rg_affinity_groups_list":        rg.DataSourceRgAffinityGroupsList(),
-		"decort_rg_affinity_groups_get":         rg.DataSourceRgAffinityGroupsGet(),
-		"decort_rg_audits":                      rg.DataSourceRgAudits(),
-		"decort_rg_list_computes":               rg.DataSourceRgListComputes(),
-		"decort_rg_list_deleted":                rg.DataSourceRgListDeleted(),
-		"decort_rg_list_lb":                     rg.DataSourceRgListLb(),
-		"decort_rg_list_pfw":                    rg.DataSourceRgListPfw(),
-		"decort_rg_list_vins":                   rg.DataSourceRgListVins(),
-		"decort_rg_usage":                       rg.DataSourceRgUsage(),
-		"decort_disk_list_types_detailed":       disks.DataSourceDiskListTypesDetailed(),
-		"decort_disk_list_types":                disks.DataSourceDiskListTypes(),
-		"decort_disk_list_deleted":              disks.DataSourceDiskListDeleted(),
-		"decort_disk_list_unattached":           disks.DataSourceDiskListUnattached(),
-		"decort_disk_snapshot":                  disks.DataSourceDiskSnapshot(),
-		"decort_disk_snapshot_list":             disks.DataSourceDiskSnapshotList(),
-		"decort_account_list":                   account.DataSourceAccountList(),
-		"decort_account_computes_list":          account.DataSourceAccountComputesList(),
-		"decort_account_disks_list":             account.DataSourceAccountDisksList(),
-		"decort_account_vins_list":              account.DataSourceAccountVinsList(),
-		"decort_account_audits_list":            account.DataSourceAccountAuditsList(),
-		"decort_account_rg_list":                account.DataSourceAccountRGList(),
-		"decort_account_consumed_units":         account.DataSourceAccountConsumedUnits(),
-		"decort_account_consumed_units_by_type": account.DataSourceAccountConsumedUnitsByType(),
-		"decort_account_reserved_units":         account.DataSourceAccountReservedUnits(),
-		"decort_account_templates_list":         account.DataSourceAccountTemplatessList(),
-		"decort_account_deleted_list":           account.DataSourceAccountDeletedList(),
-		"decort_account_flipgroups_list":        account.DataSourceAccountFlipGroupsList(),
-		"decort_bservice_list":                  bservice.DataSourceBasicServiceList(),
-		"decort_bservice":                       bservice.DataSourceBasicService(),
-		"decort_bservice_snapshot_list":         bservice.DataSourceBasicServiceSnapshotList(),
-		"decort_bservice_group":                 bservice.DataSourceBasicServiceGroup(),
-		"decort_bservice_deleted_list":          bservice.DataSourceBasicServiceDeletedList(),
-		"decort_extnet_list":                    extnet.DataSourceExtnetList(),
-		"decort_extnet_computes_list":           extnet.DataSourceExtnetComputesList(),
-		"decort_extnet":                         extnet.DataSourceExtnet(),
-		"decort_extnet_default":                 extnet.DataSourceExtnetDefault(),
-		"decort_locations_list":                 locations.DataSourceLocationsList(),
-		"decort_location_url":                   locations.DataSourceLocationUrl(),
-		"decort_image_list":                     image.DataSourceImageList(),
-		"decort_image":                          image.DataSourceImage(),
-		"decort_lb":                             lb.DataSourceLB(),
-		"decort_lb_list":                        lb.DataSourceLBList(),
-		"decort_lb_list_deleted":                lb.DataSourceLBListDeleted(),
-
-		"decort_cb_account":                 cb_account.DataSourceAccount(),
-		"decort_cb_account_list":            cb_account.DataSourceAccountList(),
-		"decort_cb_account_computes_list":   cb_account.DataSourceAccountComputesList(),
-		"decort_cb_account_deleted_list":    cb_account.DataSourceAccountDeletedList(),
-		"decort_cb_account_disks_list":      cb_account.DataSourceAccountDisksList(),
-		"decort_cb_account_flipgroups_list": cb_account.DataSourceAccountFlipGroupsList(),
-		"decort_cb_account_rg_list":         cb_account.DataSourceAccountRGList(),
-		"decort_cb_account_vins_list":       cb_account.DataSourceAccountVinsList(),
-		"decort_cb_account_audits_list":     cb_account.DataSourceAccountAuditsList(),
-		"decort_cb_disk":                    cb_disks.DataSourceDisk(),
-		"decort_cb_disk_list":               cb_disks.DataSourceDiskList(),
-		"decort_cb_image":                   cb_image.DataSourceImage(),
-		"decort_cb_grid":                    cb_grid.DataSourceGrid(),
-		"decort_cb_grid_list":               cb_grid.DataSourceGridList(),
-		"decort_cb_image_list":              cb_image.DataSourceImageList(),
-		"decort_cb_image_list_stacks":       cb_image.DataSourceImageListStacks(),
-		"decort_cb_pcidevice":               cb_pcidevice.DataSourcePcidevice(),
-		"decort_cb_pcidevice_list":          cb_pcidevice.DataSourcePcideviceList(),
-		"decort_cb_sep_list":                cb_sep.DataSourceSepList(),
-		"decort_cb_sep":                     cb_sep.DataSourceSep(),
-		"decort_cb_sep_consumption":         cb_sep.DataSourceSepConsumption(),
-		"decort_cb_sep_disk_list":           cb_sep.DataSourceSepDiskList(),
-		"decort_cb_sep_config":              cb_sep.DataSourceSepConfig(),
-		"decort_cb_sep_pool":                cb_sep.DataSourceSepPool(),
-		"decort_cb_vgpu":                    cb_vgpu.DataSourceVGPU(),
-		"decort_cb_rg_list":                 cb_rg.DataSourceRgList(),
-	}
-
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package provider
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/flipgroup"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/k8s"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/kvmvm"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/locations"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/rg"
+	"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/vins"
+
+	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"
+	cb_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
+	cb_extnet "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/extnet"
+	cb_flipgroup "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/flipgroup"
+	cb_grid "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/grid"
+	cb_image "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
+	cb_kvmvm "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
+	cb_lb "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/lb"
+	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_stack "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/stack"
+	cb_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
+
+	// cb_vgpu "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vgpu"
+	cb_k8ci "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8ci"
+	cb_k8s "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8s"
+)
+
+func newDataSourcesMap() map[string]*schema.Resource {
+	return map[string]*schema.Resource{
+		"decort_account":                           account.DataSourceAccount(),
+		"decort_resgroup":                          rg.DataSourceResgroup(),
+		"decort_kvmvm":                             kvmvm.DataSourceCompute(),
+		"decort_kvmvm_list":                        kvmvm.DataSourceComputeList(),
+		"decort_kvmvm_audits":                      kvmvm.DataSourceComputeAudits(),
+		"decort_kvmvm_get_audits":                  kvmvm.DataSourceComputeGetAudits(),
+		"decort_kvmvm_get_console_url":             kvmvm.DataSourceComputeGetConsoleUrl(),
+		"decort_kvmvm_get_log":                     kvmvm.DataSourceComputeGetLog(),
+		"decort_kvmvm_pfw_list":                    kvmvm.DataSourceComputePfwList(),
+		"decort_kvmvm_user_list":                   kvmvm.DataSourceComputeUserList(),
+		"decort_kvmvm_snapshot_usage":              kvmvm.DataSourceComputeSnapshotUsage(),
+		"decort_k8s":                               k8s.DataSourceK8s(),
+		"decort_k8s_list":                          k8s.DataSourceK8sList(),
+		"decort_k8s_list_deleted":                  k8s.DataSourceK8sListDeleted(),
+		"decort_k8s_wg":                            k8s.DataSourceK8sWg(),
+		"decort_k8s_wg_list":                       k8s.DataSourceK8sWgList(),
+		"decort_k8s_computes":                      k8s.DataSourceK8sComputes(),
+		"decort_k8ci_list":                         k8s.DataSourceK8CIList(),
+		"decort_vins":                              vins.DataSourceVins(),
+		"decort_vins_list":                         vins.DataSourceVinsList(),
+		"decort_vins_audits":                       vins.DataSourceVinsAudits(),
+		"decort_vins_ip_list":                      vins.DataSourceVinsIpList(),
+		"decort_vins_list_deleted":                 vins.DataSourceVinsListDeleted(),
+		"decort_vins_ext_net_list":                 vins.DataSourceVinsExtNetList(),
+		"decort_vins_nat_rule_list":                vins.DataSourceVinsNatRuleList(),
+		"decort_vins_static_route_list":            vins.DataSourceStaticRouteList(),
+		"decort_vins_static_route":                 vins.DataSourceStaticRoute(),
+		"decort_snapshot_list":                     snapshot.DataSourceSnapshotList(),
+		"decort_disk":                              disks.DataSourceDisk(),
+		"decort_disk_list":                         disks.DataSourceDiskList(),
+		"decort_rg_list":                           rg.DataSourceRgList(),
+		"decort_rg_affinity_group_computes":        rg.DataSourceRgAffinityGroupComputes(),
+		"decort_rg_affinity_groups_list":           rg.DataSourceRgAffinityGroupsList(),
+		"decort_rg_affinity_groups_get":            rg.DataSourceRgAffinityGroupsGet(),
+		"decort_rg_audits":                         rg.DataSourceRgAudits(),
+		"decort_rg_list_computes":                  rg.DataSourceRgListComputes(),
+		"decort_rg_list_deleted":                   rg.DataSourceRgListDeleted(),
+		"decort_rg_list_lb":                        rg.DataSourceRgListLb(),
+		"decort_rg_list_pfw":                       rg.DataSourceRgListPfw(),
+		"decort_rg_list_vins":                      rg.DataSourceRgListVins(),
+		"decort_rg_usage":                          rg.DataSourceRgUsage(),
+		"decort_disk_list_types_detailed":          disks.DataSourceDiskListTypesDetailed(),
+		"decort_disk_list_types":                   disks.DataSourceDiskListTypes(),
+		"decort_disk_list_deleted":                 disks.DataSourceDiskListDeleted(),
+		"decort_disk_list_unattached":              disks.DataSourceDiskListUnattached(),
+		"decort_disk_snapshot":                     disks.DataSourceDiskSnapshot(),
+		"decort_disk_snapshot_list":                disks.DataSourceDiskSnapshotList(),
+		"decort_account_list":                      account.DataSourceAccountList(),
+		"decort_account_computes_list":             account.DataSourceAccountComputesList(),
+		"decort_account_disks_list":                account.DataSourceAccountDisksList(),
+		"decort_account_vins_list":                 account.DataSourceAccountVinsList(),
+		"decort_account_audits_list":               account.DataSourceAccountAuditsList(),
+		"decort_account_rg_list":                   account.DataSourceAccountRGList(),
+		"decort_account_consumed_units":            account.DataSourceAccountConsumedUnits(),
+		"decort_account_consumed_units_by_type":    account.DataSourceAccountConsumedUnitsByType(),
+		"decort_account_reserved_units":            account.DataSourceAccountReservedUnits(),
+		"decort_account_templates_list":            account.DataSourceAccountTemplatessList(),
+		"decort_account_deleted_list":              account.DataSourceAccountDeletedList(),
+		"decort_account_flipgroups_list":           account.DataSourceAccountFlipGroupsList(),
+		"decort_bservice_list":                     bservice.DataSourceBasicServiceList(),
+		"decort_bservice":                          bservice.DataSourceBasicService(),
+		"decort_bservice_snapshot_list":            bservice.DataSourceBasicServiceSnapshotList(),
+		"decort_bservice_group":                    bservice.DataSourceBasicServiceGroup(),
+		"decort_bservice_deleted_list":             bservice.DataSourceBasicServiceDeletedList(),
+		"decort_extnet_list":                       extnet.DataSourceExtnetList(),
+		"decort_extnet_computes_list":              extnet.DataSourceExtnetComputesList(),
+		"decort_extnet":                            extnet.DataSourceExtnet(),
+		"decort_extnet_default":                    extnet.DataSourceExtnetDefault(),
+		"decort_locations_list":                    locations.DataSourceLocationsList(),
+		"decort_location_url":                      locations.DataSourceLocationUrl(),
+		"decort_image_list":                        image.DataSourceImageList(),
+		"decort_image":                             image.DataSourceImage(),
+		"decort_lb":                                lb.DataSourceLB(),
+		"decort_lb_list":                           lb.DataSourceLBList(),
+		"decort_lb_list_deleted":                   lb.DataSourceLBListDeleted(),
+		"decort_flipgroup":                         flipgroup.DataSourceFlipgroup(),
+		"decort_flipgroup_list":                    flipgroup.DataSourceFlipGroupList(),
+		"decort_stack":                             stack.DataSourceStack(),
+		"decort_stack_list":                        stack.DataSourceStackList(),
+		"decort_account_resource_consumption_list": account.DataSourceAccountResourceConsumptionList(),
+		"decort_account_resource_consumption_get":  account.DataSourceAccountResourceConsumptionGet(),
+		"decort_kvmvm_list_deleted":                kvmvm.DataSourceComputeListDeleted(),
+		"decort_kvmvm_vgpu_list":                   kvmvm.DataSourceComputeVGPUList(),
+		"decort_kvmvm_pci_device_list":             kvmvm.DataSourceComputePCIDeviceList(),
+		"decort_k8s_wg_cloud_init":                 k8s.DataSourceK8sWgCloudInit(),
+		"decort_rg_resource_consumption_list":      rg.DataSourceRGResourceConsumptionList(),
+		"decort_rg_resource_consumption_get":       rg.DataSourceRGResourceConsumptionGet(),
+
+		"decort_cb_account":                           cb_account.DataSourceAccount(),
+		"decort_cb_account_list":                      cb_account.DataSourceAccountList(),
+		"decort_cb_account_computes_list":             cb_account.DataSourceAccountComputesList(),
+		"decort_cb_account_list_deleted":              cb_account.DataSourceAccountDeletedList(),
+		"decort_cb_account_disks_list":                cb_account.DataSourceAccountDisksList(),
+		"decort_cb_account_flipgroups_list":           cb_account.DataSourceAccountFlipGroupsList(),
+		"decort_cb_account_rg_list":                   cb_account.DataSourceAccountRGList(),
+		"decort_cb_account_vins_list":                 cb_account.DataSourceAccountVinsList(),
+		"decort_cb_account_resource_consumption_get":  cb_account.DataSourceAccountResourceConsumptionGet(),
+		"decort_cb_account_resource_consumption_list": cb_account.DataSourceAccountResourceConsumptionList(),
+		"decort_cb_account_audits_list":               cb_account.DataSourceAccountAuditsList(),
+		"decort_cb_audit":                             cb_audit.DataSourceAudit(),
+		"decort_cb_audit_list":                        cb_audit.DataSourceAuditList(),
+		"decort_cb_audit_linked_jobs":                 cb_audit.DataSourceAuditLinkedJobs(),
+		"decort_cb_extnet":                            cb_extnet.DataSourceExtnetCB(),
+		"decort_cb_extnet_list":                       cb_extnet.DataSourceExtnetListCB(),
+		"decort_cb_extnet_default":                    cb_extnet.DataSourceExtnetDefaultCB(),
+		"decort_cb_extnet_static_route_list":          cb_extnet.DataSourceStaticRouteList(),
+		"decort_cb_extnet_static_route":               cb_extnet.DataSourceStaticRoute(),
+		"decort_cb_image":                             cb_image.DataSourceImage(),
+		"decort_cb_grid":                              cb_grid.DataSourceGrid(),
+		"decort_cb_grid_get_status":                   cb_grid.DataSourceGridGetStatus(),
+		"decort_cb_grid_post_status":                  cb_grid.DataSourceGridPostStatus(),
+		"decort_cb_grid_get_diagnosis":                cb_grid.DataSourceGridGetDiagnosis(),
+		"decort_cb_grid_post_diagnosis":               cb_grid.DataSourceGridPostDiagnosis(),
+		"decort_cb_grid_list":                         cb_grid.DataSourceGridList(),
+		"decort_cb_grid_list_emails":                  cb_grid.DataSourceGridListEmails(),
+		"decort_cb_grid_list_consumption":             cb_grid.DataSourceGridListConsumption(),
+		"decort_cb_grid_get_consumption":              cb_grid.DataSourceGridGetConsumption(),
+		"decort_cb_image_list":                        cb_image.DataSourceImageList(),
+		"decort_cb_image_list_stacks":                 cb_image.DataSourceImageListStacks(),
+		"decort_cb_kvmvm":                             cb_kvmvm.DataSourceCompute(),
+		"decort_cb_kvmvm_affinity_relations":          cb_kvmvm.DataSourceComputeAffinityRelations(),
+		"decort_cb_kvmvm_audits":                      cb_kvmvm.DataSourceComputeAudits(),
+		"decort_cb_kvmvm_boot_order_get":              cb_kvmvm.DataSourceComputeBootOrderGet(),
+		"decort_cb_kvmvm_get_audits":                  cb_kvmvm.DataSourceComputeGetAudits(),
+		"decort_cb_kvmvm_get_console_url":             cb_kvmvm.DataSourceComputeGetConsoleUrl(),
+		"decort_cb_kvmvm_get_log":                     cb_kvmvm.DataSourceComputeGetLog(),
+		"decort_cb_kvmvm_list":                        cb_kvmvm.DataSourceComputeList(),
+		"decort_cb_kvmvm_list_deleted":                cb_kvmvm.DataSourceComputeListDeleted(),
+		"decort_cb_kvmvm_migrate_storage_info":        cb_kvmvm.DataSourceComputeMigrateStorageInfo(),
+		"decort_cb_kvmvm_pci_device_list":             cb_kvmvm.DataSourceComputePCIDeviceList(),
+		"decort_cb_kvmvm_pfw_list":                    cb_kvmvm.DataSourceComputePfwList(),
+		"decort_cb_kvmvm_snapshot_list":               cb_kvmvm.DataSourceComputeSnapshotList(),
+		"decort_cb_kvmvm_snapshot_usage":              cb_kvmvm.DataSourceComputeSnapshotUsage(),
+		"decort_cb_kvmvm_user_list":                   cb_kvmvm.DataSourceComputeUserList(),
+		"decort_cb_kvmvm_vgpu_list":                   cb_kvmvm.DataSourceComputeVGPUList(),
+		"decort_cb_disk":                              cb_disks.DataSourceDisk(),
+		"decort_cb_disk_list":                         cb_disks.DataSourceDiskList(),
+		"decort_cb_disk_list_deleted":                 cb_disks.DataSourceDiskListDeleted(),
+		"decort_cb_disk_list_types":                   cb_disks.DataSourceDiskListTypes(),
+		"decort_cb_disk_list_types_detailed":          cb_disks.DataSourceDiskListTypesDetailed(),
+		"decort_cb_disk_list_unattached":              cb_disks.DataSourceDiskListUnattached(),
+		"decort_cb_disk_snapshot":                     cb_disks.DataSourceDiskSnapshot(),
+		"decort_cb_disk_snapshot_list":                cb_disks.DataSourceDiskSnapshotList(),
+		"decort_cb_pcidevice":                         cb_pcidevice.DataSourcePcidevice(),
+		"decort_cb_pcidevice_list":                    cb_pcidevice.DataSourcePcideviceList(),
+		"decort_cb_rg":                                cb_rg.DataSourceResgroup(),
+		"decort_cb_rg_affinity_group_computes":        cb_rg.DataSourceRgAffinityGroupComputes(),
+		"decort_cb_rg_affinity_groups_get":            cb_rg.DataSourceRgAffinityGroupsGet(),
+		"decort_cb_rg_affinity_groups_list":           cb_rg.DataSourceRgAffinityGroupsList(),
+		"decort_cb_rg_resource_consumption_get":       cb_rg.DataSourceRGResourceConsumptionGet(),
+		"decort_cb_rg_resource_consumption_list":      cb_rg.DataSourceRGResourceConsumptionList(),
+		"decort_cb_rg_audits":                         cb_rg.DataSourceRgAudits(),
+		"decort_cb_rg_list":                           cb_rg.DataSourceRgList(),
+		"decort_cb_rg_list_deleted":                   cb_rg.DataSourceRgListDeleted(),
+		"decort_cb_rg_list_computes":                  cb_rg.DataSourceRgListComputes(),
+		"decort_cb_rg_list_lb":                        cb_rg.DataSourceRgListLb(),
+		"decort_cb_rg_list_pfw":                       cb_rg.DataSourceRgListPfw(),
+		"decort_cb_rg_list_vins":                      cb_rg.DataSourceRgListVins(),
+		"decort_cb_rg_usage":                          cb_rg.DataSourceRgUsage(),
+		"decort_cb_sep_list":                          cb_sep.DataSourceSepList(),
+		"decort_cb_sep":                               cb_sep.DataSourceSep(),
+		"decort_cb_sep_consumption":                   cb_sep.DataSourceSepConsumption(),
+		"decort_cb_sep_disk_list":                     cb_sep.DataSourceSepDiskList(),
+		"decort_cb_sep_config":                        cb_sep.DataSourceSepConfig(),
+		"decort_cb_sep_pool":                          cb_sep.DataSourceSepPool(),
+		"decort_cb_lb":                                cb_lb.DataSourceLB(),
+		"decort_cb_lb_list":                           cb_lb.DataSourceLBList(),
+		"decort_cb_lb_list_deleted":                   cb_lb.DataSourceLBListDeleted(),
+		"decort_cb_flipgroup_list":                    cb_flipgroup.DataSourceFlipgroupList(),
+		"decort_cb_flipgroup":                         cb_flipgroup.DataSourceFlipgroup(),
+		"decort_cb_stack_list":                        cb_stack.DataSourceStacksList(),
+		"decort_cb_stack":                             cb_stack.DataSourceStack(),
+		"decort_cb_vins":                              cb_vins.DataSourceVins(),
+		"decort_cb_vins_list":                         cb_vins.DataSourceVinsList(),
+		"decort_cb_vins_audits":                       cb_vins.DataSourceVinsAudits(),
+		"decort_cb_vins_ip_list":                      cb_vins.DataSourceVinsIpList(),
+		"decort_cb_vins_list_deleted":                 cb_vins.DataSourceVinsListDeleted(),
+		"decort_cb_vins_ext_net_list":                 cb_vins.DataSourceVinsExtNetList(),
+		"decort_cb_vins_nat_rule_list":                cb_vins.DataSourceVinsNatRuleList(),
+		"decort_cb_vins_static_route":                 cb_vins.DataSourceStaticRoute(),
+		"decort_cb_vins_static_route_list":            cb_vins.DataSourceStaticRouteList(),
+		"decort_cb_k8ci":                              cb_k8ci.DataSourceK8CI(),
+		"decort_cb_k8ci_list":                         cb_k8ci.DataSourceK8CIList(),
+		"decort_cb_k8ci_list_deleted":                 cb_k8ci.DataSourceK8CIListDeleted(),
+		"decort_cb_k8s":                               cb_k8s.DataSourceK8s(),
+		"decort_cb_k8s_list":                          cb_k8s.DataSourceK8sList(),
+		"decort_cb_k8s_list_deleted":                  cb_k8s.DataSourceK8sListDeleted(),
+		"decort_cb_k8s_wg":                            cb_k8s.DataSourceK8sWg(),
+		"decort_cb_k8s_wg_cloud_init":                 cb_k8s.DataSourceK8sWgCloudInit(),
+		"decort_cb_k8s_wg_list":                       cb_k8s.DataSourceK8sWgList(),
+		"decort_cb_k8s_computes":                      cb_k8s.DataSourceK8sComputes(),
+	}
+}

internal/provider/provider.go

@@ -1,129 +1,168 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package provider
-
-import (
-	"fmt"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"golang.org/x/net/context"
-
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/location"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
-)
-
-func Provider() *schema.Provider {
-	return &schema.Provider{
-		Schema: map[string]*schema.Schema{
-			"authenticator": {
-				Type:         schema.TypeString,
-				Required:     true,
-				StateFunc:    statefuncs.StateFuncToLower,
-				ValidateFunc: validation.StringInSlice([]string{"oauth2", "legacy", "jwt"}, true), // ignore case while validating
-				Description:  "Authentication mode to use when connecting to DECORT cloud API. Should be one of 'oauth2', 'legacy' or 'jwt'.",
-			},
-
-			"oauth2_url": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				StateFunc:   statefuncs.StateFuncToLower,
-				DefaultFunc: schema.EnvDefaultFunc("DECORT_OAUTH2_URL", nil),
-				Description: "OAuth2 application URL in 'oauth2' authentication mode.",
-			},
-
-			"controller_url": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				StateFunc:   statefuncs.StateFuncToLower,
-				Description: "URL of DECORT Cloud controller to use. API calls will be directed to this URL.",
-			},
-
-			"user": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("DECORT_USER", nil),
-				Description: "User name for DECORT cloud API operations in 'legacy' authentication mode.",
-			},
-
-			"password": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("DECORT_PASSWORD", nil),
-				Description: "User password for DECORT cloud API operations in 'legacy' authentication mode.",
-			},
-
-			"app_id": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_ID", nil),
-				Description: "Application ID to access DECORT cloud API in 'oauth2' authentication mode.",
-			},
-
-			"app_secret": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_SECRET", nil),
-				Description: "Application secret to access DECORT cloud API in 'oauth2' authentication mode.",
-			},
-
-			"jwt": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("DECORT_JWT", nil),
-				Description: "JWT to access DECORT cloud API in 'jwt' authentication mode.",
-			},
-
-			"allow_unverified_ssl": {
-				Type:        schema.TypeBool,
-				Optional:    true,
-				Default:     false,
-				Description: "If true, DECORT API will not verify SSL certificates. Use this with caution and in trusted environments only!",
-			},
-		},
-
-		ResourcesMap: newResourcesMap(),
-
-		DataSourcesMap: newDataSourcesMap(),
-
-		ConfigureContextFunc: providerConfigure,
-	}
-}
-
-func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-	decsController, err := controller.ControllerConfigure(d)
-	if err != nil {
-		return nil, diag.FromErr(err)
-	}
-
-	gridId, err := location.UtilityLocationGetDefaultGridID(ctx, decsController)
-	if err != nil {
-		return nil, diag.FromErr(err)
-	}
-	if gridId == 0 {
-		return nil, diag.FromErr(fmt.Errorf("providerConfigure: invalid default Grid ID = 0"))
-	}
-
-	return decsController, nil
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package provider
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"golang.org/x/net/context"
+
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/location"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/statefuncs"
+)
+
+func Provider() *schema.Provider {
+	return &schema.Provider{
+		Schema: map[string]*schema.Schema{
+			"authenticator": {
+				Type:         schema.TypeString,
+				Required:     true,
+				StateFunc:    statefuncs.StateFuncToLower,
+				ValidateFunc: validation.StringInSlice([]string{"decs3o", "legacy", "jwt", "bvs"}, true), // ignore case while validating
+				Description:  "Authentication mode to use when connecting to DECORT cloud API. Should be one of 'decs3o', 'legacy', 'jwt' or 'bvs'.",
+			},
+
+			"oauth2_url": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				StateFunc:   statefuncs.StateFuncToLower,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_OAUTH2_URL", nil),
+				Description: "OAuth2 application URL in 'decs3o' and 'bvs' authentication mode.",
+			},
+
+			"controller_url": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				StateFunc:   statefuncs.StateFuncToLower,
+				Description: "URL of DECORT Cloud controller to use. API calls will be directed to this URL.",
+			},
+
+			"user": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_USER", nil),
+				Description: "User name for DECORT cloud API operations in 'legacy' authentication mode.",
+			},
+
+			"password": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_PASSWORD", nil),
+				Description: "User password for DECORT cloud API operations in 'legacy' authentication mode.",
+			},
+
+			"bvs_user": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_BVS_USER", nil),
+				Description: "User name for DECORT cloud API operations in 'bvs' authentication mode.",
+			},
+
+			"bvs_password": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_BVS_PASSWORD", nil),
+				Description: "User password for DECORT cloud API operations in 'bvs' authentication mode.",
+			},
+
+			"domain": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_DOMAIN", nil),
+				Description: "User password for DECORT cloud API operations in 'bvs' authentication mode.",
+			},
+
+			"app_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_ID", nil),
+				Description: "Application ID to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.",
+			},
+
+			"app_secret": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_APP_SECRET", nil),
+				Description: "Application secret to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.",
+			},
+
+			"jwt": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("DECORT_JWT", nil),
+				Description: "JWT to access DECORT cloud API in 'jwt' authentication mode.",
+			},
+
+			"allow_unverified_ssl": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "If true, DECORT API will not verify SSL certificates. Use this with caution and in trusted environments only!",
+			},
+
+			"path_cfg": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The path of the configuration file entry",
+			},
+
+			"path_token": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The path of the token file entry",
+			},
+
+			"time_to_refresh": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "The number of minutes before the expiration of the token, a refresh will be made",
+			},
+		},
+
+		ResourcesMap: newResourcesMap(),
+
+		DataSourcesMap: newDataSourcesMap(),
+
+		ConfigureContextFunc: providerConfigure,
+	}
+}
+
+func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
+	decsController, err := controller.ControllerConfigure(d)
+	if err != nil {
+		return nil, diag.FromErr(err)
+	}
+
+	gridId, err := location.UtilityLocationGetDefaultGridID(ctx, decsController)
+	if err != nil {
+		return nil, diag.FromErr(err)
+	}
+	if gridId == 0 {
+		return nil, diag.FromErr(fmt.Errorf("providerConfigure: invalid default Grid ID = 0"))
+	}
+
+	return decsController, nil
+}

internal/provider/resource_map.go

@@ -1,89 +1,103 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package provider
-
-import (
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/bservice"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/disks"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/image"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/k8s"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/kvmvm"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/lb"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/pfw"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/rg"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/snapshot"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
-
-	cb_account "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
-	cb_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
-	cb_image "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
-	cb_k8s "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8s"
-	cb_kvmvm "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
-	cb_pcidevice "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pcidevice"
-	cb_pfw "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/pfw"
-	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_snapshot "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/snapshot"
-	cb_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
-)
-
-func newResourcesMap() map[string]*schema.Resource {
-	return map[string]*schema.Resource{
-		"decort_resgroup":          rg.ResourceResgroup(),
-		"decort_kvmvm":             kvmvm.ResourceCompute(),
-		"decort_disk":              disks.ResourceDisk(),
-		"decort_disk_snapshot":     disks.ResourceDiskSnapshot(),
-		"decort_vins":              vins.ResourceVins(),
-		"decort_pfw":               pfw.ResourcePfw(),
-		"decort_k8s":               k8s.ResourceK8s(),
-		"decort_k8s_wg":            k8s.ResourceK8sWg(),
-		"decort_snapshot":          snapshot.ResourceSnapshot(),
-		"decort_account":           account.ResourceAccount(),
-		"decort_bservice":          bservice.ResourceBasicService(),
-		"decort_bservice_group":    bservice.ResourceBasicServiceGroup(),
-		"decort_image":             image.ResourceImage(),
-		"decort_image_virtual":     image.ResourceImageVirtual(),
-		"decort_lb":                lb.ResourceLB(),
-		"decort_lb_backend":        lb.ResourceLBBackend(),
-		"decort_lb_backend_server": lb.ResourceLBBackendServer(),
-		"decort_lb_frontend":       lb.ResourceLBFrontend(),
-		"decort_lb_frontend_bind":  lb.ResourceLBFrontendBind(),
-
-		"decort_cb_account":      cb_account.ResourceAccount(),
-		"decort_cb_disk":         cb_disks.ResourceDisk(),
-		"decort_cb_image":        cb_image.ResourceImage(),
-		"decort_cb_virtual_image":cb_image.ResourceVirtualImage(),
-		"decort_cb_cdrom_image":  cb_image.ResourceCDROMImage(),
-		"decort_cb_delete_images":cb_image.ResourceDeleteImages(),
-		"decort_cb_pcidevice":    cb_pcidevice.ResourcePcidevice(),
-		"decort_cb_sep":          cb_sep.ResourceSep(),
-		"decort_cb_sep_config":   cb_sep.ResourceSepConfig(),
-		"decort_cb_resgroup":     cb_rg.ResourceResgroup(),
-		"decort_cb_kvmvm":        cb_kvmvm.ResourceCompute(),
-		"decort_cb_vins":         cb_vins.ResourceVins(),
-		"decort_cb_pfw":          cb_pfw.ResourcePfw(),
-		"decort_cb_k8s":          cb_k8s.ResourceK8s(),
-		"decort_cb_k8s_wg":       cb_k8s.ResourceK8sWg(),
-		"decort_cb_snapshot":     cb_snapshot.ResourceSnapshot(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package provider
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/disks"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/flipgroup"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/k8s"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/kvmvm"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/lb"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/pfw"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/snapshot"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudapi/vins"
+
+	cb_account "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/account"
+	cb_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
+	cb_extnet "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/extnet"
+	cb_flipgroup "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/flipgroup"
+	cb_image "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/image"
+	cb_k8ci "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8ci"
+	cb_k8s "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/k8s"
+	cb_kvmvm "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/kvmvm"
+	cb_lb "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/lb"
+	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_vins "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/vins"
+)
+
+func newResourcesMap() map[string]*schema.Resource {
+	return map[string]*schema.Resource{
+		"decort_resgroup":          rg.ResourceResgroup(),
+		"decort_kvmvm":             kvmvm.ResourceCompute(),
+		"decort_disk":              disks.ResourceDisk(),
+		"decort_disk_snapshot":     disks.ResourceDiskSnapshot(),
+		"decort_vins":              vins.ResourceVins(),
+		"decort_pfw":               pfw.ResourcePfw(),
+		"decort_k8s":               k8s.ResourceK8s(),
+		"decort_k8s_wg":            k8s.ResourceK8sWg(),
+		"decort_k8s_cp":            k8s.ResourceK8sCP(),
+		"decort_snapshot":          snapshot.ResourceSnapshot(),
+		"decort_account":           account.ResourceAccount(),
+		"decort_bservice":          bservice.ResourceBasicService(),
+		"decort_bservice_group":    bservice.ResourceBasicServiceGroup(),
+		"decort_image":             image.ResourceImage(),
+		"decort_image_virtual":     image.ResourceImageVirtual(),
+		"decort_lb":                lb.ResourceLB(),
+		"decort_lb_backend":        lb.ResourceLBBackend(),
+		"decort_lb_backend_server": lb.ResourceLBBackendServer(),
+		"decort_lb_frontend":       lb.ResourceLBFrontend(),
+		"decort_lb_frontend_bind":  lb.ResourceLBFrontendBind(),
+		"decort_flipgroup":         flipgroup.ResourceFlipgroup(),
+		"decort_vins_static_route": vins.ResourceStaticRoute(),
+
+		"decort_cb_account":             cb_account.ResourceAccount(),
+		"decort_cb_extnet":              cb_extnet.ResourceExtnetCB(),
+		"decort_cb_extnet_static_route": cb_extnet.ResourceStaticRoute(),
+		"decort_cb_disk":                cb_disks.ResourceDisk(),
+		"decort_cb_disk_snapshot":       cb_disks.ResourceDiskSnapshot(),
+		"decort_cb_image":               cb_image.ResourceImage(),
+		"decort_cb_virtual_image":       cb_image.ResourceVirtualImage(),
+		"decort_cb_cdrom_image":         cb_image.ResourceCDROMImage(),
+		"decort_cb_pcidevice":           cb_pcidevice.ResourcePcidevice(),
+		"decort_cb_sep":                 cb_sep.ResourceSep(),
+		"decort_cb_sep_config":          cb_sep.ResourceSepConfig(),
+		"decort_cb_kvmvm":               cb_kvmvm.ResourceCompute(),
+		"decort_cb_vins":                cb_vins.ResourceVins(),
+		"decort_cb_k8ci":                cb_k8ci.ResourceK8CI(),
+		"decort_cb_k8s_cp":              cb_k8s.ResourceK8sCP(),
+		"decort_cb_k8s_wg":              cb_k8s.ResourceK8sWg(),
+		"decort_cb_vins_static_route":   cb_vins.ResourceStaticRoute(),
+		"decort_cb_flipgroup":           cb_flipgroup.ResourceFlipgroup(),
+		"decort_cb_lb":                  cb_lb.ResourceLB(),
+		"decort_cb_lb_backend":          cb_lb.ResourceLBBackend(),
+		"decort_cb_lb_backend_server":   cb_lb.ResourceLBBackendServer(),
+		"decort_cb_lb_frontend":         cb_lb.ResourceLBFrontend(),
+		"decort_cb_lb_frontend_bind":    cb_lb.ResourceLBFrontendBind(),
+		"decort_cb_rg":                  cb_rg.ResourceResgroup(),
+	}
+}

internal/service/cloudapi/account/data_source_account.go

@@ -41,9 +41,11 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
+// TODO: resources (additional ds / additional request inside body (?))
 func dataSourceAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	acc, err := utilityAccountCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -98,6 +100,10 @@ func resourceLimitsSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeFloat,
 			Computed: true,
 		},
+		"cu_dm": {
+			Type:     schema.TypeFloat,
+			Computed: true,
+		},
 		"cu_i": {
 			Type:     schema.TypeFloat,
 			Computed: true,
@@ -268,13 +274,13 @@ func dataSourceAccountSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"resources": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: resourcesSchemaMake(),
-			},
-		},
+		// "resources": {
+		// 	Type:     schema.TypeList,
+		// 	Computed: true,
+		// 	Elem: &schema.Resource{
+		// 		Schema: resourcesSchemaMake(),
+		// 	},
+		// },
 		"ckey": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudapi/account/data_source_account_audits_list.go

@@ -1,127 +1,128 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountAuditsList(aal account.ListAudits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, aa := range aal {
-		temp := map[string]interface{}{
-			"call":         aa.Call,
-			"responsetime": aa.ResponseTime,
-			"statuscode":   aa.StatusCode,
-			"timestamp":    aa.Timestamp,
-			"user":         aa.User,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountAuditsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountAuditsList, err := utilityAccountAuditsListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountAuditsList(accountAuditsList))
-
-	return nil
-}
-
-func dataSourceAccountAuditsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"call": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"responsetime": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"statuscode": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"timestamp": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"user": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountAuditsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountAuditsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountAuditsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountAuditsList(aal account.ListAudits) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, aa := range aal {
+		temp := map[string]interface{}{
+			"call":         aa.Call,
+			"responsetime": aa.ResponseTime,
+			"statuscode":   aa.StatusCode,
+			"timestamp":    aa.Timestamp,
+			"user":         aa.User,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceAccountAuditsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountAuditsList, err := utilityAccountAuditsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountAuditsList(accountAuditsList))
+
+	return nil
+}
+
+func dataSourceAccountAuditsListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"call": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"responsetime": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"statuscode": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"timestamp": {
+						Type:     schema.TypeFloat,
+						Computed: true,
+					},
+					"user": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+	}
+	return res
+}
+
+func DataSourceAccountAuditsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountAuditsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountAuditsListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_computes_list.go

@@ -1,202 +1,258 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountComputesList(acl account.ListComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acc := range acl {
-		temp := map[string]interface{}{
-			"account_id":       acc.AccountID,
-			"account_name":     acc.AccountName,
-			"cpus":             acc.CPUs,
-			"created_by":       acc.CreatedBy,
-			"created_time":     acc.CreatedTime,
-			"deleted_by":       acc.DeletedBy,
-			"deleted_time":     acc.DeletedTime,
-			"compute_id":       acc.ComputeID,
-			"compute_name":     acc.ComputeName,
-			"ram":              acc.RAM,
-			"registered":       acc.Registered,
-			"rg_id":            acc.RGID,
-			"rg_name":          acc.RGName,
-			"status":           acc.Status,
-			"tech_status":      acc.TechStatus,
-			"total_disks_size": acc.TotalDisksSize,
-			"updated_by":       acc.UpdatedBy,
-			"updated_time":     acc.UpdatedTime,
-			"user_managed":     acc.UserManaged,
-			"vins_connected":   acc.VINSConnected,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountComputesList, err := utilityAccountComputesListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountComputesList(accountComputesList))
-
-	return nil
-}
-
-func dataSourceAccountComputesListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"cpus": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compute_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compute_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ram": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"registered": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"total_disks_size": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"user_managed": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"vins_connected": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountComputesList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountComputesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountComputesListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountComputesList(acl *account.ListComputes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, acc := range acl.Data {
+		temp := map[string]interface{}{
+			"account_id":       acc.AccountID,
+			"account_name":     acc.AccountName,
+			"cpus":             acc.CPUs,
+			"created_by":       acc.CreatedBy,
+			"created_time":     acc.CreatedTime,
+			"deleted_by":       acc.DeletedBy,
+			"deleted_time":     acc.DeletedTime,
+			"compute_id":       acc.ComputeID,
+			"compute_name":     acc.ComputeName,
+			"ram":              acc.RAM,
+			"registered":       acc.Registered,
+			"rg_id":            acc.RGID,
+			"rg_name":          acc.RGName,
+			"status":           acc.Status,
+			"tech_status":      acc.TechStatus,
+			"total_disks_size": acc.TotalDisksSize,
+			"updated_by":       acc.UpdatedBy,
+			"updated_time":     acc.UpdatedTime,
+			"user_managed":     acc.UserManaged,
+			"vins_connected":   acc.VINSConnected,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceAccountComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountComputesList, err := utilityAccountComputesListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountComputesList(accountComputesList))
+	d.Set("entry_count", accountComputesList.EntryCount)
+
+	return nil
+}
+
+func dataSourceAccountComputesListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"compute_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by compute ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by compute name",
+		},
+		"rg_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by RG name",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"tech_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by tech. status",
+		},
+		"ip_address": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by IP address",
+		},
+		"extnet_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by extnet name",
+		},
+		"extnet_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by extnet ID",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"cpus": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"created_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"deleted_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"compute_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"compute_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ram": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"registered": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"tech_status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"total_disks_size": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"updated_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"user_managed": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"vins_connected": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountComputesList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountComputesListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountComputesListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_consumed_units.go

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

internal/service/cloudapi/account/data_source_account_consumed_units_by_type.go

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

internal/service/cloudapi/account/data_source_account_deleted_list.go

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

internal/service/cloudapi/account/data_source_account_disks_list.go

@@ -1,136 +1,172 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountDisksList(adl account.ListDisks) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, ad := range adl {
-		temp := map[string]interface{}{
-			"disk_id":   ad.ID,
-			"disk_name": ad.Name,
-			"pool":      ad.Pool,
-			"sep_id":    ad.SEPID,
-			"shareable": ad.Shareable,
-			"size_max":  ad.SizeMax,
-			"type":      ad.Type,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountDisksListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountDisksList, err := utilityAccountDisksListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountDisksList(accountDisksList))
-
-	return nil
-}
-
-func dataSourceAccountDisksListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"disk_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"disk_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"pool": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"sep_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"shareable": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"size_max": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountDisksList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountDisksListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountDisksListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountDisksList(adl *account.ListDisks) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, ad := range adl.Data {
+		temp := map[string]interface{}{
+			"disk_id":   ad.ID,
+			"disk_name": ad.Name,
+			"pool":      ad.Pool,
+			"sep_id":    ad.SEPID,
+			"shareable": ad.Shareable,
+			"size_max":  ad.SizeMax,
+			"type":      ad.Type,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceAccountDisksListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountDisksList, err := utilityAccountDisksListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountDisksList(accountDisksList))
+	d.Set("entry_count", accountDisksList.EntryCount)
+
+	return nil
+}
+
+func dataSourceAccountDisksListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"disk_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by disk ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by disk name",
+		},
+		"disk_max_size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by disk max size",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by disk type",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"disk_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"disk_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"pool": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"sep_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"shareable": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"size_max": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountDisksList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountDisksListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountDisksListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_flipgroups_list.go

@@ -1,207 +1,253 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountFlipGroupsList(afgl account.ListFLIPGroups) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, afg := range afgl {
-		temp := map[string]interface{}{
-			"account_id":   afg.AccountID,
-			"client_type":  afg.ClientType,
-			"conn_type":    afg.ConnType,
-			"created_by":   afg.CreatedBy,
-			"created_time": afg.CreatedTime,
-			"default_gw":   afg.DefaultGW,
-			"deleted_by":   afg.DeletedBy,
-			"deleted_time": afg.DeletedTime,
-			"desc":         afg.Description,
-			"gid":          afg.GID,
-			"guid":         afg.GUID,
-			"fg_id":        afg.ID,
-			"ip":           afg.IP,
-			"milestones":   afg.Milestones,
-			"fg_name":      afg.Name,
-			"net_id":       afg.NetID,
-			"net_type":     afg.NetType,
-			"netmask":      afg.NetMask,
-			"status":       afg.Status,
-			"updated_by":   afg.UpdatedBy,
-			"updated_time": afg.UpdatedTime,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountFlipGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountFlipGroupsList, err := utilityAccountFlipGroupsListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountFlipGroupsList(accountFlipGroupsList))
-
-	return nil
-}
-
-func dataSourceAccountFlipGroupsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"client_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"conn_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"default_gw": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"fg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"fg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"net_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"netmask": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountFlipGroupsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountFlipGroupsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountFlipGroupsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountFlipGroupsList(afgl *account.ListFLIPGroups) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, afg := range afgl.Data {
+		temp := map[string]interface{}{
+			"account_id":   afg.AccountID,
+			"client_type":  afg.ClientType,
+			"conn_type":    afg.ConnType,
+			"created_by":   afg.CreatedBy,
+			"created_time": afg.CreatedTime,
+			"default_gw":   afg.DefaultGW,
+			"deleted_by":   afg.DeletedBy,
+			"deleted_time": afg.DeletedTime,
+			"desc":         afg.Description,
+			"gid":          afg.GID,
+			"guid":         afg.GUID,
+			"fg_id":        afg.ID,
+			"ip":           afg.IP,
+			"milestones":   afg.Milestones,
+			"fg_name":      afg.Name,
+			"net_id":       afg.NetID,
+			"net_type":     afg.NetType,
+			"netmask":      afg.NetMask,
+			"status":       afg.Status,
+			"updated_by":   afg.UpdatedBy,
+			"updated_time": afg.UpdatedTime,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceAccountFlipGroupsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountFlipGroupsList, err := utilityAccountFlipGroupsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountFlipGroupsList(accountFlipGroupsList))
+	d.Set("entry_count", accountFlipGroupsList.EntryCount)
+
+	return nil
+}
+
+func dataSourceAccountFlipGroupsListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ViNS ID",
+		},
+		"vins_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by ViNS name",
+		},
+		"extnet_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by extnet ID",
+		},
+		"by_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by IP",
+		},
+		"flipgroup_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by flipgroup ID",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"client_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"conn_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"default_gw": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"desc": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"gid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"fg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ip": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"milestones": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"fg_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"net_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"net_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"netmask": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountFlipGroupsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountFlipGroupsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountFlipGroupsListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_get_resource_consumption.go

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

internal/service/cloudapi/account/data_source_account_list.go

@@ -1,184 +1,210 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountList(al account.ListAccounts) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acc := range al {
-		temp := map[string]interface{}{
-			"acl":          flattenRgAcl(acc.ACL),
-			"created_time": acc.CreatedTime,
-			"deleted_time": acc.DeletedTime,
-			"account_id":   acc.ID,
-			"account_name": acc.Name,
-			"status":       acc.Status,
-			"updated_time": acc.UpdatedTime,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func flattenRgAcl(rgAcls []account.RecordACL) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rgAcl := range rgAcls {
-		temp := map[string]interface{}{
-			"explicit":      rgAcl.IsExplicit,
-			"guid":          rgAcl.GUID,
-			"right":         rgAcl.Rights,
-			"status":        rgAcl.Status,
-			"type":          rgAcl.Type,
-			"user_group_id": rgAcl.UgroupID,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceAccountListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountList, err := utilityAccountListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountList(accountList))
-
-	return nil
-}
-
-func dataSourceAccountListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"acl": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"explicit": {
-									Type:     schema.TypeBool,
-									Computed: true,
-								},
-								"guid": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"right": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"status": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"type": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"user_group_id": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountList(al *account.ListAccounts) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, acc := range al.Data {
+		temp := map[string]interface{}{
+			"acl":          flattenRgAcl(acc.ACL),
+			"created_time": acc.CreatedTime,
+			"deleted_time": acc.DeletedTime,
+			"account_id":   acc.ID,
+			"account_name": acc.Name,
+			"status":       acc.Status,
+			"updated_time": acc.UpdatedTime,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenRgAcl(rgAcls []account.RecordACL) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, rgAcl := range rgAcls {
+		temp := map[string]interface{}{
+			"explicit":      rgAcl.IsExplicit,
+			"guid":          rgAcl.GUID,
+			"right":         rgAcl.Rights,
+			"status":        rgAcl.Status,
+			"type":          rgAcl.Type,
+			"user_group_id": rgAcl.UgroupID,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func dataSourceAccountListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountList, err := utilityAccountListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountList(accountList))
+	d.Set("entry_count", accountList.EntryCount)
+
+	return nil
+}
+
+func dataSourceAccountListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"acl": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by ACL",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by status",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"acl": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"explicit": {
+									Type:     schema.TypeBool,
+									Computed: true,
+								},
+								"guid": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"right": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"status": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"user_group_id": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_reserved_units.go

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

internal/service/cloudapi/account/data_source_account_resource_consumption_list.go

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

internal/service/cloudapi/account/data_source_account_rg_list.go

@@ -1,331 +1,372 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountRGList(argl account.ListRG) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, arg := range argl {
-		temp := map[string]interface{}{
-			"computes":     flattenAccRGComputes(arg.Computes),
-			"resources":    flattenAccRGResources(arg.Resources),
-			"created_by":   arg.CreatedBy,
-			"created_time": arg.CreatedTime,
-			"deleted_by":   arg.DeletedBy,
-			"deleted_time": arg.DeletedTime,
-			"rg_id":        arg.RGID,
-			"milestones":   arg.Milestones,
-			"rg_name":      arg.RGName,
-			"status":       arg.Status,
-			"updated_by":   arg.UpdatedBy,
-			"updated_time": arg.UpdatedTime,
-			"vinses":       arg.VINSes,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func flattenAccRGComputes(argc account.RGComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"started": argc.Started,
-		"stopped": argc.Stopped,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenAccResourceHack(r account.LimitsRG) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cpu":        r.CPU,
-		"disksize":   r.DiskSize,
-		"extips":     r.ExtIPs,
-		"exttraffic": r.ExtTraffic,
-		"gpu":        r.GPU,
-		"ram":        r.RAM,
-		//"seps":       flattenAccountSeps(r.SEPs),
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenAccResourceRg(r account.Resource) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cpu":        r.CPU,
-		"disksize":   r.DiskSize,
-		"extips":     r.ExtIPs,
-		"exttraffic": r.ExtTraffic,
-		"gpu":        r.GPU,
-		"ram":        r.RAM,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenAccRGResources(argr account.RGResources) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"consumed": flattenAccResourceRg(argr.Consumed),
-		"limits":   flattenAccResourceHack(argr.Limits),
-		"reserved": flattenAccResourceRg(argr.Reserved),
-	}
-	res = append(res, temp)
-	return res
-}
-
-func dataSourceAccountRGListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountRGList, err := utilityAccountRGListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountRGList(accountRGList))
-
-	return nil
-}
-
-func dataSourceAccountRGListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"computes": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"started": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"stopped": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"resources": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"consumed": {
-									Type:     schema.TypeList,
-									Computed: true,
-									Elem: &schema.Resource{
-										Schema: map[string]*schema.Schema{
-											"cpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"disksize": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"extips": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"exttraffic": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"gpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"ram": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-										},
-									},
-								},
-
-								"limits": {
-									Type:     schema.TypeList,
-									Computed: true,
-									Elem: &schema.Resource{
-										Schema: map[string]*schema.Schema{
-											"cpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"disksize": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"extips": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"exttraffic": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"gpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"ram": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-										},
-									},
-								},
-								"reserved": {
-									Type:     schema.TypeList,
-									Computed: true,
-									Elem: &schema.Resource{
-										Schema: map[string]*schema.Schema{
-											"cpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"disksize": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"extips": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"exttraffic": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"gpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"ram": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vinses": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountRGList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountRGListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountRGListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountRGList(argl *account.ListRG) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, arg := range argl.Data {
+		temp := map[string]interface{}{
+			"computes":     flattenAccRGComputes(arg.Computes),
+			"resources":    flattenAccRGResources(arg.Resources),
+			"created_by":   arg.CreatedBy,
+			"created_time": arg.CreatedTime,
+			"deleted_by":   arg.DeletedBy,
+			"deleted_time": arg.DeletedTime,
+			"rg_id":        arg.RGID,
+			"milestones":   arg.Milestones,
+			"rg_name":      arg.RGName,
+			"status":       arg.Status,
+			"updated_by":   arg.UpdatedBy,
+			"updated_time": arg.UpdatedTime,
+			"vinses":       arg.VINSes,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func flattenAccRGComputes(argc account.RGComputes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"started": argc.Started,
+		"stopped": argc.Stopped,
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccResourceHack(r account.LimitsRG) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":        r.CPU,
+		"disksize":   r.DiskSize,
+		"extips":     r.ExtIPs,
+		"exttraffic": r.ExtTraffic,
+		"gpu":        r.GPU,
+		"ram":        r.RAM,
+		//"seps":       flattenAccountSeps(r.SEPs),
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccResourceRg(r account.Resource) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"cpu":        r.CPU,
+		"disksize":   r.DiskSize,
+		"extips":     r.ExtIPs,
+		"exttraffic": r.ExtTraffic,
+		"gpu":        r.GPU,
+		"ram":        r.RAM,
+	}
+	res = append(res, temp)
+	return res
+}
+
+func flattenAccRGResources(argr account.RGResources) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	temp := map[string]interface{}{
+		"consumed": flattenAccResourceRg(argr.Consumed),
+		"limits":   flattenAccResourceHack(argr.Limits),
+		"reserved": flattenAccResourceRg(argr.Reserved),
+	}
+	res = append(res, temp)
+	return res
+}
+
+func dataSourceAccountRGListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountRGList, err := utilityAccountRGListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountRGList(accountRGList))
+	d.Set("entry_count", accountRGList.EntryCount)
+
+	return nil
+}
+
+func dataSourceAccountRGListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ViNS ID",
+		},
+		"vm_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by VM ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by status",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"computes": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"started": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"stopped": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"resources": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"consumed": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"cpu": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"disksize": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"extips": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"exttraffic": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"gpu": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"ram": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+										},
+									},
+								},
+
+								"limits": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"cpu": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"disksize": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"extips": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"exttraffic": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"gpu": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"ram": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+										},
+									},
+								},
+								"reserved": {
+									Type:     schema.TypeList,
+									Computed: true,
+									Elem: &schema.Resource{
+										Schema: map[string]*schema.Schema{
+											"cpu": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"disksize": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"extips": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"exttraffic": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"gpu": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+											"ram": {
+												Type:     schema.TypeInt,
+												Computed: true,
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+
+					"created_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"deleted_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"milestones": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"vinses": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountRGList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountRGListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountRGListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_templates_list.go

@@ -1,152 +1,186 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountTemplatesList(atl account.ListTemplates) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, at := range atl {
-		temp := map[string]interface{}{
-			"unc_path":      at.UNCPath,
-			"account_id":    at.AccountID,
-			"desc":          at.Description,
-			"template_id":   at.ID,
-			"template_name": at.Name,
-			"public":        at.Public,
-			"size":          at.Size,
-			"status":        at.Status,
-			"type":          at.Type,
-			"username":      at.Username,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountTemplatesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountTemplatesList, err := utilityAccountTemplatesListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountTemplatesList(accountTemplatesList))
-
-	return nil
-}
-
-func dataSourceAccountTemplatesListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"unc_path": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"template_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"template_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"public": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"size": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"username": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountTemplatessList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountTemplatesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountTemplatesListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountTemplatesList(atl *account.ListTemplates) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(atl.Data))
+	for _, at := range atl.Data {
+		temp := map[string]interface{}{
+			"unc_path":      at.UNCPath,
+			"account_id":    at.AccountID,
+			"desc":          at.Description,
+			"template_id":   at.ID,
+			"template_name": at.Name,
+			"public":        at.Public,
+			"size":          at.Size,
+			"status":        at.Status,
+			"type":          at.Type,
+			"username":      at.Username,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceAccountTemplatesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountTemplatesList, err := utilityAccountTemplatesListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountTemplatesList(accountTemplatesList))
+	d.Set("entry_count", accountTemplatesList.EntryCount)
+	return nil
+}
+
+func dataSourceAccountTemplatesListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"include_deleted": {
+			Type:     schema.TypeBool,
+			Optional: true,
+		},
+		"image_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by image id",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by type",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"unc_path": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"desc": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"template_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"template_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"public": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"size": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"username": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountTemplatessList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountTemplatesListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountTemplatesListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/data_source_account_vins_list.go

@@ -1,187 +1,223 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenAccountVinsList(avl account.ListVINS) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, av := range avl {
-		temp := map[string]interface{}{
-			"account_id":     av.AccountID,
-			"account_name":   av.AccountName,
-			"computes":       av.Computes,
-			"created_by":     av.CreatedBy,
-			"created_time":   av.CreatedTime,
-			"deleted_by":     av.DeletedBy,
-			"deleted_time":   av.DeletedTime,
-			"external_ip":    av.ExternalIP,
-			"vin_id":         av.ID,
-			"vin_name":       av.Name,
-			"network":        av.Network,
-			"pri_vnf_dev_id": av.PriVNFDevID,
-			"rg_id":          av.RGID,
-			"rg_name":        av.RGName,
-			"status":         av.Status,
-			"updated_by":     av.UpdatedBy,
-			"updated_time":   av.UpdatedTime,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountVinsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	accountVinsList, err := utilityAccountVinsListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountVinsList(accountVinsList))
-
-	return nil
-}
-
-func dataSourceAccountVinsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"computes": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"external_ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"vin_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vin_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"network": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"pri_vnf_dev_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceAccountVinsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceAccountVinsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceAccountVinsListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package account
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenAccountVinsList(avl *account.ListVINS) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, av := range avl.Data {
+		temp := map[string]interface{}{
+			"account_id":     av.AccountID,
+			"account_name":   av.AccountName,
+			"computes":       av.Computes,
+			"created_by":     av.CreatedBy,
+			"created_time":   av.CreatedTime,
+			"deleted_by":     av.DeletedBy,
+			"deleted_time":   av.DeletedTime,
+			"external_ip":    av.ExternalIP,
+			"vin_id":         av.ID,
+			"vin_name":       av.Name,
+			"network":        av.Network,
+			"pri_vnf_dev_id": av.PriVNFDevID,
+			"rg_id":          av.RGID,
+			"rg_name":        av.RGName,
+			"status":         av.Status,
+			"updated_by":     av.UpdatedBy,
+			"updated_time":   av.UpdatedTime,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func dataSourceAccountVinsListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	accountVinsList, err := utilityAccountVinsListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenAccountVinsList(accountVinsList))
+	d.Set("entry_count", accountVinsList.EntryCount)
+
+	return nil
+}
+
+func dataSourceAccountVinsListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of the account",
+		},
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ViNS ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"ext_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by external IP",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "Search Result",
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"computes": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"created_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"deleted_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"external_ip": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"vin_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"vin_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"network": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"pri_vnf_dev_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceAccountVinsList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceAccountVinsListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceAccountVinsListSchemaMake(),
+	}
+}

internal/service/cloudapi/account/flattens.go

@@ -7,7 +7,7 @@ import (
 
 func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	d.Set("dc_location", acc.DCLocation)
-	d.Set("resources", flattenAccResources(acc.Resources))
+	// d.Set("resources", flattenAccResources(acc.Resources))
 	d.Set("ckey", acc.CKey)
 	d.Set("acl", flattenAccAcl(acc.ACL))
 	d.Set("company", acc.Company)
@@ -21,7 +21,7 @@ func flattenAccount(d *schema.ResourceData, acc account.RecordAccount) error {
 	d.Set("guid", acc.GUID)
 	d.Set("account_id", acc.ID)
 	d.Set("account_name", acc.Name)
-	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
+	d.Set("resource_limits", flattenAccResourceLimits(acc.ResourceLimits))
 	d.Set("send_access_emails", acc.SendAccessEmails)
 	d.Set("status", acc.Status)
 	d.Set("updated_time", acc.UpdatedTime)
@@ -79,11 +79,19 @@ func flattenAccAcl(acls []account.RecordACL) []map[string]interface{} {
 	return res
 }
 
-func flattenRgResourceLimits(rl account.ResourceLimits) []map[string]interface{} {
+func flattenResourceConsumption(d *schema.ResourceData, acc *account.RecordResourceConsumption) {
+	d.Set("account_id", acc.AccountID)
+	d.Set("consumed", flattenAccResource(acc.Consumed))
+	d.Set("reserved", flattenAccResource(acc.Reserved))
+	d.Set("resource_limits", flattenAccResourceLimits(acc.ResourceLimits))
+}
+
+func flattenAccResourceLimits(rl account.ResourceLimits) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"cu_c":      rl.CUC,
 		"cu_d":      rl.CUD,
+		"cu_dm":     rl.CUDM,
 		"cu_i":      rl.CUI,
 		"cu_m":      rl.CUM,
 		"cu_np":     rl.CUNP,
@@ -95,15 +103,15 @@ func flattenRgResourceLimits(rl account.ResourceLimits) []map[string]interface{}
 
 }
 
-func flattenAccResources(r account.Resources) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"current":  flattenAccResource(r.Current),
-		"reserved": flattenAccResource(r.Reserved),
-	}
-	res = append(res, temp)
-	return res
-}
+// func flattenAccResources(r account.Resources) []map[string]interface{} {
+// 	res := make([]map[string]interface{}, 0)
+// 	temp := map[string]interface{}{
+// 		"current":  flattenAccResource(r.Current),
+// 		"reserved": flattenAccResource(r.Reserved),
+// 	}
+// 	res = append(res, temp)
+// 	return res
+// }
 
 func flattenAccountSeps(seps map[string]map[string]account.DiskUsage) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
@@ -124,14 +132,28 @@ func flattenAccountSeps(seps map[string]map[string]account.DiskUsage) []map[stri
 func flattenAccResource(r account.Resource) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
-		"cpu":        r.CPU,
-		"disksize":   r.DiskSize,
-		"extips":     r.ExtIPs,
-		"exttraffic": r.ExtTraffic,
-		"gpu":        r.GPU,
-		"ram":        r.RAM,
-		"seps":       flattenAccountSeps(r.SEPs),
+		"cpu":           r.CPU,
+		"disk_size":     r.DiskSize,
+		"disk_size_max": r.DiskSizeMax,
+		"ext_ips":       r.ExtIPs,
+		"ext_traffic":   r.ExtTraffic,
+		"gpu":           r.GPU,
+		"ram":           r.RAM,
+		"seps":          flattenAccountSeps(r.SEPs),
 	}
 	res = append(res, temp)
 	return res
 }
+
+func flattenAccResourceConsumption(lrc *account.ListResourceConsumption) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(lrc.Data))
+	for _, rc := range lrc.Data {
+		temp := map[string]interface{}{
+			"consumed":   flattenAccResource(rc.Consumed),
+			"reserved":   flattenAccResource(rc.Reserved),
+			"account_id": rc.AccountID,
+		}
+		res = append(res, temp)
+	}
+	return res
+}

internal/service/cloudapi/account/utility_account_computes_list.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListComputes, error) {
+func utilityAccountComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListComputes, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 
@@ -52,6 +52,46 @@ func utilityAccountComputesListCheckPresence(ctx context.Context, d *schema.Reso
 		AccountID: id,
 	}
 
+	if compute_id, ok := d.GetOk("compute_id"); ok {
+		req.ComputeID = uint64(compute_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if rg_name, ok := d.GetOk("rg_name"); ok {
+		req.RGName = rg_name.(string)
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if tech_status, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = tech_status.(string)
+	}
+
+	if ip_address, ok := d.GetOk("ip_address"); ok {
+		req.IPAddress = ip_address.(string)
+	}
+
+	if extnet_name, ok := d.GetOk("extnet_name"); ok {
+		req.ExtNetName = extnet_name.(string)
+	}
+
+	if extnet_id, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extnet_id.(int))
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
 	log.Debugf("utilityAccountComputesListCheckPresence: load account list")
 	accountComputesList, err := c.CloudAPI().Account().ListComputes(ctx, req)
 	if err != nil {

internal/service/cloudapi/account/utility_account_deleted_list.go

@@ -42,23 +42,29 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListAccounts, error) {
+func utilityAccountDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListAccounts, error) {
 	c := m.(*controller.ControllerCfg)
-	var (
-		pageVal uint64 = 0
-		sizeVal uint64 = 0
-	)
+
+	req := account.ListDeletedRequest{}
 
 	if page, ok := d.GetOk("page"); ok {
-		pageVal = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		sizeVal = uint64(size.(int))
+		req.Page = uint64(page.(int))
 	}
 
-	req := account.ListDeletedRequest{
-		Page: pageVal,
-		Size: sizeVal,
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if acl, ok := d.GetOk("acl"); ok {
+		req.ACL = acl.(string)
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
 	}
 
 	log.Debugf("utilityAccountDeletedListCheckPresence: load")

internal/service/cloudapi/account/utility_account_disks_list.go

@@ -41,7 +41,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountDisksListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListDisks, error) {
+func utilityAccountDisksListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListDisks, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 
@@ -51,6 +51,30 @@ func utilityAccountDisksListCheckPresence(ctx context.Context, d *schema.Resourc
 		AccountID: id,
 	}
 
+	if disk_id, ok := d.GetOk("disk_id"); ok {
+		req.DiskID = uint64(disk_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
+		req.DiskMaxSize = uint64(disk_max_size.(int))
+	}
+
+	if typeVal, ok := d.GetOk("type"); ok {
+		req.Type = typeVal.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
 	accountDisksList, err := c.CloudAPI().Account().ListDisks(ctx, req)
 	if err != nil {
 		return nil, err

internal/service/cloudapi/account/utility_account_flip_groups.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountFlipGroupsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListFLIPGroups, error) {
+func utilityAccountFlipGroupsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListFLIPGroups, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 
@@ -52,6 +52,38 @@ func utilityAccountFlipGroupsListCheckPresence(ctx context.Context, d *schema.Re
 		AccountID: id,
 	}
 
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if vins_id, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vins_id.(int))
+	}
+
+	if vins_name, ok := d.GetOk("vins_name"); ok {
+		req.VINSName = vins_name.(string)
+	}
+
+	if extnet_id, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extnet_id.(int))
+	}
+
+	if by_ip, ok := d.GetOk("by_ip"); ok {
+		req.ByIP = by_ip.(string)
+	}
+
+	if flipgroup_id, ok := d.GetOk("flipgroup_id"); ok {
+		req.FLIPGroupID = uint64(flipgroup_id.(int))
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
 	log.Debugf("utilityAccountFlipGroupsListCheckPresence")
 	accountFlipGroupsList, err := c.CloudAPI().Account().ListFLIPGroups(ctx, req)
 	if err != nil {

internal/service/cloudapi/account/utility_account_get_resource_consumption.go

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

internal/service/cloudapi/account/utility_account_list.go

@@ -42,23 +42,31 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListAccounts, error) {
+func utilityAccountListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListAccounts, error) {
 	c := m.(*controller.ControllerCfg)
-	var (
-		pageVal uint64 = 0
-		sizeVal uint64 = 0
-	)
+	req := account.ListRequest{}
 
 	if page, ok := d.GetOk("page"); ok {
-		pageVal = uint64(page.(int))
+		req.Page = uint64(page.(int))
 	}
 	if size, ok := d.GetOk("size"); ok {
-		sizeVal = uint64(size.(int))
+		req.Size = uint64(size.(int))
 	}
 
-	req := account.ListRequest{
-		Page: pageVal,
-		Size: sizeVal,
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if acl, ok := d.GetOk("acl"); ok {
+		req.ACL = acl.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
 	}
 
 	log.Debugf("utilityAccountListCheckPresence: load account list")

internal/service/cloudapi/account/utility_account_resource_consumption_list.go

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

internal/service/cloudapi/account/utility_account_rg_list.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountRGListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListRG, error) {
+func utilityAccountRGListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListRG, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 
@@ -52,6 +52,34 @@ func utilityAccountRGListCheckPresence(ctx context.Context, d *schema.ResourceDa
 		AccountID: id,
 	}
 
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if vins_id, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vins_id.(int))
+	}
+
+	if vm_id, ok := d.GetOk("vm_id"); ok {
+		req.VMID = uint64(vm_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
 	log.Debugf("utilityAccountRGListCheckPresence: load account list")
 	accountRGList, err := c.CloudAPI().Account().ListRG(ctx, req)
 	if err != nil {

internal/service/cloudapi/account/utility_account_templates_list.go

@@ -42,16 +42,34 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountTemplatesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListTemplates, error) {
+func utilityAccountTemplatesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListTemplates, error) {
 	c := m.(*controller.ControllerCfg)
-	var id uint64
 
-	id = uint64(d.Get("account_id").(int))
+	id := uint64(d.Get("account_id").(int))
 
 	req := account.ListTemplatesRequest{
 		AccountID: id,
 	}
 
+	if include_deleted, ok := d.GetOk("include_deleted"); ok {
+		req.IncludeDeleted = include_deleted.(bool)
+	}
+	if imageId, ok := d.GetOk("image_id"); ok {
+		req.ImageID = uint64(imageId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if typeTemplates, ok := d.GetOk("type"); ok {
+		req.Type = typeTemplates.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
 	log.Debugf("utilityAccountTemplatesListCheckPresence: load")
 	accountTemplatesList, err := c.CloudAPI().Account().ListTemplates(ctx, req)
 	if err != nil {

internal/service/cloudapi/account/utility_account_vins_list.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityAccountVinsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (account.ListVINS, error) {
+func utilityAccountVinsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*account.ListVINS, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 
@@ -52,6 +52,30 @@ func utilityAccountVinsListCheckPresence(ctx context.Context, d *schema.Resource
 		AccountID: id,
 	}
 
+	if vins_id, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vins_id.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if ext_ip, ok := d.GetOk("ext_ip"); ok {
+		req.ExtIP = ext_ip.(string)
+	}
+
 	log.Debugf("utilityAccountVinsListCheckPresence: load account list")
 	accountVinsList, err := c.CloudAPI().Account().ListVINS(ctx, req)
 	if err != nil {

internal/service/cloudapi/bservice/data_source_bservice.go

@@ -1,297 +1,298 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package bservice
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	bs, err := utilityBasicServiceCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.FormatUint(bs.ID, 10))
-
-	flattenService(d, bs)
-
-	return nil
-}
-
-func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"service_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"base_domain": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"architecture": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"compgroup_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compgroup_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"compgroup_role": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"stack_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-
-		"cpu_total": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"disk_total": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"groups": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"computes": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"consistency": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"groups_name": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"service_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"parent_srv_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"parent_srv_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"ram_total": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"snapshots": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"label": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"timestamp": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"valid": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-				},
-			},
-		},
-
-		"ssh_key": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"ssh_user": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"user_managed": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func DataSourceBasicService() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceBasicServiceRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package bservice
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	bs, err := utilityBasicServiceCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(bs.ID, 10))
+
+	flattenService(d, bs)
+
+	return nil
+}
+
+func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"service_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"account_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"base_domain": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"computes": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"architecture": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compgroup_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"compgroup_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"compgroup_role": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"stack_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"tech_status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+
+		"cpu_total": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"disk_total": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"groups": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"computes": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"consistency": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"tech_status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		// "groups_name": {
+		// 	Type:     schema.TypeList,
+		// 	Computed: true,
+		// 	Elem: &schema.Schema{
+		// 		Type: schema.TypeString,
+		// 	},
+		// },
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"service_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"parent_srv_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"parent_srv_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ram_total": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"snapshots": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"label": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"timestamp": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"valid": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+				},
+			},
+		},
+
+		"ssh_key": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"ssh_user": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"user_managed": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceBasicService() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceBasicServiceRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceBasicServiceSchemaMake(),
+	}
+}

internal/service/cloudapi/bservice/data_source_bservice_deleted_list.go

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

internal/service/cloudapi/bservice/data_source_bservice_group.go

@@ -1,304 +1,305 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package bservice
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceBasicServiceGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	bsg, err := utilityBasicServiceGroupCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("account_id", bsg.AccountID)
-	d.Set("account_name", bsg.AccountName)
-	d.Set("computes", flattenBSGroupComputes(bsg.Computes))
-	d.Set("consistency", bsg.Consistency)
-	d.Set("cpu", bsg.CPU)
-	d.Set("created_by", bsg.CreatedBy)
-	d.Set("created_time", bsg.CreatedTime)
-	d.Set("deleted_by", bsg.DeletedBy)
-	d.Set("deleted_time", bsg.DeletedTime)
-	d.Set("disk", bsg.Disk)
-	d.Set("driver", bsg.Driver)
-	d.Set("extnets", bsg.ExtNets)
-	d.Set("gid", bsg.GID)
-	d.Set("guid", bsg.GUID)
-	d.Set("image_id", bsg.ImageID)
-	d.Set("milestones", bsg.Milestones)
-	d.Set("compgroup_name", bsg.Name)
-	d.Set("parents", bsg.Parents)
-	d.Set("ram", bsg.RAM)
-	d.Set("rg_id", bsg.RGID)
-	d.Set("rg_name", bsg.RGName)
-	d.Set("role", bsg.Role)
-	d.Set("sep_id", bsg.SEPID)
-	d.Set("seq_no", bsg.SeqNo)
-	d.Set("status", bsg.Status)
-	d.Set("tech_status", bsg.TechStatus)
-	d.Set("timeout_start", bsg.TimeoutStart)
-	d.Set("updated_by", bsg.UpdatedBy)
-	d.Set("updated_time", bsg.UpdatedTime)
-	d.Set("vinses", bsg.VINSes)
-	return nil
-}
-
-func flattenBSGroupOSUsers(bsgosus bservice.ListOSUsers) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsgosu := range bsgosus {
-		temp := map[string]interface{}{
-			"login":    bsgosu.Login,
-			"password": bsgosu.Password,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func flattenBSGroupComputes(bsgcs bservice.ListGroupComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsgc := range bsgcs {
-		temp := map[string]interface{}{
-			"id":           bsgc.ID,
-			"ip_addresses": bsgc.IPAddresses,
-			"name":         bsgc.Name,
-			"os_users":     flattenBSGroupOSUsers(bsgc.OSUsers),
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"service_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"compgroup_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"ip_addresses": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"os_users": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"login": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"password": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"consistency": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"cpu": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"disk": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"driver": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"extnets": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"image_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"compgroup_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"parents": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"ram": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"role": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"seq_no": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"timeout_start": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vinses": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceBasicServiceGroup() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceBasicServiceGroupRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceGroupSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package bservice
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceBasicServiceGroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	bsg, err := utilityBasicServiceGroupCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("account_id", bsg.AccountID)
+	d.Set("account_name", bsg.AccountName)
+	d.Set("computes", flattenBSGroupComputes(bsg.Computes))
+	d.Set("consistency", bsg.Consistency)
+	d.Set("cpu", bsg.CPU)
+	d.Set("created_by", bsg.CreatedBy)
+	d.Set("created_time", bsg.CreatedTime)
+	d.Set("deleted_by", bsg.DeletedBy)
+	d.Set("deleted_time", bsg.DeletedTime)
+	d.Set("disk", bsg.Disk)
+	d.Set("driver", bsg.Driver)
+	d.Set("extnets", bsg.ExtNets)
+	d.Set("gid", bsg.GID)
+	d.Set("guid", bsg.GUID)
+	d.Set("image_id", bsg.ImageID)
+	d.Set("milestones", bsg.Milestones)
+	d.Set("compgroup_name", bsg.Name)
+	d.Set("parents", bsg.Parents)
+	d.Set("ram", bsg.RAM)
+	d.Set("rg_id", bsg.RGID)
+	d.Set("rg_name", bsg.RGName)
+	d.Set("role", bsg.Role)
+	d.Set("sep_id", bsg.SEPID)
+	d.Set("seq_no", bsg.SeqNo)
+	d.Set("status", bsg.Status)
+	d.Set("tech_status", bsg.TechStatus)
+	d.Set("timeout_start", bsg.TimeoutStart)
+	d.Set("updated_by", bsg.UpdatedBy)
+	d.Set("updated_time", bsg.UpdatedTime)
+	d.Set("vinses", bsg.VINSes)
+	return nil
+}
+
+func flattenBSGroupOSUsers(bsgosus bservice.ListOSUsers) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, bsgosu := range bsgosus {
+		temp := map[string]interface{}{
+			"login":    bsgosu.Login,
+			"password": bsgosu.Password,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenBSGroupComputes(bsgcs bservice.ListGroupComputes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, bsgc := range bsgcs {
+		temp := map[string]interface{}{
+			"id":           bsgc.ID,
+			"ip_addresses": bsgc.IPAddresses,
+			"name":         bsgc.Name,
+			"os_users":     flattenBSGroupOSUsers(bsgc.OSUsers),
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func dataSourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"service_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"compgroup_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"account_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"computes": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ip_addresses": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"os_users": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"login": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"password": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		"consistency": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"cpu": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"disk": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"driver": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"extnets": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"image_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"compgroup_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"parents": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"ram": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"role": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"sep_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"seq_no": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"timeout_start": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"updated_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"vinses": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+	}
+	return res
+}
+
+func DataSourceBasicServiceGroup() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceBasicServiceGroupRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceBasicServiceGroupSchemaMake(),
+	}
+}

internal/service/cloudapi/bservice/data_source_bservice_list.go

@@ -1,228 +1,264 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package bservice
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func flattenBasicServiceList(bsl bservice.ListBasicServices) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bs := range bsl {
-		temp := map[string]interface{}{
-			"account_id":      bs.AccountID,
-			"account_name":    bs.AccountName,
-			"base_domain":     bs.BaseDomain,
-			"created_by":      bs.CreatedBy,
-			"created_time":    bs.CreatedTime,
-			"deleted_by":      bs.DeletedBy,
-			"deleted_time":    bs.DeletedTime,
-			"gid":             bs.GID,
-			"groups":          bs.Groups,
-			"guid":            bs.GUID,
-			"service_id":      bs.ID,
-			"service_name":    bs.Name,
-			"parent_srv_id":   bs.ParentSrvID,
-			"parent_srv_type": bs.ParentSrvType,
-			"rg_id":           bs.RGID,
-			"rg_name":         bs.RGName,
-			"ssh_user":        bs.SSHUser,
-			"status":          bs.Status,
-			"tech_status":     bs.TechStatus,
-			"updated_by":      bs.UpdatedBy,
-			"updated_time":    bs.UpdatedTime,
-			"user_managed":    bs.UserManaged,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceBasicServiceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	basicServiceList, err := utilityBasicServiceListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenBasicServiceList(basicServiceList))
-
-	return nil
-}
-
-func dataSourceBasicServiceListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "ID of the account to query for BasicService instances",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "ID of the resource group to query for BasicService instances",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"base_domain": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"groups": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"service_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"service_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"parent_srv_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"parent_srv_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ssh_user": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"user_managed": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceBasicServiceList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceBasicServiceListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package bservice
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func flattenBasicServiceList(bsl *bservice.ListBasicServices) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, bs := range bsl.Data {
+		temp := map[string]interface{}{
+			"account_id":      bs.AccountID,
+			"account_name":    bs.AccountName,
+			"base_domain":     bs.BaseDomain,
+			"created_by":      bs.CreatedBy,
+			"created_time":    bs.CreatedTime,
+			"deleted_by":      bs.DeletedBy,
+			"deleted_time":    bs.DeletedTime,
+			"gid":             bs.GID,
+			"groups":          bs.Groups,
+			"guid":            bs.GUID,
+			"service_id":      bs.ID,
+			"service_name":    bs.Name,
+			"parent_srv_id":   bs.ParentSrvID,
+			"parent_srv_type": bs.ParentSrvType,
+			"rg_id":           bs.RGID,
+			"rg_name":         bs.RGName,
+			"ssh_user":        bs.SSHUser,
+			"status":          bs.Status,
+			"tech_status":     bs.TechStatus,
+			"updated_by":      bs.UpdatedBy,
+			"updated_time":    bs.UpdatedTime,
+			"user_managed":    bs.UserManaged,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func dataSourceBasicServiceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	basicServiceList, err := utilityBasicServiceListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenBasicServiceList(basicServiceList))
+	d.Set("entry_count", basicServiceList.EntryCount)
+
+	return nil
+}
+
+func dataSourceBasicServiceListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by bservice name",
+		},
+		"rg_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by resource group name",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by status",
+		},
+		"tech_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by tech status",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by account name",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "ID of the account to query for BasicService instances",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "ID of the resource group to query for BasicService instances",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"base_domain": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"deleted_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"deleted_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"gid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"groups": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"guid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"service_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"service_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"parent_srv_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"parent_srv_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ssh_user": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"tech_status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_by": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"updated_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"user_managed": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceBasicServiceList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceBasicServiceListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceBasicServiceListSchemaMake(),
+	}
+}

internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go

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

internal/service/cloudapi/bservice/flattens.go

@@ -30,6 +30,7 @@ func flattenResourceBasicServiceGroup(d *schema.ResourceData, bsg *bservice.Reco
 	d.Set("rg_name", bsg.RGName)
 	d.Set("role", bsg.Role)
 	d.Set("sep_id", bsg.SEPID)
+	d.Set("sep_pool", bsg.PoolName)
 	d.Set("seq_no", bsg.SeqNo)
 	d.Set("status", bsg.Status)
 	d.Set("tech_status", bsg.TechStatus)
@@ -110,7 +111,7 @@ func flattenBasicServiceComputes(bscs bservice.ListComputes) []map[string]interf
 }
 
 func flattenBasicServiceSnapshots(bsrvss bservice.ListSnapshots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(bsrvss))
 	for _, bsrvs := range bsrvss {
 		temp := map[string]interface{}{
 			"guid":      bsrvs.GUID,
@@ -122,3 +123,17 @@ func flattenBasicServiceSnapshots(bsrvss bservice.ListSnapshots) []map[string]in
 	}
 	return res
 }
+
+func flattenBasicServiceSnapshotsList(bsrvss *bservice.ListInfoSnapshots) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(bsrvss.Data))
+	for _, bsrvs := range bsrvss.Data {
+		temp := map[string]interface{}{
+			"guid":      bsrvs.GUID,
+			"label":     bsrvs.Label,
+			"timestamp": bsrvs.Timestamp,
+			"valid":     bsrvs.Valid,
+		}
+		res = append(res, temp)
+	}
+	return res
+}

internal/service/cloudapi/bservice/resource_check_input_values.go

@@ -20,5 +20,5 @@ func existRGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool
 
 	rgId := uint64(d.Get("rg_id").(int))
 
-	return len(rgList.FilterByID(rgId)) != 0, nil
+	return len(rgList.FilterByID(rgId).Data) != 0, nil
 }

internal/service/cloudapi/bservice/utility_bservicce_deleted_list.go

@@ -42,9 +42,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityBasicServiceDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (bservice.ListBasicServices, error) {
+func utilityBasicServiceDeletedListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListBasicServices, error) {
 	c := m.(*controller.ControllerCfg)
-	req := bservice.ListRequest{}
+	req := bservice.ListDeletedRequest{}
 
 	if accountId, ok := d.GetOk("account_id"); ok {
 		req.AccountID = uint64(accountId.(int))

internal/service/cloudapi/bservice/utility_bservice_list.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityBasicServiceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (bservice.ListBasicServices, error) {
+func utilityBasicServiceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListBasicServices, error) {
 	c := m.(*controller.ControllerCfg)
 	req := bservice.ListRequest{}
 
@@ -59,6 +59,30 @@ func utilityBasicServiceListCheckPresence(ctx context.Context, d *schema.Resourc
 		req.Size = uint64(size.(int))
 	}
 
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if rg_name, ok := d.GetOk("rg_name"); ok {
+		req.RGName = rg_name.(string)
+	}
+
+	if tech_status, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = tech_status.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if acc_name, ok := d.GetOk("account_name"); ok {
+		req.AccountName = acc_name.(string)
+	}
+
 	log.Debugf("utilityBasicServiceListCheckPresence")
 	basicServiceList, err := c.CloudAPI().BService().List(ctx, req)
 	if err != nil {

internal/service/cloudapi/bservice/utility_bservice_snapshot_list.go

@@ -42,7 +42,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityBasicServiceSnapshotListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (bservice.ListSnapshots, error) {
+func utilityBasicServiceSnapshotListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*bservice.ListInfoSnapshots, error) {
 	c := m.(*controller.ControllerCfg)
 	var id uint64
 

internal/service/cloudapi/disks/data_source_disk.go

@@ -47,6 +47,7 @@ import (
 func dataSourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_list.go

@@ -1,454 +1,500 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package disks
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceDiskListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	diskList, err := utilityDiskListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenDiskList(diskList))
-
-	return nil
-}
-
-func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "ID of the account the disks belong to",
-		},
-		"type": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "type of the disks",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "The unique ID of the subscriber-owner of the disk",
-					},
-					"account_name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "The name of the subscriber '(account') to whom this disk belongs",
-					},
-					"acl": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					// "boot_partition": {
-					// 	Type:        schema.TypeInt,
-					// 	Computed:    true,
-					// 	Description: "Number of disk partitions",
-					// },
-					"computes": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"compute_id": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"compute_name": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"created_time": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Created time",
-					},
-					"deleted_time": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Deleted time",
-					},
-					"desc": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Description of disk",
-					},
-					"destruction_time": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Time of final deletion",
-					},
-					"devicename": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Name of the device",
-					},
-					// "disk_path": {
-					// 	Type:        schema.TypeString,
-					// 	Computed:    true,
-					// 	Description: "Disk path",
-					// },
-					"gid": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "ID of the grid (platform)",
-					},
-					// "guid": {
-					// 	Type:        schema.TypeInt,
-					// 	Computed:    true,
-					// 	Description: "Disk ID on the storage side",
-					// },
-					"disk_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "The unique ID of the subscriber-owner of the disk",
-					},
-					"image_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Image ID",
-					},
-					"images": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-						Description: "IDs of images using the disk",
-					},
-					"iotune": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"read_bytes_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Number of bytes to read per second",
-								},
-								"read_bytes_sec_max": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Maximum number of bytes to read",
-								},
-								"read_iops_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Number of io read operations per second",
-								},
-								"read_iops_sec_max": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Maximum number of io read operations",
-								},
-								"size_iops_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Size of io operations",
-								},
-								"total_bytes_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Total size bytes per second",
-								},
-								"total_bytes_sec_max": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Maximum total size of bytes per second",
-								},
-								"total_iops_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Total number of io operations per second",
-								},
-								"total_iops_sec_max": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Maximum total number of io operations per second",
-								},
-								"write_bytes_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Number of bytes to write per second",
-								},
-								"write_bytes_sec_max": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Maximum number of bytes to write per second",
-								},
-								"write_iops_sec": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Number of write operations per second",
-								},
-								"write_iops_sec_max": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Maximum number of write operations per second",
-								},
-							},
-						},
-					},
-					// "iqn": {
-					// 	Type:        schema.TypeString,
-					// 	Computed:    true,
-					// 	Description: "Disk IQN",
-					// },
-					// "login": {
-					// 	Type:        schema.TypeString,
-					// 	Computed:    true,
-					// 	Description: "Login to access the disk",
-					// },
-					"machine_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Machine ID",
-					},
-					"machine_name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Machine name",
-					},
-					// "milestones": {
-					// 	Type:        schema.TypeInt,
-					// 	Computed:    true,
-					// 	Description: "Milestones",
-					// },
-					"disk_name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Name of disk",
-					},
-					"order": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Disk order",
-					},
-					"params": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Disk params",
-					},
-					"parent_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "ID of the parent disk",
-					},
-					// "passwd": {
-					// 	Type:        schema.TypeString,
-					// 	Computed:    true,
-					// 	Description: "Password to access the disk",
-					// },
-					"pci_slot": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "ID of the pci slot to which the disk is connected",
-					},
-					"pool": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Pool for disk location",
-					},
-					"present_to": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					// "purge_attempts": {
-					// 	Type:        schema.TypeInt,
-					// 	Computed:    true,
-					// 	Description: "Number of deletion attempts",
-					// },
-					"purge_time": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Time of the last deletion attempt",
-					},
-					// "reality_device_number": {
-					// 	Type:        schema.TypeInt,
-					// 	Computed:    true,
-					// 	Description: "Reality device number",
-					// },
-					// "reference_id": {
-					// 	Type:        schema.TypeString,
-					// 	Computed:    true,
-					// 	Description: "ID of the reference to the disk",
-					// },
-					"res_id": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Resource ID",
-					},
-					"res_name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Name of the resource",
-					},
-					"role": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Disk role",
-					},
-					"sep_id": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Storage endpoint provider ID to create disk",
-					},
-					"sep_type": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
-					},
-					"shareable": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"size_max": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Size in GB",
-					},
-					"size_used": {
-						Type:        schema.TypeFloat,
-						Computed:    true,
-						Description: "Number of used space, in GB",
-					},
-					"snapshots": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"guid": {
-									Type:        schema.TypeString,
-									Computed:    true,
-									Description: "ID of the snapshot",
-								},
-								"label": {
-									Type:        schema.TypeString,
-									Computed:    true,
-									Description: "Name of the snapshot",
-								},
-								"res_id": {
-									Type:        schema.TypeString,
-									Computed:    true,
-									Description: "Reference to the snapshot",
-								},
-								"snap_set_guid": {
-									Type:        schema.TypeString,
-									Computed:    true,
-									Description: "The set snapshot ID",
-								},
-								"snap_set_time": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "The set time of the snapshot",
-								},
-								"timestamp": {
-									Type:        schema.TypeInt,
-									Computed:    true,
-									Description: "Snapshot time",
-								},
-							},
-						},
-					},
-					"status": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Disk status",
-					},
-					"tech_status": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "Technical status of the disk",
-					},
-					"type": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
-					},
-					"vmid": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "Virtual Machine ID (Deprecated)",
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceDiskList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceDiskListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceDiskListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package disks
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceDiskListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	diskList, err := utilityDiskListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenDiskList(diskList))
+	d.Set("entry_count", diskList.EntryCount)
+
+	return nil
+}
+
+func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by name",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by account name",
+		},
+		"disk_max_size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by max disk size",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by status",
+		},
+		"shared": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Find by shared field",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "ID of the account the disks belong to",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "type of the disks",
+		},
+		"sep_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find by sep ID",
+		},
+		"pool_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find by pool name",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The unique ID of the subscriber-owner of the disk",
+					},
+					"account_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "The name of the subscriber '(account') to whom this disk belongs",
+					},
+					"acl": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					// "boot_partition": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Number of disk partitions",
+					// },
+					"computes": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"compute_id": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"compute_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"created_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Created time",
+					},
+					"deleted_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Deleted time",
+					},
+					"desc": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Description of disk",
+					},
+					"destruction_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Time of final deletion",
+					},
+					"devicename": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Name of the device",
+					},
+					// "disk_path": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Disk path",
+					// },
+					"gid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "ID of the grid (platform)",
+					},
+					// "guid": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Disk ID on the storage side",
+					// },
+					"disk_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The unique ID of the subscriber-owner of the disk",
+					},
+					"image_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Image ID",
+					},
+					"images": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "IDs of images using the disk",
+					},
+					"iotune": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"read_bytes_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of bytes to read per second",
+								},
+								"read_bytes_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of bytes to read",
+								},
+								"read_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of io read operations per second",
+								},
+								"read_iops_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of io read operations",
+								},
+								"size_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Size of io operations",
+								},
+								"total_bytes_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Total size bytes per second",
+								},
+								"total_bytes_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum total size of bytes per second",
+								},
+								"total_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Total number of io operations per second",
+								},
+								"total_iops_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum total number of io operations per second",
+								},
+								"write_bytes_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of bytes to write per second",
+								},
+								"write_bytes_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of bytes to write per second",
+								},
+								"write_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of write operations per second",
+								},
+								"write_iops_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of write operations per second",
+								},
+							},
+						},
+					},
+					// "iqn": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Disk IQN",
+					// },
+					// "login": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Login to access the disk",
+					// },
+					"machine_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Machine ID",
+					},
+					"machine_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Machine name",
+					},
+					// "milestones": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Milestones",
+					// },
+					"disk_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Name of disk",
+					},
+					"order": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Disk order",
+					},
+					"params": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Disk params",
+					},
+					"parent_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "ID of the parent disk",
+					},
+					// "passwd": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Password to access the disk",
+					// },
+					"pci_slot": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "ID of the pci slot to which the disk is connected",
+					},
+					"pool": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Pool for disk location",
+					},
+					"present_to": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					// "purge_attempts": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Number of deletion attempts",
+					// },
+					"purge_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Time of the last deletion attempt",
+					},
+					// "reality_device_number": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Reality device number",
+					// },
+					// "reference_id": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "ID of the reference to the disk",
+					// },
+					"res_id": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Resource ID",
+					},
+					"res_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Name of the resource",
+					},
+					"role": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Disk role",
+					},
+					"sep_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Storage endpoint provider ID to create disk",
+					},
+					"sep_type": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
+					},
+					"shareable": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"size_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Size in GB",
+					},
+					"size_used": {
+						Type:        schema.TypeFloat,
+						Computed:    true,
+						Description: "Number of used space, in GB",
+					},
+					"snapshots": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"guid": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "ID of the snapshot",
+								},
+								"label": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "Name of the snapshot",
+								},
+								"res_id": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "Reference to the snapshot",
+								},
+								"snap_set_guid": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "The set snapshot ID",
+								},
+								"snap_set_time": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "The set time of the snapshot",
+								},
+								"timestamp": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Snapshot time",
+								},
+							},
+						},
+					},
+					"status": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Disk status",
+					},
+					"tech_status": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Technical status of the disk",
+					},
+					"type": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+					},
+					"vmid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Virtual Machine ID (Deprecated)",
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceDiskList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceDiskListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceDiskListSchemaMake(),
+	}
+}

internal/service/cloudapi/disks/data_source_disk_list_types.go

@@ -44,17 +44,29 @@ import (
 func dataSourceDiskListTypesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	listTypes, err := utilityDiskListTypesCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
 	id := uuid.New()
 	d.SetId(id.String())
-	d.Set("types", listTypes)
+	d.Set("types", listTypes.Data)
+	d.Set("entry_count", listTypes.EntryCount)
 	return nil
 }
 
 func dataSourceDiskListTypesSchemaMake() map[string]*schema.Schema {
 	res := map[string]*schema.Schema{
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
 		"types": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -63,6 +75,10 @@ func dataSourceDiskListTypesSchemaMake() map[string]*schema.Schema {
 			},
 			Description: "The types of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return res
 }

internal/service/cloudapi/disks/data_source_disk_list_types_detailed.go

@@ -38,16 +38,18 @@ import (
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
-func flattenDiskListTypesDetailed(tld []interface{}) []map[string]interface{} {
+func flattenDiskListTypesDetailed(tld *disks.ListTypes) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
-	for _, typeListDetailed := range tld {
+	for _, typeListDetailed := range tld.Data {
 		toMap := typeListDetailed.(map[string]interface{})
 		temp := map[string]interface{}{
-			"pools":  flattenListTypesDetailedPools(toMap["pools"].([]interface{})),
-			"sep_id": toMap["sepId"].(float64),
+			"pools":    flattenListTypesDetailedPools(toMap["pools"].([]interface{})),
+			"sep_id":   toMap["sepId"].(float64),
+			"sep_name": toMap["sepName"].(string),
 		}
 		res = append(res, temp)
 	}
@@ -59,8 +61,9 @@ func flattenListTypesDetailedPools(pools []interface{}) []interface{} {
 	for _, pool := range pools {
 		toMap := pool.(map[string]interface{})
 		temp := map[string]interface{}{
-			"name":  toMap["name"].(string),
-			"types": toMap["types"].([]interface{}),
+			"name":   toMap["name"].(string),
+			"system": toMap["system"].(string),
+			"types":  toMap["types"].([]interface{}),
 		}
 		res = append(res, temp)
 	}
@@ -71,17 +74,29 @@ func flattenListTypesDetailedPools(pools []interface{}) []interface{} {
 func dataSourceDiskListTypesDetailedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	listTypesDetailed, err := utilityDiskListTypesDetailedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenDiskListTypesDetailed(listTypesDetailed))
+	d.Set("entry_count", listTypesDetailed.EntryCount)
 	return nil
 }
 
 func dataSourceDiskListTypesDetailedSchemaMake() map[string]*schema.Schema {
 	res := map[string]*schema.Schema{
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
 		"items": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -97,6 +112,10 @@ func dataSourceDiskListTypesDetailedSchemaMake() map[string]*schema.Schema {
 									Computed:    true,
 									Description: "Pool name",
 								},
+								"system": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
 								"types": {
 									Type:     schema.TypeList,
 									Computed: true,
@@ -113,9 +132,17 @@ func dataSourceDiskListTypesDetailedSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Storage endpoint provider ID to create disk",
 					},
+					"sep_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return res
 }

internal/service/cloudapi/disks/data_source_disk_list_unattached.go

@@ -44,12 +44,14 @@ import (
 func dataSourceDiskListUnattachedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	diskListUnattached, err := utilityDiskListUnattachedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenDiskListUnattached(diskListUnattached))
+	d.Set("entry_count", diskListUnattached.EntryCount)
 
 	return nil
 }
@@ -71,12 +73,56 @@ func DataSourceDiskListUnattached() *schema.Resource {
 
 func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by ID",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by account name",
+		},
+		"disk_max_size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by max disk size",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by status",
+		},
 		"account_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
 			Description: "ID of the account the disks belong to",
 		},
-
+		"sep_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find by sep ID",
+		},
+		"pool_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "find by pool name",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "type of the disks",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
 		"items": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -330,6 +376,11 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "Storage endpoint provider ID to create disk",
 					},
+					"shareable": {
+						Type:        schema.TypeBool,
+						Computed:    true,
+						Description: "shareable",
+					},
 					"size_max": {
 						Type:        schema.TypeInt,
 						Computed:    true,
@@ -401,6 +452,10 @@ func dataSourceDiskListUnattachedSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return res
 }

internal/service/cloudapi/disks/data_source_disk_snapshot.go

@@ -45,6 +45,7 @@ import (
 func dataSourceDiskSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_disk_snapshot_list.go

@@ -44,6 +44,7 @@ import (
 func dataSourceDiskSnapshotListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/disks/data_source_list_deleted.go

@@ -4,6 +4,7 @@ Authors:
 Petr Krutov, <petr.krutov@digitalenergy.online>
 Stanislav Solovev, <spsolovev@digitalenergy.online>
 Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -42,18 +43,433 @@ import (
 )
 
 func dataSourceDiskListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	diskList, err := utilityDiskListCheckPresence(ctx, d, m)
+	diskList, err := utilityDiskListDeletedCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenDiskList(diskList))
+	d.Set("entry_count", diskList.EntryCount)
 
 	return nil
 }
 
+func dataSourceDiskDeletedListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by disk ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by disk name",
+		},
+		"account_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by account name",
+		},
+		"disk_max_size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by max disk size",
+		},
+		"shared": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Find shared disks",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "ID of the account the disks belong to",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "type of the disks",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The unique ID of the subscriber-owner of the disk",
+					},
+					"account_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "The name of the subscriber '(account') to whom this disk belongs",
+					},
+					"acl": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					// "boot_partition": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Number of disk partitions",
+					// },
+					"computes": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"compute_id": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"compute_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"created_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Created time",
+					},
+					"deleted_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Deleted time",
+					},
+					"desc": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Description of disk",
+					},
+					"destruction_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Time of final deletion",
+					},
+					"devicename": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Name of the device",
+					},
+					// "disk_path": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Disk path",
+					// },
+					"gid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "ID of the grid (platform)",
+					},
+					// "guid": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Disk ID on the storage side",
+					// },
+					"disk_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "The unique ID of the subscriber-owner of the disk",
+					},
+					"image_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Image ID",
+					},
+					"images": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+						Description: "IDs of images using the disk",
+					},
+					"iotune": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"read_bytes_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of bytes to read per second",
+								},
+								"read_bytes_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of bytes to read",
+								},
+								"read_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of io read operations per second",
+								},
+								"read_iops_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of io read operations",
+								},
+								"size_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Size of io operations",
+								},
+								"total_bytes_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Total size bytes per second",
+								},
+								"total_bytes_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum total size of bytes per second",
+								},
+								"total_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Total number of io operations per second",
+								},
+								"total_iops_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum total number of io operations per second",
+								},
+								"write_bytes_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of bytes to write per second",
+								},
+								"write_bytes_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of bytes to write per second",
+								},
+								"write_iops_sec": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Number of write operations per second",
+								},
+								"write_iops_sec_max": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Maximum number of write operations per second",
+								},
+							},
+						},
+					},
+					// "iqn": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Disk IQN",
+					// },
+					// "login": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Login to access the disk",
+					// },
+					"machine_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Machine ID",
+					},
+					"machine_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Machine name",
+					},
+					// "milestones": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Milestones",
+					// },
+					"disk_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Name of disk",
+					},
+					"order": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Disk order",
+					},
+					"params": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Disk params",
+					},
+					"parent_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "ID of the parent disk",
+					},
+					// "passwd": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "Password to access the disk",
+					// },
+					"pci_slot": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "ID of the pci slot to which the disk is connected",
+					},
+					"pool": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Pool for disk location",
+					},
+					"present_to": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					// "purge_attempts": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Number of deletion attempts",
+					// },
+					"purge_time": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Time of the last deletion attempt",
+					},
+					// "reality_device_number": {
+					// 	Type:        schema.TypeInt,
+					// 	Computed:    true,
+					// 	Description: "Reality device number",
+					// },
+					// "reference_id": {
+					// 	Type:        schema.TypeString,
+					// 	Computed:    true,
+					// 	Description: "ID of the reference to the disk",
+					// },
+					"res_id": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Resource ID",
+					},
+					"res_name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Name of the resource",
+					},
+					"role": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Disk role",
+					},
+					"sep_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Storage endpoint provider ID to create disk",
+					},
+					"sep_type": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Type SEP. Defines the type of storage system and contains one of the values set in the cloud platform",
+					},
+					"shareable": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
+					"size_max": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Size in GB",
+					},
+					"size_used": {
+						Type:        schema.TypeFloat,
+						Computed:    true,
+						Description: "Number of used space, in GB",
+					},
+					"snapshots": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"guid": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "ID of the snapshot",
+								},
+								"label": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "Name of the snapshot",
+								},
+								"res_id": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "Reference to the snapshot",
+								},
+								"snap_set_guid": {
+									Type:        schema.TypeString,
+									Computed:    true,
+									Description: "The set snapshot ID",
+								},
+								"snap_set_time": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "The set time of the snapshot",
+								},
+								"timestamp": {
+									Type:        schema.TypeInt,
+									Computed:    true,
+									Description: "Snapshot time",
+								},
+							},
+						},
+					},
+					"status": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Disk status",
+					},
+					"tech_status": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "Technical status of the disk",
+					},
+					"type": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+					},
+					"vmid": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "Virtual Machine ID (Deprecated)",
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
 func DataSourceDiskListDeleted() *schema.Resource {
 	return &schema.Resource{
 		SchemaVersion: 1,
@@ -64,6 +480,6 @@ func DataSourceDiskListDeleted() *schema.Resource {
 			Default: &constants.Timeout60s,
 		},
 
-		Schema: dataSourceDiskListSchemaMake(),
+		Schema: dataSourceDiskDeletedListSchemaMake(),
 	}
 }

internal/service/cloudapi/disks/flattens.go

@@ -16,9 +16,9 @@ func flattenDiskSnapshot(d *schema.ResourceData, snapshot disks.ItemSnapshot) {
 	d.Set("snap_set_time", snapshot.SnapSetTime)
 }
 
-func flattenDiskListUnattached(ul disks.ListDisksUnattached) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, unattachedDisk := range ul {
+func flattenDiskListUnattached(ul *disks.ListDisksUnattached) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(ul.Data))
+	for _, unattachedDisk := range ul.Data {
 		unattachedDiskAcl, _ := json.Marshal(unattachedDisk.ACL)
 		tmp := map[string]interface{}{
 			"_ckey":                 unattachedDisk.CKey,
@@ -56,6 +56,7 @@ func flattenDiskListUnattached(ul disks.ListDisksUnattached) []map[string]interf
 			"res_name":              unattachedDisk.ResName,
 			"role":                  unattachedDisk.Role,
 			"sep_id":                unattachedDisk.SEPID,
+			"shareable":             unattachedDisk.Shareable,
 			"size_max":              unattachedDisk.SizeMax,
 			"size_used":             unattachedDisk.SizeUsed,
 			"snapshots":             flattenDiskSnapshotList(unattachedDisk.Snapshots),
@@ -120,7 +121,7 @@ func flattenDisk(d *schema.ResourceData, disk *disks.RecordDisk) {
 }
 
 func flattenDiskSnapshotList(sl disks.ListSnapshots) []interface{} {
-	res := make([]interface{}, 0)
+	res := make([]interface{}, 0, len(sl))
 	for _, snapshot := range sl {
 		temp := map[string]interface{}{
 			"guid":          snapshot.GUID,
@@ -136,9 +137,9 @@ func flattenDiskSnapshotList(sl disks.ListSnapshots) []interface{} {
 	return res
 }
 
-func flattenDiskList(dl disks.ListDisks) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, disk := range dl {
+func flattenDiskList(dl *disks.ListDisks) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(dl.Data))
+	for _, disk := range dl.Data {
 		diskAcl, _ := json.Marshal(disk.ACL)
 		temp := map[string]interface{}{
 			"account_id":       disk.AccountID,

internal/service/cloudapi/disks/resource_check_input_values.go

@@ -19,7 +19,7 @@ func existAccountID(ctx context.Context, d *schema.ResourceData, m interface{})
 		return false, err
 	}
 
-	return len(accountList.FilterByID(accountId)) != 0, nil
+	return len(accountList.FilterByID(accountId).Data) != 0, nil
 }
 
 func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
@@ -32,5 +32,5 @@ func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool,
 		return false, err
 	}
 
-	return len(locationList.FilterByGID(gid)) != 0, nil
+	return len(locationList.FilterByGID(gid).Data) != 0, nil
 }

internal/service/cloudapi/disks/resource_disk.go

@@ -95,6 +95,7 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 
 	diskId, err := c.CloudAPI().Disks().Create(ctx, req)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -142,7 +143,7 @@ func resourceDiskCreate(ctx context.Context, d *schema.ResourceData, m interface
 }
 
 func resourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	c := m.(*controller.ControllerCfg)
+	// c := m.(*controller.ControllerCfg)
 	warnings := dc.Warnings{}
 
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
@@ -157,23 +158,24 @@ func resourceDiskRead(ctx context.Context, d *schema.ResourceData, m interface{}
 	case status.Destroyed, status.Purged:
 		d.Set("disk_id", 0)
 		d.SetId("")
-		return resourceDiskCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceDiskCreate(ctx, d, m)
 	case status.Deleted:
-		hasChangeState = true
-		req := disks.RestoreRequest{
-			DiskID: disk.ID,
-		}
+		// hasChangeState = true
+		// req := disks.RestoreRequest{
+		// 	DiskID: disk.ID,
+		// }
 
-		if reason, ok := d.GetOk("reason"); ok {
-			req.Reason = reason.(string)
-		} else {
-			req.Reason = "Terraform automatic restore"
-		}
+		// if reason, ok := d.GetOk("reason"); ok {
+		// 	req.Reason = reason.(string)
+		// } else {
+		// 	req.Reason = "Terraform automatic restore"
+		// }
 
-		_, err := c.CloudAPI().Disks().Restore(ctx, req)
-		if err != nil {
-			warnings.Add(err)
-		}
+		// _, err := c.CloudAPI().Disks().Restore(ctx, req)
+		// if err != nil {
+		// 	warnings.Add(err)
+		// }
 	case status.Assigned:
 	case status.Modeled:
 		return diag.Errorf("The disk is in status: %s, please, contact support for more information", disk.Status)
@@ -218,6 +220,7 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -227,7 +230,8 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 	case status.Destroyed, status.Purged:
 		d.Set("disk_id", 0)
 		d.SetId("")
-		return resourceDiskCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceDiskCreate(ctx, d, m)
 	case status.Deleted:
 		hasChangeState = true
 		req := disks.RestoreRequest{
@@ -271,7 +275,7 @@ func resourceDiskUpdate(ctx context.Context, d *schema.ResourceData, m interface
 				Size:   uint64(newSize.(int)),
 			}
 
-			_, err := c.CloudAPI().Disks().Resize(ctx, req)
+			_, err := c.CloudAPI().Disks().Resize2(ctx, req)
 			if err != nil {
 				return diag.FromErr(err)
 			}
@@ -375,9 +379,9 @@ func resourceDiskDelete(ctx context.Context, d *schema.ResourceData, m interface
 func resourceDiskSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			ForceNew:    true,
+			Type:     schema.TypeInt,
+			Required: true,
+			//ForceNew:    true,
 			Description: "The unique ID of the subscriber-owner of the disk",
 		},
 		"disk_name": {
@@ -391,9 +395,9 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			Description: "Size in GB",
 		},
 		"gid": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			ForceNew:    true,
+			Type:     schema.TypeInt,
+			Required: true,
+			//ForceNew:    true,
 			Description: "ID of the grid (platform)",
 		},
 		"pool": {

internal/service/cloudapi/disks/resource_disk_snapshot.go

@@ -83,6 +83,7 @@ func resourceDiskSnapshotCreate(ctx context.Context, d *schema.ResourceData, m i
 func resourceDiskSnapshotRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	disk, err := utilityDiskCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
@@ -169,15 +170,15 @@ func resourceDiskSnapshotDelete(ctx context.Context, d *schema.ResourceData, m i
 func resourceDiskSnapshotSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"disk_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			ForceNew:    true,
+			Type:     schema.TypeInt,
+			Required: true,
+			//ForceNew:    true,
 			Description: "The unique ID of the subscriber-owner of the disk",
 		},
 		"label": {
-			Type:        schema.TypeString,
-			Required:    true,
-			ForceNew:    true,
+			Type:     schema.TypeString,
+			Required: true,
+			//ForceNew:    true,
 			Description: "Name of the snapshot",
 		},
 		"rollback": {

internal/service/cloudapi/disks/utility_disk_list.go

@@ -43,22 +43,46 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (disks.ListDisks, error) {
+func utilityDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.ListDisks, error) {
 	c := m.(*controller.ControllerCfg)
 	req := disks.ListRequest{}
 
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if account_name, ok := d.GetOk("account_name"); ok {
+		req.AccountName = account_name.(string)
+	}
+	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
+		req.DiskMaxSize = int64(disk_max_size.(int))
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if shared, ok := d.GetOk("shared"); ok {
+		req.Shared = shared.(bool)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if diskType, ok := d.GetOk("type"); ok {
+		req.Type = strings.ToUpper(diskType.(string))
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.AccountID = uint64(sepId.(int))
+	}
+	if pool_name, ok := d.GetOk("pool_name"); ok {
+		req.Pool = pool_name.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}
 	if size, ok := d.GetOk("size"); ok {
 		req.Size = uint64(size.(int))
 	}
-	if diskType, ok := d.GetOk("type"); ok {
-		req.Type = strings.ToUpper(diskType.(string))
-	}
-	if accountId, ok := d.GetOk("accountId"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
 
 	log.Debugf("utilityDiskListCheckPresence: load disk list")
 	diskList, err := c.CloudAPI().Disks().List(ctx, req)

internal/service/cloudapi/disks/utility_disk_list_deleted.go

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

internal/service/cloudapi/disks/utility_disk_list_unattached.go

@@ -9,12 +9,40 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
-func utilityDiskListUnattachedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (disks.ListDisksUnattached, error) {
+func utilityDiskListUnattachedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.ListDisksUnattached, error) {
 	c := m.(*controller.ControllerCfg)
 	req := disks.ListUnattachedRequest{}
-	if accountId, ok := d.GetOk("accountId"); ok {
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+	if account_name, ok := d.GetOk("account_name"); ok {
+		req.AccountName = account_name.(string)
+	}
+	if disk_max_size, ok := d.GetOk("disk_max_size"); ok {
+		req.DiskMaxSize = int64(disk_max_size.(int))
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if diskType, ok := d.GetOk("type"); ok {
+		req.Type = diskType.(string)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
 		req.AccountID = uint64(accountId.(int))
 	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.AccountID = uint64(sepId.(int))
+	}
+	if pool_name, ok := d.GetOk("pool_name"); ok {
+		req.Pool = pool_name.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
 
 	log.Debugf("utilityDiskListUnattachedCheckPresence: load disk Unattached list")
 	unattachedList, err := c.CloudAPI().Disks().ListUnattached(ctx, req)

internal/service/cloudapi/disks/utility_disk_types_detailed_list.go

@@ -41,11 +41,18 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
-func utilityDiskListTypesDetailedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]interface{}, error) {
+func utilityDiskListTypesDetailedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.ListTypes, error) {
 	c := m.(*controller.ControllerCfg)
 	req := disks.ListTypesRequest{
 		Detailed: true,
 	}
+	
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
 
 	log.Debugf("utilityDiskListTypesDetailedCheckPresence: load disk list Types Detailed")
 	listTypesDetailed, err := c.CloudAPI().Disks().ListTypes(ctx, req)

internal/service/cloudapi/disks/utility_disk_types_list.go

@@ -41,12 +41,19 @@ import (
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
-func utilityDiskListTypesCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]interface{}, error) {
+func utilityDiskListTypesCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*disks.ListTypes, error) {
 	c := m.(*controller.ControllerCfg)
 	req := disks.ListTypesRequest{
 		Detailed: false,
 	}
 
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
 	log.Debugf("utilityDiskListTypesCheckPresence: load disk list Types Detailed")
 	typesList, err := c.CloudAPI().Disks().ListTypes(ctx, req)
 	if err != nil {

internal/service/cloudapi/extnet/data_source_extnet.go

@@ -1,291 +1,286 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package extnet
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceExtnetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	e, err := utilityExtnetCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.FormatUint(e.ID, 10))
-	flattenExtnet(d, e)
-
-	return nil
-}
-
-func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"net_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "meta",
-		},
-		"check__ips": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"check_ips": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"default": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"default_qos": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"e_rate": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"e_burst": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"in_burst": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"in_rate": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"dns": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"excluded": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"client_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"mac": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"vm_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"free_ips": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"gateway": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"ipcidr": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"net_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"network": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"network_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"pre_reservations_num": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"prefix": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"pri_vnf_dev_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"reservations": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"client_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"domainname": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"hostname": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"mac": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"vm_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"shared_with": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"vlan_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vnfs": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"dhcp": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceExtnet() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceExtnetRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceExtnetSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceExtnetRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	e, err := utilityExtnetCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(e.ID, 10))
+	flattenExtnet(d, e)
+
+	return nil
+}
+
+func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"net_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"ckey": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"meta": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+			Description: "meta",
+		},
+		"check_ips": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"default": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"default_qos": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"e_rate": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"e_burst": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"in_burst": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"in_rate": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"desc": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"dns": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"excluded": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"client_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"mac": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ip": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"vm_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"free_ips": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"gateway": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"ipcidr": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"net_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"network": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"network_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"pre_reservations_num": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"prefix": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"pri_vnf_dev_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"reservations": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"client_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"domainname": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"hostname": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"desc": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ip": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"mac": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"vm_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"shared_with": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"vlan_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"vnfs": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"dhcp": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+	}
+	return res
+}
+
+func DataSourceExtnet() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceExtnetRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceExtnetSchemaMake(),
+	}
+}

internal/service/cloudapi/extnet/data_source_extnet_computes_list.go

@@ -1,137 +1,162 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package extnet
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceExtnetComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	extnetComputesList, err := utilityExtnetComputesListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenExtnetComputesList(extnetComputesList))
-
-	return nil
-}
-
-func dataSourceExtnetComputesListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "filter by account ID",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"extnets": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"net_id": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ipaddr": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"ipcidr": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"name": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func DataSourceExtnetComputesList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceExtnetComputesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceExtnetComputesListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceExtnetComputesListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	extnetComputesList, err := utilityExtnetComputesListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenExtnetComputesList(extnetComputesList))
+	d.Set("entry_count", extnetComputesList.EntryCount)
+	return nil
+}
+
+func dataSourceExtnetComputesListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "filter by account ID",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"compute_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by compute ID",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"extnets": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"net_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"ipaddr": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"ipcidr": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+							},
+						},
+					},
+					"id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"rg_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"rg_name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceExtnetComputesList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceExtnetComputesListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceExtnetComputesListSchemaMake(),
+	}
+}

internal/service/cloudapi/extnet/data_source_extnet_default.go

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

internal/service/cloudapi/extnet/data_source_extnet_list.go

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

internal/service/cloudapi/extnet/flattens.go

@@ -9,8 +9,7 @@ import (
 func flattenExtnet(d *schema.ResourceData, e *extnet.RecordExtNet) {
 	d.Set("ckey", e.CKey)
 	d.Set("meta", flattens.FlattenMeta(e.Meta))
-	d.Set("check__ips", e.CheckIPs)
-	d.Set("check_ips", e.CheckIps)
+	d.Set("check_ips", e.CheckIPs)
 	d.Set("default", e.Default)
 	d.Set("default_qos", flattenExtnetDefaultQos(e.DefaultQOS))
 	d.Set("desc", e.Description)
@@ -36,7 +35,7 @@ func flattenExtnet(d *schema.ResourceData, e *extnet.RecordExtNet) {
 }
 
 func flattenExcluded(ex []extnet.Excluded) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(ex))
 	for _, item := range ex {
 		temp := map[string]interface{}{
 			"client_type": item.ClientType,
@@ -52,7 +51,7 @@ func flattenExcluded(ex []extnet.Excluded) []map[string]interface{} {
 }
 
 func flattenExtnetReservations(ers extnet.ListReservations) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(ers))
 	for _, er := range ers {
 		temp := map[string]interface{}{
 			"client_type": er.ClientType,
@@ -93,7 +92,7 @@ func flattenExtnetVNFS(evnfs extnet.VNFs) []map[string]interface{} {
 }
 
 func flattenExtnetsComputes(ecs extnet.ListExtNetExtends) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(ecs))
 	for _, ec := range ecs {
 		temp := map[string]interface{}{
 			"net_id": ec.ID,
@@ -106,9 +105,9 @@ func flattenExtnetsComputes(ecs extnet.ListExtNetExtends) []map[string]interface
 	return res
 }
 
-func flattenExtnetComputesList(ecl extnet.ListExtNetComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, ec := range ecl {
+func flattenExtnetComputesList(ecl *extnet.ListExtNetComputes) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(ecl.Data))
+	for _, ec := range ecl.Data {
 		temp := map[string]interface{}{
 			"account_id":   ec.AccountID,
 			"account_name": ec.AccountName,
@@ -123,13 +122,14 @@ func flattenExtnetComputesList(ecl extnet.ListExtNetComputes) []map[string]inter
 	return res
 }
 
-func flattenExtnetList(el extnet.ListExtNets) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, e := range el {
+func flattenExtnetList(el *extnet.ListExtNets) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(el.Data))
+	for _, e := range el.Data {
 		temp := map[string]interface{}{
 			"net_id": e.ID,
 			"ipcidr": e.IPCIDR,
 			"name":   e.Name,
+			"status": e.Status,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudapi/extnet/utility_extnet_computes_list.go

@@ -42,12 +42,26 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityExtnetComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (extnet.ListExtNetComputes, error) {
+func utilityExtnetComputesListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*extnet.ListExtNetComputes, error) {
 	c := m.(*controller.ControllerCfg)
 	req := extnet.ListComputesRequest{
 		AccountID: uint64(d.Get("account_id").(int)),
 	}
 
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+	if compute_id, ok := d.GetOk("compute_id"); ok {
+		req.ComputeID = uint64(compute_id.(int))
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+
 	log.Debugf("utilityExtnetComputesListCheckPresence")
 	extnetComputesList, err := c.CloudAPI().ExtNet().ListComputes(ctx, req)
 	if err != nil {

internal/service/cloudapi/extnet/utility_extnet_list.go

@@ -42,13 +42,31 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityExtnetListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (extnet.ListExtNets, error) {
+func utilityExtnetListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*extnet.ListExtNets, error) {
 	c := m.(*controller.ControllerCfg)
 	req := extnet.ListRequest{}
 
 	if accountId, ok := d.GetOk("account_id"); ok {
 		req.AccountID = uint64(accountId.(int))
 	}
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if network, ok := d.GetOk("network"); ok {
+		req.Network = network.(string)
+	}
+	if vlan_id, ok := d.GetOk("vlan_id"); ok {
+		req.VLANID = uint64(vlan_id.(int))
+	}
+	if vnfdev_id, ok := d.GetOk("vnfdev_id"); ok {
+		req.VNFDevID = uint64(vnfdev_id.(int))
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
 	if page, ok := d.GetOk("page"); ok {
 		req.Page = uint64(page.(int))
 	}

internal/service/cloudapi/flipgroup/data_source_flipgroup.go

@@ -1,123 +1,184 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-func dataSourceAccountFlipGroupSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"client_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"conn_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"default_gw": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"fg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"ip": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"fg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"net_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"net_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"netmask": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package flipgroup
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceFlipgroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	flattenFlipgroup(d, fg)
+	d.SetId(fmt.Sprint(fg.ID))
+
+	return nil
+}
+
+func dataSourceFlipgroupSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"flipgroup_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Flipgroupd ID",
+		},
+		"account_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"client_ids": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"client_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"conn_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"conn_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"default_gw": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"desc": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"ip": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"net_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"net_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"network": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rg_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func DataSourceFlipgroup() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceFlipgroupRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout180s,
+			Default: &constants.Timeout180s,
+		},
+
+		Schema: dataSourceFlipgroupSchemaMake(),
+	}
+}

internal/service/cloudapi/flipgroup/data_source_flipgroup_list.go

@@ -0,0 +1,218 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package flipgroup
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceFlipgroupList(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	fg_list, err := utilityFlipgroupListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+
+	d.Set("items", flattenFlipgroupList(fg_list))
+	d.Set("entry_count", fg_list.EntryCount)
+
+	return nil
+}
+
+func dataSourceFlipgroupListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by Name",
+		},
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ViNS ID",
+		},
+		"vins_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by ViNS name",
+		},
+		"extnet_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ExtNetID",
+		},
+		"by_ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by IP-address",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"flipgroup_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"client_ids": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"client_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"conn_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"conn_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"default_gw": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"desc": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"gid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"milestones": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"net_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"net_type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"ip": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"net_mask": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"ckey": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"meta": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func DataSourceFlipGroupList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceFlipgroupList,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout180s,
+			Default: &constants.Timeout180s,
+		},
+
+		Schema: dataSourceFlipgroupListSchemaMake(),
+	}
+}

internal/service/cloudapi/flipgroup/flattens.go

@@ -0,0 +1,99 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package flipgroup
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/flipgroup"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/flattens"
+)
+
+func flattenFlipgroup(d *schema.ResourceData, fg *flipgroup.RecordFLIPGroup) {
+	d.Set("account_id", fg.AccountID)
+	d.Set("account_name", fg.AccountName)
+	d.Set("client_ids", fg.ClientIDs)
+	d.Set("client_type", fg.ClientType)
+	d.Set("conn_id", fg.ConnID)
+	d.Set("conn_type", fg.ConnType)
+	d.Set("created_by", fg.CreatedBy)
+	d.Set("created_time", fg.CreatedTime)
+	d.Set("default_gw", fg.DefaultGW)
+	d.Set("deleted_by", fg.DeletedBy)
+	d.Set("deleted_time", fg.DeletedTime)
+	d.Set("desc", fg.Description)
+	d.Set("gid", fg.GID)
+	d.Set("guid", fg.GUID)
+	d.Set("flipgroup_id", fg.ID)
+	d.Set("ip", fg.IP)
+	d.Set("milestones", fg.Milestones)
+	d.Set("name", fg.Name)
+	d.Set("net_id", fg.NetID)
+	d.Set("net_type", fg.NetType)
+	d.Set("network", fg.Network)
+	d.Set("rg_id", fg.RGID)
+	d.Set("rg_name", fg.RGName)
+	d.Set("status", fg.Status)
+	d.Set("updated_by", fg.UpdatedBy)
+	d.Set("updated_time", fg.UpdatedTime)
+}
+
+func flattenFlipgroupList(fg_list *flipgroup.ListFLIPGroups) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, fg := range fg_list.Data {
+		temp := map[string]interface{}{
+			"ckey":         fg.CKey,
+			"meta":         flattens.FlattenMeta(fg.Meta),
+			"account_id":   fg.AccountID,
+			"client_ids":   fg.ClientIDs,
+			"client_type":  fg.ClientType,
+			"conn_id":      fg.ConnID,
+			"conn_type":    fg.ConnType,
+			"default_gw":   fg.DefaultGW,
+			"desc":         fg.Description,
+			"gid":          fg.GID,
+			"guid":         fg.GUID,
+			"flipgroup_id": fg.ID,
+			"ip":           fg.IP,
+			"milestones":   fg.Milestones,
+			"name":         fg.Name,
+			"net_id":       fg.NetID,
+			"net_type":     fg.NetType,
+			"net_mask":     fg.NetMask,
+			"status":       fg.Status,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}

internal/service/cloudapi/flipgroup/resource_flipgroup.go

@@ -0,0 +1,306 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package flipgroup
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/flipgroup"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourceFlipgroupCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceFlipgroupCreate called with name: %s, accountID %v", d.Get("name").(string), d.Get("account_id").(int))
+
+	c := m.(*controller.ControllerCfg)
+	req := flipgroup.CreateRequest{
+		AccountID:   uint64(d.Get("account_id").(int)),
+		Name:        d.Get("name").(string),
+		NetType:     d.Get("net_type").(string),
+		NetID:       uint64(d.Get("net_id").(int)),
+		ClientType:  d.Get("client_type").(string),
+		IP:          d.Get("ip").(string),
+		Description: d.Get("desc").(string),
+	}
+
+	resp, err := c.CloudAPI().FLIPGroup().Create(ctx, req)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(fmt.Sprint(resp.ID))
+
+	var warnings dc.Warnings
+
+	if client_ids, ok := d.GetOk("client_ids"); ok {
+		casted := client_ids.([]interface{})
+		addComputesAfterCreation(ctx, &warnings, c, casted, resp.ID)
+	}
+
+	defer resourceFlipgroupRead(ctx, d, m)
+	return warnings.Get()
+}
+
+func resourceFlipgroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	flattenFlipgroup(d, fg)
+
+	return nil
+}
+
+func resourceFlipgroupUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceFlipgroupUpdate called with id: %v", d.Get("flipgroup_id").(int))
+	c := m.(*controller.ControllerCfg)
+	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	var warnings dc.Warnings
+	basicUpdate := false
+	req := flipgroup.EditRequest{FLIPGroupID: fg.ID}
+
+	if d.HasChange("desc") {
+		req.Description = d.Get("desc").(string)
+		basicUpdate = true
+	}
+
+	if d.HasChange("name") {
+		req.Name = d.Get("name").(string)
+		basicUpdate = true
+	}
+
+	if basicUpdate {
+		_, err := c.CloudAPI().FLIPGroup().Edit(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	if d.HasChange("client_ids") {
+		handleClientIDsUpdate(ctx, d, c, fg, &warnings)
+	}
+
+	defer resourceFlipgroupRead(ctx, d, m)
+	return warnings.Get()
+}
+
+func resourceFlipgroupDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceFlipgroupDelete called with id: %v", d.Get("flipgroup_id").(int))
+	c := m.(*controller.ControllerCfg)
+
+	fg, err := utilityFlipgroupCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	req := flipgroup.DeleteRequest{
+		FLIPGroupID: fg.ID,
+	}
+
+	_, err = c.CloudAPI().FLIPGroup().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceFlipgroupSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"account_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Account ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Flipgroup name",
+		},
+		"net_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "EXTNET or ViNS ID",
+		},
+		"net_type": {
+			Type:         schema.TypeString,
+			Required:     true,
+			ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS"}, true),
+			Description:  "Network type, EXTNET or VINS",
+		},
+		"client_type": {
+			Type:         schema.TypeString,
+			Required:     true,
+			Description:  "Type of client, 'compute' ('vins' will be later)",
+			ValidateFunc: validation.StringInSlice([]string{"compute"}, true),
+		},
+		"ip": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "IP address to associate with this group. If empty, the platform will autoselect IP address",
+		},
+		"desc": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "Text description of this Flipgroup instance",
+		},
+		"client_ids": {
+			Type:     schema.TypeList,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+			Description: "List of clients attached to this Flipgroup instance",
+		},
+		"flipgroup_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"account_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"conn_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"conn_type": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"default_gw": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"gid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"milestones": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"network": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"rg_id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"rg_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"updated_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func ResourceFlipgroup() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		CreateContext: resourceFlipgroupCreate,
+		ReadContext:   resourceFlipgroupRead,
+		UpdateContext: resourceFlipgroupUpdate,
+		DeleteContext: resourceFlipgroupDelete,
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout300s,
+			Read:    &constants.Timeout300s,
+			Update:  &constants.Timeout300s,
+			Delete:  &constants.Timeout300s,
+			Default: &constants.Timeout300s,
+		},
+
+		Schema: resourceFlipgroupSchemaMake(),
+	}
+}

internal/service/cloudapi/flipgroup/utility_flipgroup.go

@@ -0,0 +1,195 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package flipgroup
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/flipgroup"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func handleClientIDsUpdate(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg, fg *flipgroup.RecordFLIPGroup, warn *dc.Warnings) {
+	addedClients := make([]interface{}, 0)
+	removedClients := make([]interface{}, 0)
+
+	old_set, new_set := d.GetChange("client_ids")
+	oldSlice := old_set.([]interface{})
+	newSlice := new_set.([]interface{})
+
+	for _, oldElem := range oldSlice {
+		if !containsClient(newSlice, oldElem) {
+			removedClients = append(removedClients, oldElem)
+		}
+	}
+
+	for _, newElem := range newSlice {
+		if !containsClient(oldSlice, newElem) {
+			addedClients = append(addedClients, newElem)
+		}
+	}
+
+	log.Debugf("Found client_ids change with %v deletion(s) and %v addition(s) [flipgroupID=%v]", len(removedClients), len(addedClients), fg.ID)
+
+	if len(addedClients) > 0 {
+		for _, id := range addedClients {
+			req := flipgroup.ComputeAddRequest{
+				FLIPGroupID: fg.ID,
+				ComputeID:   uint64(id.(int)),
+			}
+
+			if _, err := c.CloudAPI().FLIPGroup().ComputeAdd(ctx, req); err != nil {
+				warn.Add(err)
+			}
+		}
+	}
+
+	if len(removedClients) > 0 {
+		for _, id := range removedClients {
+			req := flipgroup.ComputeRemoveRequest{
+				FLIPGroupID: fg.ID,
+				ComputeID:   uint64(id.(int)),
+			}
+
+			if _, err := c.CloudAPI().FLIPGroup().ComputeRemove(ctx, req); err != nil {
+				warn.Add(err)
+			}
+		}
+	}
+}
+
+func containsClient(set []interface{}, check interface{}) bool {
+	for _, elem := range set {
+		elemConv := elem.(int)
+		checkConv := check.(int)
+		if elemConv == checkConv {
+			return true
+		}
+	}
+
+	return false
+}
+
+func addComputesAfterCreation(ctx context.Context, warnings *dc.Warnings, c *controller.ControllerCfg, compute_ids []interface{}, flipgroupID uint64) {
+	if len(compute_ids) == 0 {
+		return
+	}
+
+	log.Debugf("Adding %v computes to flipgroup [id=%v]...", len(compute_ids), flipgroupID)
+
+	for _, elem := range compute_ids {
+		compute_id := uint64(elem.(int))
+		req := flipgroup.ComputeAddRequest{
+			FLIPGroupID: flipgroupID,
+			ComputeID:   compute_id,
+		}
+
+		_, err := c.CloudAPI().FLIPGroup().ComputeAdd(ctx, req)
+		if err != nil {
+			warnings.Add(err)
+		}
+	}
+}
+
+func utilityFlipgroupCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*flipgroup.RecordFLIPGroup, error) {
+	c := m.(*controller.ControllerCfg)
+	req := flipgroup.GetRequest{}
+
+	if d.Id() == "" {
+		req.FLIPGroupID = uint64(d.Get("flipgroup_id").(int))
+	} else {
+		id, _ := strconv.ParseUint(d.Id(), 10, 64)
+		req.FLIPGroupID = id
+	}
+
+	fg, err := c.CloudAPI().FLIPGroup().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return fg, err
+}
+
+func utilityFlipgroupListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*flipgroup.ListFLIPGroups, error) {
+	c := m.(*controller.ControllerCfg)
+	req := flipgroup.ListRequest{}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if vinsId, ok := d.GetOk("vins_id"); ok {
+		req.VINSID = uint64(vinsId.(int))
+	}
+
+	if vinsName, ok := d.GetOk("vins_name"); ok {
+		req.VINSName = vinsName.(string)
+	}
+
+	if extNetId, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extNetId.(int))
+	}
+
+	if byIp, ok := d.GetOk("by_ip"); ok {
+		req.ByIP = byIp.(string)
+	}
+
+	if rgId, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rgId.(int))
+	}
+
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(int))
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	fg_list, err := c.CloudAPI().FLIPGroup().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return fg_list, err
+}

internal/service/cloudapi/image/data_source_image.go

@@ -34,8 +34,8 @@ package image
 
 import (
 	"context"
+	"strconv"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
@@ -44,12 +44,11 @@ import (
 func dataSourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	image, err := utilityImageCheckPresence(ctx, d, m)
 	if err != nil {
-
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 
-	id := uuid.New()
-	d.SetId(id.String())
+	d.SetId(strconv.Itoa(int(image.ID)))
 
 	flattenImage(d, image)
 

internal/service/cloudapi/image/data_source_image_list.go

@@ -1,99 +1,160 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package image
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-)
-
-func dataSourceImageListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	imageList, err := utilityImageListCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenImageList(imageList))
-
-	return nil
-}
-
-func dataSourceImageListSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "optional account ID to include account images",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "page size",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "image list",
-			Elem: &schema.Resource{
-				Schema: dataSourceImageSchemaMake(),
-			},
-		},
-	}
-
-	return rets
-}
-
-func DataSourceImageList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceImageListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceImageListSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceImageListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	imageList, err := utilityImageListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenImageList(imageList))
+	d.Set("entry_count", imageList.EntryCount)
+
+	return nil
+}
+
+func dataSourceImageListSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"sep_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by Storage Endpoint ID",
+		},
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by status",
+		},
+		"architecture": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by architecture",
+		},
+		"type_image": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by image type",
+		},
+		"image_size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by image size",
+		},
+		"sep_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by SEP name",
+		},
+		"pool": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by pool",
+		},
+		"public": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Find public/private images",
+		},
+		"hot_resize": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Find hot resizable images",
+		},
+		"bootable": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Find bootable images",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "page size",
+		},
+		"items": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Description: "image list",
+			Elem: &schema.Resource{
+				Schema: dataSourceImageSchemaMake(),
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+
+	return rets
+}
+
+func DataSourceImageList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceImageListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceImageListSchemaMake(),
+	}
+}

internal/service/cloudapi/image/flattens.go

@@ -3,6 +3,7 @@ package image
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
+	"strconv"
 )
 
 func flattenHistory(history []image.History) []map[string]interface{} {
@@ -23,7 +24,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("unc_path", img.UNCPath)
 	d.Set("ckey", img.CKey)
 	d.Set("account_id", img.AccountID)
-	d.Set("acl", img.ACL)
+	d.Set("acl", FlattenACL(img.ACL))
 	d.Set("architecture", img.Architecture)
 	d.Set("boot_type", img.BootType)
 	d.Set("bootable", img.Bootable)
@@ -58,9 +59,9 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("version", img.Version)
 }
 
-func flattenImageList(il image.ListImages) []map[string]interface{} {
+func flattenImageList(il *image.ListImages) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
-	for _, img := range il {
+	for _, img := range il.Data {
 		temp := map[string]interface{}{
 			"account_id":   img.AccountID,
 			"architecture": img.Architecture,
@@ -85,3 +86,18 @@ func flattenImageList(il image.ListImages) []map[string]interface{} {
 	}
 	return res
 }
+
+func FlattenACL(acl interface{}) string {
+	switch d := acl.(type) {
+	case string:
+		return d
+	case int:
+		return strconv.Itoa(d)
+	case int64:
+		return strconv.FormatInt(d, 10)
+	case float64:
+		return strconv.FormatInt(int64(d), 10)
+	default:
+		return ""
+	}
+}

internal/service/cloudapi/image/resource_check_input_values.go

@@ -19,7 +19,7 @@ func existAccountID(ctx context.Context, d *schema.ResourceData, m interface{})
 		return false, err
 	}
 
-	return len(accounts.FilterByID(accountId)) != 0, nil
+	return len(accounts.FilterByID(accountId).Data) != 0, nil
 }
 
 func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
@@ -32,5 +32,5 @@ func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool,
 		return false, err
 	}
 
-	return len(locationList.FilterByGID(gid)) != 0, nil
+	return len(locationList.FilterByGID(gid).Data) != 0, nil
 }

internal/service/cloudapi/image/resource_image.go

@@ -1,272 +1,276 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package image
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
-)
-
-func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceImageCreate: called for image %s", d.Get("name").(string))
-
-	haveGID, err := existGID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveGID {
-		return diag.Errorf("resourceImageCreate: can't create Image because GID %d is not allowed or does not exist", d.Get("gid").(int))
-	}
-
-	if _, ok := d.GetOk("account_id"); ok {
-		haveAccountID, err := existAccountID(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		if !haveAccountID {
-			return diag.Errorf("resourceImageCreate: can't create Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
-		}
-	}
-
-	c := m.(*controller.ControllerCfg)
-	req := image.CreateRequest{}
-
-	req.Name = d.Get("name").(string)
-	req.URL = d.Get("url").(string)
-	req.GID = uint64(d.Get("gid").(int))
-	req.BootType = d.Get("boot_type").(string)
-	req.ImageType = d.Get("type").(string)
-
-	drivers := []string{}
-	for _, driver := range d.Get("drivers").([]interface{}) {
-		drivers = append(drivers, driver.(string))
-	}
-
-	req.Drivers = drivers
-
-	if hotresize, ok := d.GetOk("hot_resize"); ok {
-		req.HotResize = hotresize.(bool)
-	}
-	if username, ok := d.GetOk("username"); ok {
-		req.Username = username.(string)
-	}
-	if password, ok := d.GetOk("password"); ok {
-		req.Password = password.(string)
-	}
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
-	if usernameDL, ok := d.GetOk("username_dl"); ok {
-		req.UsernameDL = usernameDL.(string)
-	}
-	if passwordDL, ok := d.GetOk("password_dl"); ok {
-		req.PasswordDL = passwordDL.(string)
-	}
-	if sepId, ok := d.GetOk("sep_id"); ok {
-		req.SEPID = uint64(sepId.(int))
-	}
-	if poolName, ok := d.GetOk("pool_name"); ok {
-		req.Pool = poolName.(string)
-	}
-	if architecture, ok := d.GetOk("architecture"); ok {
-		req.Architecture = architecture.(string)
-	}
-
-	imageId, err := c.CloudAPI().Image().Create(ctx, req)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.FormatUint(imageId, 10))
-	d.Set("image_id", imageId)
-
-	_, err = utilityImageCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	return resourceImageRead(ctx, d, m)
-}
-
-func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceImageRead: called for %s id: %s", d.Get("name").(string), d.Id())
-
-	img, err := utilityImageCheckPresence(ctx, d, m)
-	if img == nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	switch img.Status {
-	case status.Modeled:
-		return diag.Errorf("The image is in status: %s, please, contact support for more information", img.Status)
-	case status.Creating:
-	case status.Created:
-	case status.Destroyed, status.Purged:
-		d.SetId("")
-		return resourceImageCreate(ctx, d, m)
-	}
-
-	flattenImage(d, img)
-
-	return nil
-}
-
-func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceImageDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
-
-	_, err := utilityImageCheckPresence(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	c := m.(*controller.ControllerCfg)
-	req := image.DeleteRequest{
-		ImageID: uint64(d.Get("image_id").(int)),
-	}
-
-	if permanently, ok := d.GetOk("permanently"); ok {
-		req.Permanently = permanently.(bool)
-	}
-
-	_, err = c.CloudAPI().Image().Delete(ctx, req)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId("")
-
-	return nil
-}
-
-func resourceImageRename(ctx context.Context, d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceImageEditName: called for %s, id: %s", d.Get("name").(string), d.Id())
-	c := m.(*controller.ControllerCfg)
-	req := image.RenameRequest{
-		ImageID: uint64(d.Get("image_id").(int)),
-		Name:    d.Get("name").(string),
-	}
-
-	_, err := c.CloudAPI().Image().Rename(ctx, req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceImageUpdate: called for %s, id: %s", d.Get("name").(string), d.Id())
-
-	haveGID, err := existGID(ctx, d, m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	if !haveGID {
-		return diag.Errorf("resourceImageUpdate: can't update Image because GID %d is not allowed or does not exist", d.Get("gid").(int))
-	}
-
-	if _, ok := d.GetOk("account_id"); ok {
-		haveAccountID, err := existAccountID(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		if !haveAccountID {
-			return diag.Errorf("resourceImageUpdate: can't update Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
-		}
-	}
-
-	image, err := utilityImageCheckPresence(ctx, d, m)
-	if image == nil {
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		return nil
-	}
-
-	switch image.Status {
-	case status.Modeled:
-		return diag.Errorf("The image is in status: %s, please, contact support for more information", image.Status)
-	case status.Creating:
-	case status.Created:
-	case status.Destroyed, status.Purged:
-		d.SetId("")
-		return resourceImageCreate(ctx, d, m)
-	}
-
-	if d.HasChange("name") {
-		err := resourceImageRename(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-	}
-
-	return resourceImageRead(ctx, d, m)
-}
-
-func ResourceImage() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		CreateContext: resourceImageCreate,
-		ReadContext:   resourceImageRead,
-		UpdateContext: resourceImageUpdate,
-		DeleteContext: resourceImageDelete,
-
-		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &constants.Timeout600s,
-			Read:    &constants.Timeout300s,
-			Update:  &constants.Timeout300s,
-			Delete:  &constants.Timeout300s,
-			Default: &constants.Timeout300s,
-		},
-
-		Schema: resourceImageSchemaMake(dataSourceImageExtendSchemaMake()),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package image
+
+import (
+	"context"
+	"strconv"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/status"
+)
+
+func resourceImageCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageCreate: called for image %s", d.Get("name").(string))
+
+	haveGID, err := existGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveGID {
+		return diag.Errorf("resourceImageCreate: can't create Image because GID %d is not allowed or does not exist", d.Get("gid").(int))
+	}
+
+	if _, ok := d.GetOk("account_id"); ok {
+		haveAccountID, err := existAccountID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveAccountID {
+			return diag.Errorf("resourceImageCreate: can't create Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
+		}
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := image.CreateRequest{}
+
+	req.Name = d.Get("name").(string)
+	req.URL = d.Get("url").(string)
+	req.GID = uint64(d.Get("gid").(int))
+	req.BootType = d.Get("boot_type").(string)
+	req.ImageType = d.Get("type").(string)
+
+	drivers := []string{}
+	for _, driver := range d.Get("drivers").([]interface{}) {
+		drivers = append(drivers, driver.(string))
+	}
+
+	req.Drivers = drivers
+
+	if hotresize, ok := d.GetOk("hot_resize"); ok {
+		req.HotResize = hotresize.(bool)
+	}
+	if username, ok := d.GetOk("username"); ok {
+		req.Username = username.(string)
+	}
+	if password, ok := d.GetOk("password"); ok {
+		req.Password = password.(string)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if usernameDL, ok := d.GetOk("username_dl"); ok {
+		req.UsernameDL = usernameDL.(string)
+	}
+	if passwordDL, ok := d.GetOk("password_dl"); ok {
+		req.PasswordDL = passwordDL.(string)
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.SEPID = uint64(sepId.(int))
+	}
+	if poolName, ok := d.GetOk("pool_name"); ok {
+		req.Pool = poolName.(string)
+	}
+	if architecture, ok := d.GetOk("architecture"); ok {
+		req.Architecture = architecture.(string)
+	}
+
+	imageId, err := c.CloudAPI().Image().Create(ctx, req)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(imageId, 10))
+	d.Set("image_id", imageId)
+
+	_, err = utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return resourceImageRead(ctx, d, m)
+}
+
+func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageRead: called for %s id: %s", d.Get("name").(string), d.Id())
+
+	img, err := utilityImageCheckPresence(ctx, d, m)
+	if img == nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	switch img.Status {
+	case status.Modeled:
+		return diag.Errorf("The image is in status: %s, please, contact support for more information", img.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceImageCreate(ctx, d, m)
+	}
+
+	flattenImage(d, img)
+
+	return nil
+}
+
+func resourceImageDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
+
+	_, err := utilityImageCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	c := m.(*controller.ControllerCfg)
+	req := image.DeleteRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+	}
+
+	if permanently, ok := d.GetOk("permanently"); ok {
+		req.Permanently = permanently.(bool)
+	}
+
+	_, err = c.CloudAPI().Image().Delete(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceImageRename(ctx context.Context, d *schema.ResourceData, m interface{}) error {
+	log.Debugf("resourceImageEditName: called for %s, id: %s", d.Get("name").(string), d.Id())
+	c := m.(*controller.ControllerCfg)
+	req := image.RenameRequest{
+		ImageID: uint64(d.Get("image_id").(int)),
+		Name:    d.Get("name").(string),
+	}
+
+	_, err := c.CloudAPI().Image().Rename(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	log.Debugf("resourceImageUpdate: called for %s, id: %s", d.Get("name").(string), d.Id())
+
+	haveGID, err := existGID(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if !haveGID {
+		return diag.Errorf("resourceImageUpdate: can't update Image because GID %d is not allowed or does not exist", d.Get("gid").(int))
+	}
+
+	if _, ok := d.GetOk("account_id"); ok {
+		haveAccountID, err := existAccountID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveAccountID {
+			return diag.Errorf("resourceImageUpdate: can't update Image because AccountID %d is not allowed or does not exist", d.Get("account_id").(int))
+		}
+	}
+
+	image, err := utilityImageCheckPresence(ctx, d, m)
+	if image == nil {
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		return nil
+	}
+
+	switch image.Status {
+	case status.Modeled:
+		return diag.Errorf("The image is in status: %s, please, contact support for more information", image.Status)
+	case status.Creating:
+	case status.Created:
+	case status.Destroyed, status.Purged:
+		d.SetId("")
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceImageCreate(ctx, d, m)
+	}
+
+	if d.HasChange("name") {
+		err := resourceImageRename(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
+	return resourceImageRead(ctx, d, m)
+}
+
+func ResourceImage() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceImageCreate,
+		ReadContext:   resourceImageRead,
+		UpdateContext: resourceImageUpdate,
+		DeleteContext: resourceImageDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout600s,
+			Read:    &constants.Timeout300s,
+			Update:  &constants.Timeout300s,
+			Delete:  &constants.Timeout300s,
+			Default: &constants.Timeout300s,
+		},
+
+		Schema: resourceImageSchemaMake(dataSourceImageExtendSchemaMake()),
+	}
+}

internal/service/cloudapi/image/resource_image_virtual.go

@@ -50,7 +50,7 @@ func resourceImageVirtualCreate(ctx context.Context, d *schema.ResourceData, m i
 	c := m.(*controller.ControllerCfg)
 	req := image.CreateVirtualRequest{
 		Name:     d.Get("name").(string),
-		TargetID: uint64(d.Get("target_id").(int)),
+		TargetID: uint64(d.Get("link_to").(int)),
 	}
 
 	imageId, err := c.CloudAPI().Image().CreateVirtual(ctx, req)

internal/service/cloudapi/image/utility_image_list.go

@@ -42,12 +42,56 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (image.ListImages, error) {
+func utilityImageListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*image.ListImages, error) {
 	c := m.(*controller.ControllerCfg)
 	req := image.ListRequest{}
 
-	if accountId, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(accountId.(int))
+	if sep_id, ok := d.GetOk("sep_id"); ok {
+		req.SEPID = uint64(sep_id.(int))
+	}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if architecture, ok := d.GetOk("architecture"); ok {
+		req.Architecture = architecture.(string)
+	}
+
+	if type_image, ok := d.GetOk("type_image"); ok {
+		req.TypeImage = type_image.(string)
+	}
+
+	if image_size, ok := d.GetOk("image_size"); ok {
+		req.ImageSize = uint64(image_size.(int))
+	}
+
+	if sep_name, ok := d.GetOk("sep_name"); ok {
+		req.SEPName = sep_name.(string)
+	}
+
+	if pool, ok := d.GetOk("pool"); ok {
+		req.Pool = pool.(string)
+	}
+
+	if public, ok := d.GetOk("public"); ok {
+		req.Public = public.(bool)
+	}
+
+	if hot_resize, ok := d.GetOk("hot_resize"); ok {
+		req.HotResize = hot_resize.(bool)
+	}
+
+	if bootable, ok := d.GetOk("bootable"); ok {
+		req.Bootable = bootable.(bool)
 	}
 
 	if page, ok := d.GetOk("page"); ok {

internal/service/cloudapi/k8s/data_source_k8ci_list.go

@@ -0,0 +1,175 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package k8s
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceK8CIListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	list, err := utilityK8CIListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(uuid.New().String())
+	flattenK8CIList(d, list)
+	d.Set("entry_count", list.EntryCount)
+
+	return nil
+}
+
+func dataSourceK8CIListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by status",
+		},
+		"worker_driver": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by worker driver",
+		},
+		"master_driver": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by master driver",
+		},
+		"network_plugin": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by network plugin",
+		},
+		"include_disabled": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Include deleted k8cis in result",
+		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"k8ci_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "K8CI ID",
+					},
+					"name": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "K8CI name",
+					},
+					"lb_image_id": {
+						Type:        schema.TypeInt,
+						Computed:    true,
+						Description: "LB Image ID",
+					},
+					"network_plugins": {
+						Type:        schema.TypeList,
+						Computed:    true,
+						Description: "List of available network plugins",
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"status": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "K8CI Status",
+					},
+					"desc": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"created_time": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"version": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func DataSourceK8CIList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceK8CIListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceK8CIListSchemaMake(),
+	}
+}

internal/service/cloudapi/k8s/data_source_k8s.go

@@ -4,6 +4,7 @@ Authors:
 Petr Krutov, <petr.krutov@digitalenergy.online>
 Stanislav Solovev, <spsolovev@digitalenergy.online>
 Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -49,6 +50,7 @@ import (
 func dataSourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	cluster, err := utilityDataK8sCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 	d.SetId(strconv.FormatUint(cluster.ID, 10))
@@ -60,7 +62,7 @@ func dataSourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{
 	}
 
 	curK8s := k8s.ItemK8SCluster{}
-	for _, k8sCluster := range k8sList {
+	for _, k8sCluster := range k8sList.Data {
 		if k8sCluster.ID == cluster.ID {
 			curK8s = k8sCluster
 		}
@@ -398,6 +400,10 @@ func dataSourceK8sSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"network_plugin": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"rg_id": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/k8s/data_source_k8s_computes.go

@@ -1,119 +1,119 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package account
-
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-
-func dataSourceAccountComputeSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"cpus": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"compute_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"compute_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"ram": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"registered": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"total_disks_size": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"user_managed": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"vins_connected": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package k8s
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceK8sComputesRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	cluster, err := utilityK8sCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(fmt.Sprint(cluster.ID))
+	flattenK8sDataComputes(d, cluster)
+
+	return nil
+}
+
+func computesSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"id": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+		"name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"group_name": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"tech_status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+}
+
+func dataSourceK8sComputesSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"k8s_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"masters": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: computesSchemaMake(),
+			},
+		},
+		"workers": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: computesSchemaMake(),
+			},
+		},
+	}
+}
+
+func DataSourceK8sComputes() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceK8sComputesRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout60s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceK8sComputesSchemaMake(),
+	}
+}

internal/service/cloudapi/k8s/data_source_k8s_list.go

@@ -135,6 +135,46 @@ func k8sWorkersGroupsSchemaMake() map[string]*schema.Schema {
 
 func createK8sListSchema() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by name",
+		},
+		"ip_address": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by IP address",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by RG ID",
+		},
+		"lb_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by LB ID",
+		},
+		"bservice_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Filter by BService ID",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by status",
+		},
+		"tech_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Filter by tech. status",
+		},
 		"includedeleted": {
 			Type:     schema.TypeBool,
 			Optional: true,
@@ -231,6 +271,10 @@ func createK8sListSchema() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"network_plugin": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"rg_id": {
 						Type:     schema.TypeInt,
 						Computed: true,
@@ -276,6 +320,10 @@ func createK8sListSchema() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 }
 

internal/service/cloudapi/k8s/data_source_k8s_list_deleted.go

@@ -58,6 +58,7 @@ func dataSourceK8sListDeletedRead(ctx context.Context, d *schema.ResourceData, m
 func dataSourceK8sListDeletedSchemaMake() map[string]*schema.Schema {
 	k8sListDeleted := createK8sListSchema()
 	delete(k8sListDeleted, "includedeleted")
+	delete(k8sListDeleted, "status")
 	return k8sListDeleted
 }
 

internal/service/cloudapi/k8s/data_source_k8s_wg.go

@@ -47,6 +47,7 @@ func dataSourceK8sWgRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	wg, workersComputeList, err := utilityDataK8sWgCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/k8s/data_source_k8s_wg_cloud_init.go

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

internal/service/cloudapi/k8s/data_source_k8s_wg_list.go

@@ -45,6 +45,7 @@ import (
 func dataSourceK8sWgListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	wgList, err := utilityK8sWgListCheckPresence(ctx, d, m)
 	if err != nil {
+		d.SetId("")
 		return diag.FromErr(err)
 	}
 

internal/service/cloudapi/k8s/flattens.go

@@ -33,13 +33,80 @@ Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/w
 package k8s
 
 import (
+	"strings"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8ci"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 )
 
+func flattenK8CIItems(list *k8ci.ListK8CI) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(list.Data))
+	for _, item := range list.Data {
+		temp := map[string]interface{}{
+			"k8ci_id":         item.ID,
+			"name":            item.Name,
+			"lb_image_id":     item.LBImageID,
+			"network_plugins": item.NetworkPlugins,
+			"status":          item.Status,
+			"desc":            item.Description,
+			"created_time":    item.CreatedTime,
+			"version":         item.Version,
+		}
+
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenK8CIList(d *schema.ResourceData, list *k8ci.ListK8CI) {
+	d.Set("items", flattenK8CIItems(list))
+}
+
+func flattenK8sDataComputes(d *schema.ResourceData, cluster *k8s.RecordK8S) {
+	d.Set("k8s_id", cluster.ID)
+	d.Set("masters", flattenMasterComputes(cluster))
+	d.Set("workers", flattenWorkerComputes(cluster))
+}
+
+func flattenMasterComputes(cluster *k8s.RecordK8S) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(cluster.K8SGroups.Masters.DetailedInfo))
+	for _, comp := range cluster.K8SGroups.Masters.DetailedInfo {
+		temp := map[string]interface{}{
+			"id":          comp.ID,
+			"name":        comp.Name,
+			"status":      comp.Status,
+			"tech_status": comp.TechStatus,
+			"group_name":  cluster.K8SGroups.Masters.Name,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenWorkerComputes(cluster *k8s.RecordK8S) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(cluster.K8SGroups.Workers))
+	for _, wg := range cluster.K8SGroups.Workers {
+		for _, comp := range wg.DetailedInfo {
+			temp := map[string]interface{}{
+				"id":          comp.ID,
+				"name":        comp.Name,
+				"status":      comp.Status,
+				"tech_status": comp.TechStatus,
+				"group_name":  wg.Name,
+			}
+			res = append(res, temp)
+		}
+	}
+
+	return res
+}
+
 func flattenAclList(aclList k8s.ListACL) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(aclList))
 	for _, acl := range aclList {
 		temp := map[string]interface{}{
 			"explicit":      acl.Explicit,
@@ -67,7 +134,7 @@ func flattenAcl(acl k8s.RecordACL) []map[string]interface{} {
 }
 
 func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(interfaces))
 	for _, interfaceCompute := range interfaces {
 		temp := map[string]interface{}{
 			"def_gw":     interfaceCompute.DefGW,
@@ -80,7 +147,7 @@ func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface
 }
 
 func flattenDetailedInfo(detailedInfoList k8s.ListDetailedInfo, computes []compute.RecordCompute) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(detailedInfoList))
 	if computes != nil {
 		for i, detailedInfo := range detailedInfoList {
 			temp := map[string]interface{}{
@@ -126,8 +193,16 @@ func flattenMasterGroup(mastersGroup k8s.MasterGroup, masters []compute.RecordCo
 }
 
 func flattenK8sGroup(k8SGroupList k8s.ListK8SGroups, workers []compute.RecordCompute) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(k8SGroupList))
 	for _, k8sGroup := range k8SGroupList {
+		labels := make([]string, 0)
+		for _, label := range k8sGroup.Labels {
+			if strings.HasPrefix(label, "workersGroupName") {
+				continue
+			}
+
+			labels = append(labels, label)
+		}
 		temp := map[string]interface{}{
 			"annotations":   k8sGroup.Annotations,
 			"cpu":           k8sGroup.CPU,
@@ -135,7 +210,7 @@ func flattenK8sGroup(k8SGroupList k8s.ListK8SGroups, workers []compute.RecordCom
 			"disk":          k8sGroup.Disk,
 			"guid":          k8sGroup.GUID,
 			"id":            k8sGroup.ID,
-			"labels":        k8sGroup.Labels,
+			"labels":        labels,
 			"name":          k8sGroup.Name,
 			"num":           k8sGroup.Num,
 			"ram":           k8sGroup.RAM,
@@ -147,15 +222,15 @@ func flattenK8sGroup(k8SGroupList k8s.ListK8SGroups, workers []compute.RecordCom
 	return res
 }
 
-func flattenK8sGroups(k8sGroups k8s.RecordK8SGroups, masters []compute.RecordCompute, workers []compute.RecordCompute) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"masters": flattenMasterGroup(k8sGroups.Masters, masters),
-		"workers": flattenK8sGroup(k8sGroups.Workers, workers),
-	}
-	res = append(res, temp)
-	return res
-}
+// func flattenK8sGroups(k8sGroups k8s.RecordK8SGroups, masters []compute.RecordCompute, workers []compute.RecordCompute) []map[string]interface{} {
+// 	res := make([]map[string]interface{}, 0)
+// 	temp := map[string]interface{}{
+// 		"masters": flattenMasterGroup(k8sGroups.Masters, masters),
+// 		"workers": flattenK8sGroup(k8sGroups.Workers, workers),
+// 	}
+// 	res = append(res, temp)
+// 	return res
+// }
 
 func flattenK8sData(d *schema.ResourceData, cluster k8s.RecordK8S, masters []compute.RecordCompute, workers []compute.RecordCompute) {
 	d.Set("acl", flattenAcl(cluster.ACL))
@@ -172,6 +247,7 @@ func flattenK8sData(d *schema.ResourceData, cluster k8s.RecordK8S, masters []com
 	d.Set("workers", flattenK8sGroup(cluster.K8SGroups.Workers, workers))
 	d.Set("lb_id", cluster.LBID)
 	d.Set("name", cluster.Name)
+	d.Set("network_plugin", cluster.NetworkPlugin)
 	d.Set("rg_id", cluster.RGID)
 	d.Set("rg_name", cluster.RGName)
 	d.Set("status", cluster.Status)
@@ -192,7 +268,7 @@ func flattenServiceAccount(serviceAccount k8s.RecordServiceAccount) []map[string
 }
 
 func flattenWorkersGroup(workersGroups k8s.ListK8SGroups) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(workersGroups))
 	for _, worker := range workersGroups {
 		temp := map[string]interface{}{
 			"annotations":      worker.Annotations,
@@ -212,12 +288,12 @@ func flattenWorkersGroup(workersGroups k8s.ListK8SGroups) []map[string]interface
 	return res
 }
 
-func flattenK8sItems(k8sItems k8s.ListK8SClusters) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, item := range k8sItems {
+func flattenK8sItems(k8sItems *k8s.ListK8SClusters) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(k8sItems.Data))
+	for _, item := range k8sItems.Data {
 		temp := map[string]interface{}{
 			"account_id":      item.AccountID,
-			"account_name":    item.Name,
+			"account_name":    item.AccountName,
 			"acl":             item.ACL,
 			"bservice_id":     item.BServiceID,
 			"ci_id":           item.CIID,
@@ -233,6 +309,7 @@ func flattenK8sItems(k8sItems k8s.ListK8SClusters) []map[string]interface{} {
 			"lb_id":           item.LBID,
 			"milestones":      item.Milestones,
 			"k8s_name":        item.Name,
+			"network_plugin":  item.NetworkPlugin,
 			"rg_id":           item.RGID,
 			"rg_name":         item.RGName,
 			"service_account": flattenServiceAccount(item.ServiceAccount),
@@ -249,8 +326,46 @@ func flattenK8sItems(k8sItems k8s.ListK8SClusters) []map[string]interface{} {
 	return res
 }
 
-func flattenK8sList(d *schema.ResourceData, k8sItems k8s.ListK8SClusters) {
+func flattenK8sList(d *schema.ResourceData, k8sItems *k8s.ListK8SClusters) {
 	d.Set("items", flattenK8sItems(k8sItems))
+	d.Set("entry_count", k8sItems.EntryCount)
+}
+
+func flattenResourceK8sCP(d *schema.ResourceData, k8s k8s.RecordK8S, masters []compute.RecordCompute) {
+	d.Set("acl", flattenAcl(k8s.ACL))
+	d.Set("account_id", k8s.AccountID)
+	d.Set("account_name", k8s.AccountName)
+	d.Set("k8sci_id", k8s.CIID)
+	d.Set("bservice_id", k8s.BServiceID)
+	d.Set("created_by", k8s.CreatedBy)
+	d.Set("created_time", k8s.CreatedTime)
+	d.Set("deleted_by", k8s.DeletedBy)
+	d.Set("deleted_time", k8s.DeletedTime)
+	d.Set("k8s_ci_name", k8s.K8CIName)
+	d.Set("with_lb", k8s.LBID != 0)
+	d.Set("lb_id", k8s.LBID)
+	d.Set("k8s_id", k8s.ID)
+	d.Set("name", k8s.Name)
+	d.Set("rg_id", k8s.RGID)
+	d.Set("rg_name", k8s.RGName)
+	d.Set("status", k8s.Status)
+	d.Set("tech_status", k8s.TechStatus)
+	d.Set("updated_by", k8s.UpdatedBy)
+	d.Set("updated_time", k8s.UpdatedTime)
+	d.Set("network_plugin", k8s.NetworkPlugin)
+
+	flattenCPParams(d, k8s.K8SGroups.Masters, masters)
+}
+
+func flattenCPParams(d *schema.ResourceData, mastersGroup k8s.MasterGroup, masters []compute.RecordCompute) {
+	d.Set("cpu", mastersGroup.CPU)
+	d.Set("detailed_info", flattenDetailedInfo(mastersGroup.DetailedInfo, masters))
+	d.Set("disk", mastersGroup.Disk)
+	d.Set("master_id", mastersGroup.ID)
+	d.Set("master_name", mastersGroup.Name)
+	d.Set("num", mastersGroup.Num)
+	d.Set("ram", mastersGroup.RAM)
+	d.Set("master_id", mastersGroup.ID)
 }
 
 func flattenResourceK8s(d *schema.ResourceData, k8s k8s.RecordK8S, masters []compute.RecordCompute, workers []compute.RecordCompute) {
@@ -283,12 +398,21 @@ func flattenResourceK8s(d *schema.ResourceData, k8s k8s.RecordK8S, masters []com
 }
 
 func flattenWg(d *schema.ResourceData, wg k8s.ItemK8SGroup, computes []compute.RecordCompute) {
+	labels := make([]string, 0, len(wg.Labels))
+	for _, label := range wg.Labels {
+		if strings.HasPrefix(label, "workersGroupName") {
+			continue
+		}
+
+		labels = append(labels, label)
+	}
+
 	d.Set("annotations", wg.Annotations)
 	d.Set("cpu", wg.CPU)
 	d.Set("detailed_info", flattenDetailedInfo(wg.DetailedInfo, computes))
 	d.Set("disk", wg.Disk)
 	d.Set("guid", wg.GUID)
-	d.Set("labels", wg.Labels)
+	d.Set("labels", labels)
 	d.Set("name", wg.Name)
 	d.Set("num", wg.Num)
 	d.Set("ram", wg.RAM)
@@ -296,7 +420,7 @@ func flattenWg(d *schema.ResourceData, wg k8s.ItemK8SGroup, computes []compute.R
 }
 
 func flattenWgList(wgList k8s.ListK8SGroups, computesMap map[uint64][]compute.RecordCompute) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(wgList))
 	for _, wg := range wgList {
 		computes := computesMap[wg.ID]
 		temp := map[string]interface{}{

internal/service/cloudapi/k8s/models.go

@@ -39,12 +39,16 @@ import (
 )
 
 type K8sNodeRecord struct {
-	ID           int    `json:"id"`
-	Name         string `json:"name"`
-	Disk         int    `json:"disk"`
-	Cpu          int    `json:"cpu"`
-	Num          int    `json:"num"`
-	Ram          int    `json:"ram"`
+	ID   int    `json:"id"`
+	Name string `json:"name"`
+	Disk int    `json:"disk"`
+	Cpu  int    `json:"cpu"`
+	Num  int    `json:"num"`
+	Ram  int    `json:"ram"`
+	// coming in future updates (curr. version 4.0.2)
+	// Labels       []interface{} `json:"labels"`
+	// Annotations  []interface{} `json:"annotations"`
+	// Taints       []interface{} `json:"taints"`
 	DetailedInfo []struct {
 		ID   int    `json:"id"`
 		Name string `json:"name"`
@@ -53,7 +57,7 @@ type K8sNodeRecord struct {
 	SepPool string `json:"SepPool"`
 }
 
-//K8sRecord represents k8s instance
+// K8sRecord represents k8s instance
 type K8sRecord struct {
 	AccountID   int    `json:"accountId"`
 	AccountName string `json:"accountName"`
@@ -72,7 +76,7 @@ type K8sRecord struct {
 
 type K8sRecordList []K8sRecord
 
-//LbRecord represents load balancer instance
+// LbRecord represents load balancer instance
 type LbRecord struct {
 	ID          int    `json:"id"`
 	Name        string `json:"name"`
@@ -87,7 +91,7 @@ type LbRecord struct {
 	} `json:"primaryNode"`
 }
 
-//Blasphemous workaround for parsing Result value
+// Blasphemous workaround for parsing Result value
 type TaskResult int
 
 func (r *TaskResult) UnmarshalJSON(b []byte) error {
@@ -117,7 +121,7 @@ func (r *TaskResult) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-//AsyncTask represents a long task completion status
+// AsyncTask represents a long task completion status
 type AsyncTask struct {
 	AuditID     string     `json:"auditId"`
 	Completed   bool       `json:"completed"`
@@ -136,7 +140,7 @@ type SshKeyConfig struct {
 	UserShell string
 }
 
-//FromSDK
+// FromSDK
 type K8SGroup struct {
 	Annotations  []string         `json:"annotations"`
 	CPU          uint64           `json:"cpu"`