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,75 +1,8 @@
-## Version 1.12.3
+## Version 1.9.4
-
-### Добавлено
-
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-606 | Поле `policies` в структуру ответа `Resource` в cloudapi/account и в cloudbroker/account |
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-603 | Поле `OSVersion` в структуры ответа `RecordCompute` и `ItemCompute` в cloudapi/compute и `RecordCompute` и `InfoCompute` в cloudbroker/compute |
-| BGOS-603 | Опциональное поле `OSVersion` в структуры запроса `RedeployRequest` и `UpdateRequest` в cloudapi/compute и cloudbroker/compute |
-| BGOS-611 | Методы `StartMigrationIN`, `StopMigrationIN`, `MigrateStorageList` и структуры запросов `StartMigrationINRequest`, `StopMigrationINRequest` и `MigrateStorageListRequest` в cloudbroker/compute |
-
-#### disks
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-609 | Опциональное поле `StoragePolicyID` в структуры запроса `ListUnattachedRequest` и `ListRequest` в cloudapi/disk и cloudbroker/disk |
-
-#### kvmx86
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-603 | Опциональное поле `OSVersion` в структуры запроса `CreateRequest` и `CreateBlankRequest` в cloudapi/compute и cloudbroker/compute |
-| BGOS-603 | Опциональное поле `OSVersion` в структуру запроса `MassCreateRequest` в cloudbroker/compute |
-
-#### node
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-608 | Методы `AddSSHIdentity`, `GetSSHIdentity` и структуры запросов `AddSSHIdentityRequest` и `GetSSHIdentityRequest` в cloudbroker/node |
-
-#### security group
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-601 | Добавлены комментарии к структурам ответов |
-
-#### storage policy
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-598 | Поле `sep_name` в структуре ответа `AccessSEPPool` в cloudapi/stpolicy и в cloudbroker/stpolicy |
-| BGOS-600 | Добавлены комментарии к структурам ответов |
 
 ### Исправлено
 
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-607 | Поле `StoragePolicies` в структуре запроса `CreateRequest` стало опциональным в cloudbroker/account |
-| BGOS-607 | Изменен тип поля `ID` в структуре запроса `StoragePolicy` с int64 на uint64 в cloudbroker/account |
-
-#### rg
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-607 | Изменен тип поля `ID` в структуре запроса `StoragePolicy` с int64 на uint64 в cloudapi/rg и в cloudbroker/rg |
-| BGOS-607 | Поле `StoragePolicies` в структуре запроса `CreateRequest` стало опциональным в cloudbroker/account |
-
-### Удалено
-
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-605 | Поле `CKey` из структуры ответа `RecordAccount` в cloudapi/account и поля `CKey` из структуры ответа `InfoAccount` и `Meta` из структуры ответа `ItemAccount` в cloudbroker/account |
-
 #### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-603 | Поля `VirtualImageID`, `VirtualImageName` из структуры ответа `RecordCompute` и `ItemCompute` в cloudapi/compute и `RecordCompute` и `InfoCompute` в cloudbroker/compute |
+| BGOS-485 | Изменен тип параметров `VGPUs` с []uint64 на []VGPUItem в структуре `RecordCompute` в  cloudapi/compute и в cloudbroker/compute |
-| BGOS-603 | Поля `ImageID` из структуры ответа `ItemCompute` в cloudapi/compute и `InfoCompute` в cloudbroker/compute |
-| BGOS-612 | Поле `ImageID` из структуры запроса `ListRequest` в cloudbroker/compute |
-
-#### image
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-604 | Метод `UpdateNodes` и структура запроса `UpdateNodesRequest` в cloudbroker/image |

README.md

@@ -14,9 +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 версии платформы
 
 ## Оглавление
 
