4.5.0

.gitignore

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

CHANGELOG.md

@@ -1,4 +1,8 @@
-## Version 4.3.6
+## Version 4.5.0
 
-## Bugfix
-- Fixed bug with disks resize error
+## Feature
+- Added support for authorization using the Basis.Virtual Security system. Add client and config
+
+### Bugfix
+- Fixed bservice and rg schema and flatten in cloudapi
+- Add stateUpgrader for k8s_cp in cloudapi/k8s

Makefile

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

README.md

@@ -6,6 +6,8 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 
 | Версия DECORT API | Версия провайдера Terraform |
 | ------ | ------ |
+| 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 |
@@ -29,6 +31,8 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 - Работа с disks,
 - Работа с k8s,
 - Работа с image,
+- Работа с flipgroups,
+- Работа с stacks,
 - Работа с reource groups,
 - Работа с VINS,
 - Работа с pfw,
@@ -86,7 +90,7 @@ terraform {
 9. Добавьте в файл блок с инициализацией провайдера.
 ```terraform
 provider "decort" {
-  authenticator        = "oauth2"
+  authenticator        = "decs3o"
   controller_url       = "https://mr4.digitalenergy.online"
   oauth2_url           = "https://sso.digitalenergy.online"
   allow_unverified_ssl = true
@@ -172,7 +176,7 @@ ${host_name}/${namespace}/${type}
 8. Добавьте в файл блок с инициализацией провайдера.
 ```terraform
 provider "decort" {
-  authenticator        = "oauth2"
+  authenticator        = "decs3o"
   controller_url       = "https://mr4.digitalenergy.online"
   oauth2_url           = "https://sso.digitalenergy.online"
   allow_unverified_ssl = true

go.mod

@@ -8,8 +8,9 @@ require (
 	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.12.0
-	repository.basistech.ru/BASIS/decort-golang-sdk v1.5.3
+	golang.org/x/net v0.16.0
+	golang.org/x/oauth2 v0.13.0
+	repository.basistech.ru/BASIS/decort-golang-sdk v1.7.0
 )
 
 require (
@@ -24,8 +25,8 @@ require (
 	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.14.1 // 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
@@ -67,12 +68,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.11.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.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

@@ -55,8 +55,8 @@ 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.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
-github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+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=
@@ -65,8 +65,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 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=
@@ -249,8 +249,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.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 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=
@@ -265,9 +265,11 @@ 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.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+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/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 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=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -293,8 +295,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.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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=
@@ -304,8 +306,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.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=
@@ -322,8 +324,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=
@@ -339,5 +341,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.5.3 h1:Rt5tE4EZcUr4ONK9u/XYe2mG1CC37xLUnNuCLYKDwYs=
-repository.basistech.ru/BASIS/decort-golang-sdk v1.5.3/go.mod h1:szsTGa73O75ckCWVGJPvTtRbhA/ubuYrYhMkPjvHlmE=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.7.0 h1:aGDg9hQXs70m4Llx8hw9Y50M1C2apDqSsNMsE8isyIM=
+repository.basistech.ru/BASIS/decort-golang-sdk v1.7.0/go.mod h1:mwcpnw0dT/PQf6AOJShjlbDNDfNitr0WM77LNKL1qjo=

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>
@@ -24,15 +24,15 @@ import (
 	"bytes"
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
+
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 
-	// "time"
-
 	log "github.com/sirupsen/logrus"
+	"golang.org/x/oauth2"
 	decort "repository.basistech.ru/BASIS/decort-golang-sdk"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
@@ -46,24 +46,29 @@ import (
 
 // 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           oauth2.Token // obtained from BVS provider on successful login in bvs mode
 	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
 }
@@ -86,17 +91,21 @@ 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:           oauth2.Token{},
 	}
 
 	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
@@ -105,33 +114,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 {
@@ -167,10 +196,10 @@ 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()
+		_, err := ret_config.getDECS3OJWT()
 		if err != nil {
 			return nil, err
 		}
@@ -189,7 +218,7 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 			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.")
+			return nil, fmt.Errorf("failed to extract user and iss fields from JWT token in oauth2 mode")
 		}
 
 		sdkConf := config.Config{
@@ -201,10 +230,24 @@ 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,
+		}
 
+		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
@@ -216,13 +259,13 @@ func (config *ControllerCfg) GetDecortUsername() string {
 	return config.decort_username
 }
 
-func (config *ControllerCfg) getOAuth2JWT() (string, error) {
+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.")
+		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)
+	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{}
@@ -253,7 +296,7 @@ func (config *ControllerCfg) getOAuth2JWT() (string, error) {
 	}
 	defer resp.Body.Close()
 
-	responseData, err := ioutil.ReadAll(resp.Body)
+	responseData, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", err
 	}
@@ -273,13 +316,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)
@@ -296,7 +339,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()
@@ -312,10 +355,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{}
@@ -336,12 +379,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)
 	}
@@ -353,21 +396,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()
 }

internal/dc/utils.go

