1.6.0-beta

1.6.0-alfa
1.5.8-gostech
2023-09-14 15:05:38 +03:00 · 2023-09-11 13:11:33 +03:00 · 2023-09-07 18:11:25 +03:00
81 changed files with 426 additions and 2999 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 cmd/
 .idea/
-.vscode/
-.fleet/
-.DS_Store
+.vscode/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,4 @@
-## Version 1.6.5
+## Version 1.6.0-beta

-## Feature
- Add field and type LibvirtDaemon in model Packages in cloudbroker/stack/models    
- Add field and type Packages in model ItemListStacks in cloudbroker/image/models. Add fields and type LibvirtBin, LibvirtDaemon, Lvm2Lockd, OpenvswitchCommon, OpenvswitchSwitch, QemuSystemX86, Sanlock
- Add filter ByGID in cloudbroker/grid/filters
- Add field userData in models WorkersGroupAddRequest in cloudapi/k8s and cloudbroker/k8s
+### Bugfix
+- Fixed RoudTrip bug in HTTP transport, made it concurrent safe
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ Decort SDK - это библиотека, написанная на языке G
    - Версия 1.3.x Decort-SDK соответствует 3.8.5 версии платформы
    - Версия 1.4.x Decort-SDK соответствует 3.8.6 версии платформы
    - Версия 1.5.x Decort-SDK соответствует 3.8.7 версии платформы
-    - Версия 1.6.x Decort-SDK соответствует 3.8.8 версии платформы

 ## Оглавление

@@ -63,11 +62,12 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Account` - управление аккаунтами - внутренними учетными записями платформы, которые являются владельцами вычислительных ресурсов;
 - `BService` - управление группами виртуальных машин (computes);
 - `Compute` - управление виртуальными машинами (индивидуально);
+- `ComputeCI` - управление конвейром для создания виртуальных машин;
 - `Disks` - управление виртуальными дисками;
 - `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
 - `FLIPgroup` - управление группами "плавающими" ip - адресами;
 - `Image` - управление образами операционных систем;
- `K8CI` - получение информации о конвейере для создания кластера;
+- `K8CI` - управление конвейром для создания кластера;
 - `K8S` - управление кластерами kubernetes;
 - `KVMPPC` - создание виртуальной машины Power PC (IBM);
 - `KVMx86` - создание виртуальной машины x86;
@@ -75,7 +75,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Locations` - получение информации о grid площадки;
 - `RG` - управление ресурсными группами аккаунта;
 - `Sizes` - получение информации о потребляемых ресурсах виртуальными машинами и дисками;
- `Stack` - получение информации о вычислительных узлах;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
 - `VINS` - управление виртуальными изолированными сетями.

@@ -85,39 +84,30 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 Данная группа ручек позволяет выполнять следующие операции в платформе:

 - `Account` - управление аккаунтами - внутренними учетными записями платформы, которые являются владельцами вычислительных ресурсов;
- `APIAccess` - управление доступом к API и его объектам;
- `Backup` - управление резервным копированием;
 - `Compute` - управление виртуальными машинами (индивидуально);
 - `Disks` - управление виртуальными дисками;
 - `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
- `FLIPGroup` - управление группами с «плавающими» ip адресами;
 - `Grid` - управление площадками;
- `Group` - управление группами пользователей;
 - `Image` - управление образами операционных систем;
 - `K8CI` - управление конвейром для создания кластера;
 - `K8S` - управление кластерами kubernetes;
 - `KVMPPC` - создание виртуальной машины Power PC (IBM);
 - `KVMx86` - создание виртуальной машины x86;
 - `LB` - управление балансировщиками нагрузки;
- `PCIDevice` - управление устройствами;
 - `RG` - управление ресурсными группами аккаунта;
 - `SEP` - управление storage endpoint (sep);
- `Stack` - получение информации о вычислительных узлах;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
- `User` - управление пользователями (индивидуально);
- `VGPU` - управление виртуальными графическими процессорами;
 - `VINS` - управление виртуальными изолированными сетями.

 ## Работа с библиотекой

 Алгоритм работы с библиотекой выглядит следующим образом:

-1. Выполнение одного из действий:
- - настройка конфигурации клиента;
- - парсинг конфигурации из файла.
-2. Создание клиента.
-3. Создание структуры запроса.
-4. Выполнение запроса.
+1. Настройка конфигурации клиента.
+2. Парсинг конфигурации из файла.
+3. Создание клиента.
+4. Создание структуры запроса.
+5. Выполнение запроса.

 ### Настройка конфигурации клиента

@@ -130,7 +120,7 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 | DecortURL | string | Да | URL адрес платформы, с которой будет осуществляться взаимодействие |
 | Retries | uint | Нет | Кол-во неудачных попыток выполнения запроса, по умолчанию - 5 |
 | Timeout | config.Duration | Нет | Таймаут HTTP клиента, по умолчанию - без ограничений |
-| SSLSkipVerify | bool | Нет | Пропуск проверки подлинности сертификата |
+| SSLSkipVerify | bool | Нет | Пропуск проверки подлинности сертификата, по умолчанию - true |
 | Token | string | Нет | JWT токен |

 #### Пример конфигурации клиента