@@ -80,8 +77,6 @@ Decort SDK - это библиотека, написанная на языке G
       - [Создание универсального клиента](#создание-универсального-клиента)
         - [Пример создания универсального клиента](#пример-создания-универсального-клиента)
         - [Пример выполнения запроса](#пример-выполнения-запроса-4)
-    - [Проверка соответствия версии платформы и версии dynamix](#проверка-соответствия-версии-платформы-и-версии-dynamix)
-        - [Пример выполнения запроса](#пример-выполнения-запроса-5)
 
 ## Установка
 
@@ -97,7 +92,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 
 - `cloudapi` - пользовательская группа, которая позволяет воспользоваться всем стардартным функционалом платформы;
 - `cloudbroker` - административная группа, которая позволяет воспользоваться всем стандартным функционалом платформы и расширенными возможностями, включающими в себя управление пользователями, ресурсами, платформами размещения ресурсов и т.д.
-- `sdn` - группа для работы с SDN;
 
 ### Cloudapi
 
@@ -118,17 +112,11 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `KVMx86` - создание виртуальной машины x86;
 - `LB` - управление балансировщиками нагрузки;
 - `Locations` - получение информации о grid площадки;
-- `Prometheus` - получение статистики prometheus;
 - `RG` - управление ресурсными группами аккаунта;
-- `Security group` – управление группами безопасности;
-- `SEP` - управление storage endpoint (sep);
 - `Stack` - получение информации о вычислительных узлах;
-- `Storage policy` – получение информации о политиках хранения;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
-- `Trunk` - получение информации о транковых портах;
 - `VFPool` - управление пулом виртуальных сетевых функций;
-- `VINS` - управление виртуальными изолированными сетями;
+- `VINS` - управление виртуальными изолированными сетями.
-- `Zone` - управление зонами.
 
 ### Cloudbroker
 
@@ -139,7 +127,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Audit` - получение информации о событиях системы;
 - `APIAccess` - управление доступом к API и его объектам;
 - `Backup` - управление резервным копированием;
-- `BService` - управление группами виртуальных машин (computes);
 - `Compute` - управление виртуальными машинами (индивидуально);
 - `Disks` - управление виртуальными дисками;
 - `DPDK` - управление виртуальными сетями DPDK;
@@ -157,24 +144,13 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Prometheus` - получение статистики prometheus;
 - `Resmon` - получение статистики resource monitoring;
 - `RG` - управление ресурсными группами аккаунта;
-- `Security group` – управление группами безопасности;
 - `SEP` - управление storage endpoint (sep);
 - `Stack` - получение информации о вычислительных узлах;
-- `Storage policy` – управление политиками хранения;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
-- `Trunk` - управление транковыми портами;
 - `User` - управление пользователями (индивидуально);
 - `VGPU` - управление виртуальными графическими процессорами;
 - `VFPool` - управление пулом виртуальных сетевых функций;
 - `VINS` - управление виртуальными изолированными сетями.
-- `Zone` - управление зонами.
-
-### SDN
-
-`SDN` позволяет выполнять запросы к группе пользовательских конечных точек
-Данная группа ручек позволяет выполнять следующие операции в платформе:
-
-- `AccessGroup` - управление группами доступа
 
 ## Работа с библиотекой
 
@@ -302,7 +278,6 @@ func main() {
 
 - `pkg/cloudapi` - для `cloudapi`
 - `pkg/cloudbroker` - для `cloudbroker`
-- `pkg/sdn` - для `sdn`
 
 В каждом пакете находятся пакеты групп API:
 
@@ -321,23 +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/sep` - для `SEP`
     - `pkg/cloudapi/stack` - для `Stack`
-    - `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`
@@ -355,19 +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/stack` - для `Stack`
-    - `pkg/cloudbroker/stpolicy` - для `Storage policy`
     - `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/access_groups` - для `AccessGroups`
 
 Все поля структуры имеют описание, в которых содержится:
 
@@ -501,7 +463,7 @@ func main() {
 
 Чтобы выполнить запрос, необходимо:
 
-1. Вызвать у клиента метод, отвечающий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, `.CloudBroker()` или `.SDN()`. Данные методы возвращают соответствующие структуры, с помощью которых можно совершать запросы.
+1. Вызвать у клиента метод, отвечаеющий за определение группы API для взаимодействия, это может быть `.CloudAPI()`, либо `.CloudBroker()`. Данные методы возвращаеют соответствующие структуры, с помощью которых можно совершать запросы.
 2. Вызвать у возвращенной структуры метод, определяющий группу ручек для взаимодействия.
 
    Доступные методы для `.CloudAPI()`:
@@ -520,17 +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()`:
 
@@ -538,7 +495,6 @@ func main() {
     - `.Audit()` - для работы с `Audit`
     - `.APIAccess()` - для работы с `APIAccess`
     - `.Backup()` - для работы с `Backup`
-    - `.BService()` - для работы с `BService`
     - `.Compute()` - для работы с `Compute`
     - `.Disks()` - для работы с `Disks`
     - `.DPDKNet()` - для работы с `DPDK`
@@ -556,21 +512,13 @@ func main() {
     - `.Prometheus()` - для работы с `Prometheus`
     - `.Resmon()` - для работы с `Resmon`
     - `.RG()` - для работы с `RG`
-    - `.SecurityGroup()` - для работы с `Security Group`
     - `.SEP()` - для работы с `SEP`
     - `.Stack()` - для работы с `Stack`
-    - `.StPolicy()` - для работы с `Storage Policy`
     - `.Tasks()` - для работы с `Tasks`
-    - `.Trunk()` - для работы с `Trunk`
     - `.User()` - для работы с `User`
     - `.VGPU()` - для работы с `VGPU`
     - `.VFPool()` - для работы с `VFPool`
     - `.VINS()` - для работы с `VINS`
-    - `.Zone()` - для работы с `Zone`
-
-    Доступные методы для `.SDN()`:
-
-    - `.AccessGroup()` - для работы с `AccessGroup`
 
 3. Вызвать метод, отвечающий за выполнение запроса и передать в него:
 
@@ -1649,36 +1597,4 @@ 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()
-}
 ```

check.go

@@ -1,88 +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 {
-		return nil, err
-	}
-
-	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 {
-		return nil, err
-	}
-
-	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 {
-		return nil, err
-	}
-
-	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{
@@ -50,8 +54,9 @@ func New(cfg config.Config) *DecortClient {
 				},
 			},
 		},
-		cfg:   trimConfig(&cfg),
+		cfg:        trimConfig(&cfg),
-		mutex: &sync.Mutex{},
+		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
 }
@@ -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

@@ -131,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 {

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,7 +12,3 @@ var FileName = map[string]string{
 }
 
 var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
-
-var VersionMap = map[string]string{
-	"4.3.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)
@@ -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,59 +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)
-}
-
 // 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 {
@@ -447,13 +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)
-}

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",
@@ -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,62 +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())
-
-	case "device":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(deviceValues))
 	}
 
 	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