@@ -1,35 +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 grid
-
-const GridListGetAPI = "/restmachine/cloudbroker/grid/list"
-const GridGetAPI = "/restmachine/cloudbroker/grid/get"
+/*
+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/provider/data_sources_map.go

@@ -34,126 +34,128 @@ import (
 	"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_disks "repository.basistech.ru/BASIS/terraform-provider-decort/internal/service/cloudbroker/disks"
+	// 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_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"
+	// 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_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_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_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_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_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_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_extnet":                  cb_extnet.DataSourceExtnetCB(),
-		"decort_cb_extnet_list":             cb_extnet.DataSourceExtnetListCB(),
-		"decort_cb_extnet_default":          cb_extnet.DataSourceExtnetDefaultCB(),
-		"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(),
+		"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_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_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(),
 	}
-
 }

internal/provider/provider.go

@@ -40,8 +40,8 @@ func Provider() *schema.Provider {
 				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'.",
+				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": {
@@ -49,7 +49,7 @@ func Provider() *schema.Provider {
 				Optional:    true,
 				StateFunc:   statefuncs.StateFuncToLower,
 				DefaultFunc: schema.EnvDefaultFunc("DECORT_OAUTH2_URL", nil),
-				Description: "OAuth2 application URL in 'oauth2' authentication mode.",
+				Description: "OAuth2 application URL in 'decs3o' and 'bvs' authentication mode.",
 			},
 
 			"controller_url": {
@@ -74,18 +74,39 @@ func Provider() *schema.Provider {
 				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 'oauth2' authentication mode.",
+				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 'oauth2' authentication mode.",
+				Description: "Application secret to access DECORT cloud API in 'decs3o' and 'bvs' authentication mode.",
 			},
 
 			"jwt": {

internal/provider/resource_map.go

@@ -36,17 +36,19 @@ import (
 	"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_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_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"
+	// 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_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_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 {
@@ -72,23 +74,31 @@ func newResourcesMap() map[string]*schema.Resource {
 		"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_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(),
+		"decort_cb_account": cb_account.ResourceAccount(),
+		"decort_cb_extnet":  cb_extnet.ResourceExtnetCB(),
+		// "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(),
+		// "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_extnet_static_route": cb_extnet.ResourceStaticRoute(),
 	}
 }

internal/service/cloudapi/account/data_source_account_get_resource_consumption.go

@@ -0,0 +1,136 @@
+/*
+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 {
+		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_resource_consumption_list.go

@@ -0,0 +1,169 @@
+/*
+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 {
+		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_templates_list.go

@@ -43,7 +43,7 @@ import (
 )
 
 func flattenAccountTemplatesList(atl *account.ListTemplates) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(atl.Data))
 	for _, at := range atl.Data {
 		temp := map[string]interface{}{
 			"unc_path":      at.UNCPath,
@@ -72,7 +72,7 @@ func dataSourceAccountTemplatesListRead(ctx context.Context, d *schema.ResourceD
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenAccountTemplatesList(accountTemplatesList))
-
+	d.Set("entry_count", accountTemplatesList.EntryCount)
 	return nil
 }
 
@@ -87,6 +87,31 @@ func dataSourceAccountTemplatesListSchemaMake() map[string]*schema.Schema {
 			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,
@@ -136,6 +161,10 @@ func dataSourceAccountTemplatesListSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return res
 }

internal/service/cloudapi/account/flattens.go

@@ -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,
@@ -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/resource_account.go

@@ -54,7 +54,7 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, m interf
 func resourceAccountRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceAccountRead: called for account with ID: %v", d.Id())
 
-	c := m.(*controller.ControllerCfg)
+	// c := m.(*controller.ControllerCfg)
 
 	acc, err := utilityAccountCheckPresence(ctx, d, m)
 	if err != nil {
@@ -67,22 +67,23 @@ func resourceAccountRead(ctx context.Context, d *schema.ResourceData, m interfac
 	switch acc.Status {
 	case status.Destroyed:
 		d.SetId("")
-		return resourceAccountCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceAccountCreate(ctx, d, m)
 	case status.Destroying:
 		return diag.Errorf("The account is in progress with status: %s", acc.Status)
 	case status.Deleted:
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
+		// id, _ := strconv.ParseUint(d.Id(), 10, 64)
 
-		req := account.RestoreRequest{
-			AccountID: id,
-		}
+		// req := account.RestoreRequest{
+		// 	AccountID: id,
+		// }
 
-		_, err := c.CloudAPI().Account().Restore(ctx, req)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().Account().Restore(ctx, req)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Disabled:
 		log.Debugf("The account is in status: %s, troubles may occur with update. Please, enable account first.", acc.Status)
 	case status.Confirmed:
@@ -142,7 +143,8 @@ func resourceAccountUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	switch acc.Status {
 	case status.Destroyed:
 		d.SetId("")
-		return resourceAccountCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceAccountCreate(ctx, d, m)
 	case status.Destroying:
 		return diag.Errorf("The account is in progress with status: %s", acc.Status)
 	case status.Deleted:

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_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_templates_list.go

@@ -44,9 +44,8 @@ import (
 
 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,
@@ -55,6 +54,21 @@ func utilityAccountTemplatesListCheckPresence(ctx context.Context, d *schema.Res
 	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)

internal/service/cloudapi/bservice/data_source_bservice.go

@@ -146,7 +146,7 @@ func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 		},
 		"disk_total": {
-			Type:     schema.TypeString,
+			Type:     schema.TypeInt,
 			Computed: true,
 		},
 		"gid": {
@@ -185,13 +185,13 @@ func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
-		"groups_name": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
+		// "groups_name": {
+		// 	Type:     schema.TypeList,
+		// 	Computed: true,
+		// 	Elem: &schema.Schema{
+		// 		Type: schema.TypeString,
+		// 	},
+		// },
 		"guid": {
 			Type:     schema.TypeInt,
 			Computed: true,

internal/service/cloudapi/bservice/data_source_bservice_snapshot_list.go

@@ -49,8 +49,8 @@ func dataSourceBasicServiceSnapshotListRead(ctx context.Context, d *schema.Resou
 
 	id := uuid.New()
 	d.SetId(id.String())
-	d.Set("items", flattenBasicServiceSnapshots(basicServiceSnapshotList))
-
+	d.Set("items", flattenBasicServiceSnapshotsList(basicServiceSnapshotList))
+	d.Set("entry_count", basicServiceSnapshotList.EntryCount)
 	return nil
 }
 

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_bservice.go

@@ -77,13 +77,40 @@ func resourceBasicServiceCreate(ctx context.Context, d *schema.ResourceData, m i
 	d.SetId(strconv.FormatUint(serviceId, 10))
 	d.Set("service_id", serviceId)
 
+	service, err := utilityBasicServiceCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	if d.Get("enable").(bool) && (service.Status == status.Disabled || service.Status == status.Created) {
+		log.Debugf("trying to enable bservice %v", serviceId)
+		_, err := c.CloudAPI().BService().Enable(ctx, bservice.EnableRequest{
+			ServiceID: serviceId,
+		})
+
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+	if d.Get("start").(bool) && d.Get("enable").(bool) {
+		log.Debugf("trying to start bservice %v", serviceId)
+		_, err := c.CloudAPI().BService().Enable(ctx, bservice.EnableRequest{
+			ServiceID: serviceId,
+		})
+
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceBasicServiceRead(ctx, d, m)
 }
 
 func resourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceBasicServiceRead")
 
-	c := m.(*controller.ControllerCfg)
+	// c := m.(*controller.ControllerCfg)
 
 	bs, err := utilityBasicServiceCheckPresence(ctx, d, m)
 	if err != nil {
@@ -104,29 +131,30 @@ func resourceBasicServiceRead(ctx context.Context, d *schema.ResourceData, m int
 	case status.Disabling:
 		log.Debugf("The basic service is in status: %s, troubles can occur with the update.", bs.Status)
 	case status.Deleted:
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
-		restoreReq := bservice.RestoreRequest{
-			ServiceID: id,
-		}
-		enableReq := bservice.EnableRequest{
-			ServiceID: id,
-		}
+		// id, _ := strconv.ParseUint(d.Id(), 10, 64)
+		// restoreReq := bservice.RestoreRequest{
+		// 	ServiceID: id,
+		// }
+		// enableReq := bservice.EnableRequest{
+		// 	ServiceID: id,
+		// }
 
-		_, err := c.CloudAPI().BService().Restore(ctx, restoreReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().BService().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		_, err = c.CloudAPI().BService().Enable(ctx, enableReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err = c.CloudAPI().BService().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Deleting:
 	case status.Destroyed:
 		d.SetId("")
-		return resourceBasicServiceCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceBasicServiceCreate(ctx, d, m)
 	case status.Destroying:
 		return diag.Errorf("The basic service is in progress with status: %s", bs.Status)
 	case status.Restoring:
@@ -224,7 +252,8 @@ func resourceBasicServiceUpdate(ctx context.Context, d *schema.ResourceData, m i
 	case status.Deleting:
 	case status.Destroyed:
 		d.SetId("")
-		return resourceBasicServiceCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceBasicServiceCreate(ctx, d, m)
 	case status.Destroying:
 		return diag.Errorf("The basic service is in progress with status: %s", bs.Status)
 	case status.Restoring:
@@ -533,7 +562,7 @@ func resourceBasicServiceSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 		},
 		"disk_total": {
-			Type:     schema.TypeString,
+			Type:     schema.TypeInt,
 			Computed: true,
 		},
 		"gid": {

internal/service/cloudapi/bservice/resource_bservice_group.go

@@ -68,6 +68,20 @@ func resourceBasicServiceGroupCreate(ctx context.Context, d *schema.ResourceData
 		req.TimeoutStart = uint64(timeoutStart.(int))
 	}
 
+	///4.4.0
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.SEPID = uint64(sepId.(int))
+	}
+
+	if sepPool, ok := d.GetOk("sep_pool"); ok {
+		req.SEPPool = sepPool.(string)
+	}
+
+	if cloudInit, ok := d.GetOk("cloud_init"); ok {
+		req.UserData = cloudInit.(string)
+	}
+	///
+
 	if vinses, ok := d.GetOk("vinses"); ok {
 		res := []uint64{}
 		for _, vins := range vinses.([]interface{}) {
@@ -93,6 +107,20 @@ func resourceBasicServiceGroupCreate(ctx context.Context, d *schema.ResourceData
 	d.SetId(strconv.FormatUint(compgroupId, 10))
 	d.Set("compgroup_id", compgroupId)
 
+	serviceId:= uint64(d.Get("service_id").(int))
+
+	if d.Get("start").(bool) {
+		log.Debugf("trying to start bservice group %v", compgroupId)
+		_, err := c.CloudAPI().BService().GroupStart(ctx, bservice.GroupStartRequest{
+			ServiceID: serviceId,
+			CompGroupID: compgroupId,
+		})
+
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceBasicServiceGroupRead(ctx, d, m)
 }
 
@@ -362,6 +390,25 @@ func resourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "compute driver like a KVM_X86, KVM_PPC, etc.",
 		},
+		///4.4.0
+		"sep_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "storage endpoint provider ID",
+		},
+		"sep_pool": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
+			Description: "pool to use if sepId is set, can be also empty if needed to be chosen by system",
+		},
+		"cloud_init": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Optional cloud_init parameters. Applied when creating new compute instance only, ignored in all other cases.",
+		},
+		///
 		"role": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -524,10 +571,6 @@ func resourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
 		"seq_no": {
 			Type:     schema.TypeInt,
 			Computed: true,

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_list.go

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

internal/service/cloudapi/disks/data_source_disk_list_types.go

@@ -49,12 +49,23 @@ func dataSourceDiskListTypesRead(ctx context.Context, d *schema.ResourceData, m
 
 	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 +74,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

@@ -49,6 +49,7 @@ func flattenDiskListTypesDetailed(tld *disks.ListTypes) []map[string]interface{}
 		temp := map[string]interface{}{
 			"pools":  flattenListTypesDetailedPools(toMap["pools"].([]interface{})),
 			"sep_id": toMap["sepId"].(float64),
+			"sep_name": toMap["sepName"].(string),
 		}
 		res = append(res, temp)
 	}
@@ -61,6 +62,7 @@ func flattenListTypesDetailedPools(pools []interface{}) []interface{} {
 		toMap := pool.(map[string]interface{})
 		temp := map[string]interface{}{
 			"name":  toMap["name"].(string),
+			"system": toMap["system"].(string),
 			"types": toMap["types"].([]interface{}),
 		}
 		res = append(res, temp)
@@ -78,11 +80,22 @@ func dataSourceDiskListTypesDetailedRead(ctx context.Context, d *schema.Resource
 	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,
@@ -98,6 +111,10 @@ func dataSourceDiskListTypesDetailedSchemaMake() map[string]*schema.Schema {
 									Computed:    true,
 									Description: "Pool name",
 								},
+								"system": {
+									Type:        schema.TypeString,
+									Computed:    true,
+								},
 								"types": {
 									Type:     schema.TypeList,
 									Computed: true,
@@ -114,9 +131,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

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

internal/service/cloudapi/disks/flattens.go

@@ -17,7 +17,7 @@ func flattenDiskSnapshot(d *schema.ResourceData, snapshot disks.ItemSnapshot) {
 }
 
 func flattenDiskListUnattached(ul *disks.ListDisksUnattached) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(ul.Data))
 	for _, unattachedDisk := range ul.Data {
 		unattachedDiskAcl, _ := json.Marshal(unattachedDisk.ACL)
 		tmp := map[string]interface{}{
@@ -120,7 +120,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,
@@ -137,7 +137,7 @@ func flattenDiskSnapshotList(sl disks.ListSnapshots) []interface{} {
 }
 
 func flattenDiskList(dl *disks.ListDisks) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(dl.Data))
 	for _, disk := range dl.Data {
 		diskAcl, _ := json.Marshal(disk.ACL)
 		temp := map[string]interface{}{

internal/service/cloudapi/disks/resource_disk.go

@@ -142,7 +142,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 +157,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)
@@ -227,7 +228,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{

internal/service/cloudapi/disks/utility_disk_list.go

@@ -47,18 +47,6 @@ func utilityDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 	c := m.(*controller.ControllerCfg)
 	req := disks.ListRequest{}
 
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-	if diskType, ok := d.GetOk("type"); ok {
-		req.Type = strings.ToUpper(diskType.(string))
-	}
-	if accountId, ok := d.GetOk("accountId"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
 	if by_id, ok := d.GetOk("by_id"); ok {
 		req.ByID = uint64(by_id.(int))
 	}
@@ -77,6 +65,24 @@ func utilityDiskListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 	if shared, ok := d.GetOk("shared"); ok {
 		req.Shared = shared.(bool)
 	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if diskType, ok := d.GetOk("type"); ok {
+		req.Type = strings.ToUpper(diskType.(string))
+	}
+	if sepId, ok := d.GetOk("sep_id"); ok {
+		req.AccountID = uint64(sepId.(int))
+	}
+	if pool_name, ok := d.GetOk("pool_name"); ok {
+		req.Pool = pool_name.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
 
 	log.Debugf("utilityDiskListCheckPresence: load disk list")
 	diskList, err := c.CloudAPI().Disks().List(ctx, req)

internal/service/cloudapi/disks/utility_disk_list_unattached.go

@@ -13,15 +13,6 @@ func utilityDiskListUnattachedCheckPresence(ctx context.Context, d *schema.Resou
 	c := m.(*controller.ControllerCfg)
 	req := disks.ListUnattachedRequest{}
 
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-	if accountId, ok := d.GetOk("accountId"); ok {
-		req.AccountID = uint64(accountId.(int))
-	}
 	if by_id, ok := d.GetOk("by_id"); ok {
 		req.ByID = uint64(by_id.(int))
 	}
@@ -34,6 +25,24 @@ func utilityDiskListUnattachedCheckPresence(ctx context.Context, d *schema.Resou
 	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

@@ -46,6 +46,13 @@ func utilityDiskListTypesDetailedCheckPresence(ctx context.Context, d *schema.Re
 	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

@@ -47,6 +47,13 @@ func utilityDiskListTypesCheckPresence(ctx context.Context, d *schema.ResourceDa
 		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_computes_list.go

@@ -50,7 +50,7 @@ func dataSourceExtnetComputesListRead(ctx context.Context, d *schema.ResourceDat
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenExtnetComputesList(extnetComputesList))
-
+	d.Set("entry_count", extnetComputesList.EntryCount)
 	return nil
 }
 
@@ -61,6 +61,26 @@ func dataSourceExtnetComputesListSchemaMake() map[string]*schema.Schema {
 			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,
@@ -117,6 +137,10 @@ func dataSourceExtnetComputesListSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return res
 }

internal/service/cloudapi/extnet/flattens.go

@@ -35,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,
@@ -51,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,
@@ -92,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,7 +106,7 @@ func flattenExtnetsComputes(ecs extnet.ListExtNetExtends) []map[string]interface
 }
 
 func flattenExtnetComputesList(ecl *extnet.ListExtNetComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(ecl.Data))
 	for _, ec := range ecl.Data {
 		temp := map[string]interface{}{
 			"account_id":   ec.AccountID,
@@ -123,7 +123,7 @@ func flattenExtnetComputesList(ecl *extnet.ListExtNetComputes) []map[string]inte
 }
 
 func flattenExtnetList(el *extnet.ListExtNets) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(el.Data))
 	for _, e := range el.Data {
 		temp := map[string]interface{}{
 			"net_id": e.ID,

internal/service/cloudapi/extnet/utility_extnet_computes_list.go

@@ -48,6 +48,20 @@ func utilityExtnetComputesListCheckPresence(ctx context.Context, d *schema.Resou
 		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/image/resource_image.go

@@ -144,7 +144,8 @@ func resourceImageRead(ctx context.Context, d *schema.ResourceData, m interface{
 	case status.Created:
 	case status.Destroyed, status.Purged:
 		d.SetId("")
-		return resourceImageCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceImageCreate(ctx, d, m)
 	}
 
 	flattenImage(d, img)
@@ -233,7 +234,8 @@ func resourceImageUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 	case status.Created:
 	case status.Destroyed, status.Purged:
 		d.SetId("")
-		return resourceImageCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceImageCreate(ctx, d, m)
 	}
 
 	if d.HasChange("name") {

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/k8s/data_source_k8s_computes.go

@@ -80,10 +80,6 @@ func computesSchemaMake() map[string]*schema.Schema {
 	}
 }
 
-func workerComputesSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{}
-}
-
 func dataSourceK8sComputesSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"k8s_id": {

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_cloud_init.go

@@ -0,0 +1,93 @@
+/*
+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 {
+		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/flattens.go

@@ -42,7 +42,7 @@ import (
 )
 
 func flattenK8CIItems(list *k8ci.ListK8CI) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(list.Data))
 	for _, item := range list.Data {
 		temp := map[string]interface{}{
 			"k8ci_id":         item.ID,
@@ -72,7 +72,7 @@ func flattenK8sDataComputes(d *schema.ResourceData, cluster *k8s.RecordK8S) {
 }
 
 func flattenMasterComputes(cluster *k8s.RecordK8S) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	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,
@@ -88,7 +88,7 @@ func flattenMasterComputes(cluster *k8s.RecordK8S) []map[string]interface{} {
 }
 
 func flattenWorkerComputes(cluster *k8s.RecordK8S) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	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{}{
@@ -106,7 +106,7 @@ func flattenWorkerComputes(cluster *k8s.RecordK8S) []map[string]interface{} {
 }
 
 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,
@@ -134,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,
@@ -147,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{}{
@@ -193,7 +193,7 @@ 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 {
@@ -222,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))
@@ -267,7 +267,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,
@@ -288,7 +288,7 @@ func flattenWorkersGroup(workersGroups k8s.ListK8SGroups) []map[string]interface
 }
 
 func flattenK8sItems(k8sItems *k8s.ListK8SClusters) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len (k8sItems.Data))
 	for _, item := range k8sItems.Data {
 		temp := map[string]interface{}{
 			"account_id":      item.AccountID,
@@ -396,7 +396,7 @@ 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)
+	labels := make([]string, 0, len(wg.Labels))
 	for _, label := range wg.Labels {
 		if strings.HasPrefix(label, "workersGroupName") {
 			continue
@@ -418,7 +418,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/old_schemas.go

@@ -0,0 +1,396 @@
+package k8s
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceK8sCPSchemaV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of the cluster.",
+			},
+			"rg_id": {
+				Type:        schema.TypeInt,
+				Required:    true,
+				ForceNew:    true,
+				Description: "Resource group ID that this instance belongs to.",
+			},
+			"k8sci_id": {
+				Type:        schema.TypeInt,
+				Required:    true,
+				ForceNew:    true,
+				Description: "ID of the k8s catalog item to base this instance on.",
+			},
+			"network_plugin": {
+				Type:         schema.TypeString,
+				Required:     true,
+				Description:  "Network plugin to be used",
+				ValidateFunc: validation.StringInSlice([]string{"flannel", "weavenet", "calico"}, true),
+			},
+			"num": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validation.IntInSlice([]int{1, 3}),
+				Description:  "Number of VMs to create. Can be either 1 or 3",
+			},
+			"cpu": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Node CPU count.",
+			},
+			"ram": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Node RAM in MB.",
+			},
+			"disk": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Node boot disk size in GB.",
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Storage Endpoint ID",
+			},
+			"sep_pool": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "Storage Endpoint Pool",
+			},
+			"with_lb": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Create k8s with load balancer if true.",
+			},
+			"extnet_only": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Use only selected ExtNet for infrastructure connections",
+			},
+			// /4.4.0
+			"cloud_init": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Meta data for working group computes, format YAML 'user_data': 1111",
+			},
+			"join_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to configure the behavior and settings for joining a node to a cluster. It includes parameters such as the cluster's control plane endpoint, token, and certificate key. insert a valid JSON string with all levels of nesting.",
+			},
+			"kube_proxy_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to configure the behavior and settings of the Kube-proxy, which is responsible for network proxying and load balancing within the cluster. It includes parameters such as proxy mode, cluster IP ranges, and other Kube-proxy specific configurations. insert a valid JSON string with all levels of nesting.",
+			},
+			"kubelet_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to configure the behavior and settings of the Kubelet, which is the primary node agent that runs on each node in the cluster. It includes parameters such as node IP address, resource allocation, pod eviction policies, and other Kubelet-specific configurations. insert a valid JSON string with all levels of nesting.",
+			},
+			"cluster_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to define global settings and configurations for the entire cluster. It includes parameters such as cluster name, DNS settings, authentication methods, and other cluster-wide configurations. insert a valid JSON string with all levels of nesting.",
+			},
+			"init_config": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "is used to define settings and actions that should be performed before any other component in the cluster starts. It allows you to configure things like node registration, network setup, and other initialization tasks. insert a valid JSON string with all levels of nesting.",
+			},
+			"additional_sans": {
+				Type:        schema.TypeList,
+				Optional:    true,
+				Description: "Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"ha_mode": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: "Use Highly Available schema for LB deploy",
+			},
+			"lb_sysctl_params": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Custom sysctl values for Load Balancer instance. Applied on boot.",
+			},
+			"oidc_cert": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "insert ssl certificate in x509 pem format",
+			},
+			////
+			"extnet_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				ForceNew:    true,
+				Description: "ID of the external network to connect workers to. If omitted network will be chosen by the platfom.",
+			},
+			"desc": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Text description of this instance.",
+			},
+			"start": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Start k8s cluster.",
+			},
+			"detailed_info": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"compute_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,
+						},
+						"interfaces": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"def_gw": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"ip_address": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"natable_vins_ip": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"natable_vins_network": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"master_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Master group ID.",
+			},
+			"master_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Master group name.",
+			},
+			"acl": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"account_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,
+									},
+								},
+							},
+						},
+						"k8s_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,
+									},
+								},
+							},
+						},
+						"rg_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,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			"account_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"account_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"bservice_id": {
+				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,
+			},
+			"k8s_ci_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"lb_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"k8s_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"lb_ip": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "IP address of default load balancer.",
+			},
+			"rg_name": {
+				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,
+			},
+			"kubeconfig": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Kubeconfig for cluster access.",
+			},
+			"vins_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "ID of default vins for this instace.",
+			},
+		},
+	}
+}

internal/service/cloudapi/k8s/resource_k8s.go

@@ -145,12 +145,66 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 
 	createReq.WithLB = d.Get("with_lb").(bool)
 
+	///4.4.0
+	createReq.HighlyAvailable = d.Get("ha_mode").(bool)
+
+	if additionalSans, ok := d.GetOk("additional_sans"); ok {
+		addSans := additionalSans.([]interface{})
+		resSans := make([]string, 0)
+		for _, san := range addSans {
+			resSans = append(resSans, san.(string))
+		}
+
+		createReq.AdditionalSANs = resSans
+	}
+
+	if clusterConfig, ok := d.GetOk("cluster_config"); ok {
+		createReq.ClusterConfiguration = clusterConfig.(string)
+	}
+
+	if kubeletConfig, ok := d.GetOk("kubelet_config"); ok {
+		createReq.KubeletConfiguration = kubeletConfig.(string)
+	}
+
+	if kubeProxyConfig, ok := d.GetOk("kube_proxy_config"); ok {
+		createReq.KubeProxyConfiguration = kubeProxyConfig.(string)
+	}
+
+	if joinConfig, ok := d.GetOk("join_config"); ok {
+		createReq.JoinConfiguration = joinConfig.(string)
+	}
+
+	if cloudInit, ok := d.GetOk("cloud_init"); ok {
+		createReq.UserData = cloudInit.(string)
+	}
+
+	if initConfig, ok := d.GetOk("init_config"); ok {
+		createReq.InitConfiguration = initConfig.(string)
+	}
+
+	if lbSysctlParams, ok := d.GetOk("lb_sysctl_params"); ok {
+		createReq.LbSysctlParams = lbSysctlParams.(string)
+	}
+
+	if oidcCertificate, ok := d.GetOk("oidc_cert"); ok {
+		createReq.OidcCertificate = oidcCertificate.(string)
+	}
+	///
+
+	createReq.ExtNetOnly = d.Get("extnet_only").(bool)
+
 	if extNet, ok := d.GetOk("extnet_id"); ok {
 		createReq.ExtNetID = uint64(extNet.(int))
 	} else {
 		createReq.ExtNetID = 0
 	}
 
+	if vins, ok := d.GetOk("vins_id"); ok {
+		createReq.VinsId = uint64(vins.(int))
+	} else {
+		createReq.VinsId = 0
+	}
+
 	if desc, ok := d.GetOk("desc"); ok {
 		createReq.Description = desc.(string)
 	}
@@ -181,7 +235,7 @@ func resourceK8sCreate(ctx context.Context, d *schema.ResourceData, m interface{
 			break
 		}
 
-		time.Sleep(time.Second * 10)
+		time.Sleep(time.Second * 20)
 	}
 
 	return resourceK8sRead(ctx, d, m)
@@ -205,31 +259,32 @@ func resourceK8sRead(ctx context.Context, d *schema.ResourceData, m interface{})
 	case status.Created:
 	case status.Deleting:
 	case status.Deleted:
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
-		restoreReq := k8s.RestoreRequest{
-			K8SID: id,
-		}
+		// id, _ := strconv.ParseUint(d.Id(), 10, 64)
+		// restoreReq := k8s.RestoreRequest{
+		// 	K8SID: id,
+		// }
 
-		_, err := c.CloudAPI().K8S().Restore(ctx, restoreReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().K8S().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		enableReq := k8s.DisableEnableRequest{
-			K8SID: id,
-		}
+		// enableReq := k8s.DisableEnableRequest{
+		// 	K8SID: id,
+		// }
 
-		_, err = c.CloudAPI().K8S().Enable(ctx, enableReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err = c.CloudAPI().K8S().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Destroying:
 		return diag.Errorf("The k8s cluster is in progress with status: %s", cluster.Status)
 	case status.Destroyed:
 		d.SetId("")
-		return resourceK8sCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceK8sCreate(ctx, d, m)
 	case status.Enabling:
 	case status.Enabled:
 	case status.Disabling:
@@ -388,7 +443,8 @@ func resourceK8sUpdate(ctx context.Context, d *schema.ResourceData, m interface{
 		return diag.Errorf("The k8s cluster is in progress with status: %s", cluster.Status)
 	case status.Destroyed:
 		d.SetId("")
-		return resourceK8sCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceK8sCreate(ctx, d, m)
 	case status.Enabling:
 	case status.Enabled:
 	case status.Disabling:
@@ -561,6 +617,12 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			Default:     true,
 			Description: "Create k8s with load balancer if true.",
 		},
+		"extnet_only": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Use only selected ExtNet for infrastructure connections",
+		},
 		"extnet_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -568,6 +630,63 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 			ForceNew:    true,
 			Description: "ID of the external network to connect workers to. If omitted network will be chosen by the platfom.",
 		},
+
+		///4.4.0
+		"cloud_init": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Meta data for working group computes, format YAML 'user_data': 1111",
+		},
+		"join_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to configure the behavior and settings for joining a node to a cluster. It includes parameters such as the cluster's control plane endpoint, token, and certificate key. insert a valid JSON string with all levels of nesting.",
+		},
+		"kube_proxy_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to configure the behavior and settings of the Kube-proxy, which is responsible for network proxying and load balancing within the cluster. It includes parameters such as proxy mode, cluster IP ranges, and other Kube-proxy specific configurations. insert a valid JSON string with all levels of nesting.",
+		},
+		"kubelet_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to configure the behavior and settings of the Kubelet, which is the primary node agent that runs on each node in the cluster. It includes parameters such as node IP address, resource allocation, pod eviction policies, and other Kubelet-specific configurations. insert a valid JSON string with all levels of nesting.",
+		},
+		"cluster_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to define global settings and configurations for the entire cluster. It includes parameters such as cluster name, DNS settings, authentication methods, and other cluster-wide configurations. insert a valid JSON string with all levels of nesting.",
+		},
+		"init_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to define settings and actions that should be performed before any other component in the cluster starts. It allows you to configure things like node registration, network setup, and other initialization tasks. insert a valid JSON string with all levels of nesting.",
+		},
+		"additional_sans": {
+			Type:        schema.TypeList,
+			Optional:    true,
+			Description: "Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names",
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"ha_mode": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Use Highly Available schema for LB deploy",
+		},
+		"lb_sysctl_params": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Custom sysctl values for Load Balancer instance. Applied on boot.",
+		},
+		"oidc_cert": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "insert ssl certificate in x509 pem format",
+		},
+		////
+
 		"desc": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -660,6 +779,7 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 		},
 		"vins_id": {
 			Type:        schema.TypeInt,
+			Optional:    true,
 			Computed:    true,
 			Description: "ID of default vins for this instace.",
 		},

internal/service/cloudapi/k8s/resource_k8s_cp.go

@@ -129,12 +129,68 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 
 	createReq.WithLB = d.Get("with_lb").(bool)
 
+	///4.4.0
+	createReq.HighlyAvailable = d.Get("ha_mode").(bool)
+
+	if additionalSans, ok := d.GetOk("additional_sans"); ok {
+		addSans := additionalSans.([]interface{})
+		resSans := make([]string, 0)
+		for _, san := range addSans {
+			resSans = append(resSans, san.(string))
+		}
+
+		createReq.AdditionalSANs = resSans
+	}
+
+	if clusterConfig, ok := d.GetOk("cluster_config"); ok {
+		createReq.ClusterConfiguration = clusterConfig.(string)
+	}
+
+	if kubeletConfig, ok := d.GetOk("kubelet_config"); ok {
+		createReq.KubeletConfiguration = kubeletConfig.(string)
+	}
+
+	if kubeProxyConfig, ok := d.GetOk("kube_proxy_config"); ok {
+		createReq.KubeProxyConfiguration = kubeProxyConfig.(string)
+	}
+
+	if joinConfig, ok := d.GetOk("join_config"); ok {
+		createReq.JoinConfiguration = joinConfig.(string)
+	}
+
+	// if cloudInit, ok := d.GetOk("cloud_init"); ok {
+	// 	createReq.UserData = cloudInit.(string)
+	// }
+
+	if initConfig, ok := d.GetOk("init_config"); ok {
+		createReq.InitConfiguration = initConfig.(string)
+	}
+
+	if lbSysctlParams, ok := d.GetOk("lb_sysctl_params"); ok {
+		createReq.LbSysctlParams = lbSysctlParams.(string)
+	}
+
+	if oidcCertificate, ok := d.GetOk("oidc_cert"); ok {
+		createReq.OidcCertificate = oidcCertificate.(string)
+		log.Debug(createReq.OidcCertificate)
+	}
+
+	///
+
+	createReq.ExtNetOnly = d.Get("extnet_only").(bool)
+
 	if extNet, ok := d.GetOk("extnet_id"); ok {
 		createReq.ExtNetID = uint64(extNet.(int))
 	} else {
 		createReq.ExtNetID = 0
 	}
 
+	if vins, ok := d.GetOk("vins_id"); ok {
+		createReq.VinsId = uint64(vins.(int))
+	} else {
+		createReq.VinsId = 0
+	}
+
 	if desc, ok := d.GetOk("desc"); ok {
 		createReq.Description = desc.(string)
 	}
@@ -165,7 +221,7 @@ func resourceK8sCPCreate(ctx context.Context, d *schema.ResourceData, m interfac
 			break
 		}
 
-		time.Sleep(time.Second * 10)
+		time.Sleep(time.Second * 20)
 	}
 
 	cluster, err := utilityK8sCheckPresence(ctx, d, m)
@@ -204,31 +260,32 @@ func resourceK8sCPRead(ctx context.Context, d *schema.ResourceData, m interface{
 	case status.Created:
 	case status.Deleting:
 	case status.Deleted:
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
-		restoreReq := k8s.RestoreRequest{
-			K8SID: id,
-		}
+		// id, _ := strconv.ParseUint(d.Id(), 10, 64)
+		// restoreReq := k8s.RestoreRequest{
+		// 	K8SID: id,
+		// }
 
-		_, err := c.CloudAPI().K8S().Restore(ctx, restoreReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().K8S().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		enableReq := k8s.DisableEnableRequest{
-			K8SID: id,
-		}
+		// enableReq := k8s.DisableEnableRequest{
+		// 	K8SID: id,
+		// }
 
-		_, err = c.CloudAPI().K8S().Enable(ctx, enableReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err = c.CloudAPI().K8S().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Destroying:
 		return diag.Errorf("The k8s cluster is in progress with status: %s", cluster.Status)
 	case status.Destroyed:
 		d.SetId("")
-		return resourceK8sCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceK8sCreate(ctx, d, m)
 	case status.Enabling:
 	case status.Enabled:
 	case status.Disabling:
@@ -291,7 +348,7 @@ func resourceK8sCPRead(ctx context.Context, d *schema.ResourceData, m interface{
 
 	if _, ok := d.GetOk("k8s_id"); !ok {
 		for _, worker := range cluster.K8SGroups.Workers {
-			err := fmt.Errorf("Found worker-group with ID %d. Make sure to import it to decort_k8s_wg resource if you wish to manage it", worker.ID)
+			err := fmt.Errorf("found worker-group with ID %d. Make sure to import it to decort_k8s_wg resource if you wish to manage it", worker.ID)
 			warnings.Add(err)
 		}
 	}
@@ -387,7 +444,8 @@ func resourceK8sCPUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.Errorf("The k8s cluster is in progress with status: %s", cluster.Status)
 	case status.Destroyed:
 		d.SetId("")
-		return resourceK8sCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceK8sCreate(ctx, d, m)
 	case status.Enabling:
 	case status.Enabled:
 	case status.Disabling:
@@ -567,6 +625,61 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 			Default:     true,
 			Description: "Create k8s with load balancer if true.",
 		},
+		"extnet_only": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Use only selected ExtNet for infrastructure connections",
+		},
+		"join_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to configure the behavior and settings for joining a node to a cluster. It includes parameters such as the cluster's control plane endpoint, token, and certificate key. insert a valid JSON string with all levels of nesting.",
+		},
+		"kube_proxy_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to configure the behavior and settings of the Kube-proxy, which is responsible for network proxying and load balancing within the cluster. It includes parameters such as proxy mode, cluster IP ranges, and other Kube-proxy specific configurations. insert a valid JSON string with all levels of nesting.",
+		},
+		"kubelet_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to configure the behavior and settings of the Kubelet, which is the primary node agent that runs on each node in the cluster. It includes parameters such as node IP address, resource allocation, pod eviction policies, and other Kubelet-specific configurations. insert a valid JSON string with all levels of nesting.",
+		},
+		"cluster_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to define global settings and configurations for the entire cluster. It includes parameters such as cluster name, DNS settings, authentication methods, and other cluster-wide configurations. insert a valid JSON string with all levels of nesting.",
+		},
+		"init_config": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "is used to define settings and actions that should be performed before any other component in the cluster starts. It allows you to configure things like node registration, network setup, and other initialization tasks. insert a valid JSON string with all levels of nesting.",
+		},
+		"additional_sans": {
+			Type:        schema.TypeList,
+			Optional:    true,
+			Description: "Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names",
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"ha_mode": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Description: "Use Highly Available schema for LB deploy",
+		},
+		"lb_sysctl_params": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Custom sysctl values for Load Balancer instance. Applied on boot.",
+		},
+		"oidc_cert": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "insert ssl certificate in x509 pem format",
+		},
+		////
 		"extnet_id": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -681,6 +794,7 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 		},
 		"vins_id": {
 			Type:        schema.TypeInt,
+			Optional:    true,
 			Computed:    true,
 			Description: "ID of default vins for this instace.",
 		},
@@ -689,7 +803,7 @@ func resourceK8sCPSchemaMake() map[string]*schema.Schema {
 
 func ResourceK8sCP() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceK8sCPCreate,
 		ReadContext:   resourceK8sCPRead,
@@ -709,5 +823,12 @@ func ResourceK8sCP() *schema.Resource {
 		},
 
 		Schema: resourceK8sCPSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceK8sCPSchemaV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceK8sCPStateUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudapi/k8s/resource_k8s_wg.go

@@ -92,6 +92,10 @@ func resourceK8sWgCreate(ctx context.Context, d *schema.ResourceData, m interfac
 		req.WorkerDisk = uint64(d.Get("disk").(int))
 	}
 
+	if cloudInit, ok := d.GetOk("cloud_init"); ok {
+		req.UserData = cloudInit.(string)
+	}
+
 	resp, err := c.CloudAPI().K8S().WorkersGroupAdd(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
@@ -110,7 +114,7 @@ func resourceK8sWgRead(ctx context.Context, d *schema.ResourceData, m interface{
 		return diag.FromErr(err)
 	}
 
-	workersComputeList := make([]compute.RecordCompute, 0, 0)
+	workersComputeList := make([]compute.RecordCompute, 0)
 	for _, info := range wg.DetailedInfo {
 		compute, err := utilityComputeCheckPresence(ctx, d, m, info.ID)
 		if err != nil {
@@ -184,6 +188,19 @@ func resourceK8sWgUpdate(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
+	if d.HasChange("cloud_init") {
+		req := k8s.UpdateWorkerNodesMetaDataRequest{
+			K8SID:          uint64(d.Get("k8s_id").(int)),
+			WorkersGroupID: wgId,
+			UserData:       d.Get("cloud_init").(string),
+		}
+
+		_, err := c.CloudAPI().K8S().UpdateWorkerNodesMetaData(ctx, req)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return nil
 }
 
@@ -286,6 +303,11 @@ func resourceK8sWgSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Optional: true,
 		},
+		"cloud_init": {
+			Type:             schema.TypeString,
+			Optional:         true,
+			DiffSuppressFunc: cloudInitDiffSupperss,
+		},
 		"wg_id": {
 			Type:        schema.TypeInt,
 			Computed:    true,

internal/service/cloudapi/k8s/state_upgraders.go

@@ -0,0 +1,15 @@
+package k8s
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourceK8sCPStateUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceK8sCPStateUpgradeV1: upgrading state")
+
+	delete(rawState, "cloud_init")
+
+	return rawState, nil
+}

internal/service/cloudapi/k8s/utility_k8s.go

@@ -261,6 +261,19 @@ func utilityK8sListCheckPresence(ctx context.Context, d *schema.ResourceData, m
 		req.TechStatus = tech_status.(string)
 	}
 
+	if includedeleted, ok := d.GetOk("includedeleted"); ok {
+		req.IncludeDeleted = includedeleted.(bool)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+
 	k8sList, err := c.CloudAPI().K8S().List(ctx, req)
 	if err != nil {
 		return nil, err
@@ -297,14 +310,18 @@ func utilityK8sListDeletedCheckPresence(ctx context.Context, d *schema.ResourceD
 		req.BasicServiceID = uint64(bservice_id.(int))
 	}
 
-	if status, ok := d.GetOk("status"); ok {
-		req.Status = status.(string)
-	}
-
 	if tech_status, ok := d.GetOk("tech_status"); ok {
 		req.TechStatus = tech_status.(string)
 	}
 
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
 	k8sList, err := c.CloudAPI().K8S().ListDeleted(ctx, req)
 	if err != nil {
 		return nil, err

internal/service/cloudapi/k8s/utility_k8s_wg.go

@@ -39,6 +39,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
@@ -70,7 +71,7 @@ func utilityDataK8sWgCheckPresence(ctx context.Context, d *schema.ResourceData,
 		return nil, nil, fmt.Errorf("WG with id %v in k8s cluster %v not found", wgId, k8sId)
 	}
 
-	workersComputeList := make([]compute.RecordCompute, 0, 0)
+	workersComputeList := make([]compute.RecordCompute, 0)
 	for _, info := range curWg.DetailedInfo {
 		compute, err := utilityComputeCheckPresence(ctx, d, m, info.ID)
 		if err != nil {
@@ -121,7 +122,7 @@ func utilityK8sWgCheckPresence(ctx context.Context, d *schema.ResourceData, m in
 		}
 	}
 
-	return nil, fmt.Errorf("Not found wg with id: %v in k8s cluster: %v", wgId, cluster.ID)
+	return nil, fmt.Errorf("not found wg with id: %v in k8s cluster: %v", wgId, cluster.ID)
 }
 
 func utilityK8sWgListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (k8s.ListK8SGroups, error) {
@@ -137,3 +138,27 @@ func utilityK8sWgListCheckPresence(ctx context.Context, d *schema.ResourceData,
 
 	return cluster.K8SGroups.Workers, nil
 }
+
+func utilityK8sWgCloudInitCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
+	c := m.(*controller.ControllerCfg)
+	req := k8s.GetWorkerNodesMetaDataRequest{
+		K8SID: uint64(d.Get("k8s_id").(int)),
+		WorkersGroupID: uint64(d.Get("wg_id").(int)),
+	}
+
+	cloudInit, err := c.CloudAPI().K8S().GetWorkerNodesMetaData(ctx, req)
+	if err != nil {
+		return "", err
+	}
+
+	return cloudInit, nil
+}
+
+func cloudInitDiffSupperss(key, oldVal, newVal string, d *schema.ResourceData) bool {
+	if newVal != "" && newVal != oldVal {
+		log.Debugf("networkSubresIPAddreDiffSupperss: key=%s, oldVal=%q, newVal=%q -> suppress=FALSE", key, oldVal, newVal)
+		return false
+	}
+	log.Debugf("networkSubresIPAddreDiffSupperss: key=%s, oldVal=%q, newVal=%q -> suppress=TRUE", key, oldVal, newVal)
+	return true // suppress difference
+}

internal/service/cloudapi/kvmvm/data_source_compute_list_deleted.go

@@ -0,0 +1,153 @@
+/*
+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 kvmvm
+
+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 dataSourceComputeListDeletedRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	computeList, err := utilityDataComputeListDeletedCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	result := computeList
+	if d.Get("ignore_k8s").(bool) {
+		// matches automatically generated names like "s234-g2134-c1" etc
+		result = matchComputes(computeList)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenComputeList(result))
+	d.Set("entry_count", computeList.EntryCount)
+
+	return nil
+}
+
+func dataSourceComputeListDeletedSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"by_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by ID",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by name",
+		},
+		"account_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by AccountID",
+		},
+		"rg_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by resgroup name",
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by RGID",
+		},
+		"tech_status": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by tech status",
+		},
+		"ip_address": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by IP address",
+		},
+		"extnet_name": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by Extnet name",
+		},
+		"extnet_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by Extnet ID",
+		},
+		"page": {
+			Type:     schema.TypeInt,
+			Optional: true,
+		},
+		"size": {
+			Type:     schema.TypeInt,
+			Optional: true,
+		},
+		"ignore_k8s": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "If set to true, ignores any VMs associated with any k8s cluster",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: itemComputeSchemaMake(),
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceComputeListDeleted() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceComputeListDeletedRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceComputeListDeletedSchemaMake(),
+	}
+}

internal/service/cloudapi/kvmvm/data_source_compute_pci_device_list.go

@@ -0,0 +1,119 @@
+/*
+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 kvmvm
+
+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 dataSourceComputePCIDeviceListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	computePCIDeviceList, err := utilityComputePCIDeviceListCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenPCIDevice(computePCIDeviceList.Data))
+	d.Set("entry_count", computePCIDeviceList.EntryCount)
+	return nil
+}
+
+func dataSourceComputePCIDeviceListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"compute_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"rg_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by RG id",
+		},
+		"device_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by device id",
+		},
+		"name": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Find by name",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Computed:    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.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func DataSourceComputePCIDeviceList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceComputePCIDeviceListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceComputePCIDeviceListSchemaMake(),
+	}
+}

internal/service/cloudapi/kvmvm/data_source_compute_pfw_list.go

@@ -49,6 +49,7 @@ func dataSourceComputePfwListRead(ctx context.Context, d *schema.ResourceData, m
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenPfwList(computePfwList))
+	d.Set("entry_count", computePfwList.EntryCount)
 	return nil
 }
 
@@ -94,6 +95,10 @@ func dataSourceComputePfwListSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 }
 

internal/service/cloudapi/kvmvm/data_source_compute_vgpu_list.go

@@ -0,0 +1,120 @@
+/*
+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 kvmvm
+
+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 dataSourceComputeVGPUListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	computeVGPUList, err := utilityComputeVGPUListCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenVGPU(computeVGPUList.Data))
+	d.Set("entry_count", computeVGPUList.EntryCount)
+	return nil
+}
+
+func dataSourceComputeVGPUListSchemaMake() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"compute_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"gpu_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by GPU id",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Find by type",
+		},
+		"status": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Find by status",
+		},
+		"includedeleted": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Description: "Include deleted computes. If using field 'status', then includedeleted will be ignored",
+		},
+		"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.Schema{
+				Type: schema.TypeString,
+
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+}
+
+func DataSourceComputeVGPUList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceComputeVGPUListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceComputeVGPUListSchemaMake(),
+	}
+}

internal/service/cloudapi/kvmvm/flattens.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>
@@ -66,7 +66,7 @@ func flattenQOS(qos compute.QOS) []map[string]interface{} {
 	return res
 }
 func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(interfaces))
 	for _, interfaceItem := range interfaces {
 		temp := map[string]interface{}{
 			"conn_id":       interfaceItem.ConnID,
@@ -92,7 +92,7 @@ func flattenInterfaces(interfaces compute.ListInterfaces) []map[string]interface
 	return res
 }
 func flattenSnapSets(snapSets compute.ListSnapSets) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(snapSets))
 	for _, snapSet := range snapSets {
 		temp := map[string]interface{}{
 			"disks":     snapSet.Disks,
@@ -105,7 +105,7 @@ func flattenSnapSets(snapSets compute.ListSnapSets) []map[string]interface{} {
 	return res
 }
 func flattenTags(tags map[string]string) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(tags))
 	for key, val := range tags {
 		temp := map[string]interface{}{
 			"key": key,
@@ -117,7 +117,7 @@ func flattenTags(tags map[string]string) []map[string]interface{} {
 }
 
 func flattenListRules(listRules compute.ListRules) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(listRules))
 	for _, rule := range listRules {
 		temp := map[string]interface{}{
 			"guid":     rule.GUID,
@@ -132,7 +132,7 @@ func flattenListRules(listRules compute.ListRules) []map[string]interface{} {
 	return res
 }
 func flattenListACL(listAcl compute.ListACL) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(listAcl))
 	for _, acl := range listAcl {
 		temp := map[string]interface{}{
 			"explicit":      acl.Explicit,
@@ -148,7 +148,7 @@ func flattenListACL(listAcl compute.ListACL) []map[string]interface{} {
 }
 
 func flattenComputeList(computes *compute.ListComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(computes.Data))
 	for _, compute := range computes.Data {
 		customFields, _ := json.Marshal(compute.CustomFields)
 		devices, _ := json.Marshal(compute.Devices)
@@ -398,7 +398,7 @@ func flattenACL(acl compute.RecordACL) []map[string]interface{} {
 }
 
 func flattenAffinityRules(affinityRules compute.ListRules) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(affinityRules))
 	for _, affinityRule := range affinityRules {
 		temp := map[string]interface{}{
 			"guid":     affinityRule.GUID,
@@ -437,7 +437,7 @@ func flattenIotune(iotune compute.IOTune) []map[string]interface{} {
 }
 
 func flattenSnapshots(snapshots compute.SnapshotExtendList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(snapshots))
 	for _, snapshot := range snapshots {
 		temp := map[string]interface{}{
 			"guid":          snapshot.GUID,
@@ -455,7 +455,7 @@ func flattenSnapshots(snapshots compute.SnapshotExtendList) []map[string]interfa
 }
 
 func flattenListComputeDisks(disks compute.ListComputeDisks) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(disks))
 	for _, disk := range disks {
 		acl, _ := json.Marshal(disk.ACL)
 		temp := map[string]interface{}{
@@ -511,7 +511,7 @@ func flattenCustomFields(customFields map[string]interface{}) string {
 }
 
 func flattenOsUsers(osUsers compute.ListOSUser) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(osUsers))
 	for _, user := range osUsers {
 		temp := map[string]interface{}{
 			"guid":       user.GUID,
@@ -590,7 +590,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 }
 
 func flattenComputeAudits(computeAudits compute.ListAudits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(computeAudits))
 	for _, computeAudit := range computeAudits {
 		temp := map[string]interface{}{
 			"call":         computeAudit.Call,
@@ -605,7 +605,7 @@ func flattenComputeAudits(computeAudits compute.ListAudits) []map[string]interfa
 }
 
 func flattenPfwList(computePfws *compute.ListPFWs) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(computePfws.Data))
 	for _, computePfw := range computePfws.Data {
 		temp := map[string]interface{}{
 			"pfw_id":            computePfw.ID,
@@ -628,7 +628,7 @@ func flattenUserList(d *schema.ResourceData, userList *compute.ListUsers) {
 }
 
 func flattenComputeGetAudits(computeAudits compute.ListShortAudits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(computeAudits))
 	for _, computeAudit := range computeAudits {
 		temp := map[string]interface{}{
 			"epoch":   computeAudit.Epoch,
@@ -640,7 +640,7 @@ func flattenComputeGetAudits(computeAudits compute.ListShortAudits) []map[string
 }
 
 func flattenSnapshotUsage(computeSnapshotUsages compute.ListUsageSnapshots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(computeSnapshotUsages))
 	for _, computeUsage := range computeSnapshotUsages {
 		temp := map[string]interface{}{
 			"count":     computeUsage.Count,
@@ -652,3 +652,55 @@ func flattenSnapshotUsage(computeSnapshotUsages compute.ListUsageSnapshots) []ma
 	}
 	return res
 }
+
+func flattenSnapshotList(computeSnapshotUsages *compute.ListSnapShots) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(computeSnapshotUsages.Data))
+	for _, computeUsage := range computeSnapshotUsages.Data {
+		temp := map[string]interface{}{
+			"disks":     computeUsage.Disks,
+			"guid":    computeUsage.GUID,
+			"label":     computeUsage.Label,
+			"timestamp": computeUsage.Timestamp,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenVGPU(m []interface{}) []string {
+	output := []string{}
+	for _, item := range m {
+		switch d := item.(type) {
+		case string:
+			output = append(output, d)
+		case int:
+			output = append(output, strconv.Itoa(d))
+		case int64:
+			output = append(output, strconv.FormatInt(d, 10))
+		case float64:
+			output = append(output, strconv.FormatInt(int64(d), 10))
+		default:
+			output = append(output, "")
+		}
+	}
+	return output
+}
+
+func flattenPCIDevice(m []interface{}) []string {
+	output := []string{}
+	for _, item := range m {
+		switch d := item.(type) {
+		case string:
+			output = append(output, d)
+		case int:
+			output = append(output, strconv.Itoa(d))
+		case int64:
+			output = append(output, strconv.FormatInt(d, 10))
+		case float64:
+			output = append(output, strconv.FormatInt(int64(d), 10))
+		default:
+			output = append(output, "")
+		}
+	}
+	return output
+}

internal/service/cloudapi/kvmvm/old_schemas.go

@@ -548,3 +548,882 @@ func resourceComputeResourceV1() *schema.Resource {
 		},
 	}
 }
+
+func resourceComputeResourceV2() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Name of this compute. Compute names are case sensitive and must be unique in the resource group.",
+			},
+			"rg_id": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.IntAtLeast(1),
+				Description:  "ID of the resource group where this compute should be deployed.",
+			},
+			"driver": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				StateFunc:    statefuncs.StateFuncToUpper,
+				ValidateFunc: validation.StringInSlice([]string{"SVA_KVM_X86", "KVM_X86", "KVM_PPC"}, false), // observe case while validating
+				Description:  "Hardware architecture of this compute instance.",
+			},
+			"cpu": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntBetween(1, constants.MaxCpusPerCompute),
+				Description:  "Number of CPUs to allocate to this compute instance.",
+			},
+			"ram": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntAtLeast(constants.MinRamPerCompute),
+				Description:  "Amount of RAM in MB to allocate to this compute instance.",
+			},
+			"image_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew:    true, //REDEPLOY
+				Description: "ID of the OS image to base this compute instance on.",
+			},
+			"boot_disk_size": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.",
+			},
+			"affinity_label": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Set affinity label for compute",
+			},
+			"affinity_rules": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"topology": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"node", "compute"}, false),
+							Description:  "compute or node, for whom rule applies",
+						},
+						"policy": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"RECOMMENDED", "REQUIRED"}, false),
+							Description:  "RECOMMENDED or REQUIRED, the degree of 'strictness' of this rule",
+						},
+						"mode": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"EQ", "NE", "ANY"}, false),
+							Description:  "EQ or NE or ANY - the comparison mode is 'value', recorded by the specified 'key'",
+						},
+						"key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "key that are taken into account when analyzing this rule will be identified",
+						},
+						"value": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "value that must match the key to be taken into account when analyzing this rule",
+						},
+					},
+				},
+			},
+			"anti_affinity_rules": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"topology": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"node", "compute"}, false),
+							Description:  "compute or node, for whom rule applies",
+						},
+						"policy": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"RECOMMENDED", "REQUIRED"}, false),
+							Description:  "RECOMMENDED or REQUIRED, the degree of 'strictness' of this rule",
+						},
+						"mode": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"EQ", "NE", "ANY"}, false),
+							Description:  "EQ or NE or ANY - the comparison mode is 'value', recorded by the specified 'key'",
+						},
+						"key": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "key that are taken into account when analyzing this rule will be identified",
+						},
+						"value": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "value that must match the key to be taken into account when analyzing this rule",
+						},
+					},
+				},
+			},
+			"disks": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_name": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Name for disk",
+						},
+						"size": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "Disk size in GiB",
+						},
+						"sep_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Storage endpoint provider ID; by default the same with boot disk",
+						},
+						"disk_type": {
+							Type:         schema.TypeString,
+							Computed:     true,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice([]string{"B", "D"}, false),
+							Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data'",
+						},
+						"pool": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Pool name; by default will be chosen automatically",
+						},
+						"desc": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Optional description",
+						},
+						"image_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Specify image id for create disk from template",
+						},
+						"permanently": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Optional:    true,
+							Description: "Disk deletion status",
+						},
+						"disk_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Disk ID",
+						},
+						"shareable": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"size_max": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"size_used": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"custom_fields": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"stateless": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Compute will be stateless (SVA_KVM_X86) if set to True",
+			},
+			"with_default_vins": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Create compute with default resgroup ViNS (true) or without any interfaces (false). This parameter is ignored if network block is specified",
+			},
+			"boot_disk": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_name": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "Name for disk",
+						},
+						"size": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "Disk size in GiB",
+						},
+						"sep_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Storage endpoint provider ID; by default the same with boot disk",
+						},
+						"disk_type": {
+							Type:         schema.TypeString,
+							Computed:     true,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice([]string{"B", "D"}, false),
+							Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data'",
+						},
+						"pool": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Pool name; by default will be chosen automatically",
+						},
+						"desc": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Optional:    true,
+							Description: "Optional description",
+						},
+						"image_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Optional:    true,
+							Description: "Specify image id for create disk from template",
+						},
+						"permanently": {
+							Type:        schema.TypeBool,
+							Computed:    true,
+							Optional:    true,
+							Description: "Disk deletion status",
+						},
+						"disk_id": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "Disk ID",
+						},
+						"shareable": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"size_max": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"size_used": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"sep_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				ForceNew:    true,
+				Description: "ID of SEP to create bootDisk on. Uses image's sepId if not set.",
+			},
+			"pool": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				ForceNew:    true,
+				Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
+			},
+
+			"extra_disks": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				MaxItems: constants.MaxExtraDisksPerCompute,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+				Description: "Optional list of IDs of extra disks to attach to this compute. You may specify several extra disks.",
+			},
+
+			"network": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				MinItems: 1,
+				MaxItems: constants.MaxNetworksPerCompute,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"net_type": {
+							Type:         schema.TypeString,
+							Required:     true,
+							StateFunc:    statefuncs.StateFuncToUpper,
+							ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS"}, false), // observe case while validating
+							Description:  "Type of the network for this connection, either EXTNET or VINS.",
+						},
+
+						"net_id": {
+							Type:        schema.TypeInt,
+							Required:    true,
+							Description: "ID of the network for this connection.",
+						},
+
+						"ip_address": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							Computed:         true,
+							DiffSuppressFunc: networkSubresIPAddreDiffSupperss,
+							Description:      "Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.",
+						},
+
+						"mac": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "MAC address associated with this connection. MAC address is assigned automatically.",
+						},
+					},
+				},
+				Description: "Optional network connection(s) for this compute. You may specify several network blocks, one for each connection.",
+			},
+
+			"tags": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"key": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+						"value": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"port_forwarding": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"public_port_start": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+						"public_port_end": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Default:  -1,
+						},
+						"local_port": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+						"proto": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validation.StringInSlice([]string{"tcp", "udp"}, false),
+						},
+					},
+				},
+			},
+
+			"user_access": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"username": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+						"access_type": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"snapshot": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"label": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"rollback": {
+				Type:     schema.TypeSet,
+				MaxItems: 1,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"label": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"cd": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"cdrom_id": {
+							Type:     schema.TypeInt,
+							Required: true,
+						},
+					},
+				},
+			},
+
+			"pin_to_stack": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
+			"description": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Optional text description of this compute instance.",
+			},
+
+			"cloud_init": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Optional cloud_init parameters. Applied when creating new compute instance only, ignored in all other cases.",
+			},
+
+			"enabled": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Computed:    true,
+				Description: "If true - enable compute, else - disable",
+			},
+
+			"pause": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
+			"reset": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
+			"auto_start": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Flag for redeploy compute",
+			},
+			"force_stop": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Flag for redeploy compute",
+			},
+			"data_disks": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice([]string{"KEEP", "DETACH", "DESTROY"}, false),
+				Default:      "DETACH",
+				Description:  "Flag for redeploy compute",
+			},
+			"started": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     true,
+				Description: "Is compute started.",
+			},
+			"detach_disks": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
+			"permanently": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
+			"is": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "system name",
+			},
+			"ipa_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "compute purpose",
+			},
+			// The rest are Compute properties, which are "computed" once it is created
+			"account_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "ID of the account this compute instance belongs to.",
+			},
+			"account_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the account this compute instance belongs to.",
+			},
+			"affinity_weight": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"arch": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"boot_order": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"boot_disk_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "This compute instance boot disk ID.",
+			},
+			"clone_reference": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"clones": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"computeci_id": {
+				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,
+			},
+			"devices": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"guid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"compute_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"interfaces": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"conn_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"conn_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"def_gw": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"flip_group_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"ip_address": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"listen_ssh": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
+						"mac": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"net_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"netmask": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"net_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"pci_slot": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"qos": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"e_rate": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"guid": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"in_brust": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+									"in_rate": {
+										Type:     schema.TypeInt,
+										Computed: true,
+									},
+								},
+							},
+						},
+						"target": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"vnfs": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeInt,
+							},
+						},
+					},
+				},
+			},
+			"lock_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"manager_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"manager_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"migrationjob": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"milestones": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"natable_vins_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"natable_vins_ip": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"natable_vins_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"natable_vins_network": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"natable_vins_network_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"os_users": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "GUID of this guest OS user.",
+						},
+
+						"login": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Login name of this guest OS user.",
+						},
+
+						"password": {
+							Type:     schema.TypeString,
+							Computed: true,
+							//Sensitive:   true,
+							Description: "Password of this guest OS user.",
+						},
+
+						"public_key": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "SSH public key of this guest OS user.",
+						},
+					},
+				},
+				Description: "Guest OS users provisioned on this compute instance.",
+			},
+			"pinned": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"reference_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"registered": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"res_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"rg_name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Name of the resource group where this compute instance is located.",
+			},
+			"snap_sets": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disks": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeInt,
+							},
+						},
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"label": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"timestamp": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"stateless_sep_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"stateless_sep_type": {
+				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,
+			},
+			"vgpus": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"virtual_image_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"virtual_image_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}

internal/service/cloudapi/kvmvm/resource_check_input_values.go

@@ -63,14 +63,16 @@ func existRgID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool
 func existImageId(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
 	c := m.(*controller.ControllerCfg)
 	imageId := uint64(d.Get("image_id").(int))
-	req := image.ListRequest{}
+	req := image.ListRequest{
+		ByID: imageId,
+	}
 
 	imageList, err := c.CloudAPI().Image().List(ctx, req)
 	if err != nil {
 		return false, err
 	}
 
-	return len(imageList.FilterByID(imageId).Data) != 0, nil
+	return len(imageList.Data) != 0, nil
 }
 
 func existVinsIdInList(vinsId uint64, vinsList *vins.ListVINS) bool {

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -129,9 +129,7 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 		createReqX86.IS = IS.(string)
 	}
 
-	if !d.Get("with_default_vins").(bool) {
-		createReqX86.Interfaces = make([]kvmx86.Interface, 0)
-	}
+	createReqX86.Interfaces = make([]kvmx86.Interface, 0)
 
 	if networks, ok := d.GetOk("network"); ok {
 		if networks.(*schema.Set).Len() > 0 {
@@ -496,7 +494,7 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
 	log.Debugf("resourceComputeRead: called for Compute name %s, RG ID %d",
 		d.Get("name").(string), d.Get("rg_id").(int))
 
-	c := m.(*controller.ControllerCfg)
+	// c := m.(*controller.ControllerCfg)
 
 	computeRec, err := utilityComputeCheckPresence(ctx, d, m)
 	if err != nil {
@@ -507,23 +505,24 @@ func resourceComputeRead(ctx context.Context, d *schema.ResourceData, m interfac
 
 	switch computeRec.Status {
 	case status.Deleted:
-		restoreReq := compute.RestoreRequest{ComputeID: computeRec.ID}
-		enableReq := compute.EnableRequest{ComputeID: computeRec.ID}
+		// restoreReq := compute.RestoreRequest{ComputeID: computeRec.ID}
+		// enableReq := compute.EnableRequest{ComputeID: computeRec.ID}
 
-		_, err := c.CloudAPI().Compute().Restore(ctx, restoreReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().Compute().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		_, err = c.CloudAPI().Compute().Enable(ctx, enableReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err = c.CloudAPI().Compute().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Destroyed:
 		d.SetId("")
-		return resourceComputeCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceComputeCreate(ctx, d, m)
 	case status.Disabled:
 		log.Debugf("The compute is in status: %s, troubles may occur with update. Please, enable compute first.", computeRec.Status)
 	case status.Redeploying:
@@ -642,7 +641,8 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 
 	case status.Destroyed:
 		d.SetId("")
-		return resourceComputeCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceComputeCreate(ctx, d, m)
 	case status.Disabled:
 		log.Debugf("The compute is in status: %s, may troubles can be occured with update. Please, enable compute first.", computeRec.Status)
 	case status.Redeploying:
@@ -1615,14 +1615,14 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 		"rg_id": {
 			Type:         schema.TypeInt,
 			Required:     true,
-			ForceNew:     true,
+			// ForceNew:     true,
 			ValidateFunc: validation.IntAtLeast(1),
 			Description:  "ID of the resource group where this compute should be deployed.",
 		},
 		"driver": {
 			Type:         schema.TypeString,
 			Required:     true,
-			ForceNew:     true,
+			// ForceNew:     true,
 			StateFunc:    statefuncs.StateFuncToUpper,
 			ValidateFunc: validation.StringInSlice([]string{"SVA_KVM_X86", "KVM_X86", "KVM_PPC"}, false), // observe case while validating
 			Description:  "Hardware architecture of this compute instance.",
@@ -1746,12 +1746,6 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Compute will be stateless (SVA_KVM_X86) if set to True",
 		},
-		"with_default_vins": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     true,
-			Description: "Create compute with default resgroup ViNS (true) or without any interfaces (false). This parameter is ignored if network block is specified",
-		},
 		"boot_disk": {
 			Type:     schema.TypeSet,
 			Computed: true,
@@ -1760,17 +1754,17 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			},
 		},
 		"sep_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Computed:    true,
-			ForceNew:    true,
+			Type:     schema.TypeInt,
+			Optional: true,
+			Computed: true,
+			// ForceNew:    true,
 			Description: "ID of SEP to create bootDisk on. Uses image's sepId if not set.",
 		},
 		"pool": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			ForceNew:    true,
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+			// ForceNew:    true,
 			Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
 		},
 
@@ -2138,7 +2132,7 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 
 func ResourceCompute() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 2,
+		SchemaVersion: 3,
 
 		CreateContext: resourceComputeCreate,
 		ReadContext:   resourceComputeRead,
@@ -2164,6 +2158,11 @@ func ResourceCompute() *schema.Resource {
 				Upgrade: resourceCompueteStateUpgradeV1,
 				Version: 1,
 			},
+			{
+				Type:    resourceComputeResourceV2().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceComputeStateUpgradeV2,
+				Version: 2,
+			},
 		},
 	}
 }

internal/service/cloudapi/kvmvm/state_upgraders.go

@@ -31,3 +31,11 @@ func resourceCompueteStateUpgradeV1(ctx context.Context, rawState map[string]int
 
 	return rawState, nil
 }
+
+func resourceComputeStateUpgradeV2(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceComputeStateUpgradeV2: upgrading state")
+	
+	delete(rawState, "with_default_vins")
+
+	return rawState, nil
+}

internal/service/cloudapi/kvmvm/utility_compute_list_deleted.go

@@ -0,0 +1,87 @@
+/*
+Copyright (c) 2019-2023 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+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 kvmvm
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityDataComputeListDeletedCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*compute.ListComputes, error) {
+	c := m.(*controller.ControllerCfg)
+	req := compute.ListDeletedRequest{}
+
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if accountId, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(accountId.(int))
+	}
+	if rgName, ok := d.GetOk("rg_name"); ok {
+		req.RGName = rgName.(string)
+	}
+	if rgId, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rgId.(int))
+	}
+	if techStatus, ok := d.GetOk("tech_status"); ok {
+		req.TechStatus = techStatus.(string)
+	}
+	if ipAddress, ok := d.GetOk("ip_address"); ok {
+		req.IPAddress = ipAddress.(string)
+	}
+	if extNetName, ok := d.GetOk("extnet_name"); ok {
+		req.ExtNetName = extNetName.(string)
+	}
+	if extnetId, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extnetId.(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))
+	}
+
+	listComputes, err := c.CloudAPI().Compute().ListDeleted(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return listComputes, nil
+}

internal/service/cloudapi/kvmvm/utility_compute_pci_device_list.go

@@ -0,0 +1,74 @@
+/*
+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 kvmvm
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityComputePCIDeviceListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*compute.ListPCIDevices, error) {
+	c := m.(*controller.ControllerCfg)
+	req := compute.ListPCIDeviceRequest{
+		ComputeID: uint64(d.Get("compute_id").(int)),
+	}
+	if rgId, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rgId.(int))
+	}
+	if devId, ok := d.GetOk("device_id"); ok {
+		req.DevID = uint64(devId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	listPCIDevice, err := c.CloudAPI().Compute().ListPCIDevice(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return listPCIDevice, err
+
+}

internal/service/cloudapi/kvmvm/utility_compute_vgpu_list.go

@@ -0,0 +1,74 @@
+/*
+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 kvmvm
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityComputeVGPUListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*compute.ListVGPUs, error) {
+	c := m.(*controller.ControllerCfg)
+	req := compute.ListVGPURequest{
+		ComputeID: uint64(d.Get("compute_id").(int)),
+	}
+	if GPUID, ok := d.GetOk("gpu_id"); ok {
+		req.GPUID = uint64(GPUID.(int))
+	}
+	if typeVGPU, ok := d.GetOk("type"); ok {
+		req.Type = typeVGPU.(string)
+	}
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+	if includeDeleted, ok := d.GetOk("includedeleted"); ok {
+		req.IncludeDeleted = includeDeleted.(bool)
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	listVGPU, err := c.CloudAPI().Compute().ListVGPU(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return listVGPU, err
+
+}

internal/service/cloudapi/lb/flattens.go

@@ -91,6 +91,7 @@ func flattenResourceLBBackend(d *schema.ResourceData, b *lb.ItemBackend, lbId in
 
 func flattenResourceLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("ha_mode", lb.HAMode)
+	d.Set("backend_haip", lb.BackendHAIP)
 	d.Set("backends", flattenLBBackends(lb.Backends))
 	d.Set("created_by", lb.CreatedBy)
 	d.Set("created_time", lb.CreatedTime)
@@ -99,6 +100,7 @@ func flattenResourceLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("desc", lb.Description)
 	d.Set("dp_api_user", lb.DPAPIUser)
 	d.Set("extnet_id", lb.ExtNetID)
+	d.Set("frontend_haip", lb.FrontendHAIP)
 	d.Set("frontends", flattenFrontends(lb.Frontends))
 	d.Set("gid", lb.GID)
 	d.Set("guid", lb.GUID)
@@ -106,6 +108,7 @@ func flattenResourceLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("image_id", lb.ImageID)
 	d.Set("milestones", lb.Milestones)
 	d.Set("name", lb.Name)
+	d.Set("part_k8s", lb.PartK8s)
 	d.Set("primary_node", flattenNode(lb.PrimaryNode))
 	d.Set("rg_id", lb.RGID)
 	d.Set("rg_name", lb.RGName)
@@ -120,6 +123,7 @@ func flattenResourceLB(d *schema.ResourceData, lb *lb.RecordLB) {
 
 func flattenLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("ha_mode", lb.HAMode)
+	d.Set("backend_haip", lb.BackendHAIP)
 	d.Set("backends", flattenLBBackends(lb.Backends))
 	d.Set("created_by", lb.CreatedBy)
 	d.Set("created_time", lb.CreatedTime)
@@ -128,12 +132,14 @@ func flattenLB(d *schema.ResourceData, lb *lb.RecordLB) {
 	d.Set("desc", lb.Description)
 	d.Set("dp_api_user", lb.DPAPIUser)
 	d.Set("extnet_id", lb.ExtNetID)
+	d.Set("frontend_haip", lb.FrontendHAIP)
 	d.Set("frontends", flattenFrontends(lb.Frontends))
 	d.Set("gid", lb.GID)
 	d.Set("guid", lb.GUID)
 	d.Set("image_id", lb.ImageID)
 	d.Set("milestones", lb.Milestones)
 	d.Set("name", lb.Name)
+	d.Set("part_k8s", lb.PartK8s)
 	d.Set("primary_node", flattenNode(lb.PrimaryNode))
 	d.Set("rg_id", lb.RGID)
 	d.Set("rg_name", lb.RGName)
@@ -246,6 +252,7 @@ func flattenLBList(lbl *lb.ListLB) []map[string]interface{} {
 	for _, lb := range lbl.Data {
 		temp := map[string]interface{}{
 			"ha_mode":         lb.HAMode,
+			"backend_haip":    lb.BackendHAIP,
 			"backends":        flattenLBBackends(lb.Backends),
 			"created_by":      lb.CreatedBy,
 			"created_time":    lb.CreatedTime,
@@ -255,6 +262,7 @@ func flattenLBList(lbl *lb.ListLB) []map[string]interface{} {
 			"dp_api_user":     lb.DPAPIUser,
 			"dp_api_password": lb.DPAPIPassword,
 			"extnet_id":       lb.ExtNetID,
+			"frontend_haip":   lb.FrontendHAIP,
 			"frontends":       flattenFrontends(lb.Frontends),
 			"gid":             lb.GID,
 			"guid":            lb.GUID,

internal/service/cloudapi/lb/lb_data_subresource.go

@@ -181,5 +181,6 @@ func dsLBItemSchemaMake() map[string]*schema.Schema {
 		Type:     schema.TypeString,
 		Computed: true,
 	}
+	delete(sch, "part_k8s")
 	return sch
 }

internal/service/cloudapi/lb/lb_resource_subresource.go

@@ -47,12 +47,12 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 
 	sch["extnet_id"] = &schema.Schema{
 		Type:     schema.TypeInt,
-		Required: true,
+		Optional: true,
 	}
 
 	sch["vins_id"] = &schema.Schema{
 		Type:     schema.TypeInt,
-		Required: true,
+		Optional: true,
 	}
 	sch["start"] = &schema.Schema{
 		Type:     schema.TypeBool,
@@ -83,7 +83,18 @@ func lbResourceSchemaMake() map[string]*schema.Schema {
 		Type:     schema.TypeBool,
 		Optional: true,
 	}
+	///4.4.0
+	sch["ha_mode"] = &schema.Schema{
+		Type:     schema.TypeBool,
+		Optional: true,
+	}
+	sch["lb_sysctl_params"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Optional: true,
+	}
 
+	
+	///
 	sch["permanently"] = &schema.Schema{
 		Type:     schema.TypeBool,
 		Optional: true,

internal/service/cloudapi/lb/lb_schema.go

@@ -40,6 +40,10 @@ func createLBSchema() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"backend_haip": {
+			Type:     schema.TypeString,
+						Computed: true,
+		},
 		"backends": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -204,6 +208,10 @@ func createLBSchema() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"frontend_haip": {
+			Type:     schema.TypeString,
+						Computed: true,
+		},
 		"frontends": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -272,6 +280,10 @@ func createLBSchema() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"part_k8s": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"primary_node": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/lb/resource_check_input_values.go

@@ -43,6 +43,11 @@ func existExtNetID(ctx context.Context, d *schema.ResourceData, m interface{}) (
 	c := m.(*controller.ControllerCfg)
 	extNetID := uint64(d.Get("extnet_id").(int))
 
+	// this code is needed in order to be able to pass 0
+	if extNetID == 0 {
+		return true, nil
+	}
+
 	req := extnet.ListRequest{}
 
 	extNetList, err := c.CloudAPI().ExtNet().List(ctx, req)
@@ -57,6 +62,11 @@ func existViNSID(ctx context.Context, d *schema.ResourceData, m interface{}) (bo
 	c := m.(*controller.ControllerCfg)
 	vinsID := uint64(d.Get("vins_id").(int))
 
+	// this code is needed in order to be able to pass 0
+	if vinsID == 0 {
+		return true, nil
+	}
+
 	req := vins.ListRequest{}
 
 	vinsList, err := c.CloudAPI().VINS().List(ctx, req)

internal/service/cloudapi/lb/resource_lb.go

@@ -88,15 +88,19 @@ func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}
 		req.Description = desc.(string)
 	}
 
+	if haMode, ok := d.GetOk("ha_mode"); ok {
+		req.HighlyAvailable = haMode.(bool)
+	}
+
 	lbId, err := c.CloudAPI().LB().Create(ctx, req)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	lbIdParsed, _ := strconv.ParseInt(lbId, 10, 64)
+	lbIdParsed := strconv.Itoa(int(lbId))
 
-	d.SetId(lbId)
-	d.Set("lb_id", lbIdParsed)
+	d.SetId(lbIdParsed)
+	d.Set("lb_id", lbId)
 
 	_, err = utilityLBCheckPresence(ctx, d, m)
 	if err != nil {
@@ -128,7 +132,7 @@ func resourceLBCreate(ctx context.Context, d *schema.ResourceData, m interface{}
 func resourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	log.Debugf("resourceLBRead")
 
-	c := m.(*controller.ControllerCfg)
+	// c := m.(*controller.ControllerCfg)
 
 	lbRec, err := utilityLBCheckPresence(ctx, d, m)
 	if lbRec == nil {
@@ -145,25 +149,26 @@ func resourceLBRead(ctx context.Context, d *schema.ResourceData, m interface{})
 	case status.Created:
 	case status.Deleting:
 	case status.Deleted:
-		lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
-		restoreReq := lb.RestoreRequest{LBID: lbId}
-		enableReq := lb.DisableEnableRequest{LBID: lbId}
+		// lbId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		// restoreReq := lb.RestoreRequest{LBID: lbId}
+		// enableReq := lb.DisableEnableRequest{LBID: lbId}
 
-		_, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-		_, err = c.CloudAPI().LB().Enable(ctx, enableReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().LB().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
+		// _, err = c.CloudAPI().LB().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Destroying:
 		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
 	case status.Destroyed:
 		d.SetId("")
-		return resourceLBCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceLBCreate(ctx, d, m)
 	case status.Enabled:
 	case status.Enabling:
 	case status.Disabling:
@@ -276,7 +281,8 @@ func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}
 		return diag.Errorf("The LB is in progress with status: %s", lbRec.Status)
 	case status.Destroyed:
 		d.SetId("")
-		return resourceLBCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceLBCreate(ctx, d, m)
 	case status.Enabled:
 	case status.Enabling:
 	case status.Disabling:
@@ -286,13 +292,26 @@ func resourceLBUpdate(ctx context.Context, d *schema.ResourceData, m interface{}
 	}
 
 	if hasChanged {
-		lbRec, err = utilityLBCheckPresence(ctx, d, m)
+		_, err = utilityLBCheckPresence(ctx, d, m)
 		if err != nil {
 			d.SetId("")
 			return diag.FromErr(err)
 		}
 	}
 
+	if d.HasChange("ha_mode") {
+		hamode := d.Get("ha_mode").(bool)
+		if hamode {
+			req:= lb.HighlyAvailableRequest {
+				LBID: uint64(d.Get("lb_id").(int)),
+			}
+			_, err := c.CloudAPI().LB().HighlyAvailable(ctx, req)
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+	}
+
 	if d.HasChange("enable") {
 		enable := d.Get("enable").(bool)
 		req := lb.DisableEnableRequest{

internal/service/cloudapi/pfw/utility_pfw.go

@@ -34,6 +34,7 @@ package pfw
 
 import (
 	"context"
+	"fmt"
 	"strconv"
 	"strings"
 
@@ -65,5 +66,5 @@ func utilityPfwCheckPresence(ctx context.Context, d *schema.ResourceData, m inte
 		}
 	}
 
-	return nil, nil
+	return nil, fmt.Errorf("PFW not found")
 }

internal/service/cloudapi/rg/data_source_rg.go

@@ -393,7 +393,7 @@ func dataSourceRgSchemaMake() map[string]*schema.Schema {
 }
 
 func dataSourceResgroupRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	rg, err := utilityDataResgroupCheckPresence(ctx, d, m)
+	rg, err := utilityResgroupCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("") // ensure ID is empty in this case
 		return diag.FromErr(err)

internal/service/cloudapi/rg/data_source_rg_affinity_groups_list.go

@@ -49,6 +49,7 @@ func dataSourceRgAffinityGroupsListRead(ctx context.Context, d *schema.ResourceD
 
 	d.SetId(strconv.Itoa(d.Get("rg_id").(int)))
 	d.Set("affinity_groups", flattenRgListGroups(list))
+	d.Set("entry_count", list.EntryCount)
 	return nil
 }
 
@@ -59,6 +60,16 @@ func dataSourceRgAffinityGroupsListSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "ID of the RG",
 		},
+		"page": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page number",
+		},
+		"size": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Page size",
+		},
 		"affinity_groups": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -71,13 +82,26 @@ func dataSourceRgAffinityGroupsListSchemaMake() map[string]*schema.Schema {
 					"ids": {
 						Type:     schema.TypeList,
 						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"node_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
 						},
 					},
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 
 	return res

internal/service/cloudapi/rg/data_source_rg_get_resource_consumption.go

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

internal/service/cloudapi/rg/data_source_rg_list_vins.go

@@ -78,17 +78,17 @@ func dataSourceRgListVinsSchemaMake() map[string]*schema.Schema {
 		},
 		"vins_id": {
 			Type:        schema.TypeInt,
-			Required:    true,
+			Optional:    true,
 			Description: "Filter by ViNS ID",
 		},
 		"page": {
 			Type:        schema.TypeInt,
-			Required:    true,
+			Optional:    true,
 			Description: "Page number",
 		},
 		"size": {
 			Type:        schema.TypeInt,
-			Required:    true,
+			Optional:    true,
 			Description: "Page size",
 		},
 		"items": {

internal/service/cloudapi/rg/data_source_rg_resource_consumption_list.go

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

internal/service/cloudapi/rg/flattens.go

@@ -40,7 +40,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
 )
 
-func flattenAccountSeps(seps map[string]map[string]DiskUsage) []map[string]interface{} {
+func flattenRGSeps(seps map[string]map[string]rg.DiskUsage) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for sepKey, sepVal := range seps {
 		for dataKey, dataVal := range sepVal {
@@ -57,31 +57,31 @@ func flattenAccountSeps(seps map[string]map[string]DiskUsage) []map[string]inter
 	return res
 }
 
-func flattenAccResource(r 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),
-	}
-	res = append(res, temp)
+// func flattenAccResource(r 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":       flattenRgSeps(r.SEPs),
+// 	}
+// 	res = append(res, temp)
 
-	return res
-}
+// 	return res
+// }
 
-func flattenRgResources(r 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 flattenRgResources(r 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 flattenResgroup(d *schema.ResourceData, details rg.RecordResourceGroup) error {
 	log.Debugf("flattenResgroup: decoded RG name %q / ID %d, account ID %d",
@@ -122,7 +122,7 @@ func flattenResgroup(d *schema.ResourceData, details rg.RecordResourceGroup) err
 }
 
 func flattenRgSeps(seps map[string]map[string]rg.DiskUsage) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(seps))
 	for sepKey, sepVal := range seps {
 		SepMap := map[string]interface{}{}
 		for dataKey, dataVal := range sepVal {
@@ -140,7 +140,6 @@ func flattenRgSeps(seps map[string]map[string]rg.DiskUsage) []map[string]interfa
 
 func flattenResource(resource rg.Resource) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
-
 	temp := map[string]interface{}{
 		"cpu":           resource.CPU,
 		"disk_size":     resource.DiskSize,
@@ -149,7 +148,7 @@ func flattenResource(resource rg.Resource) []map[string]interface{} {
 		"exttraffic":    resource.ExtTraffic,
 		"gpu":           resource.GPU,
 		"ram":           resource.RAM,
-		"seps":          flattenRgSeps(resource.SEPs),
+		"seps":          flattenRGSeps(resource.SEPs),
 	}
 
 	res = append(res, temp)
@@ -191,7 +190,7 @@ func flattenRg(d *schema.ResourceData, itemRg rg.RecordResourceGroup) {
 }
 
 func flattenRgAudits(rgAudits rg.ListAudits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(rgAudits))
 	for _, rgAudit := range rgAudits {
 		temp := map[string]interface{}{
 			"call":         rgAudit.Call,
@@ -208,7 +207,7 @@ func flattenRgAudits(rgAudits rg.ListAudits) []map[string]interface{} {
 }
 
 func flattenRgList(rgl *rg.ListResourceGroups) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(rgl.Data))
 	for _, rg := range rgl.Data {
 		temp := map[string]interface{}{
 			"account_acl":              flattenRgAcl(rg.ACL),
@@ -249,7 +248,7 @@ func flattenRgList(rgl *rg.ListResourceGroups) []map[string]interface{} {
 }
 
 func flattenRgAcl(rgAcls rg.ListACL) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(rgAcls))
 	for _, rgAcl := range rgAcls {
 		temp := map[string]interface{}{
 			"explicit":      rgAcl.Explicit,
@@ -281,7 +280,7 @@ func flattenRgResourceLimits(rl rg.ResourceLimits) []map[string]interface{} {
 }
 
 func flattenRules(list rg.ListRules) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(list))
 	for _, rule := range list {
 		temp := map[string]interface{}{
 			"guid":     rule.GUID,
@@ -299,7 +298,7 @@ func flattenRules(list rg.ListRules) []map[string]interface{} {
 }
 
 func flattenRgListComputes(lc *rg.ListComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(lc.Data))
 	for _, compute := range lc.Data {
 		temp := map[string]interface{}{
 			"account_id":         compute.AccountID,
@@ -351,7 +350,7 @@ func flattenServerSettings(settings rg.RecordServerSettings) []map[string]interf
 }
 
 func flattenListServers(list rg.ListServers) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(list))
 	for _, serv := range list {
 		temp := map[string]interface{}{
 			"address":         serv.Address,
@@ -368,7 +367,7 @@ func flattenListServers(list rg.ListServers) []map[string]interface{} {
 }
 
 func flattenBackends(b rg.ListBackends) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(b))
 	for _, item := range b {
 		temp := map[string]interface{}{
 			"algorithm":               item.Algorithm,
@@ -383,7 +382,7 @@ func flattenBackends(b rg.ListBackends) []map[string]interface{} {
 }
 
 func flattenBindings(list rg.ListBindings) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(list))
 	for _, bind := range list {
 		temp := map[string]interface{}{
 			"address": bind.Address,
@@ -398,7 +397,7 @@ func flattenBindings(list rg.ListBindings) []map[string]interface{} {
 }
 
 func flattenFrontends(list rg.ListFrontends) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(list))
 	for _, front := range list {
 		temp := map[string]interface{}{
 			"backend":  front.Backend,
@@ -427,7 +426,7 @@ func flattenNode(node rg.RecordNode) []map[string]interface{} {
 }
 
 func flattenRgListLb(listLb *rg.ListLB) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(listLb.Data))
 	for _, lb := range listLb.Data {
 		temp := map[string]interface{}{
 			"ha_mode":        lb.HAMode,
@@ -462,7 +461,7 @@ func flattenRgListLb(listLb *rg.ListLB) []map[string]interface{} {
 }
 
 func flattenRgListPfw(listPfw *rg.ListPortForwards) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(listPfw.Data))
 	for _, pfw := range listPfw.Data {
 		temp := map[string]interface{}{
 			"public_port_end":   pfw.PublicPortEnd,
@@ -481,7 +480,7 @@ func flattenRgListPfw(listPfw *rg.ListPortForwards) []map[string]interface{} {
 }
 
 func flattenRgListVins(lv *rg.ListVINS) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(lv.Data))
 	for _, vins := range lv.Data {
 		temp := map[string]interface{}{
 			"account_id":     vins.AccountID,
@@ -509,7 +508,7 @@ func flattenRgListVins(lv *rg.ListVINS) []map[string]interface{} {
 }
 
 func flattenRgAffinityGroupComputes(list rg.ListAffinityGroupsComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(list))
 
 	for _, item := range list {
 		temp := map[string]interface{}{
@@ -527,22 +526,37 @@ func flattenRgAffinityGroupComputes(list rg.ListAffinityGroupsComputes) []map[st
 	return res
 }
 
-func flattenRgAffinityGroupsGet(list []uint64) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"items": list,
+// func flattenRgAffinityGroupsGet(list []uint64) []map[string]interface{} {
+// 	res := make([]map[string]interface{}, 0)
+// 	temp := map[string]interface{}{
+// 		"items": list,
+// 	}
+// 	res = append(res, temp)
+
+// 	return res
+// }
+
+func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(list.Data))
+	for _, groupVal := range list.Data {
+		for label, ag := range groupVal {
+			temp := map[string]interface{}{
+				"label": label,
+				"ids":   flattenRgAffinityListGroup(ag),
+			}
+			res = append(res, temp)
+		}
 	}
-	res = append(res, temp)
 
 	return res
 }
 
-func flattenRgListGroups(list *rg.ListAffinityGroups) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for groupKey, groupVal := range list.Data {
+func flattenRgAffinityListGroup(list rg.ListAffinityGroup) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(list))
+	for _, ag := range list {
 		temp := map[string]interface{}{
-			"label": groupKey,
-			"ids":   groupVal,
+			"id":      ag.ID,
+			"node_id": ag.NodeID,
 		}
 		res = append(res, temp)
 	}
@@ -560,3 +574,24 @@ func flattenRgUsageResource(d *schema.ResourceData, usage rg.RecordResourceUsage
 	d.Set("ram", usage.RAM)
 	d.Set("seps", flattenRgSeps(usage.SEPs))
 }
+
+func flattenRGResourceConsumptionList(rg *rg.ListResourceConsumption) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(rg.Data))
+	for _, rc := range rg.Data {
+		temp := map[string]interface{}{
+			"consumed":        flattenResource(rc.Consumed),
+			"reserved":        flattenResource(rc.Reserved),
+			"resource_limits": flattenRgResourceLimits(rc.ResourceLimits),
+			"rg_id":           rc.RGID,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenRGResourceConsumption(d *schema.ResourceData, rg *rg.ItemResourceConsumption) {
+	d.Set("consumed", flattenResource(rg.Consumed))
+	d.Set("reserved", flattenResource(rg.Reserved))
+	d.Set("resource_limits", flattenRgResourceLimits(rg.ResourceLimits))
+	d.Set("rg_id", rg.RGID)
+}

internal/service/cloudapi/rg/resource_rg.go

@@ -185,7 +185,6 @@ func resourceResgroupCreate(ctx context.Context, d *schema.ResourceData, m inter
 				}
 			}
 		}
-
 	}
 
 	if defNet, ok := d.GetOk("def_net"); ok {
@@ -256,7 +255,7 @@ func resourceResgroupRead(ctx context.Context, d *schema.ResourceData, m interfa
 	log.Debugf("resourceResgroupRead: called for RG name %s, account ID %d",
 		d.Get("name").(string), d.Get("account_id").(int))
 
-	c := m.(*controller.ControllerCfg)
+	// c := m.(*controller.ControllerCfg)
 
 	rgData, err := utilityResgroupCheckPresence(ctx, d, m)
 	if err != nil {
@@ -272,24 +271,25 @@ func resourceResgroupRead(ctx context.Context, d *schema.ResourceData, m interfa
 	case status.Created:
 	case status.Enabled:
 	case status.Deleted:
-		restoreReq := rg.RestoreRequest{RGID: rgData.ID}
-		enableReq := rg.EnableRequest{RGID: rgData.ID}
+		// restoreReq := rg.RestoreRequest{RGID: rgData.ID}
+		// enableReq := rg.EnableRequest{RGID: rgData.ID}
 
-		_, err := c.CloudAPI().RG().Restore(ctx, restoreReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err := c.CloudAPI().RG().Restore(ctx, restoreReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		_, err = c.CloudAPI().RG().Enable(ctx, enableReq)
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		// _, err = c.CloudAPI().RG().Enable(ctx, enableReq)
+		// if err != nil {
+		// 	return diag.FromErr(err)
+		// }
 
-		hasChanged = true
+		// hasChanged = true
 	case status.Deleting:
 	case status.Destroyed:
 		d.SetId("")
-		return resourceResgroupCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceResgroupCreate(ctx, d, m)
 	case status.Destroying:
 	case status.Disabled:
 	case status.Disabling:
@@ -369,7 +369,8 @@ func resourceResgroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
 	case status.Deleting:
 	case status.Destroyed:
 		d.SetId("")
-		return resourceResgroupCreate(ctx, d, m)
+		return diag.Errorf("The resource cannot be updated because it has been destroyed")
+		// return resourceResgroupCreate(ctx, d, m)
 	case status.Destroying:
 	case status.Disabled:
 	case status.Disabling:
@@ -378,7 +379,7 @@ func resourceResgroupUpdate(ctx context.Context, d *schema.ResourceData, m inter
 	}
 
 	if hasChanged {
-		rgData, err = utilityDataResgroupCheckPresence(ctx, d, m)
+		rgData, err = utilityResgroupCheckPresence(ctx, d, m)
 		if err != nil {
 			d.SetId("")
 			return diag.FromErr(err)
@@ -787,14 +788,6 @@ func ResourceRgSchemaMake() map[string]*schema.Schema {
 				Schema: aclSchemaMake(),
 			},
 		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
 		"deleted_by": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudapi/rg/utility_rg.go

@@ -63,21 +63,3 @@ func utilityResgroupCheckPresence(ctx context.Context, d *schema.ResourceData, m
 
 	return rgData, nil
 }
-
-func utilityDataResgroupCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*rg.RecordResourceGroup, error) {
-	c := m.(*controller.ControllerCfg)
-	req := rg.GetRequest{
-		RGID: uint64(d.Get("rg_id").(int)),
-	}
-
-	if reason, ok := d.GetOk("reason"); ok {
-		req.Reason = reason.(string)
-	}
-
-	rgData, err := c.CloudAPI().RG().Get(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return rgData, nil
-}

internal/service/cloudapi/rg/utility_rg_affinity_groups_list.go

@@ -46,6 +46,14 @@ func utilityRgAffinityGroupsListCheckPresence(ctx context.Context, d *schema.Res
 		RGID: uint64(d.Get("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))
+	}
+
 	groups, err := c.CloudAPI().RG().AffinityGroupsList(ctx, req)
 	if err != nil {
 		return nil, err

internal/service/cloudapi/rg/utility_rg_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 rg
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityRGResourceConsumptionGetCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*rg.ItemResourceConsumption, error) {
+	c := m.(*controller.ControllerCfg)
+
+	id := uint64(d.Get("rg_id").(int))
+
+	req := rg.GetResourceConsumptionRequest{
+		RGID: id,
+	}
+
+	log.Debugf("utilityRGResourceConsumptionGetCheckPresence: load")
+	accountResourceConsumptionRec, err := c.CloudAPI().RG().GetResourceConsumption(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return accountResourceConsumptionRec, nil
+}

internal/service/cloudapi/rg/utility_rg_resource_consumption_list.go

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

internal/service/cloudapi/snapshot/data_source_snapshot_list.go

@@ -49,7 +49,7 @@ func dataSourceSnapshotListRead(ctx context.Context, d *schema.ResourceData, m i
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenSnapshotList(snapshotList))
-
+	d.Set("entry_count", snapshotList.EntryCount)
 	return nil
 }
 
@@ -69,6 +69,10 @@ func dataSourceSnapshotListSchemaMake() map[string]*schema.Schema {
 				Schema: dataSourceSnapshotSchemaMake(),
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 
 	return rets

internal/service/cloudapi/snapshot/flattens.go

@@ -6,7 +6,7 @@ import (
 )
 
 func flattenSnapshotList(gl *compute.ListSnapShots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(gl.Data))
 	for _, item := range gl.Data {
 		temp := map[string]interface{}{
 			"label":     item.Label,

internal/service/cloudapi/stack/data_source_stack.go

@@ -3,6 +3,7 @@ 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.
@@ -29,65 +30,44 @@ builds seamlessly.
 Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
 */
 