@@ -241,6 +231,7 @@ func main() {
  - `pkg/cloudapi/account` - для `Account`
  - `pkg/cloudapi/bservice` - для `Basic Service`
  - `pkg/cloudapi/compute` - для `Compute`
+  - `pkg/cloudapi/computeci` - для `ComputeCI`
  - `pkg/cloudapi/disks` - для `Disks`
  - `pkg/cloudapi/extnet` - для `ExtNet`
  - `pkg/cloudapi/flipgroup` - для `FLIPGroup`
@@ -252,33 +243,24 @@ func main() {
  - `pkg/cloudapi/lb` - для `LB`
  - `pkg/cloudapi/locations` - для `Locations`
  - `pkg/cloudapi/rg` - для `RG`
-  - `pkg/cloudapi/sizes` - для `Sizes`
-  - `pkg/cloudapi/stack` - для `Stack`
+  - `pkg/cloudapi/sizes` - для `RG`
  - `pkg/cloudapi/tasks` - для `Tasks`
  - `pkg/cloudapi/vins` - для `VINS`
 - **cloudbroker**:
  - `pkg/cloudbroker/account` - для `Account`
-  - `pkg/cloudbroker/apiaccess` - для `APIAccess`
-  - `pkg/cloudbroker/backup` - для `Backup`
  - `pkg/cloudbroker/compute` - для `Compute`
  - `pkg/cloudbroker/disks` - для `Disks`
  - `pkg/cloudbroker/extnet` - для `ExtNet`
-  - `pkg/cloudbroker/flipgroup` - для `FLIPGroup`
  - `pkg/cloudbroker/grid` - для `Grid`
-  - `pkg/cloudbroker/group` - для `Group`
  - `pkg/cloudbroker/image` - для `Image`
  - `pkg/cloudbroker/k8ci` - для `K8CI`
  - `pkg/cloudbroker/k8s` - для `K8S`
  - `pkg/cloudbroker/kvmppc` - для `KVMPPC`
  - `pkg/cloudbroker/kvmx86` - для `KVMX86`
  - `pkg/cloudbroker/lb` - для `LB`
-  - `pkg/cloudbroker/pcidevice` - для `PCIDevice`
  - `pkg/cloudbroker/rg` - для `RG`
  - `pkg/cloudbroker/sep` - для `SEP`
-  - `pkg/cloudbroker/stack` - для `Stack`
  - `pkg/cloudbroker/tasks` - для `Tasks`
-  - `pkg/cloudbroker/user` - для `User`
-  - `pkg/cloudbroker/vgpu` - для `VGPU`
  - `pkg/cloudbroker/vins` - для `VINS`

 Все поля структуры имеют описание, в которых содержится:
@@ -415,7 +397,7 @@ func main() {

 Чтобы выполнить запрос, необходимо:

-1. Вызвать у клиента метод, отвечаеющий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, либо `.CloudBroker()`. Данные методы возвращаеют соответствующие структуры, с помощью которых можно совершать запросы.
+1. Вызвать у клиента метод, отвечаеющий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, либо `.CloudBroker()`. Данные методы возвращаеют соответствующие структуры, с помощью которых можно соверать запросы.
 2. Вызвать у возвращенной структуры метод, определяющий группу ручек для взаимодействия.

   Доступные методы для `.CloudAPI()`:
@@ -423,6 +405,7 @@ func main() {
   - `.Account()` - для работы с `Account`
   - `.BService()` - для работы с `BService`
   - `.Compute()` - для работы с `Compute`
+   - `.ComputeCI()` - для работы с `ComputeCI`
   - `.Disks()` - для работы с `Disks`
   - `.ExtNet()` - для работы с `ExtNet`
   - `.FLIPgroup()` - для работы с `FLIPGroup`
@@ -435,46 +418,37 @@ func main() {
   - `.Locations()` - для работы с `Locations`
   - `.RG()` - для работы с `RG`
   - `.Sizes()` - для работы с `Sizes`
-   - `.Stack()` - для работы с `Stack`
   - `.Tasks()` - для работы с `Tasks`
   - `.VINS()` - для работы с `VINS`

   Доступные методы для `.CloudBroker()`:

   - `.Account()` - для работы с `Account`
-   - `.APIAccess()` - для работы с `APIAccess`
-   - `.Backup()` - для работы с `Backup`
   - `.Compute()` - для работы с `Compute`
   - `.Disks()` - для работы с `Disks`
   - `.ExtNet()` - для работы с `ExtNet`
-   - `.FLIPGroup()` - для работы с `FLIPGroup`
   - `.Grid()` - для работы с `Grid`
-   - `.Group()` - для работы с `Group`
   - `.Image()` - для работы с `Image`
   - `.K8CI()` - для работы с `K8CI`
   - `.K8S()` - для работы с `K8S`
   - `.KVMPPC()` - для работы с `KVMPPC`
   - `.KVMx86()` - для работы с `KVMX86`
   - `.LB()` - для работы с `LB`
-   - `.PCIDevice()` - для работы с `PCIDevice`
   - `.RG()` - для работы с `RG`
   - `.SEP()` - для работы с `SEP`
-   - `.Stack()` - для работы с `Stack`
   - `.Tasks()` - для работы с `Tasks`
-   - `.User()` - для работы с `User`
-   - `.VGPU()` - для работы с `VGPU`
   - `.VINS()` - для работы с `VINS`

 3. Вызвать метод, отвечающий за выполнение запроса и передать в него:

 - контекст;
 - структуру запроса.
-  У каждой группы ручек API имеются свои доступные методы, которые определяются платформой.
+  У кождой группы ручек API имеются свои доступные методы, которые определяются платформой.

 4. Обработать результат и ошибки.

 Т.к. все вызовы методов идут последовательно, можно их объеденить в конвейер:
-Общий вид конвейера будет выглядеть так:
+Общий вид вонвейра будет выглядеть так:

 ```go
  client.<API>.<группа>.<метод>
@@ -731,7 +705,7 @@ func main() {
 | DecortURL     | string | Да           | URL адрес платформы, с которой будет осуществляться взаимодействие |
 | Retries       | uint   | Нет          | Кол-во неудачных попыток выполнения запроса, по умолчанию - 5      |
 | Timeout       | config.Duration | Нет | Таймаут HTTP клиента, по умолчанию - без ограничений               |
-| SSLSkipVerify | bool   | Нет          | Пропуск проверки подлинности сертификата     |
+| SSLSkipVerify | bool   | Нет          | Пропуск проверки подлинности сертификата, по умолчанию - true      |
 | Token         | string | Нет          | JWT токен                                                          |

 #### Пример конфигурации legacy клиента
--- a/client.go
+++ b/client.go
@@ -1,34 +1,24 @@
 package decortsdk

 import (
-	"bytes"
 	"context"
-	"crypto/tls"
 	"errors"
-	"fmt"
 	"io"
-	"mime/multipart"
 	"net/http"
-	"strconv"
 	"strings"
-	"sync"
-	"time"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	k8s_cb"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
+
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/client"
 )

 // HTTP-client for platform
 type DecortClient struct {
-	decortURL  string
-	client     *http.Client
-	cfg        config.Config
-	expiryTime time.Time
-	mutex      *sync.Mutex
+	decortURL string
+	client    *http.Client
 }

 // Сlient builder
@@ -37,25 +27,9 @@ func New(cfg config.Config) *DecortClient {
 		cfg.Retries = 5
 	}

-	var expiryTime time.Time
-
-	if cfg.Token != "" {
-		expiryTime = time.Now().AddDate(0, 0, 1)
-	}
-
 	return &DecortClient{
 		decortURL: cfg.DecortURL,
-		client: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					//nolint:gosec
-					InsecureSkipVerify: cfg.SSLSkipVerify,
-				},
-			},
-		},
-		cfg:        cfg,
-		expiryTime: expiryTime,
-		mutex:      &sync.Mutex{},
+		client:    client.NewHttpClient(cfg),
 	}
 }

@@ -71,283 +45,6 @@ func (dc *DecortClient) CloudBroker() *cloudbroker.CloudBroker {

 // DecortApiCall method for sending requests to the platform
 func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
-	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
-
-	if okCa {
-		reqBody := &bytes.Buffer{}
-		writer := multipart.NewWriter(reqBody)
-		if k8sCaCreateReq.OidcCertificate != "" {
-			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-			_, _ = io.Copy(part, strings.NewReader(k8sCaCreateReq.OidcCertificate))
-		}
-
-		_ = writer.WriteField("name", k8sCaCreateReq.Name)
-		_ = writer.WriteField("rgId", strconv.FormatUint(k8sCaCreateReq.RGID, 10))
-		_ = writer.WriteField("k8ciId", strconv.FormatUint(k8sCaCreateReq.K8SCIID, 10))
-		_ = writer.WriteField("workerGroupName", k8sCaCreateReq.WorkerGroupName)
-		_ = writer.WriteField("networkPlugin", k8sCaCreateReq.NetworkPlugin)
-
-		if k8sCaCreateReq.MasterSEPID != 0 {
-			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCaCreateReq.MasterSEPID, 10))
-		}
-		if k8sCaCreateReq.MasterSEPPool != "" {
-			_ = writer.WriteField("masterSepPool", k8sCaCreateReq.MasterSEPPool)
-		}
-		if k8sCaCreateReq.WorkerSEPID != 0 {
-			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCaCreateReq.WorkerSEPID, 10))
-		}
-		if k8sCaCreateReq.WorkerSEPPool != "" {
-			_ = writer.WriteField("workerSepPool", k8sCaCreateReq.WorkerSEPPool)
-		}
-
-		if k8sCaCreateReq.Labels != nil {
-			for _, v := range k8sCaCreateReq.Labels {
-				_ = writer.WriteField("labels", v)
-			}
-		}
-		if k8sCaCreateReq.Taints != nil {
-			for _, v := range k8sCaCreateReq.Taints {
-				_ = writer.WriteField("taints", v)
-			}
-		}
-		if k8sCaCreateReq.Annotations != nil {
-			for _, v := range k8sCaCreateReq.Annotations {
-				_ = writer.WriteField("annotations", v)
-			}
-		}
-
-		if k8sCaCreateReq.MasterCPU != 0 {
-			_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(k8sCaCreateReq.MasterCPU), 10))
-		}
-		if k8sCaCreateReq.MasterNum != 0 {
-			_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(k8sCaCreateReq.MasterNum), 10))
-		}
-		if k8sCaCreateReq.MasterRAM != 0 {
-			_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(k8sCaCreateReq.MasterRAM), 10))
-		}
-		if k8sCaCreateReq.MasterDisk != 0 {
-			_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(k8sCaCreateReq.MasterDisk), 10))
-		}
-		if k8sCaCreateReq.WorkerCPU != 0 {
-			_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerCPU), 10))
-		}
-		if k8sCaCreateReq.WorkerNum != 0 {
-			_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerNum), 10))
-		}
-		if k8sCaCreateReq.WorkerRAM != 0 {
-			_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerRAM), 10))
-		}
-		if k8sCaCreateReq.WorkerDisk != 0 {
-			_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(k8sCaCreateReq.WorkerDisk), 10))
-		}
-		if k8sCaCreateReq.ExtNetID != 0 {
-			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCaCreateReq.ExtNetID, 10))
-		}
-		if k8sCaCreateReq.VinsId != 0 {
-			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCaCreateReq.VinsId, 10))
-		}
-		if !k8sCaCreateReq.WithLB {
-			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCaCreateReq.WithLB))
-		}
-
-		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCaCreateReq.HighlyAvailable))
-
-		if k8sCaCreateReq.AdditionalSANs != nil {
-			for _, v := range k8sCaCreateReq.AdditionalSANs {
-				_ = writer.WriteField("additionalSANs", v)
-			}
-		}
-		if k8sCaCreateReq.InitConfiguration != "" {
-			_ = writer.WriteField("initConfiguration", k8sCaCreateReq.InitConfiguration)
-		}
-		if k8sCaCreateReq.ClusterConfiguration != "" {
-			_ = writer.WriteField("clusterConfiguration", k8sCaCreateReq.ClusterConfiguration)
-		}
-		if k8sCaCreateReq.KubeletConfiguration != "" {
-			_ = writer.WriteField("kubeletConfiguration", k8sCaCreateReq.KubeletConfiguration)
-		}
-		if k8sCaCreateReq.KubeProxyConfiguration != "" {
-			_ = writer.WriteField("kubeProxyConfiguration", k8sCaCreateReq.KubeProxyConfiguration)
-		}
-		if k8sCaCreateReq.JoinConfiguration != "" {
-			_ = writer.WriteField("joinConfiguration", k8sCaCreateReq.JoinConfiguration)
-		}
-		if k8sCaCreateReq.Description != "" {
-			_ = writer.WriteField("desc", k8sCaCreateReq.Description)
-		}
-		if k8sCaCreateReq.UserData != "" {
-			_ = writer.WriteField("userData", k8sCaCreateReq.UserData)
-		}
-
-		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCaCreateReq.ExtNetOnly))
-		_ = writer.FormDataContentType()
-
-		ct := writer.FormDataContentType()
-
-		writer.Close()
-		req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, reqBody)
-		if err != nil {
-			return nil, err
-		}
-		if err = dc.getToken(ctx); err != nil {
-			return nil, err
-		}
-
-		resp, err := dc.domp(req, ct)
-		if err != nil {
-			return nil, err
-		}
-		defer resp.Body.Close()
-
-		respBytes, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return nil, err
-		}
-
-		if resp.StatusCode != 200 {
-			return nil, errors.New(string(respBytes))
-		}
-
-		return respBytes, nil
-	} else if okCb {
-		reqBody := &bytes.Buffer{}
-		writer := multipart.NewWriter(reqBody)
-		if k8sCbCreateReq.OidcCertificate != "" {
-			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-			_, _ = io.Copy(part, strings.NewReader(k8sCbCreateReq.OidcCertificate))
-		}
-
-		_ = writer.WriteField("name", k8sCbCreateReq.Name)
-		_ = writer.WriteField("rgId", strconv.FormatUint(k8sCbCreateReq.RGID, 10))
-		_ = writer.WriteField("k8ciId", strconv.FormatUint(k8sCbCreateReq.K8CIID, 10))
-		_ = writer.WriteField("workerGroupName", k8sCbCreateReq.WorkerGroupName)
-		_ = writer.WriteField("networkPlugin", k8sCbCreateReq.NetworkPlugin)
-
-		if k8sCbCreateReq.MasterSEPID != 0 {
-			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCbCreateReq.MasterSEPID, 10))
-		}
-		if k8sCbCreateReq.MasterSEPPool != "" {
-			_ = writer.WriteField("masterSepPool", k8sCbCreateReq.MasterSEPPool)
-		}
-		if k8sCbCreateReq.WorkerSEPID != 0 {
-			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCbCreateReq.WorkerSEPID, 10))
-		}
-		if k8sCbCreateReq.WorkerSEPPool != "" {
-			_ = writer.WriteField("workerSepPool", k8sCbCreateReq.WorkerSEPPool)
-		}
-
-		if k8sCbCreateReq.Labels != nil {
-			for _, v := range k8sCbCreateReq.Labels {
-				_ = writer.WriteField("labels", v)
-			}
-		}
-		if k8sCbCreateReq.Taints != nil {
-			for _, v := range k8sCbCreateReq.Taints {
-				_ = writer.WriteField("taints", v)
-			}
-		}
-		if k8sCbCreateReq.Annotations != nil {
-			for _, v := range k8sCbCreateReq.Annotations {
-				_ = writer.WriteField("annotations", v)
-			}
-		}
-
-		if k8sCbCreateReq.MasterCPU != 0 {
-			_ = writer.WriteField("masterCpu", strconv.FormatUint(k8sCbCreateReq.MasterCPU, 10))
-		}
-		if k8sCbCreateReq.MasterNum != 0 {
-			_ = writer.WriteField("masterNum", strconv.FormatUint(k8sCbCreateReq.MasterNum, 10))
-		}
-		if k8sCbCreateReq.MasterRAM != 0 {
-			_ = writer.WriteField("masterRam", strconv.FormatUint(k8sCbCreateReq.MasterRAM, 10))
-		}
-		if k8sCbCreateReq.MasterDisk != 0 {
-			_ = writer.WriteField("masterDisk", strconv.FormatUint(k8sCbCreateReq.MasterDisk, 10))
-		}
-		if k8sCbCreateReq.WorkerCPU != 0 {
-			_ = writer.WriteField("workerCpu", strconv.FormatUint(k8sCbCreateReq.WorkerCPU, 10))
-		}
-		if k8sCbCreateReq.WorkerNum != 0 {
-			_ = writer.WriteField("workerNum", strconv.FormatUint(k8sCbCreateReq.WorkerNum, 10))
-		}
-		if k8sCbCreateReq.WorkerRAM != 0 {
-			_ = writer.WriteField("workerRam", strconv.FormatUint(k8sCbCreateReq.WorkerRAM, 10))
-		}
-		if k8sCbCreateReq.WorkerDisk != 0 {
-			_ = writer.WriteField("workerDisk", strconv.FormatUint(k8sCbCreateReq.WorkerDisk, 10))
-		}
-		if k8sCbCreateReq.ExtNetID != 0 {
-			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCbCreateReq.ExtNetID, 10))
-		}
-		if k8sCbCreateReq.VinsId != 0 {
-			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCbCreateReq.VinsId, 10))
-		}
-		if !k8sCbCreateReq.WithLB {
-			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCbCreateReq.WithLB))
-		}
-
-		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCbCreateReq.HighlyAvailable))
-
-		if k8sCbCreateReq.AdditionalSANs != nil {
-			for _, v := range k8sCbCreateReq.AdditionalSANs {
-				_ = writer.WriteField("additionalSANs", v)
-			}
-		}
-		if k8sCbCreateReq.InitConfiguration != "" {
-			_ = writer.WriteField("initConfiguration", k8sCbCreateReq.InitConfiguration)
-		}
-		if k8sCbCreateReq.ClusterConfiguration != "" {
-			_ = writer.WriteField("clusterConfiguration", k8sCbCreateReq.ClusterConfiguration)
-		}
-		if k8sCbCreateReq.KubeletConfiguration != "" {
-			_ = writer.WriteField("kubeletConfiguration", k8sCbCreateReq.KubeletConfiguration)
-		}
-		if k8sCbCreateReq.KubeProxyConfiguration != "" {
-			_ = writer.WriteField("kubeProxyConfiguration", k8sCbCreateReq.KubeProxyConfiguration)
-		}
-		if k8sCbCreateReq.JoinConfiguration != "" {
-			_ = writer.WriteField("joinConfiguration", k8sCbCreateReq.JoinConfiguration)
-		}
-		if k8sCbCreateReq.Description != "" {
-			_ = writer.WriteField("desc", k8sCbCreateReq.Description)
-		}
-		if k8sCbCreateReq.UserData != "" {
-			_ = writer.WriteField("userData", k8sCbCreateReq.UserData)
-		}
-
-		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCbCreateReq.ExtNetOnly))
-		_ = writer.FormDataContentType()
-
-		ct := writer.FormDataContentType()
-
-		writer.Close()
-		req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, reqBody)
-		if err != nil {
-			return nil, err
-		}
-		if err = dc.getToken(ctx); err != nil {
-			return nil, err
-		}
-
-		resp, err := dc.domp(req, ct)
-		if err != nil {
-			return nil, err
-		}
-		defer resp.Body.Close()
-
-		respBytes, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return nil, err
-		}
-
-		if resp.StatusCode != 200 {
-			return nil, errors.New(string(respBytes))
-		}
-
-		return respBytes, nil
-	}
-
 	values, err := query.Values(params)
 	if err != nil {
 		return nil, err
@@ -359,11 +56,7 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 		return nil, err
 	}

-	if err = dc.getToken(ctx); err != nil {
-		return nil, err
-	}
-
-	resp, err := dc.do(req)
+	resp, err := dc.client.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -380,91 +73,3 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p

 	return respBytes, nil
 }
-
-func (dc *DecortClient) getToken(ctx context.Context) error {
-	dc.mutex.Lock()
-	defer dc.mutex.Unlock()
-
-	if dc.cfg.Token == "" || time.Now().After(dc.expiryTime) {
-		body := fmt.Sprintf("grant_type=client_credentials&client_id=%s&client_secret=%s&response_type=id_token", dc.cfg.AppID, dc.cfg.AppSecret)
-		bodyReader := strings.NewReader(body)
-
-		dc.cfg.SSOURL = strings.TrimSuffix(dc.cfg.SSOURL, "/")
-
-		req, _ := http.NewRequestWithContext(ctx, "POST", dc.cfg.SSOURL+"/v1/oauth/access_token", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-
-		resp, err := dc.client.Do(req)
-		if err != nil {
-			return fmt.Errorf("cannot get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("cannot get token: %s", tokenBytes)
-		}
-
-		token := string(tokenBytes)
-
-		dc.cfg.Token = token
-		dc.expiryTime = time.Now().AddDate(0, 0, 1)
-	}
-
-	return nil
-}
-
-func (dc *DecortClient) do(req *http.Request) (*http.Response, error) {
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
-	req.Header.Set("Accept", "application/json")
-
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := dc.client.Do(req)
-
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
-	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// }
-	// }
-
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}
-
-func (dc *DecortClient) domp(req *http.Request, ctype string) (*http.Response, error) {
-	req.Header.Add("Content-Type", ctype)
-	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
-	req.Header.Set("Accept", "application/json")
-
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := dc.client.Do(req)
-
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
-	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// }
-	// }
-
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}
--- a/config/config.go
+++ b/config/config.go
@@ -42,7 +42,7 @@ type Config struct {
 	// Required: false
 	Retries uint64 `json:"retries" yaml:"retries"`

-	// Skip verify
+	// Skip verify, true by default
 	// Required: false
 	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`

--- a/config/legacy-config.go
+++ b/config/legacy-config.go
@@ -36,7 +36,7 @@ type LegacyConfig struct {
 	// Required: false
 	Retries uint64 `json:"retries" yaml:"retries"`

-	// Skip verify
+	// Skip verify, true by default
 	// Required: false
 	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`

--- a/config/timeouts.go
+++ b/config/timeouts.go
@@ -23,7 +23,7 @@ func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		*d = Duration(tmp)
 		return nil
 	default:
-		return fmt.Errorf("invalid duration %v", value)
+		return fmt.Errorf("Invalid duration %v", value)
 	}
 }

@@ -41,7 +41,7 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 		*d = Duration(tmp)
 		return nil
 	default:
-		return fmt.Errorf("invalid duration %v", value)
+		return fmt.Errorf("Invalid duration %v", value)
 	}
 }

--- a/internal/client/http-client.go
+++ b/internal/client/http-client.go
@@ -0,0 +1,42 @@
+package client
+
+import (
+	"crypto/tls"
+	"net/http"
+	"sync"
+	"time"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+)
+
+func NewHttpClient(cfg config.Config) *http.Client {
+
+	transCfg := &http.Transport{
+		TLSClientConfig: &tls.Config{
+			//nolint:gosec
+			InsecureSkipVerify: cfg.SSLSkipVerify,
+		},
+	}
+
+	var expiredTime time.Time
+
+	if cfg.Token != "" {
+		expiredTime = time.Now().AddDate(0, 0, 1)
+	}
+
+	return &http.Client{
+		Transport: &transport{
+			base:         transCfg,
+			retries:      cfg.Retries,
+			clientID:     cfg.AppID,
+			clientSecret: cfg.AppSecret,
+			ssoURL:       cfg.SSOURL,
+			token:        cfg.Token,
+			expiryTime:   expiredTime,
+			mutex:        &sync.Mutex{},
+			//TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		},
+
+		Timeout: cfg.Timeout.Get(),
+	}
+}
--- a/internal/client/legacy-http-client.go
+++ b/internal/client/legacy-http-client.go
@@ -0,0 +1,42 @@
+package client
+
+import (
+	"crypto/tls"
+	"net/http"
+	"net/url"
+	"sync"
+	"time"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+)
+
+// NewLegacyHttpClient creates legacy HTTP Client
+func NewLegacyHttpClient(cfg config.LegacyConfig) *http.Client {
+	transCfg := &http.Transport{
+		TLSClientConfig: &tls.Config{
+			//nolint:gosec
+			InsecureSkipVerify: cfg.SSLSkipVerify,
+		},
+	}
+
+	var expiredTime time.Time
+
+	if cfg.Token != "" {
+		expiredTime = time.Now().AddDate(0, 0, 1)
+	}
+
+	return &http.Client{
+		Transport: &transportLegacy{
+			base:       transCfg,
+			username:   url.QueryEscape(cfg.Username),
+			password:   url.QueryEscape(cfg.Password),
+			retries:    cfg.Retries,
+			token:      cfg.Token,
+			decortURL:  cfg.DecortURL,
+			expiryTime: expiredTime,
+			mutex:      &sync.Mutex{},
+		},
+
+		Timeout: cfg.Timeout.Get(),
+	}
+}
--- a/internal/client/legacy-transport.go
+++ b/internal/client/legacy-transport.go
@@ -0,0 +1,78 @@
+package client
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+)
+
+type transportLegacy struct {
+	base       http.RoundTripper
+	username   string
+	password   string
+	retries    uint64
+	token      string
+	decortURL  string
+	mutex      *sync.Mutex
+	expiryTime time.Time
+}
+
+func (t *transportLegacy) RoundTrip(request *http.Request) (*http.Response, error) {
+	if t.token == "" || time.Now().After(t.expiryTime) {
+		body := fmt.Sprintf("username=%s&password=%s", t.username, t.password)
+		bodyReader := strings.NewReader(body)
+
+		req, _ := http.NewRequestWithContext(request.Context(), "POST", t.decortURL+"/restmachine/cloudapi/user/authenticate", bodyReader)
+		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+		resp, err := t.base.RoundTrip(req)
+		if err != nil {
+			return nil, fmt.Errorf("unable to get token: %w", err)
+		}
+
+		tokenBytes, _ := io.ReadAll(resp.Body)
+		resp.Body.Close()
+
+		if resp.StatusCode != 200 {
+			return nil, fmt.Errorf("unable to get token: %s", tokenBytes)
+		}
+
+		token := string(tokenBytes)
+		t.token = token
+		t.expiryTime = time.Now().AddDate(0, 0, 1)
+	}
+
+	tokenValue := fmt.Sprintf("&authkey=%s", t.token)
+	tokenReader := strings.NewReader(tokenValue)
+
+	newBody := io.MultiReader(request.Body, tokenReader)
+
+	req, _ := http.NewRequestWithContext(request.Context(), request.Method, request.URL.String(), newBody)
+
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Accept", "application/json")
+
+	var resp *http.Response
+	var err error
+	for i := uint64(0); i < t.retries; i++ {
+		t.mutex.Lock()
+		resp, err = t.base.RoundTrip(req)
+		t.mutex.Unlock()
+		if err == nil {
+			if resp.StatusCode == 200 {
+				return resp, nil
+			}
+			respBytes, _ := io.ReadAll(resp.Body)
+			err = fmt.Errorf("%s", respBytes)
+			resp.Body.Close()
+		}
+		if err != nil {
+			return nil, fmt.Errorf("could not execute request: %w", err)
+		}
+		time.Sleep(time.Second * 5)
+	}
+	return nil, fmt.Errorf("could not execute request: %w", err)
+}
--- a/internal/client/transport.go
+++ b/internal/client/transport.go
@@ -0,0 +1,74 @@
+package client
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+)
+
+type transport struct {
+	base         http.RoundTripper
+	retries      uint64
+	clientID     string
+	clientSecret string
+	token        string
+	ssoURL       string
+	expiryTime   time.Time
+	mutex        *sync.Mutex
+}
+
+func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
+	if t.token == "" || time.Now().After(t.expiryTime) {
+		body := fmt.Sprintf("grant_type=client_credentials&client_id=%s&client_secret=%s&response_type=id_token", t.clientID, t.clientSecret)
+		bodyReader := strings.NewReader(body)
+
+		t.ssoURL = strings.TrimSuffix(t.ssoURL, "/")
+
+		req, _ := http.NewRequestWithContext(req.Context(), "POST", t.ssoURL+"/v1/oauth/access_token", bodyReader)
+		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+		resp, err := t.base.RoundTrip(req)
+		if err != nil {
+			return nil, fmt.Errorf("cannot get token: %w", err)
+		}
+
+		tokenBytes, _ := io.ReadAll(resp.Body)
+		resp.Body.Close()
+
+		if resp.StatusCode != 200 {
+			return nil, fmt.Errorf("cannot get token: %s", tokenBytes)
+		}
+
+		token := string(tokenBytes)
+
+		t.token = token
+		t.expiryTime = time.Now().AddDate(0, 0, 1)
+	}
+
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Add("Authorization", "bearer "+t.token)
+	req.Header.Set("Accept", "application/json")
+
+	var resp *http.Response
+	var err error
+	for i := uint64(0); i < t.retries; i++ {
+		t.mutex.Lock()
+		resp, err = t.base.RoundTrip(req)
+		t.mutex.Unlock()
+		if err == nil {
+			if resp.StatusCode == 200 {
+				return resp, nil
+			}
+			respBytes, _ := io.ReadAll(resp.Body)
+			err = fmt.Errorf("%s", respBytes)
+			resp.Body.Close()
+		}
+		//logrus.Errorf("Could not execute request: %v. Retrying %d/%d", err, i+1, t.retries)
+		time.Sleep(time.Second * 5)
+	}
+
+	return nil, fmt.Errorf("could not execute request: %w", err)
+}
--- a/legacy-client.go
+++ b/legacy-client.go
@@ -1,34 +1,23 @@
 package decortsdk

 import (
-	"bytes"
 	"context"
-	"crypto/tls"
 	"errors"
-	"fmt"
 	"io"
-	"mime/multipart"
 	"net/http"
-	"net/url"
-	"strconv"
 	"strings"
-	"sync"
-	"time"

 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/client"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 )

 // Legacy HTTP-client for platform
 type LegacyDecortClient struct {
-	decortURL  string
-	client     *http.Client
-	cfg        config.LegacyConfig
-	expiryTime time.Time
-	mutex      *sync.Mutex
+	decortURL string
+	client    *http.Client
 }

 // Legacy client builder
@@ -37,25 +26,9 @@ func NewLegacy(cfg config.LegacyConfig) *LegacyDecortClient {
 		cfg.Retries = 5
 	}

-	var expiryTime time.Time
-
-	if cfg.Token != "" {
-		expiryTime = time.Now().AddDate(0, 0, 1)
-	}
-
 	return &LegacyDecortClient{
 		decortURL: cfg.DecortURL,
-		client: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					//nolint:gosec
-					InsecureSkipVerify: cfg.SSLSkipVerify,
-				},
-			},
-		},
-		cfg:        cfg,
-		expiryTime: expiryTime,
-		mutex:      &sync.Mutex{},
+		client:    client.NewLegacyHttpClient(cfg),
 	}
 }

@@ -71,165 +44,18 @@ func (ldc *LegacyDecortClient) CloudBroker() *cloudbroker.CloudBroker {

 // DecortApiCall method for sending requests to the platform
 func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-	if k8sCreateReq, ok := params.(k8s.CreateRequest); ok {
-		reqBody := &bytes.Buffer{}
-		writer := multipart.NewWriter(reqBody)
-		if k8sCreateReq.OidcCertificate != "" {
-			part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-			_, _ = io.Copy(part, strings.NewReader(k8sCreateReq.OidcCertificate))
-		}
-
-		_ = writer.WriteField("name", k8sCreateReq.Name)
-		_ = writer.WriteField("rgId", strconv.FormatUint(k8sCreateReq.RGID, 10))
-		_ = writer.WriteField("k8ciId", strconv.FormatUint(k8sCreateReq.K8SCIID, 10))
-		_ = writer.WriteField("workerGroupName", k8sCreateReq.WorkerGroupName)
-		_ = writer.WriteField("networkPlugin", k8sCreateReq.NetworkPlugin)
-
-		if k8sCreateReq.MasterSEPID != 0 {
-			_ = writer.WriteField("masterSepId", strconv.FormatUint(k8sCreateReq.MasterSEPID, 10))
-		}
-		if k8sCreateReq.MasterSEPPool != "" {
-			_ = writer.WriteField("masterSepPool", k8sCreateReq.MasterSEPPool)
-		}
-		if k8sCreateReq.WorkerSEPID != 0 {
-			_ = writer.WriteField("workerSepId", strconv.FormatUint(k8sCreateReq.WorkerSEPID, 10))
-		}
-		if k8sCreateReq.WorkerSEPPool != "" {
-			_ = writer.WriteField("workerSepPool", k8sCreateReq.WorkerSEPPool)
-		}
-
-		if k8sCreateReq.Labels != nil {
-			for _, v := range k8sCreateReq.Labels {
-				_ = writer.WriteField("labels", v)
-			}
-		}
-		if k8sCreateReq.Taints != nil {
-			for _, v := range k8sCreateReq.Taints {
-				_ = writer.WriteField("taints", v)
-			}
-		}
-		if k8sCreateReq.Annotations != nil {
-			for _, v := range k8sCreateReq.Annotations {
-				_ = writer.WriteField("annotations", v)
-			}
-		}
-
-		if k8sCreateReq.MasterCPU != 0 {
-			_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(k8sCreateReq.MasterCPU), 10))
-		}
-		if k8sCreateReq.MasterNum != 0 {
-			_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(k8sCreateReq.MasterNum), 10))
-		}
-		if k8sCreateReq.MasterRAM != 0 {
-			_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(k8sCreateReq.MasterRAM), 10))
-		}
-		if k8sCreateReq.MasterDisk != 0 {
-			_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(k8sCreateReq.MasterDisk), 10))
-		}
-		if k8sCreateReq.WorkerCPU != 0 {
-			_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(k8sCreateReq.WorkerCPU), 10))
-		}
-		if k8sCreateReq.WorkerNum != 0 {
-			_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(k8sCreateReq.WorkerNum), 10))
-		}
-		if k8sCreateReq.WorkerRAM != 0 {
-			_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(k8sCreateReq.WorkerRAM), 10))
-		}
-		if k8sCreateReq.WorkerDisk != 0 {
-			_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(k8sCreateReq.WorkerDisk), 10))
-		}
-		if k8sCreateReq.ExtNetID != 0 {
-			_ = writer.WriteField("extnetId", strconv.FormatUint(k8sCreateReq.ExtNetID, 10))
-		}
-		if k8sCreateReq.VinsId != 0 {
-			_ = writer.WriteField("vinsId", strconv.FormatUint(k8sCreateReq.VinsId, 10))
-		}
-		if !k8sCreateReq.WithLB {
-			_ = writer.WriteField("withLB", strconv.FormatBool(k8sCreateReq.WithLB))
-		}
-
-		_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(k8sCreateReq.HighlyAvailable))
-
-		if k8sCreateReq.AdditionalSANs != nil {
-			for _, v := range k8sCreateReq.AdditionalSANs {
-				_ = writer.WriteField("additionalSANs", v)
-			}
-		}
-		if k8sCreateReq.InitConfiguration != "" {
-			_ = writer.WriteField("initConfiguration", k8sCreateReq.InitConfiguration)
-		}
-		if k8sCreateReq.ClusterConfiguration != "" {
-			_ = writer.WriteField("clusterConfiguration", k8sCreateReq.ClusterConfiguration)
-		}
-		if k8sCreateReq.KubeletConfiguration != "" {
-			_ = writer.WriteField("kubeletConfiguration", k8sCreateReq.KubeletConfiguration)
-		}
-		if k8sCreateReq.KubeProxyConfiguration != "" {
-			_ = writer.WriteField("kubeProxyConfiguration", k8sCreateReq.KubeProxyConfiguration)
-		}
-		if k8sCreateReq.JoinConfiguration != "" {
-			_ = writer.WriteField("joinConfiguration", k8sCreateReq.JoinConfiguration)
-		}
-		if k8sCreateReq.Description != "" {
-			_ = writer.WriteField("desc", k8sCreateReq.Description)
-		}
-		if k8sCreateReq.UserData != "" {
-			_ = writer.WriteField("userData", k8sCreateReq.UserData)
-		}
-
-		_ = writer.WriteField("extnetOnly", strconv.FormatBool(k8sCreateReq.ExtNetOnly))
-		_ = writer.FormDataContentType()
-
-		ct := writer.FormDataContentType()
-
-		if err := ldc.getToken(ctx); err != nil {
-			return nil, err
-		}
-
-		_ = writer.WriteField("authkey", ldc.cfg.Token)
-
-		writer.Close()
-
-		req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, reqBody)
-		if err != nil {
-			return nil, err
-		}
-
-		resp, err := ldc.domp(req, ct)
-		if err != nil {
-			return nil, err
-		}
-		defer resp.Body.Close()
-
-		respBytes, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return nil, err
-		}
-
-		if resp.StatusCode != 200 {
-			return nil, errors.New(string(respBytes))
-		}
-
-		return respBytes, nil
-	}
-
 	values, err := query.Values(params)
 	if err != nil {
 		return nil, err
 	}

-	if err = ldc.getToken(ctx); err != nil {
-		return nil, err
-	}
-
-	body := strings.NewReader(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
-
+	body := strings.NewReader(values.Encode())
 	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, body)
 	if err != nil {
 		return nil, err
 	}

-	resp, err := ldc.do(req)
+	resp, err := ldc.client.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -246,88 +72,3 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st

 	return respBytes, nil
 }
-
-func (ldc *LegacyDecortClient) getToken(ctx context.Context) error {
-	ldc.mutex.Lock()
-	defer ldc.mutex.Unlock()
-
-	if ldc.cfg.Token == "" || time.Now().After(ldc.expiryTime) {
-		body := fmt.Sprintf("username=%s&password=%s", url.QueryEscape(ldc.cfg.Username), url.QueryEscape(ldc.cfg.Password))
-		bodyReader := strings.NewReader(body)
-
-		req, _ := http.NewRequestWithContext(ctx, "POST", ldc.cfg.DecortURL+"/restmachine/cloudapi/user/authenticate", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-
-		resp, err := ldc.client.Do(req)
-		if err != nil {
-			return fmt.Errorf("unable to get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("unable to get token: %s", tokenBytes)
-		}
-
-		token := string(tokenBytes)
-		ldc.cfg.Token = token
-		ldc.expiryTime = time.Now().AddDate(0, 0, 1)
-	}
-
-	return nil
-}
-
-func (ldc *LegacyDecortClient) do(req *http.Request) (*http.Response, error) {
-	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Accept", "application/json")
-
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
-
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := ldc.client.Do(req)
-
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
-	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// 	}
-	// }
-
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}
-
-func (ldc *LegacyDecortClient) domp(req *http.Request, ctype string) (*http.Response, error) {
-	req.Header.Add("Content-Type", ctype)
-	req.Header.Add("Authorization", "bearer "+ldc.cfg.Token)
-	req.Header.Set("Accept", "application/json")
-
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := ldc.client.Do(req)
-
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
-	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// }
-	// }
-
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}
--- a/pkg/cloudapi/account/models.go
+++ b/pkg/cloudapi/account/models.go
@@ -88,7 +88,7 @@ type Resource struct {
 	DiskSize float64 `json:"disksize"`

 	// Max disk size
-	DiskSizeMax float64 `json:"disksizemax"`
+	DiskSizeMax uint64 `json:"disksizemax"`

 	// Number of External IPs
 	ExtIPs int64 `json:"extips"`
@@ -126,10 +126,10 @@ type RecordResourceConsumption struct {
 // Information about resources
 type ItemResourceConsumption struct {
 	// Current information about resources
-	Consumed Resource `json:"consumed"`
+	Current Resource `json:"Current"`

 	// Reserved information about resources
-	Reserved Resource `json:"reserved"`
+	Reserved Resource `json:"Reserved"`

 	// Account ID
 	AccountID uint64 `json:"id"`
--- a/pkg/cloudapi/bservice/group_add.go
+++ b/pkg/cloudapi/bservice/group_add.go
@@ -68,10 +68,6 @@ type GroupAddRequest struct {
 	// Time of Compute Group readiness
 	// Required: false
 	TimeoutStart uint64 `url:"timeoutStart,omitempty" json:"timeoutStart,omitempty"`
-
-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: false
-	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
 }

 // GroupAdd creates new Compute Group within BasicService.
--- a/pkg/cloudapi/compute/list_pci_device.go
+++ b/pkg/cloudapi/compute/list_pci_device.go
@@ -22,9 +22,9 @@ type ListPCIDeviceRequest struct {
 	// Required: false
 	DevID uint64 `url:"devId,omitempty" json:"devId,omitempty"`

-	// Find by name
+	// Find by type
 	// Required: false
-	Name string `url:"name,omitempty" json:"name,omitempty"`
+	Type string `url:"type,omitempty" json:"type,omitempty"`

 	// Find by status
 	// Required: false
--- a/pkg/cloudapi/k8s/create.go
+++ b/pkg/cloudapi/k8s/create.go
@@ -8,8 +8,6 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-// type Params []string
-
 // Request struct for create kubernetes cluster
 type CreateRequest struct {
 	// Name of Kubernetes cluster
@@ -100,80 +98,22 @@ type CreateRequest struct {
 	// Required: false
 	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`

-	// ID of the ViNS to connect k8s cluster. If nothing is specified, ViNS will be created automatically
-	// Required: false
-	VinsId uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
-
 	// Create Kubernetes cluster with masters nodes behind load balancer if true.
 	// Otherwise give all cluster nodes direct external addresses from selected ExtNet
 	// Required: false
 	WithLB bool `url:"withLB" json:"withLB"`

-	// Custom sysctl values for Load Balancer instance. Applied on boot
-	// Required: false
-	LbSysctlParams string `url:"lbSysctlParams,omitempty" json:"lbSysctlParams,omitempty"`
-
-	// Use Highly Available schema for LB deploy
-	// Required: false
-	HighlyAvailable bool `url:"highlyAvailableLB,omitempty" json:"highlyAvailableLB,omitempty"`
-
-	// Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names
-	// Required: false
-	AdditionalSANs []string `url:"additionalSANs,omitempty" json:"additionalSANs,omitempty"`
-
-	// 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
-	// Required: false
-	InitConfiguration string `url:"initConfiguration,omitempty" json:"initConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	ClusterConfiguration string `url:"clusterConfiguration,omitempty" json:"clusterConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	KubeletConfiguration string `url:"kubeletConfiguration,omitempty" json:"kubeletConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	KubeProxyConfiguration string `url:"kubeProxyConfiguration,omitempty" json:"kubeProxyConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	JoinConfiguration string `url:"joinConfiguration,omitempty" json:"joinConfiguration,omitempty"`
-
 	// Text description of this Kubernetes cluster
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`

-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: false
-	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
-
-	// Use only selected ExtNet for infrastructure connections
+	//Use only selected ExtNet for infrastructure connections
 	// Required: false
 	ExtNetOnly bool `url:"extnetOnly,omitempty" json:"extnetOnly,omitempty"`
-
-	// Insert ssl certificate in x509 pem format
-	// Required: false
-	OidcCertificate string `url:"oidcCertificate,omitempty" json:"oidcCertificate,omitempty"`
 }

-// type wrapperCreateRequest struct {
-// 	CreateRequest
-// 	Params []string `url:"lbSysctlParams,omitempty"`
-// }
-
 // Create creates a new Kubernetes cluster in the specified Resource Group
 func (k8s K8S) Create(ctx context.Context, req CreateRequest) (string, error) {
-
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -181,28 +121,6 @@ func (k8s K8S) Create(ctx context.Context, req CreateRequest) (string, error) {
 		}
 	}

-	// var params []string
-
-	// if len(req.LbSysctlParams) != 0 {
-	// 	params = make([]string, 0, len(req.LbSysctlParams))
-
-	// 	for r := range req.LbSysctlParams {
-	// 		b, err := json.Marshal(req.LbSysctlParams[r])
-	// 		if err != nil {
-	// 			return "", err
-	// 		}
-
-	// 		params = append(params, string(b))
-	// 	}
-	// } else {
-	// 	params = []string{"[]"}
-	// }
-
-	// reqWrapped := wrapperCreateRequest{
-	// 	CreateRequest: req,
-	// 	Params:        params,
-	// }
-
 	url := "/cloudapi/k8s/create"

 	res, err := k8s.client.DecortApiCall(ctx, http.MethodPost, url, req)
--- a/pkg/cloudapi/k8s/get_worker_nodes_meta_data.go
+++ b/pkg/cloudapi/k8s/get_worker_nodes_meta_data.go
@@ -1,38 +0,0 @@
-package k8s
-
-import (
-	"context"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for get worker group metadata by ID
-type GetWorkerNodesMetaDataRequest struct {
-	// Kubernetes cluster ID
-	// Required: true
-	K8SID uint64 `url:"k8sId" json:"k8sId" validate:"required"`
-
-	// ID of the workers compute group
-	// Required: true
-	WorkersGroupID uint64 `url:"workersGroupId" json:"workersGroupId" validate:"required"`
-}
-
-// Get worker group metadata by ID
-func (k K8S) GetWorkerNodesMetaData(ctx context.Context, req GetWorkerNodesMetaDataRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return "", validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/k8s/getWorkerNodesMetaData"
-
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}
--- a/pkg/cloudapi/k8s/list_deleted.go
+++ b/pkg/cloudapi/k8s/list_deleted.go
@@ -32,6 +32,10 @@ type ListDeletedRequest struct {
 	// Required: false
 	BasicServiceID uint64 `url:"basicServiceId,omitempty" json:"basicServiceId,omitempty"`

+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
 	// Find by techStatus
 	// Required: false
 	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
--- a/pkg/cloudapi/k8s/models.go
+++ b/pkg/cloudapi/k8s/models.go
@@ -34,11 +34,6 @@ type ItemK8SGroup struct {

 	// List of taints
 	Taints []string `json:"taints"`
-
-	// for autoscaler
-	MinNodes    uint64 `json:"minNodes"`
-	MaxNodes    uint64 `json:"maxNodes"`
-	Autoscaling bool   `json:"autoscale"`
 }

 // List kubernetes cluster groups
@@ -46,9 +41,6 @@ type ListK8SGroups []ItemK8SGroup

 // Detailed information
 type ItemDetailedInfo struct {
-	// Externalip
-	Externalip string `json:"externalip"`
-
 	// ID
 	ID uint64 `json:"id"`

--- a/pkg/cloudapi/k8s/update_worker_nodes_meta_data.go
+++ b/pkg/cloudapi/k8s/update_worker_nodes_meta_data.go
@@ -1,48 +0,0 @@
-package k8s
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for add worker to a kubernetes cluster
-type UpdateWorkerNodesMetaDataRequest struct {
-	// Kubernetes cluster ID
-	// Required: true
-	K8SID uint64 `url:"k8sId" json:"k8sId" validate:"required"`
-
-	// ID of the workers compute group
-	// Required: true
-	WorkersGroupID uint64 `url:"workersGroupId" json:"workersGroupId" validate:"required"`
-
-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: true
-	UserData string `url:"userData" json:"userData" validate:"required"`
-}
-
-// WorkerAdd adds worker nodes to a kubernetes cluster
-func (k K8S) UpdateWorkerNodesMetaData(ctx context.Context, req UpdateWorkerNodesMetaDataRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/k8s/updateWorkerNodesMetaData"
-
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/k8s/workers_group_add.go
+++ b/pkg/cloudapi/k8s/workers_group_add.go
@@ -56,10 +56,6 @@ type WorkersGroupAddRequest struct {
 	// Worker node boot disk size in GB If 0 is specified, size is defined by the OS image size
 	// Required: false
 	WorkerDisk uint64 `url:"workerDisk,omitempty" json:"workerDisk,omitempty"`
-
-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: false
-	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
 }

 // WorkersGroupAdd adds workers group to Kubernetes cluster
--- a/pkg/cloudapi/kvmppc/create.go
+++ b/pkg/cloudapi/kvmppc/create.go
@@ -79,7 +79,7 @@ type CreateRequest struct {

 	// Start VM upon success
 	// Required: false
-	Start bool `url:"start" json:"start"`
+	Start bool `url:"start,omitempty" json:"start,omitempty"`

 	// System name
 	// Required: false
--- a/pkg/cloudapi/kvmx86/create.go
+++ b/pkg/cloudapi/kvmx86/create.go
@@ -79,7 +79,7 @@ type CreateRequest struct {

 	// Start VM upon success
 	// Required: false
-	Start bool `url:"start" json:"start"`
+	Start bool `url:"start,omitempty" json:"start,omitempty"`

 	// System name
 	// Required: false
--- a/pkg/cloudapi/lb/create.go
+++ b/pkg/cloudapi/lb/create.go
@@ -2,16 +2,13 @@ package lb

 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"net/http"
-	"strconv"
+	"strings"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-type Params []string
-
 // Request struct for create load balancer
 type CreateRequest struct {
 	// ID of the resource group where this load balancer instance will be located
@@ -31,14 +28,6 @@ type CreateRequest struct {
 	// Required: false
 	VINSID uint64 `url:"vinsId" json:"vinsId"`

-	// Custom  sysctl values for Load Balancer instance. Applied on boot
-	// Required: false
-	SysctlParams Params `url:"-" json:"sysctlParams,omitempty" validate:"omitempty,dive"`
-
-	// Use Highly Available schema for LB deploy
-	// Required: false
-	HighlyAvailable bool `url:"highlyAvailable,omitempty" json:"highlyAvailable,omitempty"`
-
 	// Start now Load balancer
 	// Required: false
 	Start bool `url:"start" json:"start"`
@@ -48,57 +37,27 @@ type CreateRequest struct {
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }

-type wrapperCreateRequest struct {
-	CreateRequest
-	Params []string `url:"sysctlParams,omitempty"`
-}
-
 // Create method will create a new load balancer instance
-func (l LB) Create(ctx context.Context, req CreateRequest) (uint64, error) {
+func (l LB) Create(ctx context.Context, req CreateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
+			return "", validators.ValidationError(validationError)
 		}
 	}

 	if req.ExtNetID == 0 && req.VINSID == 0 {
-		return 0, errors.New("vinsId and extNetId cannot be both in the value 0")
-	}
-
-	var params []string
-
-	if len(req.SysctlParams) != 0 {
-		params = make([]string, 0, len(req.SysctlParams))
-
-		for r := range req.SysctlParams {
-			b, err := json.Marshal(req.SysctlParams[r])
-			if err != nil {
-				return 0, err
-			}
-
-			params = append(params, string(b))
-		}
-	} else {
-		params = []string{}
-	}
-
-	reqWrapped := wrapperCreateRequest{
-		CreateRequest: req,
-		Params:        params,
+		return "", errors.New ("vinsId and extNetId cannot be both in the value 0")
 	}

 	url := "/cloudapi/lb/create"

-	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return 0, err
+		return "", err
 	}

-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
+	result := strings.ReplaceAll(string(res), "\"", "")

 	return result, nil
 }
--- a/pkg/cloudapi/lb/frontend_bind.go
+++ b/pkg/cloudapi/lb/frontend_bind.go
@@ -20,18 +20,18 @@ type FrontendBindRequest struct {

 	// Name of the binding to update
 	// Required: true
-	BindingName string `url:"bindingName" json:"bindingName" validate:"required"`
+	BindingName string `url:"bindingName" json:"bindingName"`

 	// If specified must be within the IP range of either Ext Net or ViNS,
 	// where this load balancer is connected - new IP address to use for this binding.
 	// If omitted, current IP address is retained
-	// Required: true
-	BindingAddress string `url:"bindingAddress" json:"bindingAddress" validate:"required"`
+	// Required: false
+	BindingAddress string `url:"bindingAddress,omitempty" json:"bindingAddress,omitempty"`

 	// New port number to use for this binding.
 	// If omitted, current port number is retained
-	// Required: true
-	BindingPort uint64 `url:"bindingPort" json:"bindingPort" validate:"required"`
+	// Required: false
+	BindingPort uint64 `url:"bindingPort,omitempty" json:"bindingPort,omitempty"`
 }

 // FrontendBind bind frontend from specified load balancer instance
--- a/pkg/cloudapi/lb/frontend_bind_update.go
+++ b/pkg/cloudapi/lb/frontend_bind_update.go
@@ -25,13 +25,13 @@ type FrontendBindUpdateRequest struct {
 	// If specified must be within the IP range of either Ext Net or ViNS,
 	// where this load balancer is connected - new IP address to use for this binding.
 	// If omitted, current IP address is retained
-	// Required: true
-	BindingAddress string `url:"bindingAddress" json:"bindingAddress" validate:"required"`
+	// Required: false
+	BindingAddress string `url:"bindingAddress,omitempty" json:"bindingAddress,omitempty"`

 	// New port number to use for this binding.
 	// If omitted, current port number is retained
-	// Required: true
-	BindingPort uint64 `url:"bindingPort" json:"bindingPort" validate:"required"`
+	// Required: false
+	BindingPort uint64 `url:"bindingPort,omitempty" json:"bindingPort,omitempty"`
 }

 // FrontendBindUpdate updates binding for the specified load balancer frontend
--- a/pkg/cloudapi/lb/make_highly_available.go
+++ b/pkg/cloudapi/lb/make_highly_available.go
@@ -1,40 +0,0 @@
-package lb
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for make Load Balancer Highly available
-type HighlyAvailableRequest struct {
-	// ID of the LB instance
-	// Required: true
-	LBID uint64 `url:"lbId" json:"lbId" validate:"required"`
-}
-
-// Make Load Balancer Highly available
-func (l LB) HighlyAvailable(ctx context.Context, req HighlyAvailableRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return 0, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/lb/makeHighlyAvailable"
-
-	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return 0, err
-	}
-
-	result, err := strconv.ParseUint(string(res), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/lb/models.go
+++ b/pkg/cloudapi/lb/models.go
@@ -8,9 +8,6 @@ type RecordLB struct {
 	// Access Control List
 	ACL interface{} `json:"acl"`

-	// BackendHAIP
-	BackendHAIP string `json:"backendHAIP"`
-
 	// List of load balancer backends
 	Backends ListBackends `json:"backends"`

@@ -35,9 +32,6 @@ type RecordLB struct {
 	// External network ID
 	ExtNetID uint64 `json:"extnetId"`

-	// FrontendHAIP
-	FrontendHAIP string `json:"frontendHAIP"`
-
 	// List of load balancer frontends
 	Frontends ListFrontends `json:"frontends"`

@@ -59,9 +53,6 @@ type RecordLB struct {
 	// Name
 	Name string `json:"name"`

-	// Part K8s
-	PartK8s bool `json:"partK8s"`
-
 	// Primary node
 	PrimaryNode RecordNode `json:"primaryNode"`

@@ -77,9 +68,6 @@ type RecordLB struct {
 	// Status
 	Status string `json:"status"`

-	// Sysctl Params
-	SysctlParams interface{} `json:"sysctlParams"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`

--- a/pkg/cloudapi/lb/updateSysctParams.go
+++ b/pkg/cloudapi/lb/updateSysctParams.go
@@ -1,72 +0,0 @@
-package lb
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for update sysct params for lb
-type UpdateSysctParamsRequest struct {
-	// ID of the LB instance
-	// Required: true
-	LBID uint64 `url:"lbId" json:"lbId" validate:"required"`
-
-	// Custom sysctl values for Load Balancer instance. Applied on boot
-	// Required: true
-	SysctlParams Params `url:"-" json:"sysctlParams" validate:"required,dive"`
-}
-
-type wrapperUpdateSysctParamsRequest struct {
-	UpdateSysctParamsRequest
-	Params []string `url:"sysctlParams" validate:"required"`
-}
-
-// Create method will create a new load balancer instance
-func (l LB) UpdateSysctParams(ctx context.Context, req UpdateSysctParamsRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	var params []string
-
-	if len(req.SysctlParams) != 0 {
-		params = make([]string, 0, len(req.SysctlParams))
-
-		for r := range req.SysctlParams {
-			b, err := json.Marshal(req.SysctlParams[r])
-			if err != nil {
-				return false, err
-			}
-
-			params = append(params, string(b))
-		}
-	} else {
-		params = []string{}
-	}
-
-	reqWrapped := wrapperUpdateSysctParamsRequest{
-		UpdateSysctParamsRequest: req,
-		Params:                   params,
-	}
-
-	url := "/cloudapi/lb/updateSysctParams"
-
-	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/rg/affinity_groups_list.go
+++ b/pkg/cloudapi/rg/affinity_groups_list.go
@@ -13,14 +13,6 @@ type AffinityGroupsListRequest struct {
 	// Resource group ID
 	// Required: true
 	RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
-
-	// Page number
-	// Required: false
-	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
-
-	// Page size
-	// Required: false
-	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }

 // AffinityGroupsList gets all currently defined affinity groups in this resource group with compute IDs
--- a/pkg/cloudapi/rg/models.go
+++ b/pkg/cloudapi/rg/models.go
@@ -48,10 +48,10 @@ type Resources struct {
 // Detailed information about resource consumption
 type ItemResourceConsumption struct {
 	// Consumed information about resources
-	Consumed Resource `json:"consumed"`
+	Consumed Resource `json:"Consumed"`

 	// Reserved information about resources
-	Reserved Resource `json:"reserved"`
+	Reserved Resource `json:"Reserved"`

 	// Resource limits
 	ResourceLimits ResourceLimits `json:"resourceLimits"`
@@ -333,7 +333,7 @@ type ListAffinityGroupsComputes []ItemAffinityGroupComputes

 type ListAffinityGroups struct {
 	// Data
-	Data []map[string][]uint64 `json:"data"`
+	Data map[string][]uint64 `json:"data"`

 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
--- a/pkg/cloudapi/stack.go
+++ b/pkg/cloudapi/stack.go
@@ -1,10 +0,0 @@
-package cloudapi
-
-import (
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
-)
-
-// Accessing the Stack method group
-func (ca *CloudAPI) Stack() *stack.Stack {
-	return stack.New(ca.client)
-}
--- a/pkg/cloudapi/stack/get.go
+++ b/pkg/cloudapi/stack/get.go
@@ -1,42 +0,0 @@
-package stack
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for get info of stack
-type GetRequest struct {
-	// Find by ID
-	// Required: true
-	StackId uint64 `url:"stackId" json:"stackId" validate:"required"`
-}
-
-// Get stack details by ID
-func (i Stack) Get(ctx context.Context, req GetRequest) (*InfoStack, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/stack/get"
-
-	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := InfoStack{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
--- a/pkg/cloudapi/stack/list.go
+++ b/pkg/cloudapi/stack/list.go
@@ -1,53 +0,0 @@
-package stack
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-)
-
-// Request struct for get list stack
-type ListRequest struct {
-	// Find by ID
-	// Required: false
-	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
-
-	// Find by name
-	// Required: false
-	Name string `url:"name,omitempty" json:"name,omitempty"`
-
-	// Find by type
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
-	// Find by status
-	// Required: false
-	Status string `url:"status,omitempty" json:"status,omitempty"`
-
-	// Page number
-	// Required: false
-	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
-
-	// Page size
-	// Required: false
-	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
-}
-
-// ListStacks gets list stack
-func (i Stack) List(ctx context.Context, req ListRequest) (*ListStacks, error) {
-	url := "/cloudapi/stack/list"
-
-	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListStacks{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
--- a/pkg/cloudapi/stack/models.go
+++ b/pkg/cloudapi/stack/models.go
@@ -1,53 +0,0 @@
-package stack
-
-// Main information about stack
-type InfoStack struct {
-	// CPU allocation ratio
-	CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
-
-	// Descr
-	Descr string `json:"descr"`
-
-	// Drivers
-	Drivers []string `json:"drivers"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// Mem allocation ratio
-	MemAllocationRatio float64 `json:"mem_allocation_ratio"`
-
-	// Name
-	Name string `json:"name"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Type
-	Type string `json:"type"`
-}
-
-// Information about stack in list
-type ItemStack struct {
-	// ID
-	ID uint64 `json:"id"`
-
-	// Name
-	Name string `json:"name"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Type
-	Type string `json:"type"`
-}
-
-// List of stacks
-type ListStacks struct {
-
-	//List
-	Data []ItemStack `json:"data"`
-
-	//Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
--- a/pkg/cloudapi/stack/stack.go
+++ b/pkg/cloudapi/stack/stack.go
@@ -1,16 +0,0 @@
-// Lists all the stack.
-package stack
-
-import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
-
-// Structure for creating request to stack
-type Stack struct {
-	client interfaces.Caller
-}
-
-// Builder for stack endpoint
-func New(client interfaces.Caller) *Stack {
-	return &Stack{
-		client: client,
-	}
-}
--- a/pkg/cloudapi/vins/create_in_account.go
+++ b/pkg/cloudapi/vins/create_in_account.go
@@ -2,24 +2,12 @@ package vins

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-type Route struct {
-	// Destination network
-	Destination string `url:"destination" json:"destination" validate:"required"`
-
-	//Destination network mask in 255.255.255.255 format
-	Netmask string `url:"netmask" json:"netmask" validate:"required"`
-
-	//Next hop host, IP address from ViNS ID free IP pool
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-}
-
 // Request struct for create VINS in account
 type CreateInAccountRequest struct {
 	// VINS name
@@ -45,15 +33,6 @@ type CreateInAccountRequest struct {
 	// Number of pre created reservations
 	// Required: false
 	PreReservationsNum uint64 `url:"preReservationsNum,omitempty" json:"preReservationsNum,omitempty"`
-
-	// List of static routes, each item must have destination, netmask, and gateway fields
-	// Required: false
-	Routes []Route `url:"-" json:"routes,omitempty" validate:"omitempty,dive"`
-}
-
-type wrapperCreateRequestInAcc struct {
-	CreateInAccountRequest
-	Routes []string `url:"routes,omitempty"`
 }

 // CreateInAccount creates VINS in account level
@@ -65,31 +44,9 @@ func (v VINS) CreateInAccount(ctx context.Context, req CreateInAccountRequest) (
 		}
 	}

-	var routes []string
-
-	if len(req.Routes) != 0 {
-		routes = make([]string, 0, len(req.Routes))
-
-		for r := range req.Routes {
-			b, err := json.Marshal(req.Routes[r])
-			if err != nil {
-				return 0, err
-			}
-
-			routes = append(routes, string(b))
-		}
-	} else {
-		routes = []string{}
-	}
-
-	reqWrapped := wrapperCreateRequestInAcc{
-		CreateInAccountRequest: req,
-		Routes:                 routes,
-	}
-
 	url := "/cloudapi/vins/createInAccount"

-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
--- a/pkg/cloudapi/vins/create_in_rg.go
+++ b/pkg/cloudapi/vins/create_in_rg.go
@@ -2,7 +2,6 @@ package vins

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

@@ -37,16 +36,7 @@ type CreateInRGRequest struct {

 	// Number of pre created reservations
 	// Required: false
-	PreReservationsNum uint64 `url:"preReservationsNum,omitempty" json:"preReservationsNum,omitempty"`
-
-	// List of static routes, each item must have destination, netmask, and gateway fields
-	// Required: false
-	Routes []Route `url:"-" json:"routes,omitempty" validate:"omitempty,dive"`
-}
-
-type wrapperCreateRequestInRG struct {
-	CreateInRGRequest
-	Routes []string `url:"routes,omitempty"`
+	PreReservationsNum uint `url:"preReservationsNum,omitempty" json:"preReservationsNum,omitempty"`
 }

 // CreateInRG creates VINS in resource group level
@@ -58,31 +48,9 @@ func (v VINS) CreateInRG(ctx context.Context, req CreateInRGRequest) (uint64, er
 		}
 	}

-	var routes []string
-
-	if len(req.Routes) != 0 {
-		routes = make([]string, 0, len(req.Routes))
-
-		for r := range req.Routes {
-			b, err := json.Marshal(req.Routes[r])
-			if err != nil {
-				return 0, err
-			}
-
-			routes = append(routes, string(b))
-		}
-	} else {
-		routes = []string{}
-	}
-
-	reqWrapped := wrapperCreateRequestInRG{
-		CreateInRGRequest: req,
-		Routes:            routes,
-	}
-
 	url := "/cloudapi/vins/createInRG"

-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
--- a/pkg/cloudapi/vins/models.go
+++ b/pkg/cloudapi/vins/models.go
@@ -252,9 +252,6 @@ type ItemVNFInterface struct {
 	// Default GW
 	DefGW string `json:"defGw"`

-	// Enabled
-	Enabled bool `json:"enabled"`
-
 	// FLIPGroup ID
 	FLIPGroupID uint64 `json:"flipgroupId"`

@@ -381,9 +378,6 @@ type RecordNAT struct {
 	// Pure virtual
 	PureVirtual bool `json:"pureVirtual"`

-	// Routes
-	Routes ListRoutes `json:"routes"`
-
 	// Status
 	Status string `json:"status"`

@@ -403,11 +397,9 @@ type NATConfig struct {
 	Network string `json:"network"`

 	// List NAT rules
-	Rules ListNATRulesConfig `json:"rules"`
+	Rules ListNATRules `json:"rules"`
 }

-type ListNATRulesConfig []ItemNATRule
-
 // Main information about GW
 type RecordGW struct {
 	// CKey
@@ -449,9 +441,6 @@ type RecordGW struct {
 	// Pure virtual
 	PureVirtual bool `json:"pureVirtual"`

-	// Routes
-	Routes ListRoutes `json:"routes"`
-
 	// Status
 	Status string `json:"status"`

@@ -539,9 +528,6 @@ type RecordDHCP struct {
 	// Pure virtual
 	PureVirtual bool `json:"pureVirtual"`

-	// Routes
-	Routes ListRoutes `json:"routes"`
-
 	// Status
 	Status string `json:"status"`

@@ -579,44 +565,14 @@ type RecordDHCPConfig struct {
 	Reservations ListReservations `json:"reservations"`
 }

-// List of static routes
-type ListStaticRoutes struct {
-	// Data
-	Data []ItemRoutes `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
-
-// List of Routes
-type ListRoutes []ItemRoutes
-
-// Detailed information about Routes
-type ItemRoutes struct {
-	//Compute Id
-	ComputeIds []uint64 `json:"computeIds"`
-
-	// Destination network
-	Destination string `json:"destination"`
-
-	//Next hop host, IP address from ViNS ID free IP pool
-	Gateway string `json:"gateway"`
-
-	// GUID
-	GUID string `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	//Destination network mask in 255.255.255.255 format
-	Netmask string `json:"netmask"`
-}
-
 // Detailed information about VINS
 type RecordVINS struct {
 	// Main information about VNF device
 	VNFDev RecordVNFDev `json:"VNFDev"`

+	// CKey
+	CKey string `json:"_ckey"`
+
 	// Account ID
 	AccountID uint64 `json:"accountId"`

@@ -626,24 +582,12 @@ type RecordVINS struct {
 	// List of VINS computes
 	Computes ListVINSComputes `json:"computes"`

-	// Created by
-	CreatedBy string `json:"createdBy"`
-
-	// Created time
-	CreatedTime uint64 `json:"createdTime"`
-
 	// Default GW
 	DefaultGW string `json:"defaultGW"`

 	// Default QOS
 	DefaultQOS QOS `json:"defaultQos"`

-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
-	// Deleted time
-	DeletedTime uint64 `json:"deletedTime"`
-
 	// Description
 	Description string `json:"desc"`

--- a/pkg/cloudapi/vins/static_route_access_grant.go
+++ b/pkg/cloudapi/vins/static_route_access_grant.go
@@ -1,48 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for grant access to static route to Compute/ViNS
-type StaticRouteAccessGrantRequest struct {
-	// ViNS ID to grant access
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Route ID to grant access, can be found in staticRouteList
-	// Required: true
-	RouteId  uint64 `url:"routeId" json:"routeId" validate:"required"`
-
-	// List of Compute IDs to grant access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// Grant access to static route to Compute/ViNS
-func (v VINS) StaticRouteAccessGrant(ctx context.Context, req StaticRouteAccessGrantRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/vins/staticRouteAccessGrant"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/vins/static_route_access_revoke.go
+++ b/pkg/cloudapi/vins/static_route_access_revoke.go
@@ -1,48 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for revoke access to static route to Compute/ViNS
-type StaticRouteAccessRevokeRequest struct {
-	// ViNS ID to revoke access
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Route ID to revoke access, can be found in staticRouteList
-	// Required: true
-	RouteId  uint64 `url:"routeId" json:"routeId" validate:"required"`
-
-	// List of Compute IDs to revoke access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// Revoke access to static route to Compute/ViNS
-func (v VINS) StaticRouteAccessRevoke(ctx context.Context, req StaticRouteAccessRevokeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/vins/staticRouteAccessRevoke"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/vins/static_route_add.go
+++ b/pkg/cloudapi/vins/static_route_add.go
@@ -1,56 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for add static route
-type StaticRouteAddRequest struct {
-	// VINS ID
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Destination network
-	// Required: true
-	Destination string `url:"destination" json:"destination" validate:"required"`
-
-	// Destination network mask in 255.255.255.255 format
-	// Required: true
-	Netmask string `url:"netmask" json:"netmask" validate:"required"`
-
-	// Next hop host, IP address from ViNS ID free IP pool
-	// Required: true
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-
-	// List of Compute IDs which have access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// StaticRouteAdd add new static route to ViNS 
-func (v VINS) StaticRouteAdd(ctx context.Context, req StaticRouteAddRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/vins/staticRouteAdd"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/vins/static_route_del.go
+++ b/pkg/cloudapi/vins/static_route_del.go
@@ -1,44 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for remove static route from ViNS
-type StaticRouteDelRequest struct {
-	// ViNS ID to remove static route from
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Route ID to remove, can be found in staticRouteList
-	// Required: true
-	RouteId  uint64 `url:"routeId" json:"routeId" validate:"required"`
-}
-
-// Remove static route from ViNS
-func (v VINS) StaticRouteDel(ctx context.Context, req StaticRouteDelRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/vins/staticRouteDel"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudapi/vins/static_route_list.go
+++ b/pkg/cloudapi/vins/static_route_list.go
@@ -1,42 +0,0 @@
-package vins
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for static route list
-type StaticRouteListRequest struct {
-	// ViNS ID to show list of static routes
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-}
-
-// Show list of static routes for ViNS
-func (v VINS) StaticRouteList(ctx context.Context, req StaticRouteListRequest) (*ListStaticRoutes, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudapi/vins/staticRouteList"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListStaticRoutes{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
--- a/pkg/cloudbroker/compute/set_custom_fields.go
+++ b/pkg/cloudbroker/compute/set_custom_fields.go
@@ -1,43 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-// Request struct for setting customFields values for the Compute
-type SetCustomFieldsRequest struct {
-	// ID of the compute
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Custom fields for Compute. Must be dict.
-	// Required: true
-	CustomFields string `url:"customFields" json:"customFields" validate:"required"`
-}
-
-// SetCustomFields sets customFields values for the Compute
-func (c Compute) SetCustomFields(ctx context.Context, req SetCustomFieldsRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/compute/setCustomFields"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/extnet/create.go
+++ b/pkg/cloudbroker/extnet/create.go
@@ -2,24 +2,12 @@ package extnet

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-type Route struct {
-	// Destination network
-	Destination string `url:"destination" json:"destination" validate:"required"`
-
-	//Destination network mask in 255.255.255.255 format
-	Netmask string `url:"netmask" json:"netmask" validate:"required"`
-
-	//Next hop host, IP address from ViNS ID free IP pool
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-}
-
 // Request struct for create external network
 type CreateRequest struct {
 	// External network name
@@ -82,15 +70,6 @@ type CreateRequest struct {
 	// OpenvSwith bridge name for ExtNet connection
 	// Required: false
 	OVSBridge string `url:"ovsBridge,omitempty" json:"ovsBridge,omitempty"`
-
-	// List of static routes, each item must have destination, netmask, and gateway fields
-	// Required: false
-	Routes []Route `url:"-" json:"routes,omitempty" validate:"omitempty,dive"`
-}
-
-type wrapperCreateRequest struct {
-	CreateRequest
-	Routes []string `url:"routes,omitempty"`
 }

 // Create creates new external network into platform
@@ -102,31 +81,9 @@ func (e ExtNet) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		}
 	}

-	var routes []string
-
-	if len(req.Routes) != 0 {
-		routes = make([]string, 0, len(req.Routes))
-
-		for r := range req.Routes {
-			b, err := json.Marshal(req.Routes[r])
-			if err != nil {
-				return 0, err
-			}
-
-			routes = append(routes, string(b))
-		}
-	} else {
-		routes = []string{}
-	}
-
-	reqWrapped := wrapperCreateRequest{
-		CreateRequest: req,
-		Routes:        routes,
-	}
-
 	url := "/cloudbroker/extnet/create"

-	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
--- a/pkg/cloudbroker/extnet/models.go
+++ b/pkg/cloudbroker/extnet/models.go
@@ -151,33 +151,3 @@ type RecordExtNet struct {
 	// List reservations
 	Reservations ListReservations `json:"reservations"`
 }
-
-// List of static routes
-type ListStaticRoutes struct {
-	// Data
-	Data []ItemRoutes `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
-
-// Detailed information about Routes
-type ItemRoutes struct {
-	//Compute Id
-	ComputeIds []uint64 `json:"computeIds"`
-
-	// Destination network
-	Destination string `json:"destination"`
-
-	//Next hop host, IP address from ViNS ID free IP pool
-	Gateway string `json:"gateway"`
-
-	// GUID
-	GUID string `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	//Destination network mask in 255.255.255.255 format
-	Netmask string `json:"netmask"`
-}
--- a/pkg/cloudbroker/extnet/static_route_access_grant.go
+++ b/pkg/cloudbroker/extnet/static_route_access_grant.go
@@ -1,48 +0,0 @@
-package extnet
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for grant access to static route to Compute/ViNS
-type StaticRouteAccessGrantRequest struct {
-	// ExtNet ID to grant access
-	// Required: true
-	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
-
-	// Route ID to grant access, can be found in staticRouteList
-	// Required: true
-	RouteId uint64 `url:"routeId" json:"routeId" validate:"required"`
-
-	// List of Compute IDs to grant access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// Grant access to static route to Compute/ViNS
-func (v ExtNet) StaticRouteAccessGrant(ctx context.Context, req StaticRouteAccessGrantRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/extnet/staticRouteAccessGrant"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/extnet/static_route_access_revoke.go
+++ b/pkg/cloudbroker/extnet/static_route_access_revoke.go
@@ -1,48 +0,0 @@
-package extnet
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for revoke access to static route to Compute/ViNS
-type StaticRouteAccessRevokeRequest struct {
-	// ExtNet ID to revoke access
-	// Required: true
-	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
-
-	// Route ID to revoke access, can be found in staticRouteList
-	// Required: true
-	RouteId uint64 `url:"routeId" json:"routeId" validate:"required"`
-
-	// List of Compute IDs to revoke access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// Revoke access to static route to Compute/ViNS
-func (v ExtNet) StaticRouteAccessRevoke(ctx context.Context, req StaticRouteAccessRevokeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/extnet/staticRouteAccessRevoke"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/extnet/static_route_add.go
+++ b/pkg/cloudbroker/extnet/static_route_add.go
@@ -1,56 +0,0 @@
-package extnet
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for add static route
-type StaticRouteAddRequest struct {
-	// ExtNet ID to add static route
-	// Required: true
-	ExtNetId  uint64 `url:"extnetId" json:"extnetId" validate:"required"`
-
-	// Destination network
-	// Required: true
-	Destination string `url:"destination" json:"destination" validate:"required"`
-
-	// Destination network mask in 255.255.255.255 format
-	// Required: true
-	Netmask string `url:"netmask" json:"netmask" validate:"required"`
-
-	// Next hop host, IP address from ViNS ID free IP pool
-	// Required: true
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-
-	// List of Compute IDs which have access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// StaticRouteAdd add new static route to ViNS
-func (v ExtNet) StaticRouteAdd(ctx context.Context, req StaticRouteAddRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/extnet/staticRouteAdd"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/extnet/static_route_del.go
+++ b/pkg/cloudbroker/extnet/static_route_del.go
@@ -1,44 +0,0 @@
-package extnet
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for remove static route from ViNS
-type StaticRouteDelRequest struct {
-	// ExtNet ID to remove static route from
-	// Required: true
-	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
-
-	// Route ID to remove, can be found in staticRouteList
-	// Required: true
-	RouteId uint64 `url:"routeId" json:"routeId" validate:"required"`
-}
-
-// Remove static route from ViNS
-func (v ExtNet) StaticRouteDel(ctx context.Context, req StaticRouteDelRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/extnet/staticRouteDel"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/extnet/static_route_list.go
+++ b/pkg/cloudbroker/extnet/static_route_list.go
@@ -1,42 +0,0 @@
-package extnet
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for static route list
-type StaticRouteListRequest struct {
-	// ExtNet ID to show list of static routes
-	// Required: true
-	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`
-}
-
-// Show list of static routes for ViNS
-func (v ExtNet) StaticRouteList(ctx context.Context, req StaticRouteListRequest) (*ListStaticRoutes, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/extnet/staticRouteList"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListStaticRoutes{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
--- a/pkg/cloudbroker/grid/filter.go
+++ b/pkg/cloudbroker/grid/filter.go
@@ -9,15 +9,6 @@ func (lg ListGrids) FilterByID(id uint64) ListGrids {
 	return lg.FilterFunc(predicate)
 }

-// FilterByGID returns ListGrids with specified GID.
-func (lg ListGrids) FilterByGID(gid uint64) ListGrids {
-	predicate := func(rg ItemGridList) bool {
-		return rg.GID == gid
-	}
-
-	return lg.FilterFunc(predicate)
-}
-
 // FilterByName returns ListGrids with specified Name.
 func (lg ListGrids) FilterByName(name string) ListGrids {
 	predicate := func(rg ItemGridList) bool {
--- a/pkg/cloudbroker/grid/filter_test.go
+++ b/pkg/cloudbroker/grid/filter_test.go
@@ -106,14 +106,6 @@ func TestFilterByID(t *testing.T) {
 	}
 }

-func TestFilterByGID(t *testing.T) {
-	actual := grids.FilterByGID(777).FindOne()
-
-	if actual.GID != 777 {
-		t.Fatal("expected ID 777, found: ", actual.GID)
-	}
-}
-
 func TestFilterByName(t *testing.T) {
 	actual := grids.FilterByName("gamma").FindOne()

--- a/pkg/cloudbroker/image/models.go
+++ b/pkg/cloudbroker/image/models.go
@@ -176,10 +176,10 @@ type GUID string
 func (r *GUID) UnmarshalJSON(b []byte) error {

 	if b[0] == '"' {
-		*r = GUID(string(b[1 : len(b)-1]))
+		*r = GUID(string(b[1:len(b)-1]))
 		return nil
 	}
-
+	
 	*r = GUID(string(b))

 	return nil
@@ -190,167 +190,74 @@ type ListHistory []History

 // List stacks
 type ListStacks struct {
-	// Data
-	Data []ItemListStacks `json:"data"`
+	Data []struct {
+		// CKey
+		CKey string `json:"_ckey"`
+
+		// Meta
+		Meta []interface{} `json:"_meta"`
+
+		// API URL
+		APIURL string `json:"apiUrl"`
+
+		// API key
+		APIKey string `json:"apikey"`
+
+		// App ID
+		AppID string `json:"appId"`
+
+		// CPU allocation ratio
+		CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
+
+		// Description
+		Description string `json:"desc"`
+
+		// Descr
+		Descr string `json:"descr"`
+
+		// Drivers
+		Drivers []string `json:"drivers"`
+
+		// Eco
+		Eco interface{} `json:"eco"`
+
+		// Error
+		Error uint64 `json:"error"`
+
+		// Grid ID
+		GID uint64 `json:"gid"`
+
+		// GID
+		GUID uint64 `json:"guid"`
+
+		// ID
+		ID uint64 `json:"id"`
+
+		// List image IDs
+		Images []uint64 `json:"images"`
+
+		// Login
+		Login string `json:"login"`
+
+		// Mem allocation ratio
+		// Required: false
+		MemAllocationRatio float64 `json:"mem_allocation_ratio"`
+
+		// Name
+		Name string `json:"name"`
+
+		// Password
+		Password string `json:"passwd"`
+
+		// Reference ID
+		ReferenceID string `json:"referenceId"`
+
+		// Status
+		Status string `json:"status"`
+
+		// Type
+		Type string `json:"type"`
+	} `json:"data"`

-	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
-
-// Detailed information about image
-type ItemListStacks struct {
-	// CKey
-	CKey string `json:"_ckey"`
-
-	// Meta
-	Meta []interface{} `json:"_meta"`
-
-	// API URL
-	APIURL string `json:"apiUrl"`
-
-	// API key
-	APIKey string `json:"apikey"`
-
-	// App ID
-	AppID string `json:"appId"`
-
-	// CPU allocation ratio
-	CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
-
-	// Description
-	Description string `json:"desc"`
-
-	// Descr
-	Descr string `json:"descr"`
-
-	// Drivers
-	Drivers []string `json:"drivers"`
-
-	// Eco
-	Eco interface{} `json:"eco"`
-
-	// Error
-	Error uint64 `json:"error"`
-
-	// Grid ID
-	GID uint64 `json:"gid"`
-
-	// GID
-	GUID uint64 `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// List image IDs
-	Images []uint64 `json:"images"`
-
-	// Login
-	Login string `json:"login"`
-
-	// Mem allocation ratio
-	MemAllocationRatio float64 `json:"mem_allocation_ratio"`
-
-	// Name
-	Name string `json:"name"`
-
-	// Packegas
-	Packages Packages `json:"packages"`
-
-	// Password
-	Password string `json:"passwd"`
-
-	// Reference ID
-	ReferenceID string `json:"referenceId"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Type
-	Type string `json:"type"`
-}
-
-// Package
-type Packages struct {
-	// LibvirtBin
-	LibvirtBin LibvirtBin `json:"libvirt-bin"`
-
-	// LibvirtDaemon
-	LibvirtDaemon LibvirtDaemon `json:"libvirt-daemon"`
-
-	// Lvm2Lockd
-	Lvm2Lockd Lvm2Lockd `json:"lvm2-lockd"`
-
-	// OpenvswitchCommon
-	OpenvswitchCommon OpenvswitchCommon `json:"openvswitch-common"`
-
-	// OpenvswitchSwitch
-	OpenvswitchSwitch OpenvswitchSwitch `json:"openvswitch-switch"`
-
-	// QemuSystemX86
-	QemuSystemX86 QemuSystemX86 `json:"qemu-system-x86"`
-
-	// Sanlock
-	Sanlock Sanlock `json:"sanlock"`
-}
-
-// LibvirtBin
-type LibvirtBin struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
-
-type LibvirtDaemon struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
-
-// Lvm2Lockd
-type Lvm2Lockd struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
-
-// OpenvswitchCommon
-type OpenvswitchCommon struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
-
-// OpenvswitchSwitch
-type OpenvswitchSwitch struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
-
-// QemuSystemX86
-type QemuSystemX86 struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
-
-// Sanlock
-type Sanlock struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`
-
-	// Version
-	Ver string `json:"ver"`
-}
--- a/pkg/cloudbroker/k8ci/filter.go
+++ b/pkg/cloudbroker/k8ci/filter.go
@@ -3,7 +3,7 @@ package k8ci
 // FilterByID returns ListK8CI with specified ID.
 func (lkc ListK8CI) FilterByID(id uint64) ListK8CI {
 	predicate := func(ikc ItemK8CI) bool {
-		return ikc.RecordK8CIList.ID == id
+		return ikc.RecordK8CI.ID == id
 	}

 	return lkc.FilterFunc(predicate)
@@ -12,7 +12,7 @@ func (lkc ListK8CI) FilterByID(id uint64) ListK8CI {
 // FilterByName returns ListK8CI with specified Name.
 func (lkc ListK8CI) FilterByName(name string) ListK8CI {
 	predicate := func(ikc ItemK8CI) bool {
-		return ikc.RecordK8CIList.Name == name
+		return ikc.RecordK8CI.Name == name
 	}

 	return lkc.FilterFunc(predicate)
--- a/pkg/cloudbroker/k8ci/filter_test.go
+++ b/pkg/cloudbroker/k8ci/filter_test.go
@@ -6,7 +6,7 @@ var k8ciItems = ListK8CI{
 	Data: []ItemK8CI{
 		{
 			CreatedTime: 123902139,
-			RecordK8CIList: RecordK8CIList{
+			RecordK8CI: RecordK8CI{
 				Description:    "",
 				GID:            0,
 				GUID:           1,
@@ -17,7 +17,7 @@ var k8ciItems = ListK8CI{
 				MaxMasterCount: 2,
 				MaxWorkerCount: 3,
 				Name:           "purple_snake",
-				SharedWith:     []uint64{},
+				SharedWith:     []interface{}{},
 				Status:         "ENABLED",
 				Version:        "1",
 				WorkerDriver:   "KVM_X86",
@@ -26,7 +26,7 @@ var k8ciItems = ListK8CI{
 		},
 		{
 			CreatedTime: 123902232,
-			RecordK8CIList: RecordK8CIList{
+			RecordK8CI: RecordK8CI{
 				Description:    "",
 				GID:            0,
 				GUID:           2,
@@ -37,7 +37,7 @@ var k8ciItems = ListK8CI{
 				MaxMasterCount: 3,
 				MaxWorkerCount: 5,
 				Name:           "green_giant",
-				SharedWith:     []uint64{},
+				SharedWith:     []interface{}{},
 				Status:         "DISABLED",
 				Version:        "2",
 				WorkerDriver:   "KVM_X86",
@@ -46,7 +46,7 @@ var k8ciItems = ListK8CI{
 		},
 		{
 			CreatedTime: 123902335,
-			RecordK8CIList: RecordK8CIList{
+			RecordK8CI: RecordK8CI{
 				Description:    "",
 				GID:            0,
 				GUID:           3,
@@ -57,7 +57,7 @@ var k8ciItems = ListK8CI{
 				MaxMasterCount: 5,
 				MaxWorkerCount: 9,
 				Name:           "magenta_cloud",
-				SharedWith:     []uint64{},
+				SharedWith:     []interface{}{},
 				Status:         "ENABLED",
 				Version:        "3",
 				WorkerDriver:   "KVM_X86",
--- a/pkg/cloudbroker/k8ci/models.go
+++ b/pkg/cloudbroker/k8ci/models.go
@@ -1,11 +1,11 @@
 package k8ci

-// Main information about K8CI in List
+// Main information about K8CI
 type ItemK8CI struct {
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 	// Detailed information about K8CI
-	RecordK8CIList
+	RecordK8CI
 }

 // List K8CI
@@ -17,55 +17,7 @@ type ListK8CI struct {
 	EntryCount uint64 `json:"entryCount"`
 }

-// Detailed information about K8CI in List
-type RecordK8CIList struct {
-	// Description
-	Description string `json:"desc"`
-
-	// Grid ID
-	GID uint64 `json:"gid"`
-
-	// GUID
-	GUID uint64 `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// Load balancer image ID
-	LBImageID uint64 `json:"lbImageId"`
-
-	// Master driver
-	MasterDriver string `json:"masterDriver"`
-
-	// Master image ID
-	MasterImageID uint64 `json:"masterImageId"`
-
-	// Max master count
-	MaxMasterCount uint64 `json:"maxMasterCount"`
-
-	// Max worker count
-	MaxWorkerCount uint64 `json:"maxWorkerCount"`
-
-	// Name
-	Name string `json:"name"`
-
-	// Shared with
-	SharedWith []uint64 `json:"sharedWith"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Version
-	Version string `json:"version"`
-
-	// Worker driver
-	WorkerDriver string `json:"workerDriver"`
-
-	// Worker image ID
-	WorkerImageID uint64 `json:"workerImageId"`
-}
-
-// Detailed information about K8CI 
+// Detailed information about K8CI
 type RecordK8CI struct {
 	// Description
 	Description string `json:"desc"`
@@ -100,11 +52,8 @@ type RecordK8CI struct {
 	// Name
 	Name string `json:"name"`

-	//NetworkPlugins
-	NetworkPlugins []string `json:"networkPlugins"`
-
 	// Shared with
-	SharedWith []uint64 `json:"sharedWith"`
+	SharedWith []interface{} `json:"sharedWith"`

 	// Status
 	Status string `json:"status"`
--- a/pkg/cloudbroker/k8s/create.go
+++ b/pkg/cloudbroker/k8s/create.go
@@ -8,8 +8,6 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-// type Params []string
-
 // Request struct for create K8S
 type CreateRequest struct {
 	// Name of kubernetes cluster
@@ -26,7 +24,7 @@ type CreateRequest struct {

 	// Name for first worker group created with cluster
 	// Required: true
-	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`
+	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required, workerGroupName"`

 	// Network plugin
 	// Must be one of these values: flunnel, weawenet, calico
@@ -102,77 +100,16 @@ type CreateRequest struct {
 	// Required: false
 	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`

-	// ID of the ViNS to connect k8s cluster. If nothing is specified, ViNS will be created automatically
-	// Required: false
-	VinsId uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
-
 	// Create kubernetes cluster with masters nodes behind load balancer if true.
 	// Otherwise give all cluster nodes direct external addresses from selected external network
 	// Required: false
 	WithLB bool `url:"withLB" json:"withLB"`

-	// Custom sysctl values for Load Balancer instance. Applied on boot
-	// Required: false
-	LbSysctlParams string `url:"lbSysctlParams,omitempty" json:"lbSysctlParams,omitempty"`
-
-	// Use Highly Available schema for LB deploy
-	// Required: false
-	HighlyAvailable bool `url:"highlyAvailableLB,omitempty" json:"highlyAvailableLB,omitempty"`
-
-	// Optional extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names
-	// Required: false
-	AdditionalSANs []string `url:"additionalSANs,omitempty" json:"additionalSANs,omitempty"`
-
-	// 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
-	// Required: false
-	InitConfiguration string `url:"initConfiguration,omitempty" json:"initConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	ClusterConfiguration string `url:"clusterConfiguration,omitempty" json:"clusterConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	KubeletConfiguration string `url:"kubeletConfiguration,omitempty" json:"kubeletConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	KubeProxyConfiguration string `url:"kubeProxyConfiguration,omitempty" json:"kubeProxyConfiguration,omitempty"`
-
-	// 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
-	// Required: false
-	JoinConfiguration string `url:"joinConfiguration,omitempty" json:"joinConfiguration,omitempty"`
-
 	// Text description of this kubernetes cluster
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
-
-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: false
-	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
-
-	// Use only selected ExtNet for infrastructure connections
-	// Required: false
-	ExtNetOnly bool `url:"extnetOnly,omitempty" json:"extnetOnly,omitempty"`
-
-	// Insert ssl certificate in x509 pem format
-	// Required: false
-	OidcCertificate string `url:"oidcCertificate,omitempty" json:"oidcCertificate,omitempty"`
 }

-// type wrapperCreateRequest struct {
-// 	CreateRequest
-// 	Params []string `url:"lbSysctlParams,omitempty"`
-// }
-
 // Create creates a new kubernetes cluster in the specified resource group
 func (k K8S) Create(ctx context.Context, req CreateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
@@ -182,28 +119,6 @@ func (k K8S) Create(ctx context.Context, req CreateRequest) (string, error) {
 		}
 	}

-	// var params []string
-
-	// if len(req.LbSysctlParams) != 0 {
-	// 	params = make([]string, 0, len(req.LbSysctlParams))
-
-	// 	for r := range req.LbSysctlParams {
-	// 		b, err := json.Marshal(req.LbSysctlParams[r])
-	// 		if err != nil {
-	// 			return "", err
-	// 		}
-
-	// 		params = append(params, string(b))
-	// 	}
-	// } else {
-	// 	params = []string{}
-	// }
-
-	// reqWrapped := wrapperCreateRequest{
-	// 	CreateRequest: req,
-	// 	Params:        params,
-	// }
-
 	url := "/cloudbroker/k8s/create"

 	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
--- a/pkg/cloudbroker/k8s/get_worker_nodes_meta_data.go
+++ b/pkg/cloudbroker/k8s/get_worker_nodes_meta_data.go
@@ -1,38 +0,0 @@
-package k8s
-
-import (
-	"context"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for get worker group metadata by ID
-type GetWorkerNodesMetaDataRequest struct {
-	// Kubernetes cluster ID
-	// Required: true
-	K8SID uint64 `url:"k8sId" json:"k8sId" validate:"required"`
-
-	// ID of the workers compute group
-	// Required: true
-	WorkersGroupID uint64 `url:"workersGroupId" json:"workersGroupId" validate:"required"`
-}
-
-// Get worker group metadata by ID
-func (k K8S) GetWorkerNodesMetaData(ctx context.Context, req GetWorkerNodesMetaDataRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return "", validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/k8s/getWorkerNodesMetaData"
-
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}
--- a/pkg/cloudbroker/k8s/models.go
+++ b/pkg/cloudbroker/k8s/models.go
@@ -2,9 +2,6 @@ package k8s

 // Deteiled information
 type ItemDetailedInfo struct {
-	// External Ip
-	ExternalIp string `json:"externalip"`
-
 	// ID
 	ID uint64 `json:"id"`

@@ -14,7 +11,7 @@ type ItemDetailedInfo struct {
 	// Status
 	Status string `json:"status"`

-	// Tech status
+	// Status
 	TechStatus string `json:"techStatus"`
 }

--- a/pkg/cloudbroker/k8s/update_worker_nodes_meta_data.go
+++ b/pkg/cloudbroker/k8s/update_worker_nodes_meta_data.go
@@ -1,48 +0,0 @@
-package k8s
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for add worker to a kubernetes cluster
-type UpdateWorkerNodesMetaDataRequest struct {
-	// Kubernetes cluster ID
-	// Required: true
-	K8SID uint64 `url:"k8sId" json:"k8sId" validate:"required"`
-
-	// ID of the workers compute group
-	// Required: true
-	WorkersGroupID uint64 `url:"workersGroupId" json:"workersGroupId" validate:"required"`
-
-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: true
-	UserData string `url:"userData" json:"userData" validate:"required"`
-}
-
-// WorkerAdd adds worker nodes to a kubernetes cluster
-func (k K8S) UpdateWorkerNodesMetaData(ctx context.Context, req UpdateWorkerNodesMetaDataRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/k8s/updateWorkerNodesMetaData"
-
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/k8s/workers_group_add.go
+++ b/pkg/cloudbroker/k8s/workers_group_add.go
@@ -58,10 +58,6 @@ type WorkersGroupAddRequest struct {
 	// Worker node boot disk size in GB If 0 is specified, size is defined by the OS image size
 	// Required: false
 	WorkerDisk uint64 `url:"workerDisk,omitempty" json:"workerDisk,omitempty"`
-
-	// Meta data for working group computes, format YAML "user_data": 1111
-	// Required: false
-	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
 }

 // WorkersGroupAdd adds workers group to kubernetes cluster
--- a/pkg/cloudbroker/kvmppc/create.go
+++ b/pkg/cloudbroker/kvmppc/create.go
@@ -79,11 +79,7 @@ type CreateRequest struct {

 	// Start VM upon success
 	// Required: false
-	Start bool `url:"start" json:"start"`
-
-	// Stack ID
-	// Required: false
-	StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"`
+	Start bool `url:"start,omitempty" json:"start,omitempty"`

 	// System name
 	// Required: false
@@ -92,10 +88,6 @@ type CreateRequest struct {
 	// Compute purpose
 	// Required: false
 	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
-
-	// Reason for action
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }

 type wrapperCreateRequest struct {
--- a/pkg/cloudbroker/kvmppc/mass_create.go
+++ b/pkg/cloudbroker/kvmppc/mass_create.go
@@ -64,7 +64,7 @@ type MassCreateRequest struct {

 	// Start after create of not
 	// Required: false
-	Start bool `url:"start" json:"start"`
+	Start bool `url:"start,omitempty" json:"start,omitempty"`

 	// Reason to action
 	// Required: false
--- a/pkg/cloudbroker/kvmx86/create.go
+++ b/pkg/cloudbroker/kvmx86/create.go
@@ -79,7 +79,7 @@ type CreateRequest struct {

 	// Start VM upon success
 	// Required: false
-	Start bool `url:"start" json:"start"`
+	Start bool `url:"start,omitempty" json:"start,omitempty"`

 	// Stack ID
 	// Required: false
@@ -97,10 +97,6 @@ type CreateRequest struct {
 	// Required: false
 	CustomField string `url:"customFields,omitempty" json:"customFields,omitempty"`

-	//Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
-	// Required: false
-	Driver string `url:"driver,omitempty" json:"driver,omitempty"` 
-
 	// Reason for action
 	// Required: false
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
--- a/pkg/cloudbroker/kvmx86/create_blank.go
+++ b/pkg/cloudbroker/kvmx86/create_blank.go
@@ -50,10 +50,6 @@ type CreateBlankRequest struct {
 	// Text description of this VM
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
-
-	//Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
-	// Required: false
-	Driver string `url:"driver,omitempty" json:"driver,omitempty"` 
 }

 type wrapperCreateBlankRequest struct {
--- a/pkg/cloudbroker/kvmx86/mass_create.go
+++ b/pkg/cloudbroker/kvmx86/mass_create.go
@@ -64,7 +64,7 @@ type MassCreateRequest struct {

 	// Start after create of not
 	// Required: false
-	Start bool `url:"start" json:"start"`
+	Start bool `url:"start,omitempty" json:"start,omitempty"`

 	// Reason to action
 	// Required: false
--- a/pkg/cloudbroker/lb/create.go
+++ b/pkg/cloudbroker/lb/create.go
@@ -2,16 +2,12 @@ package lb

 import (
 	"context"
-	"encoding/json"
-	"errors"
 	"net/http"
 	"strconv"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-type Params []string
-
 // Request struct for create load balancer
 type CreateRequest struct {
 	// ID of the resource group where this load balancer instance will be located
@@ -24,20 +20,12 @@ type CreateRequest struct {
 	Name string `url:"name" json:"name" validate:"required"`

 	// External network to connect this load balancer to
-	// Required: false
-	ExtNetID uint64 `url:"extnetId" json:"extnetId"`
+	// Required: true
+	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`

 	// Internal network (VINS) to connect this load balancer to
-	// Required: false
-	VINSID uint64 `url:"vinsId" json:"vinsId"`
-
-	// Custom  sysctl values for Load Balancer instance. Applied on boot
-	// Required: false
-	SysctlParams Params `url:"-" json:"sysctlParams,omitempty" validate:"omitempty,dive"`
-
-	// Use Highly Available schema for LB deploy
-	// Required: false
-	HighlyAvailable bool `url:"highlyAvailable,omitempty" json:"highlyAvailable,omitempty"`
+	// Required: true
+	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`

 	// Start now Load balancer
 	// Required: false
@@ -48,11 +36,6 @@ type CreateRequest struct {
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }

-type wrapperCreateRequest struct {
-	CreateRequest
-	Params []string `url:"sysctlParams,omitempty"`
-}
-
 // Create method will create a new load balancer instance
 func (lb LB) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -62,35 +45,9 @@ func (lb LB) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		}
 	}

-	if req.ExtNetID == 0 && req.VINSID == 0 {
-		return 0, errors.New("vinsId and extNetId cannot be both in the value 0")
-	}
-
-	var params []string
-
-	if len(req.SysctlParams) != 0 {
-		params = make([]string, 0, len(req.SysctlParams))
-
-		for r := range req.SysctlParams {
-			b, err := json.Marshal(req.SysctlParams[r])
-			if err != nil {
-				return 0, err
-			}
-
-			params = append(params, string(b))
-		}
-	} else {
-		params = []string{}
-	}
-
-	reqWrapped := wrapperCreateRequest{
-		CreateRequest: req,
-		Params:        params,
-	}
-
 	url := "/cloudbroker/lb/create"

-	res, err := lb.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := lb.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
--- a/pkg/cloudbroker/lb/make_highly_available.go
+++ b/pkg/cloudbroker/lb/make_highly_available.go
@@ -1,40 +0,0 @@
-package lb
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for make Load Balancer Highly available
-type HighlyAvailableRequest struct {
-	// ID of the LB instance
-	// Required: true
-	LBID uint64 `url:"lbId" json:"lbId" validate:"required"`
-}
-
-// Make Load Balancer Highly available
-func (l LB) HighlyAvailable(ctx context.Context, req HighlyAvailableRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/lb/makeHighlyAvailable"
-
-	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/lb/models.go
+++ b/pkg/cloudbroker/lb/models.go
@@ -154,10 +154,7 @@ type RecordLB struct {
 	Meta []interface{} `json:"_meta"`

 	// Access Control List
-	ACL interface{} `json:"acl"`
-
-	// BackendHAIP
-	BackendHAIP string `json:"backendHAIP"`
+	ACL []interface{} `json:"acl"`

 	// List of load balancer backends
 	Backends ListBackends `json:"backends"`
@@ -174,9 +171,6 @@ type RecordLB struct {
 	// External network ID
 	ExtNetID uint64 `json:"extnetId"`

-	// FrontendHAIP
-	FrontendHAIP string `json:"frontendHAIP"`
-
 	// List of load balancer frontends
 	Frontends ListFrontends `json:"frontends"`

@@ -198,9 +192,6 @@ type RecordLB struct {
 	// Name
 	Name string `json:"name"`

-	// Part K8s
-	PartK8s bool `json:"partK8s"`
-
 	// Primary node
 	PrimaryNode Node `json:"primaryNode"`

@@ -213,9 +204,6 @@ type RecordLB struct {
 	// Status
 	Status string `json:"status"`

-	// Sysctl Params
-	SysctlParams interface{} `json:"sysctlParams"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`

@@ -229,10 +217,7 @@ type ItemLBList struct {
 	HAMode bool `json:"HAmode"`

 	// Access Control List
-	ACL interface{} `json:"acl"`
-
-	// BackendHAIP
-	BackendHAIP string `json:"backendHAIP"`
+	ACL []interface{} `json:"acl"`

 	// List of load balancer backends
 	Backends ListBackends `json:"backends"`
@@ -261,9 +246,6 @@ type ItemLBList struct {
 	// External network ID
 	ExtNetID uint64 `json:"extnetId"`

-	// FrontendHAIP
-	FrontendHAIP string `json:"frontendHAIP"`
-
 	// List of load balancer frontends
 	Frontends ListFrontends `json:"frontends"`

@@ -297,9 +279,6 @@ type ItemLBList struct {
 	// Status
 	Status string `json:"status"`

-	// Sysctl Params
-	SysctlParams interface{} `json:"sysctlParams"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`

--- a/pkg/cloudbroker/lb/updateSysctParams.go
+++ b/pkg/cloudbroker/lb/updateSysctParams.go
@@ -1,72 +0,0 @@
-package lb
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for update sysct params for lb
-type UpdateSysctParamsRequest struct {
-	// ID of the LB instance
-	// Required: true
-	LBID uint64 `url:"lbId" json:"lbId" validate:"required"`
-
-	// Custom sysctl values for Load Balancer instance. Applied on boot
-	// Required: true
-	SysctlParams Params `url:"-" json:"sysctlParams" validate:"required,dive"`
-}
-
-type wrapperUpdateSysctParamsRequest struct {
-	UpdateSysctParamsRequest
-	Params []string `url:"sysctlParams" validate:"required"`
-}
-
-// Create method will create a new load balancer instance
-func (l LB) UpdateSysctParams(ctx context.Context, req UpdateSysctParamsRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	var params []string
-
-	if len(req.SysctlParams) != 0 {
-		params = make([]string, 0, len(req.SysctlParams))
-
-		for r := range req.SysctlParams {
-			b, err := json.Marshal(req.SysctlParams[r])
-			if err != nil {
-				return false, err
-			}
-
-			params = append(params, string(b))
-		}
-	} else {
-		params = []string{}
-	}
-
-	reqWrapped := wrapperUpdateSysctParamsRequest{
-		UpdateSysctParamsRequest: req,
-		Params:                   params,
-	}
-
-	url := "/cloudbroker/lb/updateSysctParams"
-
-	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/stack/models.go
+++ b/pkg/cloudbroker/stack/models.go
@@ -43,7 +43,6 @@ type InfoStack struct {

 	// ID
 	ID uint64 `json:"id"`
-	
 	// List image IDs
 	Images []uint64 `json:"images"`

@@ -74,6 +73,7 @@ type InfoStack struct {

 // List of stacks
 type ListStacks struct {
+
 	//List
 	Data []InfoStack `json:"data"`

@@ -83,12 +83,10 @@ type ListStacks struct {

 // Package
 type Packages struct {
+
 	// LibvirtBin
 	LibvirtBin LibvirtBin `json:"libvirt-bin"`

-	// LibvirtDaemon
-	LibvirtDaemon LibvirtDaemon `json:"libvirt-daemon"`
-
 	// Lvm2Lockd
 	Lvm2Lockd Lvm2Lockd `json:"lvm2-lockd"`

@@ -107,14 +105,7 @@ type Packages struct {

 // LibvirtBin
 type LibvirtBin struct {
-	// InstalledSize
-	InstalledSize string `json:"installed_size"`

-	// Version
-	Ver string `json:"ver"`
-}
-
-type LibvirtDaemon struct {
 	// InstalledSize
 	InstalledSize string `json:"installed_size"`

@@ -124,6 +115,7 @@ type LibvirtDaemon struct {

 // Lvm2Lockd
 type Lvm2Lockd struct {
+
 	// InstalledSize
 	InstalledSize string `json:"installed_size"`

@@ -133,6 +125,7 @@ type Lvm2Lockd struct {

 // OpenvswitchCommon
 type OpenvswitchCommon struct {
+
 	// InstalledSize
 	InstalledSize string `json:"installed_size"`

@@ -142,6 +135,7 @@ type OpenvswitchCommon struct {

 // OpenvswitchSwitch
 type OpenvswitchSwitch struct {
+
 	// InstalledSize
 	InstalledSize string `json:"installed_size"`

@@ -151,6 +145,7 @@ type OpenvswitchSwitch struct {

 // QemuSystemX86
 type QemuSystemX86 struct {
+
 	// InstalledSize
 	InstalledSize string `json:"installed_size"`

@@ -160,6 +155,7 @@ type QemuSystemX86 struct {

 // Sanlock
 type Sanlock struct {
+
 	// InstalledSize
 	InstalledSize string `json:"installed_size"`

--- a/pkg/cloudbroker/vins/create_in_account.go
+++ b/pkg/cloudbroker/vins/create_in_account.go
@@ -2,24 +2,12 @@ package vins

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )

-type Route struct {
-	// Destination network
-	Destination string `url:"destination" json:"destination" validate:"required"`
-
-	//Destination network mask in 255.255.255.255 format
-	Netmask string `url:"netmask" json:"netmask" validate:"required"`
-
-	//Next hop host, IP address from ViNS ID free IP pool
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-}
-
 // Request struct for create VINS in account
 type CreateInAccountRequest struct {
 	// VINS name
@@ -46,20 +34,11 @@ type CreateInAccountRequest struct {
 	// Required: false
 	PreReservationsNum uint64 `url:"preReservationsNum,omitempty" json:"preReservationsNum,omitempty"`

-	// List of static routes, each item must have destination, netmask, and gateway fields
-	// Required: false
-	Routes []Route `url:"-" json:"routes,omitempty" validate:"omitempty,dive"`
-
 	// Reason for action
 	// Required: false
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }

-type wrapperCreateRequestInAcc struct {
-	CreateInAccountRequest
-	Routes []string `url:"routes,omitempty"`
-}
-
 // CreateInAccount creates VINS in account level
 func (v VINS) CreateInAccount(ctx context.Context, req CreateInAccountRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -69,31 +48,9 @@ func (v VINS) CreateInAccount(ctx context.Context, req CreateInAccountRequest) (
 		}
 	}

-	var routes []string
-
-	if len(req.Routes) != 0 {
-		routes = make([]string, 0, len(req.Routes))
-
-		for r := range req.Routes {
-			b, err := json.Marshal(req.Routes[r])
-			if err != nil {
-				return 0, err
-			}
-
-			routes = append(routes, string(b))
-		}
-	}  else {
-		routes = []string{"[]"}
-	}
-
-	reqWrapped := wrapperCreateRequestInAcc{
-		CreateInAccountRequest: req,
-		Routes:    routes,
-	}
-
 	url := "/cloudbroker/vins/createInAccount"

-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
--- a/pkg/cloudbroker/vins/create_in_rg.go
+++ b/pkg/cloudbroker/vins/create_in_rg.go
@@ -2,7 +2,6 @@ package vins

 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"

@@ -37,22 +36,13 @@ type CreateInRGRequest struct {

 	// Number of pre created reservations
 	// Required: false
-	PreReservationsNum uint64 `url:"preReservationsNum,omitempty" json:"preReservationsNum,omitempty"`
-
-	// List of static routes, each item must have destination, netmask, and gateway fields
-	// Required: false
-	Routes []Route `url:"-" json:"routes,omitempty" validate:"omitempty,dive"`
+	PreReservationsNum uint `url:"preReservationsNum,omitempty" json:"preReservationsNum,omitempty"`

 	// Reason for action
 	// Required: false
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }

-type wrapperCreateRequestInRG struct {
-	CreateInRGRequest
-	Routes []string `url:"routes,omitempty"`
-}
-
 // CreateInRG creates VINS in resource group level
 func (v VINS) CreateInRG(ctx context.Context, req CreateInRGRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -61,31 +51,10 @@ func (v VINS) CreateInRG(ctx context.Context, req CreateInRGRequest) (uint64, er
 			return 0, validators.ValidationError(validationError)
 		}
 	}
-	var routes []string
-
-	if len(req.Routes) != 0 {
-		routes = make([]string, 0, len(req.Routes))
-
-		for r := range req.Routes {
-			b, err := json.Marshal(req.Routes[r])
-			if err != nil {
-				return 0, err
-			}
-
-			routes = append(routes, string(b))
-		}
-	} else {
-		routes = []string{"[]"}
-	}
-
-	reqWrapped := wrapperCreateRequestInRG{
-		CreateInRGRequest: req,
-		Routes:            routes,
-	}

 	url := "/cloudbroker/vins/createInRG"

-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
--- a/pkg/cloudbroker/vins/models.go
+++ b/pkg/cloudbroker/vins/models.go
@@ -345,7 +345,7 @@ type NATConfig struct {
 	Network string `json:"network"`

 	// Rules
-	Rules []ItemNATRule `json:"rules"`
+	Rules []interface{} `json:"rules"`
 }

 // Main information about NAT
@@ -357,7 +357,7 @@ type RecordNAT struct {
 	InfoVNF
 }

-// DHCP/GW/NAT details
+// NAT/GW/NAT details
 type InfoVNF struct {
 	// CKey
 	CKey string `json:"_ckey"`
@@ -368,6 +368,9 @@ type InfoVNF struct {
 	// Account ID
 	AccountID uint64 `json:"accountId"`

+	// Config
+	Config NATConfig `json:"config"`
+
 	// CreatedTime
 	CreatedTime uint64 `json:"createdTime"`

@@ -398,9 +401,6 @@ type InfoVNF struct {
 	// Pure virtual
 	PureVirtual bool `json:"pureVirtual"`

-	// Routes
-	Routes ListRoutes `json:"routes"`
-
 	// Status
 	Status string `json:"status"`

@@ -411,39 +411,6 @@ type InfoVNF struct {
 	Type string `json:"type"`
 }

-// List of static routes
-type ListStaticRoutes struct {
-	// Data
-	Data []ItemRoutes `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
-
-// List of Routes
-type ListRoutes []ItemRoutes
-
-// Detailed information about Routes
-type ItemRoutes struct {
-	//Compute Id
-	ComputeIds []uint64 `json:"computeIds"`
-
-	// Destination network
-	Destination string `json:"destination"`
-
-	//Next hop host, IP address from ViNS ID free IP pool
-	Gateway string `json:"gateway"`
-
-	// GUID
-	GUID string `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	//Destination network mask in 255.255.255.255 format
-	Netmask string `json:"netmask"`
-}
-
 // main information about VNF
 type RecordVNFs struct {
 	// DHCP
@@ -461,6 +428,12 @@ type RecordVINS struct {
 	// VNF device
 	VNFDev VNFDev `json:"VNFDev"`

+	// CKey
+	CKey string `json:"_ckey"`
+
+	// Meta
+	Meta []interface{} `json:"_meta"`
+
 	// Account ID
 	AccountID uint64 `json:"accountId"`

--- a/pkg/cloudbroker/vins/static_route_access_grant.go
+++ b/pkg/cloudbroker/vins/static_route_access_grant.go
@@ -1,48 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for grant access to static route to Compute/ViNS
-type StaticRouteAccessGrantRequest struct {
-	// ViNS ID to grant access
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Route ID to grant access, can be found in staticRouteList
-	// Required: true
-	RouteId uint64 `url:"routeId" json:"routeId" validate:"required"`
-
-	// List of Compute IDs to grant access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// Grant access to static route to Compute/ViNS
-func (v VINS) StaticRouteAccessGrant(ctx context.Context, req StaticRouteAccessGrantRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/vins/staticRouteAccessGrant"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/vins/static_route_access_revoke.go
+++ b/pkg/cloudbroker/vins/static_route_access_revoke.go
@@ -1,48 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for revoke access to static route to Compute/ViNS
-type StaticRouteAccessRevokeRequest struct {
-	// ViNS ID to revoke access
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Route ID to revoke access, can be found in staticRouteList
-	// Required: true
-	RouteId uint64 `url:"routeId" json:"routeId" validate:"required"`
-
-	// List of Compute IDs to revoke access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// Revoke access to static route to Compute/ViNS
-func (v VINS) StaticRouteAccessRevoke(ctx context.Context, req StaticRouteAccessRevokeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/vins/staticRouteAccessRevoke"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/vins/static_route_add.go
+++ b/pkg/cloudbroker/vins/static_route_add.go
@@ -1,56 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for add static route
-type StaticRouteAddRequest struct {
-	// VINS ID
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Destination network
-	// Required: true
-	Destination string `url:"destination" json:"destination" validate:"required"`
-
-	// Destination network mask in 255.255.255.255 format
-	// Required: true
-	Netmask string `url:"netmask" json:"netmask" validate:"required"`
-
-	// Next hop host, IP address from ViNS ID free IP pool
-	// Required: true
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-
-	// List of Compute IDs which have access to this route
-	// Required: false
-	ComputeIds []uint64 `url:"computeIds,omitempty" json:"computeIds,omitempty"`
-}
-
-// StaticRouteAdd add new static route to ViNS
-func (v VINS) StaticRouteAdd(ctx context.Context, req StaticRouteAddRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/vins/staticRouteAdd"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/vins/static_route_del.go
+++ b/pkg/cloudbroker/vins/static_route_del.go
@@ -1,44 +0,0 @@
-package vins
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for remove static route from ViNS
-type StaticRouteDelRequest struct {
-	// ViNS ID to remove static route from
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-
-	// Route ID to remove, can be found in staticRouteList
-	// Required: true
-	RouteId uint64 `url:"routeId" json:"routeId" validate:"required"`
-}
-
-// Remove static route from ViNS
-func (v VINS) StaticRouteDel(ctx context.Context, req StaticRouteDelRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return false, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/vins/staticRouteDel"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
--- a/pkg/cloudbroker/vins/static_route_list.go
+++ b/pkg/cloudbroker/vins/static_route_list.go
@@ -1,42 +0,0 @@
-package vins
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for static route list
-type StaticRouteListRequest struct {
-	// ViNS ID to show list of static routes
-	// Required: true
-	VINSID uint64 `url:"vinsId" json:"vinsId" validate:"required"`
-}
-
-// Show list of static routes for ViNS
-func (v VINS) StaticRouteList(ctx context.Context, req StaticRouteListRequest) (*ListStaticRoutes, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validationError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validationError)
-		}
-	}
-
-	url := "/cloudbroker/vins/staticRouteList"
-
-	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListStaticRoutes{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
Author	SHA1	Message	Date
Nikita Sorokin	afcbc7e749	1.6.0-beta	2023-09-14 15:05:38 +03:00
Nikita Sorokin	0b3de4df7f	1.6.0-alfa	2023-09-11 13:11:33 +03:00
Nikita Sorokin	c0608d08b9	1.5.8-gostech	2023-09-07 18:11:25 +03:00