v1.9.4

.gitignore

@@ -6,5 +6,4 @@ cmd/
 tests/platform_upgrade/.env
 tests/platform_upgrade/input.json
 tests/platform_upgrade/*.txt
-tests/platform_upgrade/*.log
 *.env

CHANGELOG.md

@@ -1,68 +1,8 @@
-## Version 1.13.0
+## Version 1.9.4
-
-Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами  
-Метод `ListNodes` в cloudbroker/image стал deprecated и в следующих версиях будет удалён  
-Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены
-Методы `ComputeCISet`, `ComputeCIUnset`, `GetAudits` в cloudbroker/computeGetAudits и `GetAudits` в cloudbroker/compute стали deprecated и будут удалены в следующих версиях |
-
-Все методы группы `.SDN()` находятся в альфа-версии.
-
-### Добавлено
-
-#### kvmx86
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-665 | Опциональные поля `HPBacked`, `CPUPin`, `NumaAffinity` в структуру запроса `CreateBlankRequest` в cloudapi/kvmx86 и cloudbroker/kvmx86 |
-
-#### node
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-664 | Методы `GetLogicalCoresCount`, `SetCpuAllocationRatio`, `SetMemAllocationRatio` и структуры `GetLogicalCoresCountRequest`,`SetCpuAllocationRatioRequest`,`SetMemAllocationRatioRequest` в cloudbroker/node|
-| BGOS-666 | Поля `OpenvSwitchBridges`, `Description`, `SDNHypervisorName` в структуру ответа `RecordNode` и поля `OpenvSwitchBridges`, `APIUrl`, `Drivers`, `OldCompatLVMID` в структуру ответа `ItemNode` в cloudbroker/node |
-| BGOS-676 | Поля `Flags`, `ModelName`, в структуру ответа `CpuInfo` и поля `CPUAllocationRatio`, `MemAllocationRatio`, `Packages` в структуру ответа `ItemNode` в cloudbroker/node |
 
+### Исправлено
 
 #### compute
 | Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-675 | Метод `ChangeReadOnly` в cloudbroker/compute |
-| BGOS-675 | Поле `ReadOnly` в структуру `InfoCompute`, `RecordCompute`, `ItemCompute` в cloudbroker/compute и cloudapi/compute  |
-
-### Изменено
-
-#### Общее
-| Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-664 | StackID был заменен на NodeID |
+| BGOS-485 | Изменен тип параметров `VGPUs` с []uint64 на []VGPUItem в структуре `RecordCompute` в  cloudapi/compute и в cloudbroker/compute |
-
-#### node
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-666 | Изменен json-тег поля `VCPU` на `vCPUs` в структуре `FreeResourcesInfo` в cloudbroker/node |
-
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-667 | Валидатор `accountCUType` теперь допускает значения `CU_M`, `CU_C`, `CU_D`, `CU_DM`, `CU_I`, `gpu_units` |
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-683 | Изменен тип поля `StoragePolicyID` с required на optional в структурах запроса `RedeployRequest` в cloudapi/compute и cloudbroker/compute |
-
-### Удалено
-
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-667 | Поле `MaxNetworkPeerTransfer` из структур запросов `UpdateRequest` и `CreateRequest` в cloudapi/account и cloudbroker/account |
-
-#### rg
-| Идентификатор<br>задачи | Описание |
-| --- | ---|
-| BGOS-670 | Поля `MaxNetworkPeerTransfer` из структур запроса `CreateRequest` и `UpdateRequest`, поле `CUNP` из структуры`ResourceLimits` в cloudapi/rg и cloudbroker/rg |
-
-#### stack
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-664 | Удалена группа stack |

README.md

@@ -14,10 +14,6 @@ Decort SDK - это библиотека, написанная на языке G
     - Версия 1.7.х Decort-SDK соответствует 3.8.9 версии платформы
     - Версия 1.8.х Decort-SDK соответствует 4.0.0 версии платформы
     - Версия 1.9.х Decort-SDK соответствует 4.1.0 версии платформы
-    - Версия 1.10.х Decort-SDK соответствует 4.2.0 версии платформы
-    - Версия 1.11.х Decort-SDK соответствует 4.3.0 версии платформы
-    - Версия 1.12.х Decort-SDK соответствует 4.4.0 версии платформы
-    - Версия 1.13.х Decort-SDK соответствует 4.5.0 версии платформы
 
 ## Оглавление
 
@@ -28,7 +24,6 @@ Decort SDK - это библиотека, написанная на языке G
   - [Список API](#список-api)
     - [Cloudapi](#cloudapi)
     - [Cloudbroker](#cloudbroker)
-    - [SDN](#sdn)
   - [Работа с библиотекой](#работа-с-библиотекой)
     - [Настройка конфигурации клиента](#настройка-конфигурации-клиента)
       - [Пример конфигурации клиента](#пример-конфигурации-клиента)
@@ -82,10 +77,6 @@ Decort SDK - это библиотека, написанная на языке G
       - [Создание универсального клиента](#создание-универсального-клиента)
         - [Пример создания универсального клиента](#пример-создания-универсального-клиента)
         - [Пример выполнения запроса](#пример-выполнения-запроса-4)
-    - [Проверка соответствия версии платформы и версии dynamix](#проверка-соответствия-версии-платформы-и-версии-dynamix)
-        - [Пример выполнения запроса](#пример-выполнения-запроса-5)
-    - [Создание mock клиента](#создание-mock-клиента)
-      - [Пример создания mock клиента](#пример-создания-mock-клиента)
 
 ## Установка
 
@@ -101,7 +92,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 
 - `cloudapi` - пользовательская группа, которая позволяет воспользоваться всем стардартным функционалом платформы;
 - `cloudbroker` - административная группа, которая позволяет воспользоваться всем стандартным функционалом платформы и расширенными возможностями, включающими в себя управление пользователями, ресурсами, платформами размещения ресурсов и т.д.
-- `sdn` - группа для работы с SDN;
 
 ### Cloudapi
 
@@ -122,16 +112,11 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `KVMx86` - создание виртуальной машины x86;
 - `LB` - управление балансировщиками нагрузки;
 - `Locations` - получение информации о grid площадки;
-- `Prometheus` - получение статистики prometheus;
 - `RG` - управление ресурсными группами аккаунта;
-- `Security group` – управление группами безопасности;
+- `Stack` - получение информации о вычислительных узлах;
-- `SEP` - управление storage endpoint (sep);
-- `Storage policy` – получение информации о политиках хранения;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
-- `Trunk` - получение информации о транковых портах;
 - `VFPool` - управление пулом виртуальных сетевых функций;
-- `VINS` - управление виртуальными изолированными сетями;
+- `VINS` - управление виртуальными изолированными сетями.
-- `Zone` - управление зонами.
 
 ### Cloudbroker
 
@@ -142,7 +127,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Audit` - получение информации о событиях системы;
 - `APIAccess` - управление доступом к API и его объектам;
 - `Backup` - управление резервным копированием;
-- `BService` - управление группами виртуальных машин (computes);
 - `Compute` - управление виртуальными машинами (индивидуально);
 - `Disks` - управление виртуальными дисками;
 - `DPDK` - управление виртуальными сетями DPDK;
@@ -160,32 +144,13 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Prometheus` - получение статистики prometheus;
 - `Resmon` - получение статистики resource monitoring;
 - `RG` - управление ресурсными группами аккаунта;
-- `Security group` – управление группами безопасности;
 - `SEP` - управление storage endpoint (sep);
-- `Storage policy` – управление политиками хранения;
+- `Stack` - получение информации о вычислительных узлах;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
-- `Trunk` - управление транковыми портами;
 - `User` - управление пользователями (индивидуально);
 - `VGPU` - управление виртуальными графическими процессорами;
 - `VFPool` - управление пулом виртуальных сетевых функций;
 - `VINS` - управление виртуальными изолированными сетями.
-- `Zone` - управление зонами.
-
-### SDN
-
-`SDN` позволяет выполнять запросы к группе пользовательских конечных точек
-Данная группа ручек позволяет выполнять следующие операции в платформе:
-
-- `Access group` - управление группами доступа;
-- `Address pool` - управление пулами адресов;
-- `DefaultSecurityPolicies` - управление политиками хранения по умолчанию;
-- `ExtNet` - управление виртуальными сетями, отвечающими за внешний доступ;
-- `FloatingIPs` - управление плавающими IP-адресами;
-- `Logical ports` - управление логическими портами;
-- `NetworkObjectGroups` - управление группами объектов сети;
-- `Routers` - управление роутерами;
-- `SecurityPolicies` - управление политиками хранения;
-- `Segments` - управление сегментами;
 
 ## Работа с библиотекой
 
@@ -313,7 +278,6 @@ func main() {
 
 - `pkg/cloudapi` - для `cloudapi`
 - `pkg/cloudbroker` - для `cloudbroker`
-- `pkg/sdn` - для `sdn`
 
 В каждом пакете находятся пакеты групп API:
 
@@ -332,22 +296,16 @@ func main() {
     - `pkg/cloudapi/kvmx86` - для `KVMX86`
     - `pkg/cloudapi/lb` - для `LB`
     - `pkg/cloudapi/locations` - для `Locations`
-    - `pkg/cloudapi/prometheus` - для `Prometheus`
     - `pkg/cloudapi/rg` - для `RG`
-    - `pkg/cloudapi/secgroup` - для `Security group`
+    - `pkg/cloudapi/stack` - для `Stack`
-    - `pkg/cloudapi/sep` - для `SEP`
-    - `pkg/cloudapi/stpolicy` - для `Storage policy`
     - `pkg/cloudapi/tasks` - для `Tasks`
-    - `pkg/cloudapi/trunk` - для `Trunk`
     - `pkg/cloudapi/vfpool` - для `VFPool`
     - `pkg/cloudapi/vins` - для `VINS`
-    - `pkg/cloudapi/zone` - для `Zone`
 - **cloudbroker**:
     - `pkg/cloudbroker/account` - для `Account`
     - `pkg/cloudbroker/audit` - для `Audit`
     - `pkg/cloudbroker/apiaccess` - для `APIAccess`
     - `pkg/cloudbroker/backup` - для `Backup`
-    - `pkg/cloudbroker/bservice` - для `Basic Service`
     - `pkg/cloudbroker/compute` - для `Compute`
     - `pkg/cloudbroker/disks` - для `Disks`
     - `pkg/cloudbroker/dpdknet` - для `DPDK`
@@ -365,27 +323,13 @@ func main() {
     - `pkg/cloudbroker/prometheus` - для `Prometheus`
     - `pkg/cloudbroker/resmon` - для `Resmon`
     - `pkg/cloudbroker/rg` - для `RG`
-    - `pkg/cloudbroker/secgroup` - для `Security group`
     - `pkg/cloudbroker/sep` - для `SEP`
-    - `pkg/cloudbroker/stpolicy` - для `Storage policy`
+    - `pkg/cloudbroker/stack` - для `Stack`
     - `pkg/cloudbroker/tasks` - для `Tasks`
-    - `pkg/cloudbroker/trunk` - для `Trunk`
     - `pkg/cloudbroker/user` - для `User`
     - `pkg/cloudbroker/vgpu` - для `VGPU`
     - `pkg/cloudbroker/vfpool` - для `VFPool`
     - `pkg/cloudbroker/vins` - для `VINS`
-    - `pkg/cloudbroker/zone` - для `Zone`
- - **sdn**:
-    - `pkg/sdn/acsgroups` - для `Access groups`
-    - `pkg/sdn/adrspools` - для `Address pool`
-    - `pkg/sdn/defsecpolicies` - для `DefaultSecurityPolicies`
-    - `pkg/sdn/external_networks` - для `ExtNet`
-    - `pkg/sdn/flips` - для `FloatingIPs`
-    - `pkg/sdn/logicalports` - для `Logical ports`
-    - `pkg/sdn/netobjgroups` - для `NetworkObjectGroups`
-    - `pkg/sdn/routers` - для `Routers`
-    - `pkg/sdn/secpolicies` - для `SecurityPolicies`
-    - `pkg/sdn/segments` - для `Segments`
 
 Все поля структуры имеют описание, в которых содержится:
 
@@ -463,9 +407,9 @@ type CreateRequest struct {
 	// Required: false
 	Start bool `url:"start,omitempty" json:"start,omitempty"`
 
-	// Node ID
+	// Stack ID
 	// Required: false
-	NodeID uint64 `url:"nodeId,omitempty" json:"nodeId,omitempty"`
+	StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"`
 
 	// System name
 	// Required: false
@@ -519,7 +463,7 @@ func main() {
 
 Чтобы выполнить запрос, необходимо:
 
-1. Вызвать у клиента метод, отвечающий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, `.CloudBroker()` или `.SDN()`. Данные методы возвращают соответствующие структуры, с помощью которых можно совершать запросы.
+1. Вызвать у клиента метод, отвечаеющий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, либо `.CloudBroker()`. Данные методы возвращаеют соответствующие структуры, с помощью которых можно совершать запросы.
 2. Вызвать у возвращенной структуры метод, определяющий группу ручек для взаимодействия.
 
    Доступные методы для `.CloudAPI()`:
@@ -538,16 +482,12 @@ func main() {
     - `.KVMx86()` - для работы с `KVMX86`
     - `.LB()` - для работы с `LB`
     - `.Locations()` - для работы с `Locations`
-    - `.Prometheus()` - для работы с `Prometheus`
     - `.RG()` - для работы с `RG`
-    - `.SecurityGroup()` - для работы с `Security Group`
+    - `.Resmon()` - для работы с `Resmon`
-    - `.SEP()` - для работы с `SEP`
+    - `.Stack()` - для работы с `Stack`
-    - `.StPolicy()` - для работы с `Storage Policy`
     - `.Tasks()` - для работы с `Tasks`
-    - `.Trunk()` - для работы с `Trunk`
     - `.VFPool()` - для работы с `VFPool`
     - `.VINS()` - для работы с `VINS`
-    - `.Zone()` - для работы с `Zone`
 
    Доступные методы для `.CloudBroker()`:
 
@@ -555,7 +495,6 @@ func main() {
     - `.Audit()` - для работы с `Audit`
     - `.APIAccess()` - для работы с `APIAccess`
     - `.Backup()` - для работы с `Backup`
-    - `.BService()` - для работы с `BService`
     - `.Compute()` - для работы с `Compute`
     - `.Disks()` - для работы с `Disks`
     - `.DPDKNet()` - для работы с `DPDK`
@@ -573,29 +512,13 @@ func main() {
     - `.Prometheus()` - для работы с `Prometheus`
     - `.Resmon()` - для работы с `Resmon`
     - `.RG()` - для работы с `RG`
-    - `.SecurityGroup()` - для работы с `Security Group`
     - `.SEP()` - для работы с `SEP`
-    - `.StPolicy()` - для работы с `Storage Policy`
+    - `.Stack()` - для работы с `Stack`
     - `.Tasks()` - для работы с `Tasks`
-    - `.Trunk()` - для работы с `Trunk`
     - `.User()` - для работы с `User`
     - `.VGPU()` - для работы с `VGPU`
     - `.VFPool()` - для работы с `VFPool`
     - `.VINS()` - для работы с `VINS`
-    - `.Zone()` - для работы с `Zone`
-
-    Доступные методы для `.SDN()`:
-
-    - `.AccessGroup()` - для работы с `Access group`
-    - `.AddressPool()` - для работы с `Addres pool`
-    - `.DefaultSecurityPolicies()` - для работы с `DefaultSecurityPolicies`
-    - `.ExtNet()` - для работы с `ExtNet`
-    - `.FloatingIPs()` - для работы с `FloatingIPs`
-    - `.LogicalPorts()` - для работы с `Logical ports`
-    - `.NetworkObjectGroups()` - для работы с `NetworkObjectGroups`
-    - `.Routers()` - для работы с `Routers`
-    - `.SecurityPolicies()` - для работы с `SecurityPolicies`
-    - `.Segments()` - для работы с `Segments`
 
 3. Вызвать метод, отвечающий за выполнение запроса и передать в него:
 
@@ -1675,66 +1598,3 @@ func main() {
     fmt.Println(res)
 }
 ```
-
-
-## Проверка соответствия версии платформы и версии dynamix
-
-С версии 1.11.5 для каждого клиента добавлен метод `Check` для проверки соответствия decort-sdk и платформы dynamix.
-В случае соответсвия decort-sdk и платформы dynamix возвращается структура, содержащая информацию о версии и актуальном билде платформы.
-
-#### Пример выполнения запроса
-
-```go
-import (
-    "repository.basistech.ru/BASIS/decort-golang-sdk/config"
-)
-
-func main(){
-    // Настройка конфигурации
-    config := config.Config{
-        AppID:     "<APP_ID>",
-        AppSecret: "<APP_SECRET>",
-        SSOURL:    "https://sso.digitalenergy.online",
-        DecortURL: "https://mr4.digitalenergy.online",
-        Retries:   5,
-        SSLSkipVerify: true,
-    }
-
-    // Создание клиента
-    client := decort.New(config)
-	
-    // Проверка соответствия версии
-    checkInfo, err := client.Check()
-}
-```
-
-# Создание mock клиента
-
-Создание клиента происходит с помощью функции-строителя `NewMockDecortClient` из основного пакета `decort-sdk`. Функция принимает mock реализацию интерфейса interfaces.Calller, возвращает структуру `MockDecortClient`, с помощью которой можно производить unit тестирование API Decort SDK без подключения к серверу
-
-#### Пример создания mock клиента
-```go
-package unit_test
-
-import (
-	"testing"
-	"go.uber.org/mock/gomock"
-	decortsdk "repository.basistech.ru/BASIS/decort-golang-sdk"
-)
-
-// Пример юнит тестирования на моках
-func TestClient(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	// Создаем mock интерфейса Caller
-	mockCaller := decortsdk.NewMockCaller(ctrl)
-	// Создаем mock интерфейса DecortClient
-	mockClient := decortsdk.NewMockDecortClient(mockCaller)
-    // ....
-}
-```
-Пример юнит теста можно посмотреть в файле [samples/client/client_test.go](samples/client/client_test.go)
-
-При редактировании интерфеса interface.Caller необходимо перегенерировать Mock :
-``` shell
-make gen-mock
-```

check.go

@@ -1,106 +0,0 @@
-package decortsdk
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-)
-
-type CheckInfo struct {
-	Version string `json:"version"`
-	Build   uint64 `json:"build"`
-}
-
-const versionURL = "/system/info/version"
-
-func (de DecortClient) Check() (*CheckInfo, error) {
-	res, err := de.DecortApiCall(context.Background(), http.MethodGet, versionURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	info := CheckInfo{}
-
-	err = json.Unmarshal([]byte(strings.Replace(strings.Trim(string(res), `"`), "\\", "", -1)), &info)
-	if err != nil {
-		var v string
-		json.Unmarshal([]byte(res), &v)
-		if _, exists := constants.VersionMap[v]; exists {
-			info.Version = v
-		} else {
-			return nil, fmt.Errorf("platform version isn't supported")
-		}
-	}
-
-	if v, ok := constants.VersionMap[info.Version]; ok {
-		if v == "-" {
-			return &info, nil
-		}
-		return nil, errors.New(fmt.Sprintf("SDK don't support platform version %s, please use %s SDK version", info.Version, v))
-	}
-
-	return nil, errors.New(fmt.Sprintf("platform version %s isn't supported", info.Version))
-}
-
-func (bvs BVSDecortClient) Check() (*CheckInfo, error) {
-	res, err := bvs.DecortApiCall(context.Background(), http.MethodGet, versionURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	info := CheckInfo{}
-
-	err = json.Unmarshal([]byte(strings.Replace(strings.Trim(string(res), `"`), "\\", "", -1)), &info)
-	if err != nil {
-		var v string
-		json.Unmarshal([]byte(res), &v)
-		if _, exists := constants.VersionMap[v]; exists {
-			info.Version = v
-		} else {
-			return nil, fmt.Errorf("platform version isn't supported")
-		}
-	}
-
-	if v, ok := constants.VersionMap[info.Version]; ok {
-		if v == "-" {
-			return &info, nil
-		}
-		return nil, errors.New(fmt.Sprintf("SDK don't support platform version %s, please use %s SDK version", info.Version, v))
-	}
-
-	return nil, errors.New(fmt.Sprintf("platform version %s isn't supported", info.Version))
-}
-
-func (ldc LegacyDecortClient) Check() (*CheckInfo, error) {
-	res, err := ldc.DecortApiCall(context.Background(), http.MethodGet, versionURL, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	info := CheckInfo{}
-
-	err = json.Unmarshal([]byte(strings.Replace(strings.Trim(string(res), `"`), "\\", "", -1)), &info)
-	if err != nil {
-		var v string
-		json.Unmarshal([]byte(res), &v)
-		if _, exists := constants.VersionMap[v]; exists {
-			info.Version = v
-		} else {
-			return nil, fmt.Errorf("platform version isn't supported")
-		}
-	}
-
-	if v, ok := constants.VersionMap[info.Version]; ok {
-		if v == "-" {
-			return &info, nil
-		}
-		return nil, errors.New(fmt.Sprintf("SDK don't support platform version %s, please use %s SDK version", info.Version, v))
-	}
-
-	return nil, errors.New(fmt.Sprintf("platform version %s isn't supported", info.Version))
-}

client.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -22,7 +21,6 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
 )
 
 // DecortClient is HTTP-client for platform
@@ -40,6 +38,12 @@ 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{
@@ -51,6 +55,7 @@ func New(cfg config.Config) *DecortClient {
 			},
 		},
 		cfg:        trimConfig(&cfg),
+		expiryTime: expiryTime,
 		mutex:      &sync.Mutex{},
 	}
 }
@@ -65,11 +70,6 @@ func (dc *DecortClient) CloudBroker() *cloudbroker.CloudBroker {
 	return cloudbroker.New(dc)
 }
 
-// SDN builder
-func (dc *DecortClient) SDN() *sdn.SDN {
-	return sdn.New(dc)
-}
-
 // DecortApiCall method for sending requests to the platform
 func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
 
@@ -107,47 +107,6 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 	return respBytes, err
 }
 
-// DecortApiCallCtype method for sending requests to the platform with content type
-func (dc *DecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
-
-	var body *bytes.Buffer
-
-	switch ctype {
-	case constants.MIMESTREAM:
-		body = bytes.NewBuffer(params.([]byte))
-	case constants.MIMEJSON:
-		jsonBody, err := json.Marshal(params)
-		if err != nil {
-			return nil, err
-		}
-		body = bytes.NewBuffer(jsonBody)
-	default:
-		ctype = constants.MIMEPOSTForm
-		values, err := query.Values(params)
-		if err != nil {
-			return nil, err
-		}
-		body = bytes.NewBufferString(values.Encode())
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
-	if err != nil {
-		return nil, err
-	}
-
-	// get token
-	if err = dc.getToken(ctx); err != nil {
-		return nil, err
-	}
-	// perform request
-	respBytes, err := dc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-
-	return respBytes, err
-}
-
 // DecortApiCallMP method for sending requests to the platform
 func (dc *DecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
 	body, ctype, err := multiPartReq(params)
@@ -211,13 +170,8 @@ func (dc *DecortClient) getToken(ctx context.Context) error {
 
 	// save token in config
 	token := string(tokenBytes)
-	expiryTime, err := getTokenExp(token)
-	if err != nil {
-		return fmt.Errorf("cannot get expiry time: %w", err)
-	}
-
 	dc.cfg.Token = token
-	dc.expiryTime = expiryTime
+	dc.expiryTime = time.Now().AddDate(0, 0, 1)
 
 	return nil
 }
@@ -288,7 +242,7 @@ func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 
 	// handle successful request
 	respBytes, _ := io.ReadAll(resp.Body)
-	if resp.StatusCode == 200 || resp.StatusCode == 204 {
+	if resp.StatusCode == 200 {
 		return respBytes, nil
 	}
 
@@ -421,29 +375,3 @@ func trimConfig(cfg *config.Config) config.Config {
 	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
 	return *cfg
 }
-
-func getTokenExp(token string) (time.Time, error) {
-	parts := strings.Split(token, ".")
-	if len(parts) != 3 {
-		return time.Time{}, fmt.Errorf("invalid token format")
-	}
-
-	payload, err := base64.RawURLEncoding.DecodeString(parts[1])
-	if err != nil {
-		return time.Time{}, fmt.Errorf("error decode payload from token: %w", err)
-	}
-
-	var claims map[string]interface{}
-	if err := json.Unmarshal(payload, &claims); err != nil {
-		return time.Time{}, err
-	}
-
-	exp, ok := claims["exp"]
-	if !ok {
-		return time.Time{}, fmt.Errorf("exp time bot found")
-	}
-
-	expTime := time.Unix(int64(exp.(float64)), 0)
-
-	return expTime, nil
-}

client_bvs.go

@@ -18,7 +18,6 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
 )
 
 // BVSDecortClient is HTTP-client for platform
@@ -70,11 +69,6 @@ func (bdc *BVSDecortClient) CloudBroker() *cloudbroker.CloudBroker {
 	return cloudbroker.New(bdc)
 }
 
-// SDN builder
-func (bdc *BVSDecortClient) SDN() *sdn.SDN {
-	return sdn.New(bdc)
-}
-
 // DecortApiCall method for sending requests to the platform
 func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
 	var body *bytes.Buffer
@@ -137,72 +131,6 @@ func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url strin
 	return respBytes, err
 }
 
-// DecortApiCallCtype method for sending requests to the platform with content type
-func (bdc *BVSDecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
-	var body *bytes.Buffer
-
-	switch ctype {
-	case constants.MIMESTREAM:
-		body = bytes.NewBuffer(params.([]byte))
-	case constants.MIMEJSON:
-		jsonBody, err := json.Marshal(params)
-		if err != nil {
-			return nil, err
-		}
-		body = bytes.NewBuffer(jsonBody)
-	default:
-		ctype = constants.MIMEPOSTForm
-		values, err := query.Values(params)
-		if err != nil {
-			return nil, err
-		}
-		body = bytes.NewBufferString(values.Encode())
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+constants.RESTMACHINE+url, body)
-	if err != nil {
-		return nil, err
-	}
-
-	// get token
-	if bdc.cfg.Token.AccessToken == "" {
-		if _, err = bdc.GetToken(ctx); err != nil {
-			return nil, err
-		}
-	}
-
-	// refresh token
-	if bdc.cfg.Token.RefreshToken != "" && bdc.cfg.Token.Expiry.Add(-time.Duration(bdc.cfg.TimeToRefresh)*time.Minute).Before(time.Now()) {
-		if _, err := bdc.RefreshToken(ctx); err != nil {
-			if _, err = bdc.GetToken(ctx); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	// perform request
-	reqCopy := req.Clone(ctx)
-	respBytes, err := bdc.do(req, ctype)
-	if err == nil {
-		return respBytes, nil
-	}
-
-	// get token and retry in case of access denied
-	if err.Error() == "access is denied" {
-		_, err = bdc.GetToken(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		respBytes, err = bdc.do(reqCopy, "")
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return respBytes, err
-}
-
 func (bdc *BVSDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
 	body, ctype, err := multiPartReq(params)
 	if err != nil {

client_mock.go

@@ -1,32 +0,0 @@
-package decortsdk
-
-import (
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
-)
-
-type MockDecortClient struct {
-	apiCaller *MockCaller
-}
-
-func NewMockDecortClient(apiCaller *MockCaller) ClientInterface {
-	return &MockDecortClient{
-		apiCaller: apiCaller,
-	}
-}
-
-// CloudAPI builder
-func (mdc *MockDecortClient) CloudAPI() *cloudapi.CloudAPI {
-	return cloudapi.New(mdc.apiCaller)
-}
-
-// CloudBroker builder
-func (mdc *MockDecortClient) CloudBroker() *cloudbroker.CloudBroker {
-	return cloudbroker.New(mdc.apiCaller)
-}
-
-// SDN builder
-func (mdc *MockDecortClient) SDN() *sdn.SDN {
-	return sdn.New(mdc.apiCaller)
-}

client_mock_gen.go

@@ -1,86 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: interfaces/caller.go
-//
-// Generated by this command:
-//
-//	mockgen -package decortsdk -source interfaces/caller.go
-//
-
-// Package decortsdk is a generated GoMock package.
-package decortsdk
-
-import (
-	context "context"
-	reflect "reflect"
-
-	gomock "go.uber.org/mock/gomock"
-)
-
-// MockCaller is a mock of Caller interface.
-type MockCaller struct {
-	ctrl     *gomock.Controller
-	recorder *MockCallerMockRecorder
-	isgomock struct{}
-}
-
-// MockCallerMockRecorder is the mock recorder for MockCaller.
-type MockCallerMockRecorder struct {
-	mock *MockCaller
-}
-
-// NewMockCaller creates a new mock instance.
-func NewMockCaller(ctrl *gomock.Controller) *MockCaller {
-	mock := &MockCaller{ctrl: ctrl}
-	mock.recorder = &MockCallerMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockCaller) EXPECT() *MockCallerMockRecorder {
-	return m.recorder
-}
-
-// DecortApiCall mocks base method.
-func (m *MockCaller) DecortApiCall(ctx context.Context, method, url string, params any) ([]byte, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DecortApiCall", ctx, method, url, params)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// DecortApiCall indicates an expected call of DecortApiCall.
-func (mr *MockCallerMockRecorder) DecortApiCall(ctx, method, url, params any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecortApiCall", reflect.TypeOf((*MockCaller)(nil).DecortApiCall), ctx, method, url, params)
-}
-
-// DecortApiCallCtype mocks base method.
-func (m *MockCaller) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params any) ([]byte, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DecortApiCallCtype", ctx, method, url, ctype, params)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// DecortApiCallCtype indicates an expected call of DecortApiCallCtype.
-func (mr *MockCallerMockRecorder) DecortApiCallCtype(ctx, method, url, ctype, params any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecortApiCallCtype", reflect.TypeOf((*MockCaller)(nil).DecortApiCallCtype), ctx, method, url, ctype, params)
-}
-
-// DecortApiCallMP mocks base method.
-func (m *MockCaller) DecortApiCallMP(ctx context.Context, method, url string, params any) ([]byte, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DecortApiCallMP", ctx, method, url, params)
-	ret0, _ := ret[0].([]byte)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// DecortApiCallMP indicates an expected call of DecortApiCallMP.
-func (mr *MockCallerMockRecorder) DecortApiCallMP(ctx, method, url, params any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DecortApiCallMP", reflect.TypeOf((*MockCaller)(nil).DecortApiCallMP), ctx, method, url, params)
-}

go.mod

@@ -1,25 +1,21 @@
 module repository.basistech.ru/BASIS/decort-golang-sdk
 
-go 1.24.0
+go 1.20
 
 require (
-	github.com/go-playground/validator/v10 v10.28.0
+	github.com/go-playground/validator/v10 v10.11.2
 	github.com/google/go-querystring v1.1.0
 	github.com/joho/godotenv v1.5.1
-	github.com/stretchr/testify v1.9.0
-	go.uber.org/mock v0.6.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.10 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
-	golang.org/x/crypto v0.42.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
-	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -1,15 +1,13 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
-github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
+github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
-github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
+github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -17,22 +15,26 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
-golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

interfaces/caller.go

@@ -7,9 +7,6 @@ type Caller interface {
 	// DecortApiCall method for sending requests to the platform
 	DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error)
 
-	// DecortApiCallCtype method for sending requests to the platform
-	DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error)
-
 	// DecortApiCallMP method for sending requests to the platform
 	DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error)
 }

internal/constants/constants.go

@@ -2,23 +2,9 @@ package constants
 
 const (
 	RESTMACHINE = "/restmachine"
-)
 
-const (
+	// RAM_DIVISIBILITY sets divisibility of RAM value
-	MIMEJSON              = "application/json"
+	RAM_DIVISIBILITY uint64 = 128
-	MIMEHTML              = "text/html"
-	MIMEXML               = "application/xml"
-	MIMEXML2              = "text/xml"
-	MIMEPlain             = "text/plain"
-	MIMEPOSTForm          = "application/x-www-form-urlencoded"
-	MIMEMultipartPOSTForm = "multipart/form-data"
-	MIMEPROTOBUF          = "application/x-protobuf"
-	MIMEMSGPACK           = "application/x-msgpack"
-	MIMEMSGPACK2          = "application/msgpack"
-	MIMEYAML              = "application/x-yaml"
-	MIMEYAML2             = "application/yaml"
-	MIMETOML              = "application/toml"
-	MIMESTREAM            = "application/octet-stream"
 )
 
 var FileName = map[string]string{
@@ -26,12 +12,3 @@ var FileName = map[string]string{
 }
 
 var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
-
-var VersionMap = map[string]string{
-	"4.5.0": "-",
-	"4.4.0": "-",
-	"4.3.0": "-",
-	"4.2.0": "-",
-	"4.1.1": "-",
-	"4.1.0": "-",
-}

internal/validators/custom.go

@@ -6,7 +6,6 @@ import (
 	"net/url"
 	"reflect"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
@@ -14,6 +13,13 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
 )
 
+// computeDriverValidator is used to validate Driver field in kvmx86 create.
+func computeDriverValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, computeDriverValues)
+}
+
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -21,13 +27,6 @@ func protoValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, protoValues)
 }
 
-// apiGroupValidator is used to validate APIGroup fields
-func apiGroupValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, apiGroupValues)
-}
-
 // accessTypeValidator is used to validate AccessType fields.
 func accessTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -51,6 +50,13 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	return true
 }
 
+// driverValidator is used to validate Driver fields.
+func driverValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, driverValues)
+}
+
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -107,27 +113,6 @@ func computex86NetTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, computex86NetTypeValues)
 }
 
-// securityGroupDirectionValidator is used to validate Direction field
-func securityGroupDirectionValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, securityGroupDirectionValues)
-}
-
-// securityGroupEthertypeValidator is used to validate Ethertype field
-func securityGroupEthertypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, securityGroupEthertypeValues)
-}
-
-// securityGroupProtocolValidator is used to validate Protocol field
-func securityGroupProtocolValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, securityGroupProtocolValues)
-}
-
 // computeOrderValidator is used to validate Order field.
 func computeOrderValidator(fe validator.FieldLevel) bool {
 	fieldSlice, ok := fe.Field().Interface().([]string)
@@ -165,11 +150,11 @@ func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, flipgroupClientTypeValues)
 }
 
-// massCreateTypeValidator is used to validate net type field when mass creating kvm
+// kvmNetTypeValidator is used to validate NetType field.
-func massCreateTypeValidator(fe validator.FieldLevel) bool {
+func kvmNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, massCreateNetTypeValues)
+	return IsInSlice(fieldValue, kvmNetTypeValues)
 }
 
 // lbAlgorithmValidator is used to validate Algorithm field.
@@ -214,6 +199,22 @@ func imageTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, imageTypeValues)
 }
 
+// imageDriversValidator is used to validate Drivers field.
+func imageDriversValidator(fe validator.FieldLevel) bool {
+	fieldSlice, ok := fe.Field().Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	for _, item := range fieldSlice {
+		if !IsInSlice(item, imageDriversValues) {
+			return false
+		}
+	}
+
+	return true
+}
+
 // imageArchitectureValidator is used to validate Architecture field.
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -373,66 +374,11 @@ func urlValidartor(fl validator.FieldLevel) bool {
 
 func chipsetValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
 
 	return IsInSlice(fieldValue, chipsetValues)
 }
 
-func preferredCPUValidator(fe validator.FieldLevel) bool {
-	fieldSlice, ok := fe.Field().Interface().([]int64)
-	if !ok {
-		return false
-	}
-
-	for _, value := range fieldSlice {
-		if value < -1 {
-			return false
-		}
-	}
-
-	return true
-}
-
-// loaderTypeValidator is used to validate loaderType fields
-func loaderTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, loaderTypeValues)
-}
-
-// languageValidator is used to validate language fields
-func languageValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, languageValues)
-}
-
-func userProviderValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, userProviders)
-}
-
-// sepTypeValidator is used to validate sepType fields
-func sepTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, sepTypeValues)
-}
-
-// deviceValidator is used to validate extnet device fields
-func deviceValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, deviceValues)
-}
-
-// ipTypesValidator is used to validate ip types version fields
-func ipTypesValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, ipTypeValues)
-}
-
 // ValidateRAM checks if request contains RAM value that is positive integer divisible by divisibility passed.
 // It is recommended to pass constants.RAM_DIVISIBILITY as divisility arguement
 func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
@@ -454,20 +400,3 @@ func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
 	}
 	return multierror.Join(errs...)
 }
-
-// trunkTagsValidator checks if trunk_tags is in range from 1 to 4095
-func trunkTagsValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-	numFieldValue, err := strconv.ParseInt(fieldValue, 10, 64)
-	if err != nil {
-		return false
-	}
-	return uint64(numFieldValue) >= uint64(trunkTagsMin) && uint64(numFieldValue) <= uint64(trunkTagsMax)
-}
-
-// addressPoolNetTypeValidator is used to validate NetAddressType fields
-func addressPoolNetTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, addressPoolNetTypeValues)
-}

internal/validators/messages.go

@@ -28,6 +28,12 @@ func errorMessage(fe validator.FieldError) string {
 	case "isBool":
 		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
+	case "driver":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(driverValues))
+
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -46,13 +52,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(protoValues))
 
-	// apiGroup Validators
-	case "apiGroup":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(apiGroupValues))
-
 	// Account Validators
 	case "accountCUType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -95,9 +94,6 @@ func errorMessage(fe validator.FieldError) string {
 	case "mtu":
 		return fmt.Sprint(prefix, fe.Field(), "must be ", mtuMin, "-", mtuMax)
 
-	case "preferredCPU":
-		return fmt.Sprint(prefix, fe.Field(), "must be equal to or greater than", -1)
-
 	case "computex86NetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -122,6 +118,12 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDataDisksValues))
 
+	case "computeDriver":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computeDriverValues))
+
 	// Disk Validators
 	case "diskType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -142,12 +144,12 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
-	// KVM_X86 Mass create validators
+	// KVM_X86 Validators
-	case "massCreateNetType":
+	case "kvmNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
-			joinValues(massCreateNetTypeValues))
+			joinValues(kvmNetTypeValues))
 
 	// LB Validators
 	case "lbAlgorithm":
@@ -189,6 +191,12 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(imageTypeValues))
 
+	case "imageDrivers":
+		return fmt.Sprintf("%s %s must contain only the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(imageDriversValues))
+
 	case "imageArchitecture":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -297,75 +305,6 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(chipsetValues))
-
-	case "loaderType":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(loaderTypeValues))
-
-	case "language":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(languageValues))
-
-	case "sepType":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(sepTypeValues))
-
-	// user validators
-	case "userProvider":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(userProviders))
-
-	// security group validators
-	case "securityGroupDirection":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(securityGroupDirectionValues))
-
-	case "securityGroupEthertype":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(securityGroupEthertypeValues))
-
-	case "securityGroupProtocol":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(securityGroupProtocolValues))
-
-	// trunk tags validator
-	case "trunkTags":
-		return fmt.Sprintf("%s %s must be in range from 1 to 4095",
-			prefix,
-			fe.Field())
-
-		// addressPoolNetTypeValidator validator
-	case "addressPoolNetTypeValidator":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(addressPoolNetTypeValues))
-
-	case "device":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(deviceValues))
-
-	case "ipTypes":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(ipTypeValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -31,7 +31,7 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
+	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
 	if err != nil {
 		return err
 	}
@@ -46,6 +46,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("driver", driverValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
 	if err != nil {
 		return err
@@ -56,6 +61,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("imageDrivers", imageDriversValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("imageArchitecture", imageArchitectureValidator)
 	if err != nil {
 		return err
@@ -121,7 +131,7 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("massCreateNetType", massCreateTypeValidator)
+	err = validate.RegisterValidation("kvmNetType", kvmNetTypeValidator)
 	if err != nil {
 		return err
 	}
@@ -251,65 +261,5 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("preferredCPU", preferredCPUValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("loaderType", loaderTypeValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("language", languageValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("userProvider", userProviderValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("sepType", sepTypeValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("device", deviceValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("trunkTags", trunkTagsValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("securityGroupDirection", securityGroupDirectionValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("securityGroupEthertype", securityGroupEthertypeValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("securityGroupProtocol", securityGroupProtocolValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("addressPoolNetTypeValidator", addressPoolNetTypeValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("ipTypes", ipTypesValidator)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/validators/values.go

@@ -1,13 +1,12 @@
 package validators
 
 var (
-	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
+	driverValues     = []string{"KVM_X86"}
-
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
 
-	accountCUTypeValues = []string{"CU_M", "CU_C", "CU_D", "CU_DM", "CU_I", "gpu_units"}
+	accountCUTypeValues = []string{"CU_M", "CU_C", "CU_D", "CU_DM", "CU_S", "CU_A", "CU_NO", "CU_I", "CU_NP"}
 
 	bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
 
@@ -16,16 +15,17 @@ var (
 	computeModeValues       = []string{"EQ", "EN", "ANY"}
 	computeDiskTypeValues   = []string{"D", "B"}
 	computeNetTypeValues    = []string{"EXTNET", "VINS"}
-	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
+	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK"}
 	computeOrderValues      = []string{"cdrom", "network", "hd"}
 	computeDataDisksValues  = []string{"KEEP", "DETACH", "DESTROY"}
+	computeDriverValues     = []string{"KVM_X86", "SVA_KVM_X86"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
-	massCreateNetTypeValues = []string{"EXTNET", "VINS", "TRUNK"}
+	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
-	kvmx86NetTypeValues     = []string{"EXTNET", "VINS", "EMPTY", "VFNIC", "DPDK", "SDN", "TRUNK"}
+	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC", "DPDK"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
@@ -35,7 +35,8 @@ var (
 	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
-	imageTypeValues         = []string{"windows", "linux", "unknown"}
+	imageTypeValues         = []string{"windows", "linux", "other"}
+	imageDriversValues      = []string{"KVM_X86"}
 	imageArchitectureValues = []string{"X86_64"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
@@ -46,11 +47,11 @@ var (
 
 	interfaceStateValues = []string{"on", "off"}
 
-	actionValues = []string{"is_powered", "power_on", "shutdown", "force_shutdown", "reboot"}
+	actionValues = []string{"power_on", "shutdown", "force_shutdown", "reboot"}
 
 	vmActionValues = []string{"stop", "move"}
 
-	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac", "trunk"}
+	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic"}
 
 	networkInterfaceNamingValues = []string{"eth", "ens"}
 
@@ -63,30 +64,10 @@ var (
 	eventIDxValues = []string{"on", "off", "selected by hypervisor"}
 
 	chipsetValues = []string{"i440fx", "Q35"}
-
-	loaderTypeValues = []string{"linux", "windows", "unknown"}
-
-	sepTypeValues = []string{"hitachi", "dorado", "tatlin", "shared", "local", "des"}
-
-	languageValues = []string{"ru", "en"}
-
-	userProviders = []string{"bvs", "decs3o"}
-
-	deviceValues = []string{"primary", "secondary"}
-
-	securityGroupDirectionValues = []string{"inbound", "outbound"}
-	securityGroupEthertypeValues = []string{"IPv4", "IPv6"}
-	securityGroupProtocolValues  = []string{"icmp", "tcp", "udp"}
-
-	addressPoolNetTypeValues = []string{"IPv4", "IPv6", "MAC"}
-
-	ipTypeValues = []string{"v4, v6"}
 )
 
 const (
 	mtuMin = 1
-	mtuMax = 9216
 
-	trunkTagsMin = 1
+	mtuMax = 9216
-	trunkTagsMax = 4095
 )

legacy-client.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -18,7 +17,6 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
 )
 
 // LegacyDecortClient is Legacy HTTP-client for platform
@@ -68,11 +66,6 @@ func (ldc *LegacyDecortClient) CloudBroker() *cloudbroker.CloudBroker {
 	return cloudbroker.New(ldc)
 }
 
-// SDN builder
-func (ldc *LegacyDecortClient) SDN() *sdn.SDN {
-	return sdn.New(ldc)
-}
-
 // DecortApiCall method for sending requests to the platform
 func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
 	// get token
@@ -109,47 +102,6 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st
 	return respBytes, err
 }
 
-// DecortApiCallCtype method for sending requests to the platform with content type
-func (ldc *LegacyDecortClient) DecortApiCallCtype(ctx context.Context, method, url, ctype string, params interface{}) ([]byte, error) {
-	// get token
-	if err := ldc.getToken(ctx); err != nil {
-		return nil, err
-	}
-
-	var body *bytes.Buffer
-
-	switch ctype {
-	case constants.MIMESTREAM:
-		body = bytes.NewBuffer(params.([]byte))
-	case constants.MIMEJSON:
-		jsonBody, err := json.Marshal(params)
-		if err != nil {
-			return nil, err
-		}
-		body = bytes.NewBuffer(jsonBody)
-	default:
-		ctype = constants.MIMEPOSTForm
-		values, err := query.Values(params)
-		if err != nil {
-			return nil, err
-		}
-		body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
-	}
-
-	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
-	if err != nil {
-		return nil, err
-	}
-
-	// perform request
-	respBytes, err := ldc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-
-	return respBytes, err
-}
-
 func (ldc *LegacyDecortClient) DecortApiCallMP(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
 	body, ctype, err := multiPartReq(params)
 	if err != nil {

pkg/cloudapi/account/create.go

@@ -0,0 +1,75 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// CreateRequest struct for creating account
+type CreateRequest struct {
+	// Display name
+	// Required: true
+	Name string `url:"name" json:"name" validate:"required"`
+
+	// Name of the account
+	// Required: true
+	Username string `url:"username" json:"username" validate:"required"`
+
+	// Email
+	// Required: false
+	EmailAddress string `url:"emailaddress,omitempty" json:"emailaddress,omitempty" validate:"omitempty,email"`
+
+	// Max size of memory in MB
+	// Required: false
+	MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
+
+	// Max size of aggregated vdisks in GB
+	// Required: false
+	MaxVDiskCapacity int64 `url:"maxVDiskCapacity,omitempty" json:"maxVDiskCapacity,omitempty"`
+
+	// Max number of CPU cores
+	// Required: false
+	MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
+
+	// Max sent/received network transfer peering
+	// Required: false
+	MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
+
+	// Max number of assigned public IPs
+	// Required: false
+	MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`
+
+	// If true send emails when a user is granted access to resources
+	// Required: false
+	SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"`
+
+	// Limit (positive) or disable (0) GPU resources
+	// Required: false
+	GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
+}
+
+// Create creates account
+// Setting a cloud unit maximum to -1 or empty will not put any restrictions on the resource
+func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/create"
+
+	res, err := a.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
+}

pkg/cloudapi/account/delete.go

@@ -19,18 +19,18 @@ type DeleteRequest struct {
 }
 
 // Delete completes delete an account from the system Returns true if account is deleted or was already deleted or never existed
-func (a Account) Delete(ctx context.Context, req DeleteRequest) (string, error) {
+func (a Account) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/delete"
 
-	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return "", err
+		return false, err
 	}
 
-	return string(result), nil
+	return true, nil
 }

pkg/cloudapi/account/filter_test.go

@@ -7,7 +7,7 @@ import (
 var accounts = ListAccounts{
 	Data: []ItemAccount{
 		{
-			ACL: []ListRecordACL{
+			ACL: []RecordACL{
 				{
 					IsExplicit: true,
 					GUID:       "",
@@ -25,7 +25,7 @@ var accounts = ListAccounts{
 			UpdatedTime: 1676645275,
 		},
 		{
-			ACL: []ListRecordACL{
+			ACL: []RecordACL{
 				{
 					IsExplicit: true,
 					GUID:       "",
@@ -43,7 +43,7 @@ var accounts = ListAccounts{
 			UpdatedTime: 1676645275,
 		},
 		{
-			ACL: []ListRecordACL{
+			ACL: []RecordACL{
 				{
 					IsExplicit: true,
 					GUID:       "",

pkg/cloudapi/account/get_consumed_cloud_units_by_type.go

@@ -27,8 +27,11 @@ type GetConsumedCloudUnitsByTypeRequest struct {
 //   - CU_C: returns number of virtual cpu cores
 //   - CU_D: returns consumed virtual disk storage in GB
 //   - CU_DM: returns consumed max virtual disk storage in GB
+//   - CU_S: returns consumed primary storage (NAS) in TB
+//   - CU_A: returns consumed secondary storage (Archive) in TB
+//   - CU_NO: returns sent/received network transfer in operator in GB
+//   - CU_NP: returns sent/received network transfer peering in GB
 //   - CU_I: returns number of public IPs
-//   - gpu_units: return number of GPU units
 func (a Account) GetConsumedCloudUnitsByType(ctx context.Context, req GetConsumedCloudUnitsByTypeRequest) (float64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/account/list.go

@@ -30,11 +30,6 @@ type ListRequest struct {
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 
-	// Sort by zone id
-	// Default value: 0
-	// Required: false
-	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudapi/account/models.go

@@ -1,34 +1,7 @@
 package account
 
-// Access Control List
-type ListRecordACL struct {
-	// Whether access is explicitly specified
-	IsExplicit bool `json:"explicit"`
-
-	// GUID
-	GUID string `json:"guid"`
-
-	// Access rights
-	Rights string `json:"right"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Account Type
-	Type string `json:"type"`
-
-	// Account owner ID
-	UgroupID string `json:"userGroupId"`
-
-	// Is it possible to remove
-	CanBeDeleted bool `json:"canBeDeleted"`
-}
-
 // Access Control List
 type RecordACL struct {
-	// Emails
-	Emails []string `json:"emails"`
-
 	// Whether access is explicitly specified
 	IsExplicit bool `json:"explicit"`
 
@@ -73,21 +46,12 @@ type ResourceLimits struct {
 
 	// Number of graphics cores
 	GPUUnits float64 `json:"gpu_units"`
-
-	// Storage policy
-	StoragePolicy []StoragePolicyItem `json:"storage_policy"`
-}
-
-type StoragePolicyItem struct {
-	ID uint64 `json:"id"`
-
-	Limit int `json:"limit"`
 }
 
 // Main information in one of if the list of accounts
 type ItemAccount struct {
 	// Access Control List
-	ACL []ListRecordACL `json:"acl"`
+	ACL []RecordACL `json:"acl"`
 
 	// Compute Features
 	ComputeFeatures []string `json:"computeFeatures"`
@@ -98,9 +62,6 @@ type ItemAccount struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// ID
 	ID uint64 `json:"id"`
 
@@ -112,9 +73,6 @@ type ItemAccount struct {
 
 	// Updated time
 	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Zones
-	ZoneIDs []uint64 `json:"zoneIds"`
 }
 
 // List of accounts
@@ -124,18 +82,6 @@ type ListAccounts struct {
 	EntryCount uint64 `json:"entryCount"`
 }
 
-// Policy
-type Policy struct {
-	// Size of the disk
-	DiskSize float64 `json:"disksize"`
-
-	// Max size of the disk
-	DiskSizeMax float64 `json:"disksizemax"`
-
-	// SEPs used
-	SEPs map[string]map[string]DiskUsage `json:"seps"`
-}
-
 // Resources used
 type Resource struct {
 	// Number of cores
@@ -156,9 +102,6 @@ type Resource struct {
 	// Number of grafic cores
 	GPU int64 `json:"gpu"`
 
-	// Policies
-	Policies map[string]Policy `json:"policies"`
-
 	// Number of RAM
 	RAM int64 `json:"ram"`
 
@@ -219,20 +162,14 @@ type Machines struct {
 	Halted uint64 `json:"halted"`
 }
 
-// Detailed information about the account zone
-type ZoneID struct {
-	// ID of zone
-	ID int64 `json:"id"`
-
-	// Name of zone
-	Name string `json:"name"`
-}
-
 // Main information about account
 type RecordAccount struct {
 	// DCLocation
 	DCLocation string `json:"DCLocation"`
 
+	// CKey
+	CKey string `json:"_ckey"`
+
 	// Access control list
 	ACL []RecordACL `json:"acl"`
 
@@ -260,9 +197,6 @@ type RecordAccount struct {
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// Deactivation time
 	DeactivationTime float64 `json:"deactivationTime"`
 
@@ -299,9 +233,6 @@ type RecordAccount struct {
 	// Status
 	Status string `json:"status"`
 
-	// Storage policy ids
-	StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
-
 	// UniqPools
 	UniqPools []interface{} `json:"uniqPools"`
 
@@ -316,12 +247,6 @@ type RecordAccount struct {
 
 	// VINSes
 	VINSes uint64 `json:"vinses"`
-
-	// Zone
-	ZoneIDs []ZoneID `json:"zoneIds"`
-
-	// Zones
-	DefaultZoneID uint64 `json:"defaultZoneId"`
 }
 
 // Main information about compute
@@ -587,9 +512,6 @@ type ItemRG struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// Resource group ID
 	RGID uint64 `json:"id"`
 

pkg/cloudapi/account/restore.go

@@ -3,7 +3,6 @@ package account
 import (
 	"context"
 	"net/http"
-
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -15,18 +14,18 @@ type RestoreRequest struct {
 }
 
 // Restore restores a deleted account
-func (a Account) Restore(ctx context.Context, req RestoreRequest) (string, error) {
+func (a Account) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/restore"
 
-	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return "", err
+		return false, err
 	}
 
-	return string(result), nil
+	return true, nil
 }

pkg/cloudapi/account/update.go

@@ -14,10 +14,6 @@ type UpdateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
-	// Description
-	// Required: false
-	Description string `url:"desc,omitempty" json:"desc,omitempty"`
-
 	// Name of the account
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
@@ -34,6 +30,10 @@ type UpdateRequest struct {
 	// Required: false
 	MaxCPUCapacity int64 `url:"maxCPUCapacity,omitempty" json:"maxCPUCapacity,omitempty"`
 
+	// Max sent/received network transfer peering
+	// Required: false
+	MaxNetworkPeerTransfer int64 `url:"maxNetworkPeerTransfer,omitempty" json:"maxNetworkPeerTransfer,omitempty"`
+
 	// Max number of assigned public IPs
 	// Required: false
 	MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`
@@ -50,10 +50,6 @@ type UpdateRequest struct {
 	// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
 	// Required: false
 	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
-
-	// Default zone ID
-	// Required: false
-	DefaultZoneID uint64 `url:"defaultZoneId,omitempty" json:"defaultZoneId,omitempty"`
 }
 
 // Update updates an account name and resource types and limits

pkg/cloudapi/audit/filter.go

@@ -1,81 +0,0 @@
-package audit
-
-// FilterByID returns ListAudits with specified ID.
-func (la ListAudits) FilterByID(guid string) ListAudits {
-	predicate := func(ia ItemAudit) bool {
-		return ia.GUID == guid
-	}
-
-	return la.FilterFunc(predicate)
-}
-
-// FilterByCall returns ListAudits with specified call.
-func (la ListAudits) FilterByCall(call string) ListAudits {
-	predicate := func(ic ItemAudit) bool {
-		return ic.Call == call
-	}
-
-	return la.FilterFunc(predicate)
-}
-
-// FilterByCorrelationID returns ListAudits with specified correlation id.
-func (la ListAudits) FilterByCorrelationID(correlationID string) ListAudits {
-	predicate := func(ic ItemAudit) bool {
-		return ic.CorrelationID == correlationID
-	}
-
-	return la.FilterFunc(predicate)
-}
-
-// FilterByRemoteAddr returns ListAudits with specified remote address.
-func (la ListAudits) FilterByRemoteAddr(remoteAddr string) ListAudits {
-	predicate := func(ic ItemAudit) bool {
-		return ic.RemoteAddr == remoteAddr
-	}
-
-	return la.FilterFunc(predicate)
-}
-
-// FilterByUser returns ListAudits with specified user name.
-func (la ListAudits) FilterByUser(user string) ListAudits {
-	predicate := func(ic ItemAudit) bool {
-		return ic.User == user
-	}
-
-	return la.FilterFunc(predicate)
-}
-
-// FilterByStatusCode return ListAudits with specified status code.
-func (la ListAudits) FilterByStatusCode(statusCode uint64) ListAudits {
-	predicate := func(ic ItemAudit) bool {
-		return ic.StatusCode == statusCode
-	}
-
-	return la.FilterFunc(predicate)
-
-}
-
-// FilterFunc allows filtering ListAudits based on a user-specified predicate.
-func (la ListAudits) FilterFunc(predicate func(ItemAudit) bool) ListAudits {
-	var result ListAudits
-
-	for _, item := range la.Data {
-		if predicate(item) {
-			result.Data = append(result.Data, item)
-		}
-	}
-
-	result.EntryCount = uint64(len(result.Data))
-
-	return result
-}
-
-// FindOne returns first found ItemAudit
-// If none was found, returns an empty struct.
-func (la ListAudits) FindOne() ItemAudit {
-	if len(la.Data) == 0 {
-		return ItemAudit{}
-	}
-
-	return la.Data[0]
-}

pkg/cloudapi/audit/filter_test.go

@@ -1,115 +0,0 @@
-package audit
-
-import (
-	"testing"
-)
-
-var audits = ListAudits{
-	Data: []ItemAudit{
-		{
-			Args:          "[]",
-			Call:          "/restmachine/cloudapi/audit/linkedJobs",
-			GUID:          "550e8400-e29b-41d4-a716-446655440001",
-			CorrelationID: "550e8400-e29b-41d4-a716-446655440001",
-			Kwargs:        `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
-			RemoteAddr:    "192.168.1.100",
-			ResponseTime:  1,
-			Result:        `[]`,
-			StatusCode:    200,
-			Timestamp:     1640995200,
-			TimestampEnd:  1640995201,
-			User:          "test@example.com",
-			TTL:           "2025-07-31T14:22:57.028000",
-		},
-		{
-			Args:          "[]",
-			Call:          "/restmachine/cloudapi/audit/test",
-			GUID:          "550e8400-e29b-41d4-a716-446655440002",
-			CorrelationID: "550e8400-e29b-41d4-a716-446655440002",
-			Kwargs:        `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
-			RemoteAddr:    "192.168.1.105",
-			ResponseTime:  5,
-			Result:        `[]`,
-			StatusCode:    400,
-			Timestamp:     1640995200,
-			TimestampEnd:  1640995201,
-			User:          "test2@example.com",
-			TTL:           "2025-07-31T14:22:57.028000",
-		},
-	},
-	EntryCount: 2,
-}
-
-func TestFilterByID(t *testing.T) {
-	actual := audits.FilterByID("550e8400-e29b-41d4-a716-446655440002").FindOne()
-
-	if actual.GUID != "550e8400-e29b-41d4-a716-446655440002" {
-		t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.GUID)
-	}
-
-	actualEmpty := audits.FilterByID("")
-
-	if len(actualEmpty.Data) != 0 {
-		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
-	}
-}
-
-func TestFilterByCorrelationID(t *testing.T) {
-	actual := audits.FilterByCorrelationID("550e8400-e29b-41d4-a716-446655440002").FindOne()
-
-	if actual.CorrelationID != "550e8400-e29b-41d4-a716-446655440002" {
-		t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.CorrelationID)
-	}
-
-	actualEmpty := audits.FilterByCorrelationID("")
-
-	if len(actualEmpty.Data) != 0 {
-		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
-	}
-}
-
-func TestFilterByRemoteAddr(t *testing.T) {
-	actual := audits.FilterByRemoteAddr("192.168.1.100").FindOne()
-
-	if actual.RemoteAddr != "192.168.1.100" {
-		t.Fatal("expected remote address 192.168.1.100, found: ", actual.RemoteAddr)
-	}
-
-	actualEmpty := audits.FilterByRemoteAddr("")
-
-	if len(actualEmpty.Data) != 0 {
-		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
-	}
-}
-
-func TestFilterByUser(t *testing.T) {
-	actual := audits.FilterByUser("test@example.com").FindOne()
-
-	if actual.User != "test@example.com" {
-		t.Fatal("expected user test@example.com, found: ", actual.RemoteAddr)
-	}
-
-	actualEmpty := audits.FilterByUser("")
-
-	if len(actualEmpty.Data) != 0 {
-		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
-	}
-}
-
-func TestFilterByCall(t *testing.T) {
-	actual := audits.FilterByCall("/restmachine/cloudapi/audit/test").FindOne()
-
-	if actual.Call != "/restmachine/cloudapi/audit/test" {
-		t.Fatal("expected call /restmachine/cloudapi/audit/test, found: ", actual.Call)
-	}
-}
-
-func TestFilterByStatusCode(t *testing.T) {
-	actual := audits.FilterByStatusCode(200)
-
-	for _, item := range actual.Data {
-		if item.StatusCode != 200 {
-			t.Fatal("expected 200 status code, found: ", item.StatusCode)
-		}
-	}
-}

pkg/cloudapi/audit/get.go

@@ -12,7 +12,7 @@ import (
 type GetRequest struct {
 	// Audit GUID
 	// Required: true
-	AuditGuid string `url:"audit_guid" json:"audit_guid" validate:"required"`
+	AuditGuid string `url:"auditGuid" json:"auditGuid" validate:"required"`
 }
 
 // Get gets information about audit as a RecordAudit struct

pkg/cloudapi/audit/list.go

@@ -1,124 +0,0 @@
-package audit
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ListRequest struct to give list of account audits
-type ListRequest struct {
-
-	// Find all audits after point in time (unixtime)
-	// Required: false
-	TimestampAt uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
-
-	// Find all audits before point in time (unixtime)
-	// Required: false
-	TimestampTo uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
-
-	// Find by user (Mongo RegExp supported)
-	// Required: false
-	User string `url:"user,omitempty" json:"user,omitempty"`
-
-	// Find by api endpoint (Mongo RegExp supported)
-	// Required: false
-	Call string `url:"call,omitempty" json:"call,omitempty"`
-
-	// Find by request id
-	// Required: false
-	RequestID string `url:"request_id,omitempty" json:"request_id,omitempty"`
-
-	// Find by HTTP min status code
-	// Required: false
-	MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
-
-	// Find by HTTP max status code
-	// Required: false
-	MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
-
-	// Sort by one of supported fields, format +|-(field)
-	// Required: false
-	SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty" validate:"omitempty,sortBy"`
-
-	// Page number
-	// Required: false
-	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
-
-	// Page size
-	// Required: false
-	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
-
-	// Find by resource group id
-	// Required: false
-	RGID uint64 `url:"resgroup_id,omitempty" json:"resgroup_id,omitempty"`
-
-	// Find by compute id
-	// Required: false
-	ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
-
-	// Find by account id
-	// Required: false
-	AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
-
-	// Find by vins id
-	// Required: false
-	VINSID uint64 `url:"vins_id,omitempty" json:"vins_id,omitempty"`
-
-	// Find by service id
-	// Required: false
-	ServiceID uint64 `url:"service_id,omitempty" json:"service_id,omitempty"`
-
-	// Find by k8s id
-	// Required: false
-	K8SID uint64 `url:"k8s_id,omitempty" json:"k8s_id,omitempty"`
-
-	// Find by flipgroup id
-	// Required: false
-	FLIPGroupID uint64 `url:"flipgroup_id,omitempty" json:"flipgroup_id,omitempty"`
-
-	// Find by load balancer id
-	// Required: false
-	LBID uint64 `url:"lb_id,omitempty" json:"lb_id,omitempty"`
-
-	// Find by sep id
-	// Required: false
-	SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
-
-	// Exclude audit lines from response
-	// Required: false
-	ExcludeAuditLines bool `url:"exclude_audit_lines,omitempty" json:"exclude_audit_lines,omitempty"`
-}
-
-// List gets audit records for the specified account object
-func (a Audit) List(ctx context.Context, req ListRequest) (*ListAudits, error) {
-
-	res, err := a.ListRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListAudits{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
-
-// ListRaw gets list of audit records an array of bytes
-func (a Audit) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/audit/list"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/audit/models.go

@@ -12,9 +12,6 @@ type RecordAudit struct {
 	// GUID
 	GUID string `json:"guid"`
 
-	// Correlation ID
-	CorrelationID string `json:"correlation_id"`
-
 	// Kwargs
 	Kwargs string `json:"kwargs"`
 
@@ -42,54 +39,3 @@ type RecordAudit struct {
 	// User
 	User string `json:"user"`
 }
-
-// Main info about audit
-type ItemAudit struct {
-	// Args
-	Args string `json:"args"`
-
-	// Call
-	Call string `json:"call"`
-
-	// GUID
-	GUID string `json:"guid"`
-
-	// Correlation ID
-	CorrelationID string `json:"correlation_id"`
-
-	// Kwargs
-	Kwargs string `json:"kwargs"`
-
-	// RemoteAddr
-	RemoteAddr string `json:"remote_addr"`
-
-	// Response time
-	ResponseTime float64 `json:"responsetime"`
-
-	// Result
-	Result string `json:"result"`
-
-	// Status code
-	StatusCode uint64 `json:"statuscode"`
-
-	// Timestamp
-	Timestamp float64 `json:"timestamp"`
-
-	// Timestamp End
-	TimestampEnd float64 `json:"timestampEnd"`
-
-	// User
-	User string `json:"user"`
-
-	// TTL
-	TTL string `json:"_ttl"`
-}
-
-// List of audits
-type ListAudits struct {
-	// Data
-	Data []ItemAudit `json:"data"`
-
-	// EntryCount
-	EntryCount uint64 `json:"entryCount"`
-}

pkg/cloudapi/bservice/create.go

@@ -25,10 +25,6 @@ type CreateRequest struct {
 	// SSH key to deploy for the specified user. Same key will be deployed to all computes of the service
 	// Required: false
 	SSHKey string `url:"sshKey,omitempty" json:"sshKey,omitempty"`
-
-	// Zone ID
-	// Required: false
-	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
 }
 
 // Create creates blank BasicService instance

pkg/cloudapi/bservice/delete.go

@@ -16,7 +16,6 @@ type DeleteRequest struct {
 
 	// If set to False, Basic service will be deleted to recycle bin. Otherwise destroyed immediately
 	// Required: false
-	// Default: false
 	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
 }
 

pkg/cloudapi/bservice/group_add.go

@@ -38,9 +38,11 @@ type GroupAddRequest struct {
 	// Required: true
 	ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
 
-	// Compute driver like a KVM_X86, etc.
+	// Compute driver
+	// should be one of:
+	//	- KVM_X86
 	// Required: true
-	Driver string `url:"driver" json:"driver" validate:"required"`
+	Driver string `url:"driver" json:"driver" validate:"driver"`
 
 	// Storage endpoint provider ID
 	// Required: false
@@ -69,15 +71,6 @@ type GroupAddRequest struct {
 	// Meta data for working group computes, format YAML "user_data": 1111
 	// Required: false
 	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
-
-	// Chipset "i440fx" or "Q35
-	// Default value : Q35
-	// Required: false
-	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
-
-	// ID of the chosen storage policy
-	// Required: false
-	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/bservice/group_resize.go

@@ -22,12 +22,6 @@ type GroupResizeRequest struct {
 	// Required: true
 	Count int64 `url:"count" json:"count" validate:"required"`
 
-	// Chipset for new computes, either i440fx or Q35 (i440fx by default)
-	// Available values : i440fx, Q35
-	// Default value : Q35
-	// Required: true
-	Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`
-
 	// Either delta or absolute value of computes
 	// Should be one of:
 	//	- ABSOLUTE

pkg/cloudapi/bservice/list.go

@@ -46,11 +46,6 @@ type ListRequest struct {
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 
-	// Sort by zone id
-	// Default value: 0
-	// Required: false
-	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudapi/bservice/migrate_to_zone.go

@@ -1,42 +0,0 @@
-package bservice
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// MigrateToZone struct to move basic service to another zone
-type MigrateToZoneRequest struct {
-	// ID of the BasicService to move
-	// Required: true
-	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
-
-	// ID of the zone to move
-	// Required: true
-	ZoneID uint64 `url:"zoneId" json:"zoneId" validate:"required"`
-}
-
-// MigrateToZone moves basic service instance to new zone
-func (b BService) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/bservice/migrateToZone"
-
-	res, err := b.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
-}

pkg/cloudapi/bservice/models.go

@@ -88,9 +88,6 @@ type RecordBasicService struct {
 
 	// Whether user controlled
 	UserManaged bool `json:"userManaged"`
-
-	// Zone ID
-	ZoneID uint64 `json:"zoneId"`
 }
 
 // Main information about Compute
@@ -119,8 +116,8 @@ type ItemCompute struct {
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
-	// NodeID
+	// StackID
-	NodeID uint64 `json:"node_id"`
+	StackID uint64 `json:"stackId"`
 
 	// Status
 	Status string `json:"status"`
@@ -298,9 +295,6 @@ type ItemGroupCompute struct {
 
 	// List of information about OS Users
 	OSUsers ListOSUsers `json:"osUsers"`
-
-	//Chipset
-	Chipset string `json:"chipset"`
 }
 
 // List of Group Computes
@@ -385,9 +379,6 @@ type ItemBasicService struct {
 
 	// User Managed or not
 	UserManaged bool `json:"userManaged"`
-
-	// Zone ID
-	ZoneID uint64 `json:"zoneId"`
 }
 
 // List of BasicServices

pkg/cloudapi/compute/abort_shared_snapshot_merge.go

@@ -1,42 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// AbortSharedSnapshotMergeRequest struct to abort shared snapshots merge
-type AbortSharedSnapshotMergeRequest struct {
-	// ID of the compute
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-
-	// Label of the snapshot
-	// Required: true
-	Label string `url:"label" json:"label" validate:"required"`
-}
-
-// AbortSharedSnapshotMerge shared snapshots merge abort
-func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/abort_shared_snapshot_merge"
-
-	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
-}

pkg/cloudapi/compute/audits.go

@@ -12,47 +12,11 @@ import (
 type AuditsRequest struct {
 	// ID of the compute
 	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Find all audits after point in time
-	// Required: false
-	TimestampAT uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
-
-	// Find all audits before point in time
-	// Required: false
-	TimestampTO uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
-
-	// Find by user
-	// Required: false
-	User string `url:"user,omitempty" json:"user,omitempty"`
-
-	// Find by api endpoints
-	// Required: false
-	Call string `url:"call,omitempty" json:"call,omitempty"`
-
-	// Sort by one of supported fields, format ±<field>
-	// Required: false
-	SortBy string `url:"sort_by,omitempty" json:"sort_by,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"`
-
-	// Find by HTTP min status code
-	// Required: false
-	MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
-
-	// Find by HTTP max status code
-	// Required: false
-	MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
 }
 
 // Audits gets audit records for the specified compute object
-func (c Compute) Audits(ctx context.Context, req AuditsRequest) (*ListAudits, error) {
+func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListAudits, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
@@ -60,7 +24,7 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (*ListAudits, er
 
 	url := "/cloudapi/compute/audits"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
@@ -72,5 +36,5 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (*ListAudits, er
 		return nil, err
 	}
 
-	return &list, nil
+	return list, nil
 }

pkg/cloudapi/compute/change_ip.go

@@ -12,23 +12,23 @@ import (
 type ChangeIPRequest struct {
 	// ID of compute instance
 	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 
 	// Network type
 	// 'EXTNET' for connect to external network directly
 	// 'VINS' for connect to ViNS
 	// Required: true
-	NetType string `url:"net_type" json:"net_type" validate:"computeNetType"`
+	NetType string `url:"netType" json:"netType" validate:"computeNetType"`
 
 	// Network ID for connect to
 	// For EXTNET - external network ID
 	// For VINS - VINS ID
 	// Required: true
-	NetID uint64 `url:"net_id" json:"net_id" validate:"required"`
+	NetID uint64 `url:"netId" json:"netId" validate:"required"`
 
 	// IP address to which we will change the existing one, it must be from the same subnet
 	// Required: true
-	IPAddr string `url:"ip_addr" json:"ip_addr" validate:"required"`
+	IPAddr string `url:"ipAddr" json:"ipAddr" validate:"required"`
 }
 
 // ChangeIP change reserved IP for compute instance

pkg/cloudapi/compute/change_mac.go

@@ -1,46 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ChangeMACRequest struct to change MAC for network
-type ChangeMACRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-
-	// Current mac address
-	// Required: true
-	СurrentMAC string `url:"current_mac_address" json:"current_mac_address" validate:"required"`
-
-	// the MAC address to which we will change the existing one
-	// Required: true
-	NewMAC string `url:"new_mac_address" json:"new_mac_address" validate:"required"`
-}
-
-// ChangeMAC change MAC for compute instance
-func (c Compute) ChangeMAC(ctx context.Context, req ChangeMACRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/changeMac"
-
-	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
-}

pkg/cloudapi/compute/change_mtu.go

@@ -1,46 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ChangeMTURequest struct to change MTU for a compute
-type ChangeMTURequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-
-	// Interface name or MAC address
-	// Required: true
-	Interface string `url:"interface" json:"interface" validate:"required"`
-
-	// Maximum transmission unit
-	// Required: true
-	MTU uint64 `url:"mtu" json:"mtu" validate:"required" validate:"omitempty,mtu"`
-}
-
-// ChangeMTU change MTU for compute instance
-func (c Compute) ChangeMTU(ctx context.Context, req ChangeMTURequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/change_mtu"
-
-	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
-}

pkg/cloudapi/compute/change_secutity_group.go

@@ -1,50 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ChangeSecGroupsRequest struct to change security groups for compute
-type ChangeSecGroupsRequest struct {
-	// Identifier compute
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-
-	// Interface name or MAC address
-	// Required: true
-	Interface string `url:"interface" json:"interface" validate:"required"`
-
-	// List of security group IDs to assign to this interface
-	// Required: false
-	SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
-
-	// Flag indicating whether security groups are enabled for this interface
-	// Required: false
-	EnableSecGroups interface{} `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty" validate:"omitempty,isBool"`
-}
-
-// ChangeSecGroups changes security groups for compute
-func (c Compute) ChangeSecGroups(ctx context.Context, req ChangeSecGroupsRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/change_security_groups"
-
-	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
-}

pkg/cloudapi/compute/clone.go

@@ -3,8 +3,8 @@ package compute
 import (
 	"context"
 	"net/http"
+	"strconv"
 
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -18,10 +18,6 @@ type CloneRequest struct {
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
-	// ID of the Storage Policy
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// Timestamp of the parent's snapshot to create clone from
 	// Required: false
 	SnapshotTimestamp uint64 `url:"snapshotTimestamp,omitempty" json:"snapshotTimestamp,omitempty"`
@@ -34,29 +30,26 @@ type CloneRequest struct {
 	// Default: false
 	// Required: false
 	Force bool `url:"force" json:"force"`
-
-	// The name of the pool to migrate disks to
-	// Required: false
-	PoolName string `url:"pool_name" json:"pool_name"`
-
-	// The ID of the SEP to migrate disks to
-	// Required: false
-	SEPID uint64 `url:"sep_id" json:"sep_id"`
 }
 
 // Clone clones compute instance
-func (c Compute) Clone(ctx context.Context, req CloneRequest) (string, error) {
+func (c Compute) Clone(ctx context.Context, req CloneRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/clone"
 
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return "", err
+		return 0, err
 	}
 
-	return string(res), nil
+	result, err := strconv.ParseUint(string(res), 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return result, nil
 }

pkg/cloudapi/compute/clone_abort.go

@@ -1,39 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// CloneAbortRequest struct to abort a compute clone
-type CloneAbortRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-}
-
-// CloneAbort aborts a compute clone
-func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/clone_abort"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/clone_status.go

@@ -1,40 +0,0 @@
-package compute
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GetCloneStatusRequest struct to get information about compute clone status
-type GetCloneStatusRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-}
-
-// GetCloneStatus gets information about compute clone status as a RecordCloneStatus struct
-func (c Compute) GetCloneStatus(ctx context.Context, req GetCloneStatusRequest) ([]RecordCloneStatus, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/clone_status"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	cloneStatus := make([]RecordCloneStatus, 0)
-
-	err = json.Unmarshal(res, &cloneStatus)
-	if err != nil {
-		return nil, err
-	}
-
-	return cloneStatus, nil
-}

pkg/cloudapi/compute/create_template.go

@@ -3,6 +3,7 @@ package compute
 import (
 	"context"
 	"net/http"
+	"strconv"
 	"strings"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -26,15 +27,47 @@ type wrapperCreateTemplateRequest struct {
 }
 
 // CreateTemplate create template from compute instance
-func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest) (string, error) {
+func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest) (uint64, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	reqWrapped := wrapperCreateTemplateRequest{
+		CreateTemplateRequest: req,
+		AsyncMode:                 false,
+	}
+
+	url := "/cloudapi/compute/createTemplate"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	if err != nil {
+		return 0, err
+	}
+
+	result, err := strconv.ParseUint(string(res), 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return result, nil
+}
+
+// CreateTemplateAsync create template from compute instance
+func (c Compute) CreateTemplateAsync(ctx context.Context, req CreateTemplateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
+	reqWrapped := wrapperCreateTemplateRequest{
+		CreateTemplateRequest: req,
+		AsyncMode:                 true,
+	}
+
 	url := "/cloudapi/compute/createTemplate"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return "", err
 	}

pkg/cloudapi/compute/create_template_from_blank.go

@@ -27,10 +27,6 @@ type CreateTemplateFromBlankRequest struct {
 	// Required: true
 	ImageType string `url:"imagetype" json:"imagetype" validate:"imageType"`
 
-	// Storage policy id of disk. The rules of the specified storage policy will be used.
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// Username for the image
 	// Required: false
 	Username string `url:"username,omitempty" json:"username,omitempty"`
@@ -43,6 +39,10 @@ type CreateTemplateFromBlankRequest struct {
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
+	// SEP ID
+	// Required: false
+	SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
+
 	// Pool for image create
 	// Required: false
 	PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`

pkg/cloudapi/compute/disk_add.go

@@ -22,10 +22,6 @@ type DiskAddRequest struct {
 	// Required: true
 	Size uint64 `url:"size" json:"size" validate:"required"`
 
-	// Storage policy id of disk. The rules of the specified storage policy will be used.
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// Type of the disk
 	// Should be one of:
 	//	- D
@@ -50,14 +46,6 @@ type DiskAddRequest struct {
 	// Specify image id for create disk from template
 	// Required: false
 	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
-
-	// Desired PCI slot (hex string, e.g. "0x1A")
-	// Required: false
-	PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
-
-	// Desired bus number (hex string, e.g. "0x03")
-	// Required: false
-	BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
 }
 
 // DiskAdd creates new disk and attach to compute

pkg/cloudapi/compute/disk_attach.go

@@ -21,14 +21,6 @@ type DiskAttachRequest struct {
 	// Type of the disk B;D
 	// Required: false
 	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" validate:"omitempty,computeDiskType"`
-
-	// Desired PCI slot (hex string, e.g. "0x1A")
-	// Required: false
-	PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
-
-	// Desired bus number (hex string, e.g. "0x03")
-	// Required: false
-	BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
 }
 
 // DiskAttach attach disk to compute

pkg/cloudapi/compute/filter_test.go

@@ -49,12 +49,14 @@ var computes = ListComputes{
 			Disks: []InfoDisk{
 				{
 					ID:      65191,
+					PCISlot: 6,
 				},
 			},
 			Driver:           "KVM_X86",
 			GID:              212,
 			GUID:             48500,
 			ID:               48500,
+			ImageID:          9884,
 			Interfaces:       []ItemVNFInterface{},
 			LockStatus:       "UNLOCKED",
 			ManagerID:        0,
@@ -62,7 +64,7 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363500,
 			Name:             "test",
-			PinnedToNode:     true,
+			Pinned:           false,
 			RAM:              4096,
 			ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
 			Registered:       true,
@@ -81,7 +83,7 @@ var computes = ListComputes{
 			UserManaged:      true,
 			VGPUs:            []uint64{},
 			VINSConnected:    0,
-			ZoneID:           1,
+			VirtualImageID:   0,
 		},
 		{
 			ACL:               ListACL{},
@@ -110,12 +112,14 @@ var computes = ListComputes{
 			Disks: []InfoDisk{
 				{
 					ID:      65248,
+					PCISlot: 6,
 				},
 			},
 			Driver:           "KVM_X86",
 			GID:              212,
 			GUID:             48556,
 			ID:               48556,
+			ImageID:          9884,
 			Interfaces:       []ItemVNFInterface{},
 			LockStatus:       "UNLOCKED",
 			ManagerID:        0,
@@ -123,10 +127,10 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363853,
 			Name:             "compute_2",
+			Pinned:           false,
 			RAM:              4096,
 			ReferenceID:      "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
 			Registered:       true,
-			PinnedToNode:     true,
 			ResName:          "compute-48556",
 			RGID:             79727,
 			RGName:           "sdk_negative_fields_test",
@@ -142,7 +146,7 @@ var computes = ListComputes{
 			UserManaged:      true,
 			VGPUs:            []uint64{},
 			VINSConnected:    0,
-			ZoneID:           5,
+			VirtualImageID:   0,
 		},
 	},
 	EntryCount: 2,

pkg/cloudapi/compute/get_log.go

@@ -27,7 +27,7 @@ func (c Compute) GetLog(ctx context.Context, req GetLogRequest) (string, error)
 
 	url := "/cloudapi/compute/getLog"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return "", err
 	}
@@ -42,7 +42,7 @@ func (c Compute) GetLogGet(ctx context.Context, req GetLogRequest) (string, erro
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudapi/compute/getLog"
+	url := "/cloudapi//compute/getLog"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
 	if err != nil {

pkg/cloudapi/compute/guest_agent_disable.go

@@ -1,38 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GuestAgentDisableRequest struct to disable guest agent
-type GuestAgentDisableRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-}
-
-// Disable guest agent at a specific compute
-func (c Compute) GuestAgentDisable(ctx context.Context, req GuestAgentDisableRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/guest_agent_disable"
-
-	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
-}

pkg/cloudapi/compute/guest_agent_execute.go

@@ -1,48 +0,0 @@
-package compute
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GuestAgentExecuteRequest struct to execute command from user to agent
-type GuestAgentExecuteRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-
-	// Custom command from user to agent
-	// Required: true
-	Command string `url:"command" json:"command" validate:"required"`
-
-	// Arguments to command
-	// Required: true
-	Arguments string `url:"arguments" json:"arguments" validate:"required"`
-}
-
-// Execute guest agent command
-func (c Compute) GuestAgentExecuteRequest(ctx context.Context, req GuestAgentExecuteRequest) (map[string]interface{}, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/guest_agent_execute"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	var result map[string]interface{}
-
-	err = json.Unmarshal(res, &result)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/guest_agent_feature_get.go

@@ -1,40 +0,0 @@
-package compute
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GuestAgentFeatureGetRequest struct to feature get guest agent
-type GuestAgentFeatureGetRequest struct {
-	// ID of compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-}
-
-// List of features
-func (c Compute) GuestAgentFeatureGet(ctx context.Context, req GuestAgentFeatureGetRequest) ([]string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/guest_agent_feature_get"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	features := make([]string, 0)
-
-	err = json.Unmarshal(res, &features)
-	if err != nil {
-		return nil, err
-	}
-
-	return features, nil
-}

pkg/cloudapi/compute/list.go

@@ -58,11 +58,6 @@ type ListRequest struct {
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 
-	// Sort by zone id
-	// Default value: 0
-	// Required: false
-	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudapi/compute/models.go

@@ -5,13 +5,13 @@ import "strconv"
 // Access Control List
 type RecordACL struct {
 	// Account ACL list
-	AccountACL ListACL `json:"accountACL"`
+	AccountACL ListACL `json:"accountAcl"`
 
 	// Compute ACL list
-	ComputeACL ListACL `json:"computeACL"`
+	ComputeACL ListACL `json:"computeAcl"`
 
 	// Resource group ACL list
-	RGACL ListACL `json:"rgACL"`
+	RGACL ListACL `json:"rgAcl"`
 }
 
 type ListUsers struct {
@@ -161,9 +161,6 @@ type RecordAffinityRelations struct {
 
 // Main information about attached network
 type RecordNetAttach struct {
-	// Bus number
-	BusNumber uint64 `json:"bus_number"`
-
 	// Connection ID
 	ConnID uint64 `json:"connId"`
 
@@ -176,9 +173,6 @@ type RecordNetAttach struct {
 	// Enabled
 	Enabled bool `json:"enabled"`
 
-	// Enable security groups
-	EnableSecGroups bool `json:"enable_secgroups"`
-
 	// FLIPGroup ID
 	FLIPGroupID uint64 `json:"flipgroupId"`
 
@@ -188,18 +182,12 @@ type RecordNetAttach struct {
 	// IP address
 	IPAddress string `json:"ipAddress"`
 
-	// Libvirt Settings
-	LibvirtSettings LibvirtSettings `json:"libvirtSettings"`
-
 	// Listen SSH
 	ListenSSH bool `json:"listenSsh"`
 
 	// MAC
 	MAC string `json:"mac"`
 
-	// Maximum transmission unit
-	MTU uint64 `json:"mtu"`
-
 	// Name
 	Name string `json:"name"`
 
@@ -212,18 +200,9 @@ type RecordNetAttach struct {
 	// Network type
 	NetType string `json:"netType"`
 
-	// Node id
-	NodeID int `json:"nodeId"`
-
 	// PCI slot
 	PCISlot int64 `json:"pciSlot"`
 
-	// SDN interface ID
-	SDNInterfaceID string `json:"sdn_interface_id"`
-
-	// List of security groups
-	SecurityGroups []uint64 `json:"security_groups"`
-
 	// QOS
 	QOS QOS `json:"qos"`
 
@@ -233,11 +212,11 @@ type RecordNetAttach struct {
 	// Type
 	Type string `json:"type"`
 
-	// List of trunk tags
-	TrunkTags []uint64 `json:"trunk_tags"`
-
 	// List VNF IDs
 	VNFs []uint64 `json:"vnfs"`
+
+	// Maximum transmission unit
+	MTU uint64 `json:"mtu"`
 }
 
 // Detailed information about audit
@@ -259,13 +238,7 @@ type ItemAudit struct {
 }
 
 // List Detailed audits
-type ListAudits struct {
+type ListAudits []ItemAudit
-	// Data
-	Data []ItemAudit `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
 
 // Short information about audit
 type ItemShortAudit struct {
@@ -326,21 +299,12 @@ type RecordCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
-	// Auto start when node restarted
-	AutoStart bool `json:"autoStart"`
-
 	// Architecture
 	Architecture string `json:"arch"`
 
-	// Boot image ID
-	BootImageID uint64 `json:"boot_image_id"`
-
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
-	// Boot type
-	BootType string `json:"bootType"`
-
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
@@ -401,9 +365,6 @@ type RecordCompute struct {
 	// HPBacked
 	HPBacked bool `json:"hpBacked"`
 
-	// Hot resize
-	HotResize bool `json:"hotResize"`
-
 	// ID
 	ID uint64 `json:"id"`
 
@@ -416,15 +377,6 @@ type RecordCompute struct {
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
-	// Loader meta iso information
-	LoaderMetaIso LoaderMetaIso `json:"loaderMetaIso"`
-
-	// Live migration job ID
-	LiveMigrationJobID uint64 `json:"live_migration_job_id"`
-
-	// Loader type
-	LoaderType string `json:"loaderType"`
-
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -446,9 +398,6 @@ type RecordCompute struct {
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
-	// Network interface naming
-	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
-
 	// Numa Affinity
 	NumaAffinity string `json:"numaAffinity"`
 
@@ -470,23 +419,11 @@ type RecordCompute struct {
 	// Natable VINS network name
 	NatableVINSNetworkName string `json:"natableVinsNetworkName"`
 
-	// Name of OS
-	OSVersion string `json:"os_version"`
-
 	// List OS Users
 	OSUsers ListOSUser `json:"osUsers"`
 
-	// Pinned to node
+	// Pinned or not
-	PinnedToNode bool `json:"pinnedToNode"`
+	Pinned bool `json:"pinned"`
-
-	// PreferredCPU
-	PreferredCPU []int64 `json:"preferredCpu"`
-
-	// Qemu_quest
-	QemuQuest QemuQuest `json:"qemu_guest"`
-
-	// ReadOnly indicates read-only mode state
-	ReadOnly bool `json:"read_only"`
 
 	// Number of RAM
 	RAM uint64 `json:"ram"`
@@ -539,89 +476,14 @@ type RecordCompute struct {
 	// Userdata
 	Userdata interface{} `json:"userdata"`
 
-	// vGPUs list
+	// vGPU list
-	VGPUs []VGPUItem `json:"vgpus"`
+	VGPUs []ItemVGPU `json:"vgpus"`
 
-	// VNC password
+	// Virtual image ID
-	VNCPassword string `json:"vncPasswd"`
+	VirtualImageID uint64 `json:"virtualImageId"`
 
-	// Zone ID
+	// Virtual image name
-	// Required: false
+	VirtualImageName string `json:"virtualImageName"`
-	ZoneID uint64 `json:"zoneId"`
-}
-type LoaderMetaIso struct {
-	// Name
-	DeviceName string `json:"devicename"`
-
-	// Path
-	Path string `json:"path"`
-}
-
-type QemuQuest struct {
-	Enabled              bool     `json:"enabled"`
-	EnabledAgentFeatures []string `json:"enabled_agent_features"`
-	GUID                 string   `json:"guid"`
-	LastUpdate           uint64   `json:"last_update"`
-	User                 string   `json:"user"`
-}
-
-type VGPUItem struct {
-	// ID
-	ID uint64 `json:"id"`
-
-	// GID
-	GID uint64 `json:"gid"`
-
-	// Type
-	Type string `json:"type"`
-
-	// Mode
-	Mode string `json:"mode"`
-
-	// Status
-	Status string `json:"status"`
-
-	// ProfileID
-	ProfileID uint64 `json:"profileId"`
-
-	// RAM
-	RAM uint64 `json:"ram"`
-
-	// LastUpdateTime
-	LastUpdateTime uint64 `json:"lastUpdateTime"`
-
-	// CreatedTime
-	CreatedTime uint64 `json:"createdTime"`
-
-	// DeletedTime
-	DeletedTime uint64 `json:"deletedTime"`
-
-	// VMID
-	VMID uint64 `json:"vmid"`
-
-	// PGPuid
-	PGPuid uint64 `json:"pgpuid"`
-
-	// ReferenceID
-	ReferenceID string `json:"referenceId"`
-
-	// AccountID
-	AccountID uint64 `json:"accountId"`
-
-	// RgID
-	RgID uint64 `json:"rgId"`
-
-	// LastClaimedBy
-	LastClaimedBy uint64 `json:"lastClaimedBy"`
-
-	// PCISlot
-	PCISlot uint64 `json:"pciSlot"`
-
-	// BusNumber
-	BusNumber uint64 `json:"bus_number"`
-
-	// GUID
-	GUID uint64 `json:"guid"`
 }
 
 // Information about libvirt settings
@@ -701,9 +563,6 @@ type ItemVNFInterface struct {
 	// Enabled
 	Enabled bool `json:"enabled"`
 
-	// Enable security groups
-	EnableSecGroups bool `json:"enable_secgroups"`
-
 	// FLIPGroup ID
 	FLIPGroupID uint64 `json:"flipgroupId"`
 
@@ -746,18 +605,9 @@ type ItemVNFInterface struct {
 	// QOS
 	QOS QOS `json:"qos"`
 
-	// List of security groups
-	SecGroups []uint64 `json:"security_groups"`
-
-	// SDN interface ID
-	SDNInterfaceID string `json:"sdn_interface_id"`
-
 	// Target
 	Target string `json:"target"`
 
-	// Trunk tags
-	TrunkTags string `json:"trunk_tags"`
-
 	// Type
 	Type string `json:"type"`
 
@@ -795,18 +645,9 @@ type ItemComputeDisk struct {
 	// Bus number
 	BusNumber uint64 `json:"bus_number"`
 
-	// Created by
-	CreatedBy string `json:"createdBy"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Device name
-	DeviceName string `json:"devicename"`
-
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -849,6 +690,9 @@ type ItemComputeDisk struct {
 	// Name
 	Name string `json:"name"`
 
+	// Order
+	Order uint64 `json:"order"`
+
 	// Params
 	Params string `json:"params"`
 
@@ -859,13 +703,13 @@ type ItemComputeDisk struct {
 	Passwd string `json:"passwd"`
 
 	// PCI slot
-	PCISlot int64 `json:"pci_slot"`
+	PCISlot int64 `json:"pciSlot"`
 
 	// Pool
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -888,9 +732,6 @@ type ItemComputeDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -903,23 +744,14 @@ type ItemComputeDisk struct {
 	// Status
 	Status string `json:"status"`
 
-	// Storage policy id of compute.
-	StoragePolicyID uint64 `json:"storage_policy_id"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
-	// Need to clean before destroy
-	ToClean bool `json:"to_clean"`
-
 	// Type
 	Type string `json:"type"`
 
-	// Updated by
+	// Virtual machine ID
-	UpdatedBy string `json:"updatedBy"`
+	VMID uint64 `json:"vmid"`
-
-	// UpdatedTime
-	UpdatedTime uint64 `json:"updatedTime"`
 }
 
 type ItemReplication struct {
@@ -1034,21 +866,12 @@ type ItemCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
-	// Auto start when node restarted
-	AutoStart bool `json:"autoStart"`
-
 	// Architecture
 	Architecture string `json:"arch"`
 
-	// Boot image ID
-	BootImageID uint64 `json:"boot_image_id"`
-
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
-	// Boot type
-	BootType string `json:"bootType"`
-
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
@@ -1106,24 +929,18 @@ type ItemCompute struct {
 	// GUID
 	GUID uint64 `json:"guid"`
 
-	// Hot resize
-	HotResize bool `json:"hotResize"`
-
 	// HPBacked
 	HPBacked bool `json:"hpBacked"`
 
 	// ID
 	ID uint64 `json:"id"`
 
+	// Image ID
+	ImageID uint64 `json:"imageId"`
+
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
-	// Live migration job ID
-	LiveMigrationJobID uint64 `json:"live_migration_job_id"`
-
-	// Loader type
-	LoaderType string `json:"loaderType"`
-
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -1145,33 +962,18 @@ type ItemCompute struct {
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
-	// network interface naming
-	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
-
 	// Numa Affinity
 	NumaAffinity string `json:"numaAffinity"`
 
 	//NumaNodeId
 	NumaNodeId int64 `json:"numaNodeId"`
 
-	// Pinned to node
+	// Pinned or not
-	PinnedToNode bool `json:"pinnedToNode"`
+	Pinned bool `json:"pinned"`
-
-	// PreferredCPU
-	PreferredCPU []int64 `json:"preferredCpu"`
 
 	// Number of RAM
 	RAM uint64 `json:"ram"`
 
-	// Name of OS
-	OSVersion string `json:"os_version"`
-
-	// Qemu_quest
-	QemuQuest QemuQuest `json:"qemu_guest"`
-
-	// ReadOnly indicates read-only mode state
-	ReadOnly bool `json:"read_only"`
-
 	// Reference ID
 	ReferenceID string `json:"referenceId"`
 
@@ -1226,8 +1028,8 @@ type ItemCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
-	// Zone ID
+	// Virtual image ID
-	ZoneID uint64 `json:"zoneId"`
+	VirtualImageID uint64 `json:"virtualImageId"`
 }
 
 // ListInfoDisks
@@ -1237,6 +1039,12 @@ type ListInfoDisks []InfoDisk
 type InfoDisk struct {
 	// ID
 	ID uint64 `json:"id"`
+
+	// PCISlot
+	PCISlot int64 `json:"pciSlot"`
+
+	// Bus number
+	BusNumber uint64 `json:"bus_number"`
 }
 
 // List information about computes
@@ -1337,8 +1145,8 @@ type ItemPCIDevice struct {
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
-	// Node ID
+	// Stack ID
-	NodeID uint64 `json:"nodeId"`
+	StackID uint64 `json:"stackId"`
 
 	// Status
 	Status string `json:"status"`
@@ -1355,31 +1163,3 @@ type ListPCIDevices struct {
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
-
-type RecordCloneStatus struct {
-	// Disk ID
-	DiskID int `json:"disk_id"`
-
-	// Clone Status
-	Status CloneStatus `json:"status"`
-}
-
-type CloneStatus struct {
-	// Type
-	Type int `json:"type"`
-
-	// Copy speed
-	Bandwidth int `json:"bandwidth"`
-
-	// Current progress
-	Cur int `json:"cur"`
-
-	// Total size
-	End int `json:"end"`
-
-	// Operation status
-	Ready bool `json:"ready"`
-
-	// Progress percent
-	ProgressPercent int `json:"progress_percent"`
-}

pkg/cloudapi/compute/net_attach.go

@@ -19,9 +19,6 @@ type NetAttachRequest struct {
 	// 'VINS' for connect to ViNS
 	// 'VFNIC' for connect to vfpool
 	// 'DPDK' for connect to DPDK
-	// `EMPTY` for connect empty network
-	// `SDT` for connect to SDN
-	// `TRUNK` for connect to TRUNK
 	// Required: true
 	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
 
@@ -35,31 +32,9 @@ type NetAttachRequest struct {
 	// Required: false
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
 
-	// MAC address
+	// Used only for DPDK type, must be 1-9216
-	// Required: false
-	MACAddr string `url:"mac_addr,omitempty" json:"mac_addr,omitempty"`
-
-	// Used only for EXTNET and DPDK
-	// For DPDK must be 1-9216
-	// For EXTNET must be 1500-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
-
-	// Unique identifier of logical port on SDN side
-	// Required: false
-	SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"`
-
-	// List of security group IDs to assign to this interface
-	// Required: false
-	SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
-
-	// Flag indicating whether security groups are enabled for this interface
-	// Required: false
-	EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
-
-	// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
-	// Required: false
-	Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
 }
 
 // NetAttach attaches network to compute and gets info about network

pkg/cloudapi/compute/pin_to_node.go

@@ -1,43 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// PinToNodeRequest struct to pin compute to node
-type PinToNodeRequest struct {
-	// ID of the compute instance
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Auto start when node restarted
-	// Required: false
-	// Default: false
-	AutoStart bool `url:"autoStart" json:"autoStart"`
-}
-
-// PinToNode pin compute to current node
-func (c Compute) PinToNode(ctx context.Context, req PinToNodeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/pin_to_node"
-
-	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
-}

pkg/cloudapi/compute/pin_to_stack.go

@@ -0,0 +1,38 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// PinToStackRequest struct to pin compute to stack
+type PinToStackRequest struct {
+	// ID of the compute instance
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+}
+
+// PinToStack pin compute to current stack
+func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (uint64, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/pinToStack"
+
+	res, err := c.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
+}

pkg/cloudapi/compute/redeploy.go

@@ -14,18 +14,10 @@ type RedeployRequest struct {
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 
-	// Storage policy id of compute. The rules of the specified storage policy will be used.
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
-
 	// ID of the new OS image, if image change is required
 	// Required: false
 	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
 
-	// The OS version that will be installed on the virtual machine
-	// Required: false
-	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
-
 	// new size for the boot disk in GB, if boot disk size change is required
 	// Required: false
 	DiskSize uint64 `url:"diskSize,omitempty" json:"diskSize,omitempty"`

pkg/cloudapi/compute/resize.go

@@ -27,10 +27,6 @@ type ResizeRequest struct {
 	// Force compute resize
 	// Required: false
 	Force bool `url:"force,omitempty" json:"force,omitempty"`
-
-	// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
-	// Required: false
-	PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/compute/shared_snapshot_merge_status.go

@@ -1,33 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// SharedSnapshotMergeStatusRequest struct to get shared snapshot merge status
-type SharedSnapshotMergeStatusRequest struct {
-	// ID of compute instance to get log for
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-}
-
-// SharedSnapshotMergeStatus shared snapshots merge status
-// returns a string representing either the current status or the progress percentage
-func (c Compute) SharedSnapshotMergeStatus(ctx context.Context, req SharedSnapshotMergeStatusRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/shared_snapshot_merge_status"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/unpin_from_stack.go

@@ -8,21 +8,21 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// UnpinFromNodeRequest struct to unpin from node
+// UnpinFromStackRequest struct for unpin from stack
-type UnpinFromNodeRequest struct {
+type UnpinFromStackRequest struct {
 	// ID of the compute instance
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-// UnpinFromNode unpins compute from current node
+// UnpinFromStack unpins compute from current stack
-func (c Compute) UnpinFromNode(ctx context.Context, req UnpinFromNodeRequest) (bool, error) {
+func (c Compute) UnpinFromStack(ctx context.Context, req UnpinFromStackRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudbroker/compute/unpin_from_node"
+	url := "/cloudapi/compute/unpinFromStack"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/compute/update.go

@@ -30,45 +30,19 @@ type UpdateRequest struct {
 	// Default: none
 	NumaAffinity string `url:"numaAffinity,omitempty" json:"numaAffinity,omitempty" validate:"omitempty,numaAffinity"`
 
-	// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node, true or false
+	// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node
 	// Required: false
-	CPUPin interface{} `url:"cpupin,omitempty" json:"cpupin,omitempty" validate:"omitempty,isBool"`
+	// Default: false
+	CPUPin bool `url:"cpupin" json:"cpupin"`
 
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
 
-	// Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node, true or false
+	// Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node
 	// Required: false
-	HPBacked interface{} `url:"hpBacked,omitempty" json:"hpBacked,omitempty" validate:"omitempty,isBool"`
+	// Default: false
-
+	HPBacked bool `url:"hpBacked" json:"hpBacked"`
-	// Auto start when node restarted, true or false
-	// Required: false
-	AutoStart interface{} `url:"autoStart,omitempty" json:"autoStart,omitempty" validate:"omitempty,isBool"`
-
-	// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
-	// Required: false
-	PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`
-
-	// VM type linux, windows or unknown
-	// Required: false
-	LoaderType string `url:"loaderType,omitempty" json:"loaderType,omitempty" validate:"omitempty,loaderType"`
-
-	// Boot type of image bios or uefi
-	// Required: false
-	BootType string `url:"bootType,omitempty" json:"bootType,omitempty" validate:"omitempty,imageBootType"`
-
-	// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming.
-	// Required: false
-	NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"`
-
-	// Does this machine supports hot resize, true or false
-	// Required: false
-	HotResize interface{} `url:"hotResize,omitempty" json:"hotResize,omitempty" validate:"omitempty,isBool"`
-
-	// The OS version that will be installed on the virtual machine
-	// Required: false
-	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
 }
 
 // Update updates some properties of the compute

pkg/cloudapi/disks/change_disk_storage_policy.go

@@ -1,42 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ChangeDiskStoragePolicyRequest struct to change storage policy for disk
-type ChangeDiskStoragePolicyRequest struct {
-	// ID of the disk
-	// Required: true
-	DiskID uint64 `url:"disk_id" json:"disk_id" validate:"required"`
-
-	// ID of the storage policy to which to connect for disk
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-}
-
-// ChangeDiskStoragePolicy changes storage policy for disk
-func (d Disks) ChangeDiskStoragePolicy(ctx context.Context, req ChangeDiskStoragePolicyRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/change_disk_storage_policy"
-
-	res, err := d.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
-}

pkg/cloudapi/disks/create.go

@@ -3,9 +3,8 @@ package disks
 import (
 	"context"
 	"net/http"
-	"strconv"
-
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+	"strconv"
 )
 
 // CreateRequest struct to create disk
@@ -14,14 +13,14 @@ type CreateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
+	// ID of the grid (platform)
+	// Required: true
+	GID uint64 `url:"gid" json:"gid" validate:"required"`
+
 	// Name of disk
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
-	// ID of the storage policy under the disk will be created
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// Description of disk
 	// Required: false
 	Description string `url:"description,omitempty" json:"description,omitempty"`
@@ -30,6 +29,21 @@ type CreateRequest struct {
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 
+	// Type of disk
+	//	- B=Boot
+	//	- D=Data
+	//	- T=Temp
+	// Required: true
+	Type string `url:"type" json:"type" validate:"diskType"`
+
+	// Size in GB default is 0
+	// Required: false
+	SSDSize uint64 `url:"ssdSize,omitempty" json:"ssdSize,omitempty"`
+
+	// Max IOPS disk can perform defaults to 2000
+	// Required: false
+	IOPS uint64 `url:"iops,omitempty" json:"iops,omitempty"`
+
 	// Storage endpoint provider ID to create disk
 	// Required: false
 	SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`

pkg/cloudapi/disks/filter_test.go

@@ -35,9 +35,9 @@ var disks = ListDisks{
 			ParentID: 0,
 			PCISlot:  6,
 			Pool:     "vmstor",
-			//PresentTo: []uint64{
+			PresentTo: []uint64{
-			//	27,
+				27,
-			//},
+			},
 			PurgeTime:  0,
 			ResID:      "sample",
 			ResName:    "sample",
@@ -78,10 +78,10 @@ var disks = ListDisks{
 			ParentID: 0,
 			PCISlot:  6,
 			Pool:     "vmstor",
-			//PresentTo: []uint64{
+			PresentTo: []uint64{
-			//	27,
+				27,
-			//	27,
+				27,
-			//},
+			},
 			PurgeTime:  0,
 			ResID:      "sample",
 			ResName:    "sample",
@@ -211,9 +211,9 @@ var searchDisks = ListSearchDisks{
 		ParentID: 0,
 		PCISlot:  6,
 		Pool:     "vmstor",
-		//PresentTo: []uint64{
+		PresentTo: []uint64{
-		//	27,
+			27,
-		//},
+		},
 		PurgeTime:  0,
 		ResID:      "sample",
 		ResName:    "sample",
@@ -254,10 +254,10 @@ var searchDisks = ListSearchDisks{
 		ParentID: 0,
 		PCISlot:  6,
 		Pool:     "vmstor",
-		//PresentTo: []uint64{
+		PresentTo: []uint64{
-		//	27,
+			27,
-		//	27,
+			27,
-		//},
+		},
 		PurgeTime:  0,
 		ResID:      "sample",
 		ResName:    "sample",
@@ -393,7 +393,7 @@ var unattachedDisks = ListDisksUnattached{
 			Password:            "",
 			PCISlot:             -1,
 			Pool:                "data05",
-			PresentTo:           map[string]uint64{},
+			PresentTo:           []uint64{},
 			PurgeAttempts:       0,
 			PurgeTime:           0,
 			RealityDeviceNumber: 0,
@@ -445,10 +445,10 @@ var unattachedDisks = ListDisksUnattached{
 			Password:   "",
 			PCISlot:    -1,
 			Pool:       "data05",
-			//PresentTo: []uint64{
+			PresentTo: []uint64{
-			//	27,
+				27,
-			//	27,
+				27,
-			//},
+			},
 			PurgeAttempts:       0,
 			PurgeTime:           0,
 			RealityDeviceNumber: 0,

pkg/cloudapi/disks/from_platform_disk.go

@@ -27,6 +27,12 @@ type FromPlatformDiskRequest struct {
 	// Required: true
 	ImageType string `url:"imagetype" json:"imagetype" validate:"imageType"`
 
+	// Binary architecture of this image
+	// Should be:
+	//	- X86_64
+	// Required: true
+	Architecture string `url:"architecture" json:"architecture" validate:"imageArchitecture"`
+
 	// Username for the image
 	// Required: false
 	Username string `url:"username,omitempty" json:"username,omitempty"`
@@ -39,10 +45,19 @@ type FromPlatformDiskRequest struct {
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
+	// SEP ID
+	// Required: false
+	SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
+
 	// Pool for image create
 	// Required: false
 	PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`
 
+	// List of types of compute suitable for image
+	// Example: [ "KVM_X86" ]
+	// Required: true
+	Drivers []string `url:"drivers" json:"drivers" validate:"required"`
+
 	// Does this machine supports hot resize
 	// Required: false
 	HotResize bool `url:"hotresize" json:"hotresize"`

pkg/cloudapi/disks/list.go

@@ -46,10 +46,6 @@ type ListRequest struct {
 	// Required: false
 	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
 
-	// Find by storage policy id
-	// Required: false
-	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
-
 	// Find by pool name
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`

pkg/cloudapi/disks/list_unattached.go

@@ -38,10 +38,6 @@ type ListUnattachedRequest struct {
 	// Required: false
 	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
 
-	// Find by storage policy id
-	// Required: false
-	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
-
 	// Find by pool name
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`

pkg/cloudapi/disks/models.go

@@ -14,15 +14,9 @@ type ItemDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
-	//Created by
-	CreatedBy string `json:"createdBy"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -56,9 +50,6 @@ type ItemDisk struct {
 	// Machine name
 	MachineName string `json:"machineName"`
 
-	// Milestones
-	Milestones uint64 `json:"milestones"`
-
 	// Name
 	Name string `json:"name"`
 
@@ -78,7 +69,7 @@ type ItemDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -104,9 +95,6 @@ type ItemDisk struct {
 	// SepID
 	SepID uint64 `json:"sepId"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -119,26 +107,14 @@ type ItemDisk struct {
 	// Status
 	Status string `json:"status"`
 
-	// Storage policy ID
-	StoragePolicyID uint64 `json:"storage_policy_id"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
-	// Need to clean before destroy
-	ToClean bool `json:"to_clean"`
-
 	// Type
 	Type string `json:"type"`
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
-
-	// Update time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Updated by
-	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemDiskUnattached struct {
@@ -224,7 +200,7 @@ type ItemDiskUnattached struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
@@ -378,15 +354,9 @@ type RecordDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
-	// Created by
-	CreatedBy string `json:"createdBy"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -414,15 +384,6 @@ type RecordDisk struct {
 	// IOTune
 	IOTune IOTune `json:"iotune"`
 
-	// Machine ID
-	MachineID uint64 `json:"machineId"`
-
-	// Machine name
-	MachineName string `json:"machineName"`
-
-	// Milestones
-	Milestones uint64 `json:"milestones"`
-
 	// Name
 	Name string `json:"name"`
 
@@ -442,7 +403,7 @@ type RecordDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -468,9 +429,6 @@ type RecordDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -483,26 +441,14 @@ type RecordDisk struct {
 	// Status
 	Status string `json:"status"`
 
-	// Storage policy ID
-	StoragePolicyID uint64 `json:"storage_policy_id"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
-	// Need to clean before destroy
-	ToClean bool `json:"to_clean"`
-
 	// Type
 	Type string `json:"type"`
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
-
-	// Update time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Updated by
-	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemReplication struct {

pkg/cloudapi/disks/replicate.go

@@ -25,13 +25,9 @@ type ReplicateRequest struct {
 	// Pool name to create slave disk in
 	// Required: true
 	PoolName string `url:"poolName" json:"poolName" validate:"required"`
-
-	// ID of the storage policy under the disk will be created
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
 }
 
-// Replicate create an empty disk in chosen SEP and pool combination.
+// Create an empty disk in chosen SEP and pool combination.
 // Starts replication between chosen disk and newly created disk
 // Note: only TATLIN type SEP are supported for replications between
 func (d Disks) Replicate(ctx context.Context, req ReplicateRequest) (uint64, error) {

pkg/cloudapi/disks/resize.go

@@ -19,6 +19,31 @@ type ResizeRequest struct {
 	Size uint64 `url:"size" json:"size" validate:"required"`
 }
 
+// Resize resizes disk
+// Returns 200 if disk is resized online, else will return 202,
+// in that case please stop and start your machine after changing the disk size, for your changes to be reflected.
+// This method will not be used for disks, assigned to computes. Only unassigned disks and disks, assigned with "old" virtual machines.
+func (d Disks) Resize(ctx context.Context, req ResizeRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/disks/resize"
+
+	res, err := d.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
+}
+
 // Resize2 resize disk
 // Returns 200 if disk is resized online, else will return 202,
 // in that case please stop and start your machine after changing the disk size, for your changes to be reflected.

pkg/cloudapi/dpdknet/models.go

@@ -14,9 +14,6 @@ type RecordDPDKNet struct {
 	// Description
 	Description string `json:"description"`
 
-	// Enable Security Groups
-	EnableSecGroups bool `json:"enable_secgroups"`
-
 	// Grid ID
 	GID uint64 `json:"gid"`
 
@@ -66,9 +63,6 @@ type ItemDPDKNet struct {
 	// Description
 	Description string `json:"description"`
 
-	// Enable Security Groups
-	EnableSecGroups bool `json:"enable_secgroups"`
-
 	// Grid ID
 	GID uint64 `json:"gid"`
 

pkg/cloudapi/extnet/get_reserved_ip.go

@@ -1,50 +0,0 @@
-package extnet
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GetRequest struct to get information about reserved address or address poll
-type GetReservedIP struct {
-	// AccountID of the account whose reservation information we want to receive
-	// Required: true
-	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
-
-	// Field for specifying the ID of extnet whose reservation information we want to receive
-	// Required: false
-	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`
-}
-
-// GetReservedIP gets information about reserved address or address poll as a slice of RecordReservedIP struct
-func (e ExtNet) GetReservedIP(ctx context.Context, req GetReservedIP) ([]RecordReservedIP, error) {
-	res, err := e.GetReservedIPRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	reservedIP := make([]RecordReservedIP, 0)
-
-	err = json.Unmarshal(res, &reservedIP)
-	if err != nil {
-		return nil, err
-	}
-
-	return reservedIP, nil
-}
-
-// GetRaw gets detailed information about external network as an array of bytes
-func (e ExtNet) GetReservedIPRaw(ctx context.Context, req GetReservedIP) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/extnet/getReservedIp"
-
-	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/extnet/list.go

@@ -42,11 +42,6 @@ type ListRequest struct {
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 
-	// Sort by zone id
-	// Default value: 0
-	// Required: false
-	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -54,10 +49,6 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
-
-	//openVswitch bridge name
-	//Required: false
-	OVSBridge string `url:"ovsBridge,omitempty" json:"ovsBridge,omitempty"`
 }
 
 // List gets list of all available external networks as a ListExtNets struct

pkg/cloudapi/extnet/models.go

@@ -87,9 +87,6 @@ type QOS struct {
 
 // Main information about reservations
 type ItemReservation struct {
-	// Account ID
-	AccountID uint64 `json:"account_id"`
-
 	// ClientType
 	ClientType string `json:"clientType"`
 
@@ -172,9 +169,6 @@ type RecordExtNet struct {
 	// Excluded
 	Excluded []Excluded `json:"excluded"`
 
-	// Enable Security Groups
-	EnableSecGroups bool `json:"enable_secgroups"`
-
 	// Free IPs
 	FreeIPs int64 `json:"free_ips"`
 
@@ -196,20 +190,14 @@ type RecordExtNet struct {
 	// Milestones
 	Milestones uint64 `json:"milestones"`
 
-	// MTU
-	MTU uint64 `json:"mtu"`
-
 	// Name
 	Name string `json:"name"`
 
 	// Network
 	Network string `json:"network"`
 
-	// Network IDs
+	// Network ID
-	NetworkIDs NetworkIDs `json:"networkIds"`
+	NetworkID uint64 `json:"networkId"`
-
-	// NTP
-	NTP []string `json:"ntp"`
 
 	// OVS Bridge
 	OVSBridge string `json:"ovsBridge"`
@@ -223,18 +211,9 @@ type RecordExtNet struct {
 	// PriVNFDevID
 	PriVNFDevID uint64 `json:"priVnfDevId"`
 
-	// Redundant
-	Redundant bool `json:"redundant"`
-
-	// SecVnfDevId
-	SecVNFDevID uint64 `json:"secVnfDevId"`
-
 	// List reservations
 	Reservations ListReservations `json:"reservations"`
 
-	// List pre-reservations
-	PreReservations ListReservations `json:"pre-reservations"`
-
 	// Shared with
 	SharedWith []uint64 `json:"sharedWith"`
 
@@ -246,32 +225,4 @@ type RecordExtNet struct {
 
 	// VNFs
 	VNFs VNFs `json:"vnfs"`
-
-	// Zone ID
-	ZoneID uint64 `json:"zoneId"`
-}
-
-type NetworkIDs struct {
-	// Primary
-	Primary uint64 `json:"primary"`
-
-	// Secondary
-	Secondary uint64 `json:"secondary"`
-}
-
-// Detailed information about reserved address or address pool
-type RecordReservedIP struct {
-	ExtnetID     int            `json:"extnet_id"`
-	Reservations []Reservations `json:"reservations"`
-}
-
-type Reservations struct {
-	AccountID  int    `json:"account_id"`
-	ClientType string `json:"clientType"`
-	DomainName string `json:"domainname"`
-	Hostname   string `json:"hostname"`
-	IP         string `json:"ip"`
-	Mac        string `json:"mac"`
-	Type       string `json:"type"`
-	VMID       int    `json:"vmId"`
 }

pkg/cloudapi/flipgroup/create.go

@@ -32,9 +32,8 @@ type CreateRequest struct {
 	// Type of client
 	//	- 'compute'
 	//	- 'vins' (will be later)
-	// Required: false
+	// Required: true
-	// Default: "compute"
+	ClientType string `url:"clientType" json:"clientType" validate:"flipgroupClientType"`
-	ClientType string `url:"clientType,omitempty" json:"clientType,omitempty"`
 
 	// IP address to associate with this group. If empty, the platform will autoselect IP address
 	// Required: false

pkg/cloudapi/image/change_storage_policy.go

@@ -1,41 +0,0 @@
-package image
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ChangeStoragePolicyRequest struct {
-	// ID of the image to change the storage policy
-	// Required: true
-	ImageID uint64 `url:"image_id" json:"image_id" validate:"required"`
-
-	// ID of the storage policy to move the image to
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-}
-
-// ChangeStoragePolicy changes the storage policy of the image chosen
-func (i Image) ChangeStoragePolicy(ctx context.Context, req ChangeStoragePolicyRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/image/change_storage_policy"
-
-	res, err := i.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
-}

pkg/cloudapi/image/create.go

@@ -2,7 +2,6 @@ package image
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -35,10 +34,6 @@ type CreateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
-	// ID of the chosen storage policy
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming
 	// Should be:
 	//  - eth
@@ -73,11 +68,17 @@ type CreateRequest struct {
 	// Pool for image create
 	// Required: false
 	Pool string `url:"poolName,omitempty" json:"poolName,omitempty"`
-}
 
-type asyncWrapperCreateRequest struct {
+	// Binary architecture of this image
-	CreateRequest
+	// Should be:
-	AsyncMode bool `url:"asyncMode"`
+	//	- X86_64
+	// Required: false
+	Architecture string `url:"architecture,omitempty" json:"architecture,omitempty" validate:"omitempty,imageArchitecture"`
+
+	// List of types of compute suitable for image
+	// Example: [ "KVM_X86" ]
+	// Required: true
+	Drivers []string `url:"drivers" json:"drivers" validate:"min=1,max=2,imageDrivers"`
 }
 
 // Create creates image from a media identified by URL
@@ -101,29 +102,3 @@ func (i Image) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 
 	return result, nil
 }
-
-// AsyncCreate creates image from a media identified by URL in async mode
-func (i Image) AsyncCreate(ctx context.Context, req CreateRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/image/create"
-
-	asyncReq := asyncWrapperCreateRequest{CreateRequest: req, AsyncMode: true}
-
-	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, asyncReq)
-	if err != nil {
-		return " ", err
-	}
-
-	var taskID string
-
-	err = json.Unmarshal(res, &taskID)
-	if err != nil {
-		return "", err
-	}
-
-	return taskID, nil
-}

pkg/cloudapi/image/create_virtual.go

@@ -17,11 +17,6 @@ type CreateVirtualRequest struct {
 	// ID of real image to link this virtual image to upon creation
 	// Required: true
 	TargetID uint64 `url:"targetId" json:"targetId" validate:"required"`
-
-	// AccountID to make the virtual image exclusive
-	// Required: false
-	// Default: 0
-	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 }
 
 // CreateVirtual creates virtual image

pkg/cloudapi/image/list.go

@@ -26,6 +26,10 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Find by architecture
+	// Required: false
+	Architecture string `url:"architecture,omitempty" json:"architecture,omitempty"`
+
 	// Find by type
 	// Required: false
 	TypeImage string `url:"typeImage,omitempty" json:"typeImage,omitempty"`
@@ -69,10 +73,6 @@ type ListRequest struct {
 	// Find by enabled True or False
 	// Required: false
 	Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
-
-	// Find by storage policy id
-	// Required: false
-	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
 }
 
 // List gets list of available images as a ListImages struct, optionally filtering by account ID

pkg/cloudapi/image/models.go

@@ -50,9 +50,6 @@ type ItemImage struct {
 	// Status
 	Status string `json:"status"`
 
-	// Storage policy ID
-	StoragePolicyID uint64 `json:"storage_policy_id"`
-
 	// Type
 	Type string `json:"type"`
 
@@ -165,7 +162,7 @@ type RecordImage struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// ProviderName
 	ProviderName string `json:"provider_name"`
@@ -188,21 +185,12 @@ type RecordImage struct {
 	// Size
 	Size uint64 `json:"size"`
 
-	// snapshot ID
-	SnapshotID string `json:"snapshotId"`
-
 	// Status
 	Status string `json:"status"`
 
-	// Storage policy ID
-	StoragePolicyID uint64 `json:"storage_policy_id"`
-
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
-	// Need to clean before destroy
-	ToClean bool `json:"to_clean"`
-
 	// Type
 	Type string `json:"type"`
 

pkg/cloudapi/k8ci/list.go

@@ -22,6 +22,14 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Find by worker driver
+	// Required: false
+	WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
+
+	// Find by master driver
+	// Required: false
+	MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
+
 	// Find by network plugin
 	// Required: false
 	NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`

pkg/cloudapi/k8ci/list_deleted.go

@@ -18,6 +18,14 @@ type ListDeletedRequest struct {
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
 
+	// Find by worker driver
+	// Required: false
+	WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
+
+	// Find by master driver
+	// Required: false
+	MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
+
 	// Find by network plugin
 	// Required: false
 	NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`

pkg/cloudapi/k8s/create.go

@@ -31,10 +31,6 @@ type CreateRequest struct {
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`
 
-	// ID of the chosen storage policy
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// ID of SEP to create boot disks for master nodes. Uses images SEP ID if not set
 	// Required: false
 	MasterSEPID uint64 `url:"masterSepId,omitempty" json:"masterSepId,omitempty"`
@@ -169,12 +165,7 @@ type CreateRequest struct {
 
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
-	// Default: Q35
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
-
-	// Zone ID
-	// Required: false
-	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/k8s/list.go

@@ -46,11 +46,6 @@ type ListRequest struct {
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
 
-	// Sort by zone id
-	// Default value: 0
-	// Required: false
-	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
-
 	// Sort by one of supported fields, format +|-(field)
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`

pkg/cloudapi/k8s/migrate_to_zone.go

@@ -1,42 +0,0 @@
-package k8s
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// MigrateToZone struct to move k8s cluster to another zone
-type MigrateToZoneRequest struct {
-	// Kubernetes cluster ID to move
-	// Required: true
-	K8SID uint64 `url:"k8sId" json:"k8sId" validate:"required"`
-
-	// ID of the zone to move
-	// Required: true
-	ZoneID uint64 `url:"zoneId" json:"zoneId" validate:"required"`
-}
-
-// MigrateToZone moves k8s cluster instance to new zone
-func (k8s K8S) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/k8s/migrateToZone"
-
-	res, err := k8s.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
-}

pkg/cloudapi/k8s/models.go

@@ -89,9 +89,6 @@ type RecordK8S struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// Only external network
 	ExtnetOnly bool `json:"extnetOnly"`
 
@@ -139,9 +136,6 @@ type RecordK8S struct {
 
 	// With LB
 	WithLB bool `json:"withLB"`
-
-	// Zone ID
-	ZoneID uint64 `json:"zoneId"`
 }
 
 // Detailed information about address of the Virtual Internet Protocol
@@ -308,9 +302,6 @@ type ItemK8SCluster struct {
 
 	// List workers group
 	WorkersGroup ListK8SGroups `json:"workersGroups"`
-
-	// Zone ID
-	ZoneID uint64 `json:"zoneId"`
 }
 
 // Information about service account

pkg/cloudapi/k8s/worker_add.go

@@ -24,7 +24,6 @@ type WorkerAddRequest struct {
 
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
-	// Default: Q35
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
 }
 

pkg/cloudapi/k8s/workers_group_add.go

@@ -17,10 +17,6 @@ type WorkersGroupAddRequest struct {
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
-	// ID of the chosen storage policy
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// ID of SEP to create boot disks for default worker nodes group. Uses images SEP ID if not set
 	// Required: false
 	WorkerSEPID uint64 `url:"workerSepId,omitempty" json:"workerSepId,omitempty"`
@@ -66,7 +62,6 @@ type WorkersGroupAddRequest struct {
 
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
-	// Default: Q35
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
 }
 

pkg/cloudapi/kvmx86/create.go

@@ -16,9 +16,6 @@ type Interface struct {
 	//	- EXTNET
 	//  - VFNIC
 	//  - DPDK
-	//  - EMPTY
-	//  - SDN
-	//  - TRUNK
 	NetType string `url:"netType" json:"netType" validate:"required,kvmx86NetType"`
 
 	// Network ID for connect to,
@@ -34,26 +31,6 @@ type Interface struct {
 	// Used only to DPDK net type
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
-
-	// MAC address to assign to this VM when connecting to the specified network
-	// Required: false
-	MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"`
-
-	// SDN interface id
-	// Required: false
-	SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty"`
-
-	// List of security group IDs to assign to this interface
-	// Required: false
-	SecGroups []uint64 `url:"security_groups,omitempty" json:"security_groups,omitempty"`
-
-	// Flag indicating whether security groups are enabled for this interface
-	// Required: false
-	EnableSecGroups bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
-
-	// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
-	// Required: false
-	Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
 }
 
 // DataDisk detailed struct for DataDisks field in CreateRequest and CreateBlankRequest
@@ -66,10 +43,6 @@ type DataDisk struct {
 	// Required: true
 	Size uint64 `url:"size" json:"size" validate:"required"`
 
-	// Storage policy id of disk. The rules of the specified storage policy will be used.
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// Storage endpoint provider ID
 	// By default the same with boot disk
 	// Required: false
@@ -108,10 +81,6 @@ type CreateRequest struct {
 	// Required: true
 	RAM uint64 `url:"ram" json:"ram" validate:"required"`
 
-	// Storage policy id of сompute. The rules of the specified storage policy will be used.
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state
 	// Required: false
 	WithoutBootDisk bool `url:"withoutBootDisk" json:"withoutBootDisk"`
@@ -121,10 +90,6 @@ type CreateRequest struct {
 	// Required: false
 	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
 
-	// The OS version that will be installed on the virtual machine
-	// Required: false
-	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
-
 	// Size of the boot disk in GB
 	// Required: false
 	BootDisk uint64 `url:"bootDisk,omitempty" json:"bootDisk,omitempty"`
@@ -174,6 +139,10 @@ type CreateRequest struct {
 	// Required: false
 	CustomFields 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" validate:"omitempty,computeDriver"`
+
 	// Rule for VM placement with NUMA affinity.
 	// Possible values - none (placement without NUMA affinity),
 	// strict (strictly with NUMA affinity, if not possible - do not start VM),
@@ -189,21 +158,12 @@ type CreateRequest struct {
 
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
-	// Default: Q35
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
 
 	// Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node
 	// Required: false
 	// Default: false
 	HPBacked bool `url:"hpBacked" json:"hpBacked"`
-
-	// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
-	// Required: false
-	PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`
-
-	// Zone ID
-	// Required: false
-	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/kvmx86/create_blank.go

@@ -28,10 +28,6 @@ type CreateBlankRequest struct {
 	// Required: true
 	RAM uint64 `url:"ram" json:"ram" validate:"required"`
 
-	// Storage policy id of compute. The rules of the specified storage policy will be used.
-	// Required: true
-	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
-
 	// If True, the imageId, bootDisk, sepId, pool parameters are ignored and the compute is created without a boot disk in the stopped state
 	// Required: false
 	WithoutBootDisk bool `url:"withoutBootDisk" json:"withoutBootDisk"`
@@ -61,60 +57,17 @@ type CreateBlankRequest struct {
 	// Required: false
 	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
+	// Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
+	// Required: false
+	Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
+
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
-	// Default: Q35
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
 
-	// Use Huge Pages to allocate RAM of the virtual machine. The system must be pre-configured by allocating Huge Pages on the physical node
-	// Required: false
-	// Default: false
-	HPBacked bool `url:"hp_backed" json:"hp_backed"`
-
-	// Run VM on dedicated CPUs. To use this feature, the system must be pre-configured by allocating CPUs on the physical node
-	// Required: false
-	// Default: false
-	CPUPin bool `url:"cpu_pin" json:"cpu_pin"`
-
-	// Rule for VM placement with NUMA affinity.
-	// Possible values - none (placement without NUMA affinity),
-	// strict (strictly with NUMA affinity, if not possible - do not start VM),
-	// loose (use NUMA affinity if possible)
-	// Required: false
-	// Default: none
-	NumaAffinity string `url:"numa_affinity,omitempty" json:"numa_affinity,omitempty" validate:"omitempty,numaAffinity"`
-
 	// Text description of this VM
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
-
-	// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
-	// Required: false
-	PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`
-
-	// VM type linux, windows or unknown
-	// Required: false
-	LoaderType string `url:"loaderType,omitempty" json:"loaderType,omitempty" validate:"omitempty,loaderType"`
-
-	// Boot type of image bios or uefi
-	// Required: false
-	BootType string `url:"bootType,omitempty" json:"bootType,omitempty" validate:"omitempty,imageBootType"`
-
-	// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming.
-	// Required: false
-	NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"`
-
-	// Does this machine supports hot resize
-	// Required: false
-	HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"`
-
-	// Zone ID
-	// Required: false
-	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
-
-	// The OS version that will be installed on the virtual machine
-	// Required: false
-	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/lb/create.go

@@ -38,16 +38,12 @@ type CreateRequest struct {
 	HighlyAvailable bool `url:"highlyAvailable,omitempty" json:"highlyAvailable,omitempty"`
 
 	// Start now Load balancer
-	// Required: true
+	// Required: false
-	Start bool `url:"start" json:"start" validate:"required"`
+	Start bool `url:"start" json:"start"`
 
 	// Text description of this load balancer
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
-
-	// Zone ID
-	// Required: false
-	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
 }
 
 type wrapperCreateRequest struct {

pkg/cloudapi/lb/list.go

@@ -50,11 +50,6 @@ type ListRequest struct {
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 
-	// Sort by zone id
-	// Default value: 0
-	// Required: false
-	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudapi/lb/migrate_to_zone.go

@@ -1,42 +0,0 @@
-package lb
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// MigrateToZone struct to move lb to another zone
-type MigrateToZoneRequest struct {
-	// ID of the load balancer instance to move
-	// Required: true
-	LBID uint64 `url:"lbId" json:"lbId" validate:"required"`
-
-	// ID of the zone to move
-	// Required: true
-	ZoneID uint64 `url:"zoneId" json:"zoneId" validate:"required"`
-}
-
-// MigrateToZone moves lb instance to new zone
-func (l LB) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/lb/migrateToZone"
-
-	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
-}

pkg/cloudapi/lb/models.go

@@ -8,9 +8,6 @@ type RecordLB struct {
 	// Access Control List
 	ACL interface{} `json:"acl"`
 
-	//Account ID
-	AccountID uint64 `json:"accountId"`
-
 	// BackendHAIP
 	BackendHAIP string `json:"backendHAIP"`
 
@@ -87,7 +84,7 @@ type RecordLB struct {
 	Status string `json:"status"`
 
 	// Sysctl Params
-	SysctlParams map[string]string `json:"sysctlParams"`
+	SysctlParams interface{} `json:"sysctlParams"`
 
 	// Tech status
 	TechStatus string `json:"techStatus"`
@@ -103,9 +100,6 @@ type RecordLB struct {
 
 	// VINS ID
 	VINSID uint64 `json:"vinsId"`
-
-	// Zone ID
-	ZoneID uint64 `json:"zoneId"`
 }
 
 // Main information about load balancer

pkg/cloudapi/locations/models.go

@@ -20,9 +20,6 @@ type ItemLocation struct {
 	// Name
 	Name string `json:"name"`
 
-	// Network Modes
-	NetworkModes []string `json:"network_modes"`
-
 	// Flag
 	Flag string `json:"flag"`
 
@@ -31,9 +28,6 @@ type ItemLocation struct {
 
 	// CKey
 	CKey string `json:"_ckey"`
-
-	// Support of SDN
-	SDNSupport bool `json:"sdn_support"`
 }
 
 // List of locations

pkg/cloudapi/pcidevice/models.go

@@ -29,8 +29,8 @@ type ItemPCIDevice struct {
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
-	// Node ID
+	// Stack ID
-	NodeID uint64 `json:"nodeId"`
+	StackID uint64 `json:"stackId"`
 
 	// Status
 	Status string `json:"status"`
@@ -47,3 +47,4 @@ type ListPCIDevices struct {
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+