@@ -251,55 +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
-	}
-
 	return nil
 }

internal/validators/values.go

@@ -1,8 +1,7 @@
 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"}
@@ -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"}
 
 	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,26 +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"}
 )
 
 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"
@@ -103,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/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"`
@@ -54,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/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/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"`
 

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,14 +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
-	//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 : i440fx
-	//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
@@ -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 bool `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty"`
-}
-
-// 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/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

pkg/cloudapi/compute/filter_test.go

@@ -48,13 +48,15 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID: 65191,
+					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",
-			PinnedToStack:    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{},
@@ -109,13 +111,15 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID: 65248,
+					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,
-			PinnedToStack:    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 {
@@ -238,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 {
@@ -305,18 +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 order
 	BootOrder []string `json:"bootOrder"`
 
-	// Boot type
-	BootType string `json:"bootType"`
-
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
@@ -377,9 +365,6 @@ type RecordCompute struct {
 	// HPBacked
 	HPBacked bool `json:"hpBacked"`
 
-	// Hot resize
-	HotResize bool `json:"hotResize"`
-
 	// ID
 	ID uint64 `json:"id"`
 
@@ -392,12 +377,6 @@ type RecordCompute struct {
 	// 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"`
 
@@ -419,9 +398,6 @@ type RecordCompute struct {
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
-	// Network interface naming
-	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
-
 	// Numa Affinity
 	NumaAffinity string `json:"numaAffinity"`
 
@@ -443,20 +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 stack
+	// Pinned or not
-	PinnedToStack bool `json:"pinnedToStack"`
+	Pinned bool `json:"pinned"`
-
-	// PreferredCPU
-	PreferredCPU []int64 `json:"preferredCpu"`
-
-	// Qemu_quest
-	QemuQuest QemuQuest `json:"qemu_guest"`
 
 	// Number of RAM
 	RAM uint64 `json:"ram"`
@@ -509,82 +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 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
@@ -664,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"`
 
@@ -709,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"`
 
@@ -803,6 +690,9 @@ type ItemComputeDisk struct {
 	// Name
 	Name string `json:"name"`
 
+	// Order
+	Order uint64 `json:"order"`
+
 	// Params
 	Params string `json:"params"`
 
@@ -813,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"`
@@ -842,9 +732,6 @@ type ItemComputeDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -857,20 +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"`
 }
 
 type ItemReplication struct {
@@ -985,18 +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 order
 	BootOrder []string `json:"bootOrder"`
 
-	// Boot type
-	BootType string `json:"bootType"`
-
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
@@ -1054,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"`
 
@@ -1093,30 +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 stack
+	// Pinned or not
-	PinnedToStack bool `json:"pinnedToStack"`
+	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"`
-
 	// Reference ID
 	ReferenceID string `json:"referenceId"`
 
@@ -1171,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
@@ -1182,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

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

@@ -13,30 +13,25 @@ type PinToStackRequest 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"`
 }
 
 // PinToStack pin compute to current stack
-func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (bool, error) {
+func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		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 false, err
+		return 0, err
 	}
 
-	result, err := strconv.ParseBool(string(res))
+	result, err := strconv.ParseUint(string(res), 10, 64)
 	if err != nil {
-		return false, err
+		return 0, err
 	}
 
 	return result, nil

pkg/cloudapi/compute/redeploy.go

@@ -14,17 +14,9 @@ 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" json:"storage_policy_id" validate:"required"`
-
 	// 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

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/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,17 @@ 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"`

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"`

pkg/cloudapi/image/models.go

@@ -162,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"`
@@ -185,15 +185,9 @@ 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"`
 

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"`
@@ -170,10 +166,6 @@ type CreateRequest struct {
 	// Type of the emulated system, Q35 or i440fx
 	// Required: false
 	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/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"`

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),
@@ -195,14 +164,6 @@ type CreateRequest struct {
 	// 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,6 +57,10 @@ 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
 	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"omitempty,chipset"`
@@ -68,34 +68,6 @@ type CreateBlankRequest struct {
 	// 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/get_list.go

@@ -1,71 +0,0 @@
-package locations
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ListGetRequest struct to get list of locations
-type ListGetRequest struct {
-	// 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 flag
-	// Required: false
-	Flag string `url:"flag,omitempty" json:"flag,omitempty"`
-
-	// Find by name
-	// Required: false
-	Name string `url:"name,omitempty" json:"name,omitempty"`
-
-	// Find by ID
-	// Required: false
-	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
-
-	// Find by code location
-	// Required: false
-	LocationCode string `url:"locationCode,omitempty" json:"locationCode,omitempty"`
-
-	// Sort by one of supported fields, format +|-(field)
-	// Required: false
-	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
-}
-
-// ListGet gets list of all locations as a ListLocations struct
-func (l Locations) ListGet(ctx context.Context, req ListGetRequest) (*ListLocations, error) {
-
-	res, err := l.ListGetRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListLocations{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
-
-// ListGetRaw gets list of all locations as an array of bytes
-func (l Locations) ListGetRaw(ctx context.Context, req ListGetRequest) ([]byte, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/locations/list"
-
-	res, err := l.client.DecortApiCall(ctx, http.MethodGet, url, req)
-	return res, err
-}

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/prometheus.go

@@ -1,8 +0,0 @@
-package cloudapi
-
-import "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/prometheus"
-
-// Accessing the Resmon method group
-func (ca *CloudAPI) Prometheus() *prometheus.Prometheus {
-	return prometheus.New(ca.client)
-}

pkg/cloudapi/prometheus/compute_cpu_load.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeCPULoadRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Per-second CPU time consumed by Compute in percent, average over the time step specified
-func (p Prometheus) ComputeCPULoad(ctx context.Context, req ComputeCPULoadRequest) (*PrometheusData, error) {
-	res, err := p.ComputeCPULoadRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeCPULoadRaw(ctx context.Context, req ComputeCPULoadRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeCPUload"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_memory_available.go

@@ -1,53 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeMemoryAvailableRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-}
-
-// Available Memory
-func (p Prometheus) ComputeMemoryAvailable(ctx context.Context, req ComputeMemoryAvailableRequest) (*PrometheusData, error) {
-	res, err := p.ComputeMemoryAvailableRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeMemoryAvailableRaw(ctx context.Context, req ComputeMemoryAvailableRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeMemoryAvailable"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_memory_unused.go

@@ -1,53 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeMemoryUnusedRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-}
-
-// Unused Memory
-func (p Prometheus) ComputeMemoryUnused(ctx context.Context, req ComputeMemoryUnusedRequest) (*PrometheusData, error) {
-	res, err := p.ComputeMemoryUnusedRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeMemoryUnusedRaw(ctx context.Context, req ComputeMemoryUnusedRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeMemoryUnused"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_memory_usable.go

@@ -1,53 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeMemoryUsableRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-}
-
-// Usable Memory
-func (p Prometheus) ComputeMemoryUsable(ctx context.Context, req ComputeMemoryUsableRequest) (*PrometheusData, error) {
-	res, err := p.ComputeMemoryUsableRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeMemoryUsableRaw(ctx context.Context, req ComputeMemoryUsableRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeMemoryUsable"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_memory_usage.go

@@ -1,53 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeMemoryUsageRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-}
-
-// Memory Usage
-func (p Prometheus) ComputeMemoryUsage(ctx context.Context, req ComputeMemoryUsageRequest) (*PrometheusData, error) {
-	res, err := p.ComputeMemoryUsageRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeMemoryUsageRaw(ctx context.Context, req ComputeMemoryUsageRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeMemoryUsage"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_memory_used.go

@@ -1,53 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeMemoryUsedRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-}
-
-// Used Memory
-func (p Prometheus) ComputeMemoryUsed(ctx context.Context, req ComputeMemoryUsedRequest) (*PrometheusData, error) {
-	res, err := p.ComputeMemoryUsedRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeMemoryUsedRaw(ctx context.Context, req ComputeMemoryUsedRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeMemoryUsed"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_read_bytes.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeReadBytesRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Read Bytes
-func (p Prometheus) ComputeReadBytes(ctx context.Context, req ComputeReadBytesRequest) (*PrometheusData, error) {
-	res, err := p.ComputeReadBytesRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeReadBytesRaw(ctx context.Context, req ComputeReadBytesRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeReadBytes"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_read_requests.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeReadRequestsRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Read Requests
-func (p Prometheus) ComputeReadRequests(ctx context.Context, req ComputeReadRequestsRequest) (*PrometheusData, error) {
-	res, err := p.ComputeReadRequestsRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeReadRequestsRaw(ctx context.Context, req ComputeReadRequestsRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeReadRequests"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_receive_bytes.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeReceiveBytesRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Receive Bytes
-func (p Prometheus) ComputeReceiveBytes(ctx context.Context, req ComputeReceiveBytesRequest) (*PrometheusData, error) {
-	res, err := p.ComputeReceiveBytesRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeReceiveBytesRaw(ctx context.Context, req ComputeReceiveBytesRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeReceiveBytes"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_receive_packets.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeReceivePacketsRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Receive Packets
-func (p Prometheus) ComputeReceivePackets(ctx context.Context, req ComputeReceivePacketsRequest) (*PrometheusData, error) {
-	res, err := p.ComputeReceivePacketsRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeReceivePacketsRaw(ctx context.Context, req ComputeReceivePacketsRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeReceivePackets"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_transmit_bytes.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeTransmitBytesRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Transmit Bytes
-func (p Prometheus) ComputeTransmitBytes(ctx context.Context, req ComputeTransmitBytesRequest) (*PrometheusData, error) {
-	res, err := p.ComputeTransmitBytesRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeTransmitBytesRaw(ctx context.Context, req ComputeTransmitBytesRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeTransmitBytes"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_transmit_packets.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeTransmitPacketsRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Transmit Packets
-func (p Prometheus) ComputeTransmitPackets(ctx context.Context, req ComputeTransmitPacketsRequest) (*PrometheusData, error) {
-	res, err := p.ComputeTransmitPacketsRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeTransmitPacketsRaw(ctx context.Context, req ComputeTransmitPacketsRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeTransmitPackets"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_write_bytes.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeWriteBytesRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Write Bytes
-func (p Prometheus) ComputeWriteBytes(ctx context.Context, req ComputeWriteBytesRequest) (*PrometheusData, error) {
-	res, err := p.ComputeWriteBytesRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeWriteBytesRaw(ctx context.Context, req ComputeWriteBytesRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeWriteBytes"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/compute_write_requests.go

@@ -1,57 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ComputeWriteRequestsRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Write Requests
-func (p Prometheus) ComputeWriteRequests(ctx context.Context, req ComputeWriteRequestsRequest) (*PrometheusData, error) {
-	res, err := p.ComputeWriteRequestsRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := PrometheusData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputeWriteRequestsRaw(ctx context.Context, req ComputeWriteRequestsRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computeWriteRequests"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/prometheus/computes.go

@@ -1,77 +0,0 @@
-package prometheus
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-const (
-	ComputeCPULoad         = "computeCPUload"
-	ComputeMemoryUsage     = "computeMemoryUsage"
-	ComputeMemoryUsable    = "computeMemoryUsable"
-	ComputeMemoryUnused    = "computeMemoryUnused"
-	ComputeMemoryUsed      = "computeMemoryUsed"
-	ComputeMemoryAvailable = "computeMemoryAvailable"
-	ComputeReadBytes       = "computeReadBytes"
-	ComputeReadRequests    = "computeReadRequests"
-	ComputeReceiveBytes    = "computeReceiveBytes"
-	ComputeTransmitBytes   = "computeTransmitBytes"
-	ComputeTransmitPackets = "computeTransmitPackets"
-	ComputeWriteBytes      = "computeWriteBytes"
-	ComputeWriteRequests   = "computeWriteRequests"
-)
-
-type ComputesRequest struct {
-	// List of compute IDs to fetch metrics for
-	// Required: true
-	ComputeIDs []uint64 `url:"computeIds" json:"computeIds" validate:"required"`
-
-	// List of compute IDs to fetch metrics for
-	// Required: true
-	MetricIDs []string `url:"metricIds" json:"metricIds" validate:"required"`
-
-	// Time to loads of statistic in seconds
-	// Required: false
-	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
-
-	// The reading interval in seconds
-	// Required: false
-	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
-
-	// Number of zeros after the decimal point
-	// Required: false
-	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
-}
-
-// Get multiple metrics for multiple compute instances
-func (p Prometheus) Computes(ctx context.Context, req ComputesRequest) (*ComputesData, error) {
-	res, err := p.ComputesRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := ComputesData{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets information about compute as an array of bytes
-func (p Prometheus) ComputesRaw(ctx context.Context, req ComputesRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/prometheus/computes"
-
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}