-package account
+package stack
 
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+import (
+	"context"
+	"strconv"
 
-func dataSourceAccountVinsSchema() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"account_id": {
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func dataSourceStackSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"stack_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"cpu_allocation_ratio": {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
-		"account_name": {
+		"descr": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"computes": {
+		"drivers": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"mem_allocation_ratio": {
 			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": {
+		"name": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
@@ -95,13 +75,36 @@ func dataSourceAccountVinsSchema() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"updated_by": {
+		"type": {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
+	}
+	return res
+}
+
+func dataSourceStackRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	stack, err := utilityStackCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+	d.SetId(strconv.Itoa(d.Get("stack_id").(int)))
+	flattenStack(d, *stack)
+	return nil
+}
+
+func DataSourceStack() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceStackRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
 		},
+
+		Schema: dataSourceStackSchemaMake(),
 	}
 }

internal/service/cloudapi/stack/data_source_stack_list.go

@@ -0,0 +1,136 @@
+/*
+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 stack
+
+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 dataSourceStackListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	stackList, err := utilityStackListCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenStackList(stackList))
+	d.Set("entry_count", stackList.EntryCount)
+
+	return nil
+}
+
+func dataSourceStackListSchemaMake() 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",
+		},
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Find by type",
+		},
+		"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{
+					"stack_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"status": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"type": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceStackList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceStackListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceStackListSchemaMake(),
+	}
+}

internal/service/cloudapi/stack/flattens.go

@@ -0,0 +1,69 @@
+/*
+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 stack
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
+)
+
+func flattenStackList(stackl *stack.ListStacks) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0)
+	for _, stack := range stackl.Data {
+		temp := map[string]interface{}{
+			"stack_id": stack.ID,
+			"name":     stack.Name,
+			"status":   stack.Status,
+			"type":     stack.Type,
+		}
+		res = append(res, temp)
+	}
+	return res
+
+}
+
+func flattenStack(d *schema.ResourceData, details stack.InfoStack) error {
+	log.Debugf("flattenStack: decoded Stack name %q / ID %d",
+		details.Name, details.ID)
+
+	d.Set("stack_id", details.ID)
+	d.Set("cpu_allocation_ratio", details.CPUAllocationRatio)
+	d.Set("name", details.Name)
+	d.Set("descr", details.Descr)
+	d.Set("mem_allocation_ratio", details.MemAllocationRatio)
+	d.Set("status", details.Status)
+	d.Set("type", details.Type)
+	d.Set("drivers", details.Drivers)
+	return nil
+}

internal/service/cloudapi/stack/utility_stack.go

@@ -0,0 +1,62 @@
+/*
+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 stack
+
+import (
+	"context"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityStackCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*stack.InfoStack, error) {
+	c := m.(*controller.ControllerCfg)
+	req := stack.GetRequest{}
+
+	if d.Id() != "" {
+		stackId, _ := strconv.ParseUint(d.Id(), 10, 64)
+		req.StackId = stackId
+	} else {
+		req.StackId = uint64(d.Get("stack_id").(int))
+	}
+
+	stackData, err := c.CloudAPI().Stack().Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return stackData, nil
+}

internal/service/cloudapi/stack/utility_stack_list.go

@@ -0,0 +1,77 @@
+/*
+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 stack
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityStackListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*stack.ListStacks, error) {
+	c := m.(*controller.ControllerCfg)
+	req := stack.ListRequest{}
+
+	if byId, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(byId.(int))
+	}
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if status, ok := d.GetOk("status"); ok {
+		req.Status = status.(string)
+	}
+
+	if stackType, ok := d.GetOk("type"); ok {
+		req.Type = stackType.(string)
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+
+	log.Debugf("utilityStackListCheckPresence: load stack list")
+	stackList, err := c.CloudAPI().Stack().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return stackList, nil
+}

internal/service/cloudapi/vins/data_source_static_route.go

@@ -0,0 +1,107 @@
+/*
+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 vins
+
+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 dataSourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	staticRoute, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(staticRoute.ID, 10))
+	flattenStaticRouteData(d, staticRoute)
+	return nil
+}
+
+func dataSourceStaticRouteSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Unique ID of the ViNS",
+		},
+		"route_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Unique ID of the static route",
+		},
+		"compute_ids": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"destination": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"gateway": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"netmask": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+	return rets
+}
+
+func DataSourceStaticRoute() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceStaticRouteRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceStaticRouteSchemaMake(),
+	}
+}

internal/service/cloudapi/vins/data_source_static_route_list.go

@@ -0,0 +1,121 @@
+/*
+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 vins
+
+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 dataSourceStaticRouteListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	staticRouteList, err := utilityStaticRouteListCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenStaticRouteList(staticRouteList))
+	d.Set("entry_count", staticRouteList.EntryCount)
+
+	return nil
+}
+
+func dataSourceStaticRouteListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of VINS",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_ids": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"destination": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"gateway": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"netmask": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"route_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceStaticRouteList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceStaticRouteListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceStaticRouteListSchemaMake(),
+	}
+}

internal/service/cloudapi/vins/data_source_vins.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>
@@ -34,8 +34,8 @@ package vins
 
 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"
@@ -47,8 +47,9 @@ func dataSourceVinsRead(ctx context.Context, d *schema.ResourceData, m interface
 		return diag.FromErr(err)
 	}
 
-	d.SetId(strconv.FormatUint(vins.ID, 10))
-	flattenVinsData(d, *vins)
+	id := uuid.New()
+	d.SetId(id.String())
+	flattenVinsData(d, vins)
 	return nil
 }
 
@@ -640,7 +641,7 @@ func rulesSchemaMake() map[string]*schema.Schema {
 	}
 }
 
-func configSchrmaMake() map[string]*schema.Schema {
+func natConfigSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"net_mask": {
 			Type:     schema.TypeInt,
@@ -678,7 +679,7 @@ func natSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			Computed: true,
 			Elem: &schema.Resource{
-				Schema: configSchrmaMake(),
+				Schema: natConfigSchemaMake(),
 			},
 		},
 		"devices": {
@@ -768,7 +769,6 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 			Required:    true,
 			Description: "Unique ID of the ViNS. If ViNS ID is specified, then ViNS name, rg_id and account_id are ignored.",
 		},
-
 		"vnf_dev": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -776,10 +776,6 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 				Schema: vnfDevSchemaMake(),
 			},
 		},
-		"_ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
 		"account_id": {
 			Type:        schema.TypeInt,
 			Computed:    true,
@@ -797,6 +793,14 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 				Schema: vinsComputeSchemaMake(),
 			},
 		},
+		"created_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"created_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"default_gw": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -808,6 +812,14 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 				Schema: qosSchemaMake(),
 			},
 		},
+		"deleted_by": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"deleted_time": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"desc": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -874,6 +886,14 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 			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,

internal/service/cloudapi/vins/data_source_vins_audits.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>

internal/service/cloudapi/vins/data_source_vins_ext_net_list.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>
@@ -49,7 +49,7 @@ func dataSourceVinsExtNetListRead(ctx context.Context, d *schema.ResourceData, m
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenVinsExtNetList(extNetList))
-
+	d.Set("entry_count", extNetList.EntryCount)
 	return nil
 }
 
@@ -92,6 +92,10 @@ func DataSourceVinsExtNetListchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return rets
 }

internal/service/cloudapi/vins/data_source_vins_ip_list.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>
@@ -49,7 +49,7 @@ func dataSourceVinsIpListRead(ctx context.Context, d *schema.ResourceData, m int
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenVinsIpList(ips))
-
+	d.Set("entry_count", ips.EntryCount)
 	return nil
 }
 
@@ -96,6 +96,10 @@ func DataSourceVinsIpListSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return rets
 }

internal/service/cloudapi/vins/data_source_vins_list.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>

internal/service/cloudapi/vins/data_source_vins_list_deleted.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>

internal/service/cloudapi/vins/data_source_vins_nat_rule_list.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>
@@ -49,6 +49,8 @@ func dataSourceVinsNatRuleListRead(ctx context.Context, d *schema.ResourceData,
 	id := uuid.New()
 	d.SetId(id.String())
 	d.Set("items", flattenVinsNatRuleList(natRules))
+	d.Set("entry_count", natRules.EntryCount)
+
 	return nil
 }
 
@@ -99,6 +101,10 @@ func DataSourceVinsNatRuleListSchemaMake() map[string]*schema.Schema {
 				},
 			},
 		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 	}
 	return rets
 }

internal/service/cloudapi/vins/flattens.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>
@@ -49,7 +49,7 @@ func flattenMGMT(mgmt vins.RecordMGMT) []map[string]interface{} {
 	return res
 }
 
-func flattenResources(resources *vins.RecordResources) []map[string]interface{} {
+func flattenResources(resources vins.RecordResources) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"cpu":      resources.CPU,
@@ -65,7 +65,7 @@ func flattenConfig(config vins.RecordVNFConfig) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	temp := map[string]interface{}{
 		"mgmt":      flattenMGMT(config.MGMT),
-		"resources": flattenResources(&config.Resources),
+		"resources": flattenResources(config.Resources),
 	}
 	res = append(res, temp)
 	return res
@@ -84,8 +84,7 @@ func flattenQOS(qos vins.QOS) []map[string]interface{} {
 }
 
 func flattenInterfaces(interfaces []vins.ItemVNFInterface) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-
+	res := make([]map[string]interface{}, 0, len(interfaces))
 	for _, vnfInterface := range interfaces {
 		temp := map[string]interface{}{
 			"conn_id":      vnfInterface.ConnID,
@@ -141,7 +140,7 @@ func flattenVNFDev(vnfDev vins.RecordVNFDev) []map[string]interface{} {
 }
 
 func flattenComputes(computes vins.ListVINSComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(computes))
 	for _, compute := range computes {
 		temp := map[string]interface{}{
 			"compute_id":   compute.ID,
@@ -154,7 +153,7 @@ func flattenComputes(computes vins.ListVINSComputes) []map[string]interface{} {
 }
 
 func flattenReservations(reservations vins.ListReservations) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(reservations))
 	for _, reservation := range reservations {
 		temp := map[string]interface{}{
 			"client_type": reservation.ClientType,
@@ -275,9 +274,9 @@ func flattenGW(gw vins.RecordGW) []map[string]interface{} {
 	return res
 }
 
-func flattenRules(rules vins.ListNATRules) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rule := range rules.Data {
+func flattenRules(rules vins.ListNATRulesConfig) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(rules))
+	for _, rule := range rules {
 		tmp := map[string]interface{}{
 			"rule_id":           rule.ID,
 			"local_ip":          rule.LocalIP,
@@ -343,9 +342,9 @@ func flattenVNFS(vnfs vins.RecordVNFs) []map[string]interface{} {
 	return res
 }
 
-func flattenRuleBlock(rules vins.ListNATRules) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rule := range rules.Data {
+func flattenRuleBlock(rules vins.ListNATRulesConfig) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(rules))
+	for _, rule := range rules {
 		tmp := map[string]interface{}{
 			"int_ip":         rule.LocalIP,
 			"int_port":       rule.LocalPort,
@@ -359,15 +358,18 @@ func flattenRuleBlock(rules vins.ListNATRules) []map[string]interface{} {
 	return res
 }
 
-func flattenVins(d *schema.ResourceData, vins vins.RecordVINS) {
+func flattenVins(d *schema.ResourceData, vins *vins.RecordVINS) {
 	d.Set("vins_id", vins.ID)
 	d.Set("vnf_dev", flattenVNFDev(vins.VNFDev))
-	d.Set("_ckey", vins.CKey)
 	d.Set("account_id", vins.AccountID)
 	d.Set("account_name", vins.AccountName)
 	d.Set("computes", flattenComputes(vins.Computes))
+	d.Set("created_by", vins.CreatedBy)
+	d.Set("created_time", vins.CreatedTime)
 	d.Set("default_gw", vins.DefaultGW)
 	d.Set("default_qos", flattenQOS(vins.DefaultQOS))
+	d.Set("deleted_by", vins.DeletedBy)
+	d.Set("deleted_time", vins.DeletedTime)
 	d.Set("desc", vins.Description)
 	d.Set("gid", vins.GID)
 	d.Set("guid", vins.GUID)
@@ -384,21 +386,26 @@ func flattenVins(d *schema.ResourceData, vins vins.RecordVINS) {
 	d.Set("rg_name", vins.RGName)
 	d.Set("sec_vnf_dev_id", vins.SecVNFDevID)
 	d.Set("status", vins.Status)
+	d.Set("updated_by", vins.UpdatedBy)
+	d.Set("updated_time", vins.UpdatedTime)
 	d.Set("user_managed", vins.UserManaged)
 	d.Set("vnfs", flattenVNFS(vins.VNFs))
 	d.Set("vxlan_id", vins.VXLANID)
 	d.Set("nat_rule", flattenRuleBlock(vins.VNFs.NAT.Config.Rules))
 }
 
-func flattenVinsData(d *schema.ResourceData, vins vins.RecordVINS) {
+func flattenVinsData(d *schema.ResourceData, vins *vins.RecordVINS) {
 	d.Set("vins_id", vins.ID)
 	d.Set("vnf_dev", flattenVNFDev(vins.VNFDev))
-	d.Set("_ckey", vins.CKey)
 	d.Set("account_id", vins.AccountID)
 	d.Set("account_name", vins.AccountName)
 	d.Set("computes", flattenComputes(vins.Computes))
+	d.Set("created_by", vins.CreatedBy)
+	d.Set("created_time", vins.CreatedTime)
 	d.Set("default_gw", vins.DefaultGW)
 	d.Set("default_qos", flattenQOS(vins.DefaultQOS))
+	d.Set("deleted_by", vins.DeletedBy)
+	d.Set("deleted_time", vins.DeletedTime)
 	d.Set("desc", vins.Description)
 	d.Set("gid", vins.GID)
 	d.Set("guid", vins.GUID)
@@ -415,14 +422,16 @@ func flattenVinsData(d *schema.ResourceData, vins vins.RecordVINS) {
 	d.Set("rg_name", vins.RGName)
 	d.Set("sec_vnf_dev_id", vins.SecVNFDevID)
 	d.Set("status", vins.Status)
+	d.Set("updated_by", vins.UpdatedBy)
+	d.Set("updated_time", vins.UpdatedTime)
 	d.Set("user_managed", vins.UserManaged)
 	d.Set("vnfs", flattenVNFS(vins.VNFs))
 	d.Set("vxlan_id", vins.VXLANID)
 }
 
-func flattenVinsAudits(auidts vins.ListAudits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, audit := range auidts {
+func flattenVinsAudits(audits vins.ListAudits) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(audits))
+	for _, audit := range audits {
 		temp := map[string]interface{}{
 			"call":          audit.Call,
 			"response_time": audit.ResponseTime,
@@ -437,7 +446,7 @@ func flattenVinsAudits(auidts vins.ListAudits) []map[string]interface{} {
 }
 
 func flattenVinsExtNetList(extNetList *vins.ListExtNets) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(extNetList.Data))
 	for _, extNet := range extNetList.Data {
 		temp := map[string]interface{}{
 			"default_gw":  extNet.DefaultGW,
@@ -454,7 +463,7 @@ func flattenVinsExtNetList(extNetList *vins.ListExtNets) []map[string]interface{
 }
 
 func flattenVinsIpList(ips *vins.ListIPs) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(ips.Data))
 	for _, ip := range ips.Data {
 		temp := map[string]interface{}{
 			"client_type": ip.ClientType,
@@ -472,7 +481,7 @@ func flattenVinsIpList(ips *vins.ListIPs) []map[string]interface{} {
 }
 
 func flattenVinsList(vl *vins.ListVINS) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
+	res := make([]map[string]interface{}, 0, len(vl.Data))
 	for _, v := range vl.Data {
 		temp := map[string]interface{}{
 			"account_id":   v.AccountID,
@@ -497,8 +506,37 @@ func flattenVinsList(vl *vins.ListVINS) []map[string]interface{} {
 	return res
 }
 
-func flattenVinsNatRuleList(natRules *vins.ListNATRules) []map[string]interface{} {
+// /4.4.0
+func flattenStaticRouteList(sr *vins.ListStaticRoutes) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
+	for _, staticRoute := range sr.Data {
+		temp := map[string]interface{}{
+			"route_id":    staticRoute.ID,
+			"destination": staticRoute.Destination,
+			"gateway":     staticRoute.Gateway,
+			"guid":        staticRoute.GUID,
+			"netmask":     staticRoute.Netmask,
+			"compute_ids": staticRoute.ComputeIds,
+		}
+		res = append(res, temp)
+	}
+
+	return res
+}
+
+func flattenStaticRouteData(d *schema.ResourceData, route *vins.ItemRoutes) {
+	d.Set("destination", route.Destination)
+	d.Set("gateway", route.Gateway)
+	d.Set("guid", route.GUID)
+	d.Set("netmask", route.Netmask)
+	d.Set("compute_ids", route.ComputeIds)
+	d.Set("route_id", route.ID)
+}
+
+///
+
+func flattenVinsNatRuleList(natRules *vins.ListNATRules) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(natRules.Data))
 	for _, natRule := range natRules.Data {
 		temp := map[string]interface{}{
 			"id":                natRule.ID,

internal/service/cloudapi/vins/resource_check_input_values.go

@@ -8,6 +8,7 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
 )
 
@@ -68,3 +69,16 @@ func existGID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool,
 
 	return len(locationList.FilterByGID(gid).Data) != 0, nil
 }
+
+func existVinsID(ctx context.Context, d *schema.ResourceData, m interface{}) (bool, error) {
+	c := m.(*controller.ControllerCfg)
+	vinsID := uint64(d.Get("vins_id").(int))
+	req := vins.ListRequest{}
+
+	vinsList, err := c.CloudAPI().VINS().List(ctx, req)
+	if err != nil {
+		return false, err
+	}
+
+	return len(vinsList.FilterByID(vinsID).Data) != 0, nil
+}

internal/service/cloudapi/vins/resource_static_route.go

@@ -0,0 +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 vins
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*controller.ControllerCfg)
+
+	if _, ok := d.GetOk("vins_id"); ok {
+		haveVinsID, err := existVinsID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveVinsID {
+			return diag.Errorf("resourceStaticRouteCreate: can't create Static Route because Vins ID %d is not allowed or does not exist", d.Get("vins_id").(int))
+		}
+	}
+
+	req := vins.StaticRouteAddRequest{
+		VINSID:      uint64(d.Get("vins_id").(int)),
+		Destination: d.Get("destination").(string),
+		Netmask:     d.Get("netmask").(string),
+		Gateway:     d.Get("gateway").(string),
+	}
+
+	if computesIDS, ok := d.GetOk("compute_ids"); ok {
+		ids := computesIDS.([]interface{})
+
+		res := make([]uint64, 10)
+
+		for _, id := range ids {
+			computeId := uint64(id.(int))
+			res = append(res, computeId)
+		}
+
+		req.ComputeIds = res
+	}
+
+	_, err := c.CloudAPI().VINS().StaticRouteAdd(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	staticRouteData, err := getStaticRouteData(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(fmt.Sprintf("%d#%d", req.VINSID, staticRouteData.ID))
+
+	return resourceStaticRouteRead(ctx, d, m)
+}
+
+func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	warnings := dc.Warnings{}
+
+	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	flattenStaticRouteData(d, staticRouteData)
+
+	return warnings.Get()
+}
+
+func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*controller.ControllerCfg)
+	warnings := dc.Warnings{}
+
+	if _, ok := d.GetOk("vins_id"); ok {
+		haveVinsID, err := existVinsID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveVinsID {
+			return diag.Errorf("resourceVinsUpdate: can't update Static Route because VinsID %d is not allowed or does not exist", d.Get("vins_id").(int))
+		}
+	}
+
+	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	if d.HasChange("compute_ids") {
+		deletedIds := make([]uint64, 0)
+		addedIds := make([]uint64, 0)
+
+		oldComputeIds, newComputeIds := d.GetChange("compute_ids")
+		oldComputeIdsSlice := oldComputeIds.([]interface{})
+		newComputeIdsSlice := newComputeIds.([]interface{})
+
+		for _, el := range oldComputeIdsSlice {
+			if !isContainsIds(newComputeIdsSlice, el) {
+				convertedEl := uint64(el.(int))
+				deletedIds = append(deletedIds, convertedEl)
+			}
+		}
+
+		for _, el := range newComputeIdsSlice {
+			if !isContainsIds(oldComputeIdsSlice, el) {
+				convertedEl := uint64(el.(int))
+				addedIds = append(addedIds, convertedEl)
+			}
+		}
+
+		if len(deletedIds) > 0 {
+			req := vins.StaticRouteAccessRevokeRequest{
+				VINSID:     uint64(d.Get("vins_id").(int)),
+				RouteId:    staticRouteData.ID,
+				ComputeIds: deletedIds,
+			}
+
+			_, err := c.CloudAPI().VINS().StaticRouteAccessRevoke(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+
+		if len(addedIds) > 0 {
+			req := vins.StaticRouteAccessGrantRequest{
+				VINSID:     uint64(d.Get("vins_id").(int)),
+				RouteId:    staticRouteData.ID,
+				ComputeIds: addedIds,
+			}
+
+			_, err := c.CloudAPI().VINS().StaticRouteAccessGrant(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+	}
+
+	return append(warnings.Get(), resourceStaticRouteRead(ctx, d, m)...)
+}
+
+func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*controller.ControllerCfg)
+	arr := strings.Split(d.Id(), "#")
+	if len(arr) != 2 {
+		return diag.FromErr(fmt.Errorf("broken state id"))
+	}
+
+	vinsId, _ := strconv.ParseUint(arr[0], 10, 64)
+	routeId, _ := strconv.ParseUint(arr[1], 10, 64)
+
+	req := vins.StaticRouteDelRequest{
+		VINSID:  vinsId,
+		RouteId: routeId,
+	}
+
+	_, err := c.CloudAPI().VINS().StaticRouteDel(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
+	rets := dataSourceStaticRouteSchemaMake()
+	rets["route_id"] = &schema.Schema{
+		Type:     schema.TypeInt,
+		Computed: true,
+		Optional: true,
+	}
+	rets["compute_ids"] = &schema.Schema{
+		Type:     schema.TypeList,
+		Optional: true,
+		Computed: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeInt,
+		},
+	}
+	rets["destination"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+
+	rets["gateway"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	rets["netmask"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+
+	return rets
+}
+
+func isContainsIds(els []interface{}, el interface{}) bool {
+	convEl := el.(int)
+	for _, elOld := range els {
+		if convEl == elOld.(int) {
+			return true
+		}
+	}
+	return false
+}
+
+func ResourceStaticRoute() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceStaticRouteCreate,
+		ReadContext:   resourceStaticRouteRead,
+		UpdateContext: resourceStaticRouteUpdate,
+		DeleteContext: resourceStaticRouteDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout20m,
+			Read:    &constants.Timeout600s,
+			Update:  &constants.Timeout20m,
+			Delete:  &constants.Timeout600s,
+			Default: &constants.Timeout600s,
+		},
+
+		Schema: resourceStaticRouteSchemaMake(),
+	}
+}