v1.12.6

.gitignore

@@ -3,3 +3,8 @@ cmd/
 .vscode/
 .fleet/
 .DS_Store
+tests/platform_upgrade/.env
+tests/platform_upgrade/input.json
+tests/platform_upgrade/*.txt
+tests/platform_upgrade/*.log
+*.env

CHANGELOG.md

@@ -1,4 +1,32 @@
-## Version 1.7.1
+## Version 1.12.6
 
-## Bugfix
-- Fix panic in clients
+Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами
+Метод `ListStacks` в cloudbroker/image стал deprecated и в следующих версиях будет удалён
+Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены
+
+### Добавлено
+
+#### общее
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-638 | Добавлена поддержка версий 4.1.0 и 4.2.0 в функцию check |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-481 | Метод `AsyncCreateCDROMImage` в cloudbroker/image |
+
+#### node 
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-634 | Метод `UpdateDescription` и структура запроса `UpdateDescriptionRequest` в cloudbroker/node |
+
+#### stpolicy
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-636 | Вычисляемое поле `StoragePolicyID` в структуры ответа `InfoStoragePolicy` и `ItemStoragePolicy` в `cloudapi/stpolicy` и в cloudbroker/stpolicy |
+
+#### vins 
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-637 | Вычисляемое поле `LiveMigrationJobID` в структуры ответа `RecordVNFDev` в cloudapi/vins и в `VNFDev` cloudbroker/vins |

LICENSE

@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2022 Basis LTD
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README_EN.md

@@ -1,62 +0,0 @@
-# Decort SDK
-
-Decort SDK is a library, written in GO (Golang) for interact with the **DECORT** API.  
-The library contents structures and methods for requesting to an user (cloudapi) and admin (cloudbroker) groups of API.  
-Also the library have structures for responses.
-
-## Contents
-
-- [Install](#install)
-- [API List](#api-list)
-- [Examples](#examples)
-- [Examples2](#examples2)
-
-## Install
-
-```bash
-go get -u repository.basistech.ru/BASIS/decort-golang-sdk
-```
-
-## API List
-
-## Examples
-
-```go
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/kvmx86"
-)
-
-func main() {
-	cfg := config.Config{
-		AppID:     "<APPID>",
-		AppSecret: "<APPSECRET>",
-		SSOURL:    "https://sso.digitalenergy.online",
-		DecortURL: "https://mr4.digitalenergy.online",
-		Retries:   5,
-	}
-	client := decort.New(cfg)
-	req := kvmx86.CreateRequest{
-		RGID:    123,
-		Name:    "compute",
-		CPU:     4,
-		RAM:     4096,
-		ImageID: 321,
-	}
-
-	res, err := client.KVMX86().Create(context.Background(), req)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println(res)
-}
-```
-
-## Examples2

check.go

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

client.go

@@ -4,11 +4,13 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"errors"
+	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"io"
 	"mime/multipart"
 	"net/http"
+	"reflect"
 	"strconv"
 	"strings"
 	"sync"
@@ -16,15 +18,14 @@ import (
 
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
 )
 
-const restmachine = "/restmachine"
-
-// HTTP-client for platform
+// DecortClient is HTTP-client for platform
 type DecortClient struct {
 	decortURL  string
 	client     *http.Client
@@ -39,12 +40,6 @@ 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{
@@ -55,9 +50,8 @@ func New(cfg config.Config) *DecortClient {
 				},
 			},
 		},
-		cfg:        cfg,
-		expiryTime: expiryTime,
-		mutex:      &sync.Mutex{},
+		cfg:   trimConfig(&cfg),
+		mutex: &sync.Mutex{},
 	}
 }
 
@@ -71,17 +65,22 @@ 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) {
-	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
-	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
+
 	var body *bytes.Buffer
 	var ctype string
 
-	if okCa {
-		body, ctype = createK8sCloudApi(k8sCaCreateReq)
-	} else if okCb {
-		body, ctype = createK8sCloudBroker(k8sCbCreateReq)
+	byteSlice, ok := params.([]byte)
+	if ok {
+		body = bytes.NewBuffer(byteSlice)
+		// ctype = "application/x-iso9660-image"
+		ctype = "application/octet-stream"
 	} else {
 		values, err := query.Values(params)
 		if err != nil {
@@ -90,322 +89,361 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 		body = bytes.NewBufferString(values.Encode())
 	}
 
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+restmachine+url, body)
+	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
+}
+
+// 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)
+	if err != nil {
+		return nil, err
+	}
+
+	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
 	}
 
-	resp, err := dc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBytes, err := io.ReadAll(resp.Body)
+	// perform request
+	respBytes, err := dc.do(req, ctype)
 	if err != nil {
 		return nil, err
 	}
 
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
-	}
-
-	return respBytes, nil
+	return respBytes, err
 }
 
 func (dc *DecortClient) getToken(ctx context.Context) error {
 	dc.mutex.Lock()
 	defer dc.mutex.Unlock()
 
-	if dc.cfg.Token == "" || time.Now().After(dc.expiryTime) {
-		body := fmt.Sprintf("grant_type=client_credentials&client_id=%s&client_secret=%s&response_type=id_token", dc.cfg.AppID, dc.cfg.AppSecret)
-		bodyReader := strings.NewReader(body)
-
-		dc.cfg.SSOURL = strings.TrimSuffix(dc.cfg.SSOURL, "/")
-
-		req, _ := http.NewRequestWithContext(ctx, "POST", dc.cfg.SSOURL+"/v1/oauth/access_token", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-
-		resp, err := dc.client.Do(req)
-		if err != nil {
-			return fmt.Errorf("cannot get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("cannot get token: %s", tokenBytes)
-		}
-
-		token := string(tokenBytes)
-
-		dc.cfg.Token = token
-		dc.expiryTime = time.Now().AddDate(0, 0, 1)
+	// new token is not needed
+	if dc.cfg.Token != "" && !time.Now().After(dc.expiryTime) {
+		return nil
 	}
 
+	// set up request headers and body
+	body := fmt.Sprintf("grant_type=client_credentials&client_id=%s&client_secret=%s&response_type=id_token", dc.cfg.AppID, dc.cfg.AppSecret)
+	bodyReader := strings.NewReader(body)
+
+	dc.cfg.SSOURL = strings.TrimSuffix(dc.cfg.SSOURL, "/")
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", dc.cfg.SSOURL+"/v1/oauth/access_token", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// request token
+	resp, err := dc.client.Do(req)
+	if err != nil || resp == nil {
+		return fmt.Errorf("cannot get token: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("cannot get token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("cannot get token: %s", tokenBytes)
+	}
+
+	// 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
+
 	return nil
 }
 
-func (dc *DecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
+// do method performs request and returns response as an array of bytes and nil error in case of response status code 200.
+// In any other cases do returns nil response and error.
+// Retries are implemented in case of connection reset errors.
+func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
+	// set up request headers and body
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	if ctype != "" {
-		req.Header.Add("Content-Type", ctype)
-	} else {
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+		req.Header.Set("Content-Type", ctype)
 	}
 
 	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
 	req.Header.Set("Accept", "application/json")
 
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-
-	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-	// 	req = req.Clone(req.Context())
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := dc.client.Do(req)
-	if err == nil {
-		if resp.StatusCode == 200 {
-			return resp, err
-		}
+	buf, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
 	}
-	// }
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
 
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := dc.client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
+
+	// retries logic GOES HERE
+	// get http response
+	//var resp *http.Response
+	//for i := uint64(0); i < dc.cfg.Retries; i++ {
+	//	req := req.Clone(req.Context())
+	//	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	//
+	//	if i > 0 {
+	//		time.Sleep(5 * time.Second) // no time sleep for the first request
+	//	}
+	//
+	//	resp, err = dc.client.Do(req)
+	//
+	//	// stop retries on success and close response body
+	//	if resp != nil {
+	//		defer resp.Body.Close()
+	//	}
+	//	if err == nil {
+	//		break
+	//	}
+	//
+	//	// retries in case of connection errors with time sleep
+	//	if isConnectionError(err) {
+	//		continue
+	//	}
+	//
+	//	// return error in case of non-connection error
+	//	return nil, err
+	//}
+
+	// handle http request errors
+	if err != nil {
+		return nil, err
+	}
+	if resp == nil {
+		return nil, fmt.Errorf("got empty response without error")
+	}
+
+	// handle successful request
+	respBytes, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with status code other than 200
+	err = fmt.Errorf("%s", respBytes)
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
 
-func createK8sCloudApi(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
+// isConnectionError checks if given error falls within specific and associated connection errors
+//func isConnectionError(err error) bool {
+//	if strings.Contains(err.Error(), "connection reset by peer") {
+//		return true
+//	}
+//	if errors.Is(err, io.EOF) {
+//		return true
+//	}
+//
+//	return false
+//}
+
+// multiPartReq writes the request structure to the request body, and also returns string of the content-type
+func multiPartReq(params interface{}) (*bytes.Buffer, string, error) {
 	reqBody := &bytes.Buffer{}
 	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
+	values := reflect.ValueOf(params)
+	types := values.Type()
+	defer writer.Close()
+	for i := 0; i < values.NumField(); i++ {
+		if !values.Field(i).IsValid() {
+			continue
+		}
 
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8SCIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
+		if values.Field(i).IsZero() {
+			continue
+		}
 
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
+		if file, ok := constants.FileName[types.Field(i).Name]; ok {
+			part, err := writer.CreateFormFile(trimString(types.Field(i)), file)
+			if err != nil {
+				return &bytes.Buffer{}, "", err
+			}
+			_, err = io.Copy(part, strings.NewReader(valueToString(values.Field(i).Interface())))
+			if err != nil {
+				return &bytes.Buffer{}, "", err
+			}
+			continue
+		}
 
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
+		if values.Field(i).Type().Kind() == reflect.Slice {
+			switch slice := values.Field(i).Interface().(type) {
+			case []string:
+				if validators.IsInSlice(trimString(types.Field(i)), constants.K8sValues) {
+					code, err := json.Marshal(slice)
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+					err = writer.WriteField(trimString(types.Field(i)), string(code))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				} else {
+					for _, val := range slice {
+						err := writer.WriteField(trimString(types.Field(i)), val)
+						if err != nil {
+							return &bytes.Buffer{}, "", err
+						}
+					}
+				}
+			case []uint:
+				for _, val := range slice {
+					err := writer.WriteField(trimString(types.Field(i)), strconv.FormatUint(uint64(val), 10))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				}
+			case []uint64:
+				for _, val := range slice {
+					err := writer.WriteField(trimString(types.Field(i)), strconv.FormatUint(val, 10))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				}
+			case []map[string]interface{}:
+				for _, val := range slice {
+					encodeStr, err := json.Marshal(val)
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+					err = writer.WriteField(trimString(types.Field(i)), string(encodeStr))
+					if err != nil {
+						return &bytes.Buffer{}, "", err
+					}
+				}
+			default:
+				return &bytes.Buffer{}, "", fmt.Errorf("unsupported slice type:%T", slice)
+			}
+			continue
+		}
+
+		err := writer.WriteField(trimString(types.Field(i)), valueToString(values.Field(i).Interface()))
+		if err != nil {
+			return &bytes.Buffer{}, "", err
 		}
 	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(req.MasterCPU), 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(req.MasterNum), 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(req.MasterRAM), 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(req.MasterDisk), 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(req.WorkerCPU), 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(req.WorkerNum), 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(req.WorkerRAM), 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(req.WorkerDisk), 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
 	ct := writer.FormDataContentType()
-	writer.Close()
-
-	return reqBody, ct
+	return reqBody, ct, nil
 }
 
-func createK8sCloudBroker(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
+func valueToString(a any) string {
+	switch str := a.(type) {
+	case string:
+		return str
+	case uint:
+		return strconv.FormatUint(uint64(str), 10)
+	case uint64:
+		return strconv.FormatUint(str, 10)
+	case bool:
+		return strconv.FormatBool(str)
+	default:
+		return ""
 	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8CIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(req.MasterCPU, 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(req.MasterNum, 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(req.MasterRAM, 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(req.MasterDisk, 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(req.WorkerCPU, 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(req.WorkerNum, 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(req.WorkerRAM, 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(req.WorkerDisk, 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	ct := writer.FormDataContentType()
-
-	writer.Close()
-	return reqBody, ct
+}
+
+func trimString(el reflect.StructField) string {
+	return strings.TrimSuffix(el.Tag.Get("url"), ",omitempty")
+}
+
+func trimConfig(cfg *config.Config) config.Config {
+	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
+	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

@@ -8,21 +8,19 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"mime/multipart"
 	"net/http"
-	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
 )
 
-// HTTP-client for platform
+// BVSDecortClient is HTTP-client for platform
 type BVSDecortClient struct {
 	client    *http.Client
 	cfg       config.BVSConfig
@@ -30,11 +28,21 @@ type BVSDecortClient struct {
 	decortURL string
 }
 
+type tokenJSON struct {
+	AccessToken  string `json:"access_token"`
+	TokenType    string `json:"token_type"`
+	RefreshToken string `json:"refresh_token"`
+	ExpiresIn    uint64 `json:"expires_in"`
+}
+
 // Сlient builder
 func NewBVS(cfg config.BVSConfig) *BVSDecortClient {
 	if cfg.Retries == 0 {
 		cfg.Retries = 5
 	}
+	if cfg.TimeToRefresh == 0 {
+		cfg.TimeToRefresh = 1
+	}
 
 	return &BVSDecortClient{
 		decortURL: cfg.DecortURL,
@@ -46,7 +54,7 @@ func NewBVS(cfg config.BVSConfig) *BVSDecortClient {
 				},
 			},
 		},
-		cfg:   cfg,
+		cfg:   trimBVSConfig(&cfg),
 		mutex: &sync.Mutex{},
 	}
 }
@@ -63,15 +71,14 @@ func (bdc *BVSDecortClient) CloudBroker() *cloudbroker.CloudBroker {
 
 // DecortApiCall method for sending requests to the platform
 func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
-	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
 	var body *bytes.Buffer
 	var ctype string
 
-	if okCa {
-		body, ctype = createK8sCloudApiBVS(k8sCaCreateReq)
-	} else if okCb {
-		body, ctype = createK8sCloudBrokerBVS(k8sCbCreateReq)
+	byteSlice, ok := params.([]byte)
+	if ok {
+		body = bytes.NewBuffer(byteSlice)
+		// ctype = "application/x-iso9660-image"
+		ctype = "application/octet-stream"
 	} else {
 		values, err := query.Values(params)
 		if err != nil {
@@ -80,322 +87,375 @@ func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url strin
 		body = bytes.NewBufferString(values.Encode())
 	}
 
-	req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+restmachine+url, body)
+	req, err := http.NewRequestWithContext(ctx, method, bdc.decortURL+constants.RESTMACHINE+url, body)
 	if err != nil {
 		return nil, err
 	}
 
-	if err = bdc.getToken(ctx); err != nil {
-		return nil, err
+	// get token
+	if bdc.cfg.Token.AccessToken == "" {
+		if _, err = bdc.GetToken(ctx); err != nil {
+			return nil, err
+		}
 	}
 
-	resp, err := bdc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBytes, err := io.ReadAll(resp.Body)
-	if 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
+			}
+		}
 	}
 
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
+	// perform request
+	reqCopy := req.Clone(ctx)
+	respBytes, err := bdc.do(req, ctype)
+	if err == nil {
+		return respBytes, 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) getToken(ctx context.Context) error {
+// 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 {
+		return nil, err
+	}
+
+	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, ctype)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return respBytes, err
+}
+
+// GetToken allows you to get a token and returns the token structure. When specifying the PathCfg variable,
+// the token and configuration will be written to a file.
+// When specifying the PathToken variable, the token will be written to a file.
+func (bdc *BVSDecortClient) GetToken(ctx context.Context) (config.Token, error) {
 	bdc.mutex.Lock()
 	defer bdc.mutex.Unlock()
 
-	if !bdc.cfg.Token.Valid() {
+	// set up request headers and body
+	body := fmt.Sprintf("grant_type=password&client_id=%s&client_secret=%s&username=%s&password=%s&response_type=token&scope=openid", bdc.cfg.AppID, bdc.cfg.AppSecret, bdc.cfg.Username, bdc.cfg.Password)
+	bodyReader := strings.NewReader(body)
 
-		body := fmt.Sprintf("grant_type=password&client_id=%s&client_secret=%s&username=%s&password=%s&response_type=token&scope=openid", bdc.cfg.AppID, bdc.cfg.AppSecret, bdc.cfg.Username, bdc.cfg.Password)
-		bodyReader := strings.NewReader(body)
+	bdc.cfg.SSOURL = strings.TrimSuffix(bdc.cfg.SSOURL, "/")
 
-		bdc.cfg.SSOURL = strings.TrimSuffix(bdc.cfg.SSOURL, "/")
+	req, _ := http.NewRequestWithContext(ctx, "POST", bdc.cfg.SSOURL+"/realms/"+bdc.cfg.Domain+"/protocol/openid-connect/token", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 
-		req, _ := http.NewRequestWithContext(ctx, "POST", bdc.cfg.SSOURL+"/realms/"+bdc.cfg.Domain+"/protocol/openid-connect/token", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	// request token
+	resp, err := bdc.client.Do(req)
+	if err != nil || resp == nil {
+		return config.Token{}, fmt.Errorf("cannot get token: %w", err)
+	}
+	defer resp.Body.Close()
 
-		resp, err := bdc.client.Do(req)
-		if err != nil {
-			return fmt.Errorf("cannot get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("cannot get token: %s", tokenBytes)
-		}
-
-		err = json.Unmarshal(tokenBytes, &bdc.cfg.Token)
-		if err != nil {
-			return fmt.Errorf("cannot unmarshal token: %s", tokenBytes)
-		}
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return config.Token{}, fmt.Errorf("cannot get token: %w", err)
 	}
 
-	return nil
+	if resp.StatusCode != 200 {
+		return config.Token{}, fmt.Errorf("cannot get token: %s", tokenBytes)
+	}
+
+	// save token in config
+	var tj tokenJSON
+	if err = json.Unmarshal(tokenBytes, &tj); err != nil {
+		return config.Token{}, fmt.Errorf("cannot unmarshal token: %w", err)
+	}
+
+	bdc.cfg.Token = config.Token{
+		AccessToken:  tj.AccessToken,
+		TokenType:    tj.TokenType,
+		RefreshToken: tj.RefreshToken,
+		Expiry:       tj.expiry(),
+	}
+
+	if bdc.cfg.PathCfg != "" {
+		ser, _ := bdc.cfg.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathCfg)
+	}
+
+	if bdc.cfg.PathToken != "" {
+		ser, _ := bdc.cfg.Token.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathToken)
+	}
+
+	return bdc.cfg.Token, nil
 }
 
-func (bdc *BVSDecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
-	if ctype != "" {
-		req.Header.Add("Content-Type", ctype)
-	} else {
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+// RefreshToken allows you to refresh a token and returns the token structure. When specifying the PathCfg variable,
+// the token and configuration will be written to a file.
+// When specifying the PathToken variable, the token will be written to a file
+func (bdc *BVSDecortClient) RefreshToken(ctx context.Context) (config.Token, error) {
+	bdc.mutex.Lock()
+	defer bdc.mutex.Unlock()
+
+	// set up request headers and body
+	body := fmt.Sprintf("grant_type=refresh_token&client_id=%s&client_secret=%s&refresh_token=%s&scope=openid", bdc.cfg.AppID, bdc.cfg.AppSecret, bdc.cfg.Token.RefreshToken)
+	bodyReader := strings.NewReader(body)
+
+	bdc.cfg.SSOURL = strings.TrimSuffix(bdc.cfg.SSOURL, "/")
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", bdc.cfg.SSOURL+"/realms/"+bdc.cfg.Domain+"/protocol/openid-connect/token", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// refresh token
+	resp, err := bdc.client.Do(req)
+	if err != nil || resp == nil {
+		return config.Token{}, fmt.Errorf("cannot refresh token: %w", err)
 	}
-	bdc.cfg.Token.SetAuthHeader(req)
+	defer resp.Body.Close()
+
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return config.Token{}, fmt.Errorf("cannot refresh token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return config.Token{}, fmt.Errorf("cannot refresh token: %s", tokenBytes)
+	}
+
+	// save token in config
+	var tj tokenJSON
+	if err = json.Unmarshal(tokenBytes, &tj); err != nil {
+		return config.Token{}, fmt.Errorf("cannot unmarshal after refresh token: %w", err)
+	}
+
+	bdc.cfg.Token = config.Token{
+		AccessToken:  tj.AccessToken,
+		TokenType:    tj.TokenType,
+		RefreshToken: tj.RefreshToken,
+		Expiry:       tj.expiry(),
+	}
+
+	if bdc.cfg.PathCfg != "" {
+		ser, _ := bdc.cfg.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathCfg)
+	}
+
+	if bdc.cfg.PathToken != "" {
+		ser, _ := bdc.cfg.Token.Serialize("", "    ")
+		_ = ser.WriteToFile(bdc.cfg.PathToken)
+	}
+
+	return bdc.cfg.Token, nil
+}
+
+func (e *tokenJSON) expiry() (t time.Time) {
+	if v := e.ExpiresIn; v != 0 {
+		return time.Now().Add(time.Duration(v) * time.Second)
+	}
+	return
+}
+
+// do method performs request and returns response as an array of bytes and nil error in case of response status code 200.
+// In any other cases do returns nil response and error.
+// Retries are implemented in case of connection reset errors.
+func (bdc *BVSDecortClient) do(req *http.Request, ctype string) ([]byte, error) {
+	// set up request headers and body
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	if ctype != "" {
+		req.Header.Set("Content-Type", ctype)
+	}
+
+	req.Header.Add("Authorization", "bearer "+bdc.cfg.Token.AccessToken)
 	req.Header.Set("Accept", "application/json")
 
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-
-	// for i := uint64(0); i < bdc.cfg.Retries; i++ {
-	// 	req = req.Clone(req.Context())
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := bdc.client.Do(req)
-	if err == nil {
-		if resp.StatusCode == 200 {
-			return resp, err
-		}
+	buf, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
 	}
-	// }
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
 
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := bdc.client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
+
+	// retries logic GOES HERE
+	// get http response
+	//var resp *http.Response
+	//for i := uint64(0); i < bdc.cfg.Retries; i++ {
+	//	req := req.Clone(req.Context())
+	//	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	//
+	//	if i > 0 {
+	//		time.Sleep(5 * time.Second) // no time sleep for the first request
+	//	}
+	//
+	//	resp, err = bdc.client.Do(req)
+	//
+	//	// stop retries on success and close response body
+	//	if resp != nil {
+	//		defer resp.Body.Close()
+	//	}
+	//	if err == nil {
+	//		break
+	//	}
+	//
+	//	// retries in case of connection errors with time sleep
+	//	if isConnectionError(err) {
+	//		continue
+	//	}
+	//
+	//	// return error in case of non-connection error
+	//	return nil, err
+	//}
+
+	// handle http request errors
+	if err != nil {
+		return nil, err
+	}
+	if resp == nil {
+		return nil, fmt.Errorf("got empty response without error")
+	}
+
+	var respBytes []byte
+	respBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	// handle access denied and successful request
+	if resp.StatusCode == 401 {
+		return respBytes, errors.New("access is denied")
+	}
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with other status codes
+	err = fmt.Errorf("%s", respBytes)
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
 
-func createK8sCloudApiBVS(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8SCIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(req.MasterCPU), 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(req.MasterNum), 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(req.MasterRAM), 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(req.MasterDisk), 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(req.WorkerCPU), 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(req.WorkerNum), 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(req.WorkerRAM), 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(req.WorkerDisk), 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	ct := writer.FormDataContentType()
-	writer.Close()
-
-	return reqBody, ct
-}
-
-func createK8sCloudBrokerBVS(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8CIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(req.MasterCPU, 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(req.MasterNum, 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(req.MasterRAM, 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(req.MasterDisk, 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(req.WorkerCPU, 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(req.WorkerNum, 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(req.WorkerRAM, 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(req.WorkerDisk, 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	ct := writer.FormDataContentType()
-
-	writer.Close()
-	return reqBody, ct
+func trimBVSConfig(cfg *config.BVSConfig) config.BVSConfig {
+	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
+	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
+	return *cfg
 }

config/config_bvs.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"golang.org/x/oauth2"
 	"gopkg.in/yaml.v3"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -24,7 +24,7 @@ type BVSConfig struct {
 	// Domain name
 	// Required: true
 	// Example: "dynamix"
-	Domain string `json:"domain" yaml:"domain"`
+	Domain string `json:"domain" yaml:"domain" validate:"required"`
 
 	// Application (client) identifier for authorization
 	// in the cloud platform controller in oauth2 mode.
@@ -50,7 +50,7 @@ type BVSConfig struct {
 	// JWT platform token
 	// Required: false
 	// Example: "qwqwdfwv68979we0q9bfv7e9sbvd89798qrwv97ff"
-	Token oauth2.Token `json:"token" yaml:"token"`
+	Token Token `json:"token" yaml:"token"`
 
 	// Amount platform request attempts
 	// Default value: 5
@@ -64,6 +64,40 @@ type BVSConfig struct {
 	// HTTP client timeout, unlimited if left empty
 	// Required: false
 	Timeout Duration `json:"timeout" yaml:"timeout"`
+
+	// The path of the configuration file entry
+	// Required: false
+	PathCfg string `json:"path_cfg" yaml:"path_cfg"`
+
+	// The path of the token file entry
+	// Required: false
+	PathToken string `json:"path_token" yaml:"path_token"`
+
+	// The number of minutes before the expiration of the token, a refresh will be made
+	// Required: false
+	TimeToRefresh int64 `json:"timeToRefresh" yaml:"timeToRefresh"`
+}
+
+type Token struct {
+	// AccessToken is the token that authorizes and authenticates
+	// the requests.
+	// Required: false
+	AccessToken string `json:"access_token" yaml:"access_token"`
+
+	// TokenType is the type of token.
+	// The Type method returns either this or "Bearer", the default.
+	// Required: false
+	TokenType string `json:"token_type" yaml:"token_type"`
+
+	// RefreshToken is a token that's used by the application
+	// (as opposed to the user) to refresh the access token
+	// if it expires.
+	// Required: false
+	RefreshToken string `json:"refresh_token" yaml:"refresh_token"`
+
+	// Expiry is the optional expiration time of the access token.
+	// Required: false
+	Expiry time.Time `json:"expiry" yaml:"expiry"`
 }
 
 // SetTimeout is used to set HTTP client timeout.
@@ -93,6 +127,50 @@ func ParseConfigBVSJSON(path string) (BVSConfig, error) {
 	return config, nil
 }
 
+// ParseConfigJSON parses Token from specified JSON-formatted file.
+func ParseTokenBVSJSON(path string) (Token, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Token{}, err
+	}
+
+	var token Token
+
+	err = json.Unmarshal(file, &token)
+	if err != nil {
+		return Token{}, err
+	}
+
+	err = validators.ValidateConfig(token)
+	if err != nil {
+		return Token{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return token, nil
+}
+
+// ParseTokenBVSYAML parses Token from specified YAML-formatted file.
+func ParseTokenBVSYAML(path string) (Token, error) {
+	file, err := os.ReadFile(path)
+	if err != nil {
+		return Token{}, err
+	}
+
+	var token Token
+
+	err = yaml.Unmarshal(file, &token)
+	if err != nil {
+		return Token{}, err
+	}
+
+	err = validators.ValidateConfig(token)
+	if err != nil {
+		return Token{}, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	return token, nil
+}
+
 // ParseConfigYAML parses Config from specified YAML-formatted file.
 func ParseConfigBVSYAML(path string) (BVSConfig, error) {
 	file, err := os.ReadFile(path)
@@ -114,3 +192,25 @@ func ParseConfigBVSYAML(path string) (BVSConfig, error) {
 
 	return config, nil
 }
+
+func (t Token) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(t, prefix, indent)
+	}
+
+	return json.Marshal(t)
+}
+
+func (c BVSConfig) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(c, prefix, indent)
+	}
+
+	return json.Marshal(c)
+}

config/timeouts.go

@@ -22,6 +22,8 @@ func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		}
 		*d = Duration(tmp)
 		return nil
+	case float64:
+		return nil
 	default:
 		return fmt.Errorf("invalid duration %v", value)
 	}
@@ -40,6 +42,8 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 		}
 		*d = Duration(tmp)
 		return nil
+	case float64:
+		return nil
 	default:
 		return fmt.Errorf("invalid duration %v", value)
 	}

config/universal-config.go

@@ -0,0 +1,8 @@
+package config
+
+// UniversalConfig combines configurations for different types of clients
+type UniversalConfig struct {
+	Decs3oConfig *Config       `json:"decs3oConfig,omitempty" yaml:"decs3oConfig,omitempty"`
+	BVSConfig    *BVSConfig    `json:"bvsConfig,omitempty" yaml:"bvsConfig,omitempty"`
+	LegacyConfig *LegacyConfig `json:"legacyConfig,omitempty" yaml:"legacyConfig,omitempty"`
+}

go.mod

@@ -5,20 +5,17 @@ go 1.20
 require (
 	github.com/go-playground/validator/v10 v10.11.2
 	github.com/google/go-querystring v1.1.0
-	golang.org/x/oauth2 v0.13.0
+	github.com/joho/godotenv v1.5.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/net v0.16.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -8,15 +8,13 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
 github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -28,29 +26,13 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
-golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

interfaces/caller.go

@@ -6,4 +6,10 @@ import "context"
 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)
 }

interfaces/request.go

@@ -0,0 +1,7 @@
+package interfaces
+
+// Interface to valiate RAM values
+type RequestWithRAM interface {
+	// GetRAM returns RAM values
+	GetRAM() map[string]uint64
+}

internal/constants/constants.go

@@ -0,0 +1,36 @@
+package constants
+
+const (
+	RESTMACHINE = "/restmachine"
+)
+
+const (
+	MIMEJSON              = "application/json"
+	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{
+	"OidcCertificate": "ca.crt",
+}
+
+var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
+
+var VersionMap = map[string]string{
+	"4.4.0": "-",
+	"4.3.0": "-",
+	"4.2.0": "-",
+	"4.1.1": "-",
+	"4.1.0": "-",
+}

internal/validators/custom.go

@@ -1,31 +1,38 @@
 package validators
 
 import (
+	"errors"
+	"fmt"
+	"net/url"
+	"reflect"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/multierror"
 )
 
-// computeDriverValidator is used to validate Driver field in kvmx86/kvmppc create.
-func computeDriverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return StringInSlice(fieldValue, computeDriverValues)
-}
-
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, protoValues)
+	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()
 
-	return StringInSlice(fieldValue, accessTypeValues)
+	return IsInSlice(fieldValue, accessTypeValues)
 }
 
 // resTypesValidator is used to validate ResTypes fields.
@@ -36,7 +43,7 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !StringInSlice(value, resTypesValues) {
+		if !IsInSlice(value, resTypesValues) {
 			return false
 		}
 	}
@@ -44,60 +51,81 @@ 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 StringInSlice(fieldValue, driverValues)
-}
-
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, accountCUTypeValues)
+	return IsInSlice(fieldValue, accountCUTypeValues)
 }
 
 // bserviceModeValidator is used to validate Mode field.
 func bserviceModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, bserviceModeValues)
+	return IsInSlice(fieldValue, bserviceModeValues)
 }
 
 // computeTopologyValidator is used to validate Topology field.
 func computeTopologyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeTopologyValues)
+	return IsInSlice(fieldValue, computeTopologyValues)
 }
 
 // computePolicyValidator is used to validate Policy field.
 func computePolicyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computePolicyValues)
+	return IsInSlice(fieldValue, computePolicyValues)
 }
 
 // computeModeValidator is used to validate Mode field.
 func computeModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeModeValues)
+	return IsInSlice(fieldValue, computeModeValues)
 }
 
 // computeDiskTypeValidator is used to validate DiskType field.
 func computeDiskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeDiskTypeValues)
+	return IsInSlice(fieldValue, computeDiskTypeValues)
 }
 
 // computeNetTypeValidator is used to validate NetType field.
 func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeNetTypeValues)
+	return IsInSlice(fieldValue, computeNetTypeValues)
+}
+
+// computex86NetTypeValidator is used to validate NetType field.
+func computex86NetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	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.
@@ -108,7 +136,7 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !StringInSlice(value, computeOrderValues) {
+		if !IsInSlice(value, computeOrderValues) {
 			return false
 		}
 	}
@@ -120,100 +148,84 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 func computeDataDisksValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, computeDataDisksValues)
+	return IsInSlice(fieldValue, computeDataDisksValues)
 }
 
 // diskTypeValidator is used to validate Type field.
 func diskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, diskTypeValues)
+	return IsInSlice(fieldValue, diskTypeValues)
 }
 
 // flipgroupClientTypeValidator is used to validate ClientType field.
 func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, flipgroupClientTypeValues)
+	return IsInSlice(fieldValue, flipgroupClientTypeValues)
 }
 
 // kvmNetTypeValidator is used to validate NetType field.
 func kvmNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, kvmNetTypeValues)
+	return IsInSlice(fieldValue, kvmNetTypeValues)
 }
 
 // lbAlgorithmValidator is used to validate Algorithm field.
 func lbAlgorithmValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, lbAlgorithmValues)
+	return IsInSlice(fieldValue, lbAlgorithmValues)
 }
 
 // rgDefNetValidator is used to validate DefNet field.
 func rgDefNetValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, rgDefNetValues)
+	return IsInSlice(fieldValue, rgDefNetValues)
 }
 
 // rgNetTypeValidator is used to validate NetType field.
 func rgNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, rgNetTypeValues)
+	return IsInSlice(fieldValue, rgNetTypeValues)
 }
 
 // vinsTypeValidator is used to validate Type field.
 func vinsTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, vinsTypeValues)
+	return IsInSlice(fieldValue, vinsTypeValues)
 }
 
 // imageBootTypeValidator is used to validate BootType field.
 func imageBootTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, imageBootTypeValues)
+	return IsInSlice(fieldValue, imageBootTypeValues)
 }
 
 // imageTypeValidator is used to validate ImageType field.
 func imageTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(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 !StringInSlice(item, imageDriversValues) {
-			return false
-		}
-	}
-
-	return true
+	return IsInSlice(fieldValue, imageTypeValues)
 }
 
 // imageArchitectureValidator is used to validate Architecture field.
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, imageArchitectureValues)
+	return IsInSlice(fieldValue, imageArchitectureValues)
 }
 
 // sepFieldTypeValidator is used to validate FieldType field.
 func sepFieldTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return StringInSlice(fieldValue, sepFieldTypeValues)
+	return IsInSlice(fieldValue, sepFieldTypeValues)
 }
 
 // hwPathValidator is used to validate HWPath field.
@@ -230,7 +242,7 @@ func networkPluginValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return StringInSlice(fieldValue, networkPluginValues)
+	return IsInSlice(fieldValue, networkPluginValues)
 }
 
 // networkPluginsValidator is used to validate NetworkPlugins field
@@ -243,7 +255,7 @@ func networkPluginsValidator(fe validator.FieldLevel) bool {
 	for _, item := range fieldSlice {
 		item = strings.ToLower(item)
 
-		if !StringInSlice(item, networkPluginValues) {
+		if !IsInSlice(item, networkPluginValues) {
 			return false
 		}
 	}
@@ -255,14 +267,35 @@ func interfaceStateValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return StringInSlice(fieldValue, interfaceStateValues)
+	return IsInSlice(fieldValue, interfaceStateValues)
+}
+
+func interfaceTXModelValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, txModelValues)
+}
+
+func interfaceIOEventFDValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, ioEventFDValues)
+}
+
+func interfaceEventIDxValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	fieldValue = strings.ToLower(fieldValue)
+
+	return IsInSlice(fieldValue, eventIDxValues)
 }
 
 func strictLooseValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return StringInSlice(fieldValue, strictLooseValues)
+	return IsInSlice(fieldValue, strictLooseValues)
 }
 
 // name workerGroup must be more 3 symbol
@@ -272,3 +305,155 @@ func workerGroupNameValidator(fe validator.FieldLevel) bool {
 
 	return len(fieldValue) >= 3
 }
+
+func sortByValidator(fe validator.FieldLevel) bool {
+
+	sortByRegexp := regexp.MustCompile(`^[+-][a-zA-Z_]+`)
+
+	return sortByRegexp.MatchString(fe.Field().String())
+}
+
+func actionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, actionValues)
+}
+
+func vmActionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, vmActionValues)
+}
+
+func mtuValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().Uint()
+
+	return fieldValue >= uint64(mtuMin) && fieldValue <= uint64(mtuMax)
+}
+
+func computeFeaturesValidator(fe validator.FieldLevel) bool {
+	field := fe.Field()
+	slice, ok := field.Interface().([]string)
+	if !ok {
+		return false
+	}
+
+	return IsSubSlice(slice, computeFeaturesValues)
+}
+
+func networkInterfaceNamingValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, networkInterfaceNamingValues)
+}
+
+func numaAffinityValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, numaAffinityValues)
+}
+
+// kvmx86NetTypeValidator is used to validate NetType field for x86 compute.
+func kvmx86NetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, kvmx86NetTypeValues)
+}
+
+func isBoolTypeValidator(fe validator.FieldLevel) bool {
+	return fe.Field().CanConvert(reflect.TypeOf(true))
+}
+
+func urlValidartor(fl validator.FieldLevel) bool {
+	fieldValues := fl.Field().String()
+
+	_, err := url.ParseRequestURI(fieldValues)
+	return err == nil
+}
+
+func chipsetValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	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 {
+
+	if divisibility == 0 {
+
+		return errors.New("second argument of ValidateRAM should be greater than 0")
+	}
+	mapRAM := r.GetRAM()
+
+	errs := make([]error, 0, len(mapRAM))
+
+	for k, v := range mapRAM {
+
+		if v%divisibility != 0 {
+
+			errs = append(errs, fmt.Errorf("expected value of %s: \"%d\" should be divisible by %d", k, v, divisibility))
+		}
+	}
+	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/helper.go

@@ -34,7 +34,7 @@ func GetErrors(err error) validator.ValidationErrors {
 	return err.(validator.ValidationErrors)
 }
 
-func StringInSlice(str string, target []string) bool {
+func IsInSlice(str string, target []string) bool {
 	for _, v := range target {
 		if v == str {
 			return true
@@ -42,3 +42,12 @@ func StringInSlice(str string, target []string) bool {
 	}
 	return false
 }
+
+func IsSubSlice(source []string, target []string) bool {
+	for _, s := range source {
+		if !IsInSlice(s, target) {
+			return false
+		}
+	}
+	return true
+}

internal/validators/messages.go

@@ -25,12 +25,8 @@ func errorMessage(fe validator.FieldError) string {
 		return fmt.Sprintf("%s %s: unexpected URL format", prefix, fe.Field())
 	case "email":
 		return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())
-
-	case "driver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(driverValues))
+	case "isBool":
+		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -50,6 +46,13 @@ 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",
@@ -89,6 +92,18 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDiskTypeValues))
 
+	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,
+			fe.Field(),
+			joinValues(computex86NetTypeValues))
+
 	case "computeNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -107,12 +122,6 @@ 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",
@@ -133,7 +142,7 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
-	// KVM_X86/KVM_PPC Validators
+	// KVM_X86 Validators
 	case "kvmNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -180,12 +189,6 @@ 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,
@@ -229,6 +232,127 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(interfaceStateValues))
+
+	case "interfaceTXModel":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(txModelValues))
+
+	case "interfaceIOEventFD":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(ioEventFDValues))
+
+	case "interfaceEventIDx":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(eventIDxValues))
+
+	case "sortBy":
+		return fmt.Sprintf("%s %s must be in format +|-(field)",
+			prefix,
+			fe.Field())
+
+	case "action":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(actionValues))
+
+	case "vmaction":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(vmActionValues))
+
+	case "computeFeatures":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computeFeaturesValues))
+
+	case "networkInterfaceNaming":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(networkInterfaceNamingValues))
+
+	case "numaAffinity":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(numaAffinityValues))
+
+	case "kvmx86NetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(kvmx86NetTypeValues))
+
+	case "chipset":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			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

@@ -25,12 +25,13 @@ func getDecortValidator() *validator.Validate {
 
 // registerAllValidators registers all custom validators in DecortValidator.
 func registerAllValidators(validate *validator.Validate) error {
+
 	err := validate.RegisterValidation("proto", protoValidator)
 	if err != nil {
 		return err
 	}
 
-	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
+	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
 	if err != nil {
 		return err
 	}
@@ -45,11 +46,6 @@ 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
@@ -60,11 +56,6 @@ 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
@@ -105,6 +96,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("computex86NetType", computex86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("computeOrder", computeOrderValidator)
 	if err != nil {
 		return err
@@ -180,10 +176,130 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("interfaceTXModel", interfaceTXModelValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("interfaceIOEventFD", interfaceIOEventFDValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("interfaceEventIDx", interfaceEventIDxValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("workerGroupName", workerGroupNameValidator)
 	if err != nil {
 		return err
 	}
 
+	err = validate.RegisterValidation("sortBy", sortByValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("action", actionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("vmaction", vmActionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("mtu", mtuValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("computeFeatures", computeFeaturesValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("networkInterfaceNaming", networkInterfaceNamingValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("numaAffinity", numaAffinityValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("kvmx86NetType", kvmx86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("isBool", isBoolTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("url", urlValidartor)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("chipset", chipsetValidator)
+	if err != nil {
+		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,7 +1,8 @@
 package validators
 
 var (
-	driverValues     = []string{"KVM_X86", "KVM_PPC"}
+	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
+
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
@@ -10,38 +11,78 @@ var (
 
 	bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
 
-	computeTopologyValues  = []string{"compute", "node"}
-	computePolicyValues    = []string{"RECOMMENDED", "REQUIRED"}
-	computeModeValues      = []string{"EQ", "EN", "ANY"}
-	computeDiskTypeValues  = []string{"D", "B"}
-	computeNetTypeValues   = []string{"EXTNET", "VINS"}
-	computeOrderValues     = []string{"cdrom", "network", "hd"}
-	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
-	computeDriverValues    = []string{"KVM_X86", "SVA_KVM_X86"}
+	computeTopologyValues   = []string{"compute", "node"}
+	computePolicyValues     = []string{"RECOMMENDED", "REQUIRED"}
+	computeModeValues       = []string{"EQ", "EN", "ANY"}
+	computeDiskTypeValues   = []string{"D", "B"}
+	computeNetTypeValues    = []string{"EXTNET", "VINS"}
+	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
+	computeOrderValues      = []string{"cdrom", "network", "hd"}
+	computeDataDisksValues  = []string{"KEEP", "DETACH", "DESTROY"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
-	kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
+	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
+	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "EMPTY", "VFNIC", "DPDK", "SDN", "TRUNK"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
 	rgDefNetValues  = []string{"PRIVATE", "PUBLIC", "NONE"}
 	rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
 
-	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDE"}
+	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
-	imageTypeValues         = []string{"windows", "linux", "other"}
-	imageDriversValues      = []string{"KVM_X86"}
-	imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
+	imageTypeValues         = []string{"windows", "linux", "unknown"}
+	imageArchitectureValues = []string{"X86_64"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 
-	networkPluginValues = []string{"flannel", "weawenet", "calico"}
+	networkPluginValues = []string{"flannel", "weavenet", "calico"}
 
 	strictLooseValues = []string{"strict", "loose"}
 
 	interfaceStateValues = []string{"on", "off"}
+
+	actionValues = []string{"is_powered", "power_on", "shutdown", "force_shutdown", "reboot"}
+
+	vmActionValues = []string{"stop", "move"}
+
+	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac", "trunk"}
+
+	networkInterfaceNamingValues = []string{"eth", "ens"}
+
+	numaAffinityValues = []string{"none", "strict", "loose"}
+
+	txModelValues = []string{"iothread", "timer", "selected by hypervisor"}
+
+	ioEventFDValues = []string{"on", "off", "selected by hypervisor"}
+
+	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
+	trunkTagsMax = 4095
 )

legacy-client.go

@@ -4,26 +4,23 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"errors"
+	"encoding/json"
 	"fmt"
 	"io"
-	"mime/multipart"
 	"net/http"
 	"net/url"
-	"strconv"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/google/go-querystring/query"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
 )
 
-// Legacy HTTP-client for platform
+// LegacyDecortClient is Legacy HTTP-client for platform
 type LegacyDecortClient struct {
 	decortURL  string
 	client     *http.Client
@@ -54,7 +51,7 @@ func NewLegacy(cfg config.LegacyConfig) *LegacyDecortClient {
 				},
 			},
 		},
-		cfg:        cfg,
+		cfg:        trimLegacyConfig(&cfg),
 		expiryTime: expiryTime,
 		mutex:      &sync.Mutex{},
 	}
@@ -72,20 +69,18 @@ func (ldc *LegacyDecortClient) CloudBroker() *cloudbroker.CloudBroker {
 
 // DecortApiCall method for sending requests to the platform
 func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
+	// get token
 	if err := ldc.getToken(ctx); err != nil {
 		return nil, err
 	}
 
-	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
-	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
-
 	var body *bytes.Buffer
 	var ctype string
 
-	if okCa {
-		body, ctype = createK8sCloudApiLegacy(k8sCaCreateReq, ldc.cfg.Token)
-	} else if okCb {
-		body, ctype = createK8sCloudBrokerLegacy(k8sCbCreateReq, ldc.cfg.Token)
+	byteSlice, ok := params.([]byte)
+	if ok {
+		body = bytes.NewBuffer(byteSlice)
+		ctype = "application/octet-stream"
 	} else {
 		values, err := query.Values(params)
 		if err != nil {
@@ -94,317 +89,202 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st
 		body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
 	}
 
-	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+restmachine+url, body)
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := ldc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBytes, err := io.ReadAll(resp.Body)
+	// perform request
+	respBytes, err := ldc.do(req, ctype)
 	if err != nil {
 		return nil, err
 	}
 
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
+	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
 	}
 
-	return respBytes, nil
+	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 {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+constants.RESTMACHINE+url, body)
+	if err != nil {
+		return nil, err
+	}
+
+	// get token
+	if err = ldc.getToken(ctx); 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) getToken(ctx context.Context) error {
 	ldc.mutex.Lock()
 	defer ldc.mutex.Unlock()
 
-	if ldc.cfg.Token == "" || time.Now().After(ldc.expiryTime) {
-		body := fmt.Sprintf("username=%s&password=%s", url.QueryEscape(ldc.cfg.Username), url.QueryEscape(ldc.cfg.Password))
-		bodyReader := strings.NewReader(body)
-
-		req, _ := http.NewRequestWithContext(ctx, "POST", ldc.cfg.DecortURL+"/restmachine/cloudapi/user/authenticate", bodyReader)
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-
-		resp, err := ldc.client.Do(req)
-		if err != nil {
-			return fmt.Errorf("unable to get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("unable to get token: %s", tokenBytes)
-		}
-
-		token := string(tokenBytes)
-		ldc.cfg.Token = token
-		ldc.expiryTime = time.Now().AddDate(0, 0, 1)
+	// new token is not needed
+	if ldc.cfg.Token != "" && !time.Now().After(ldc.expiryTime) {
+		return nil
 	}
 
+	// set up request headers and body
+	body := fmt.Sprintf("username=%s&password=%s", url.QueryEscape(ldc.cfg.Username), url.QueryEscape(ldc.cfg.Password))
+	bodyReader := strings.NewReader(body)
+
+	req, _ := http.NewRequestWithContext(ctx, "POST", ldc.cfg.DecortURL+constants.RESTMACHINE+"/cloudapi/user/authenticate", bodyReader)
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	// request token
+	resp, err := ldc.client.Do(req)
+	if err != nil || resp == nil {
+		return fmt.Errorf("cannot get token: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var tokenBytes []byte
+	tokenBytes, err = io.ReadAll(resp.Body)
+	if err != nil {
+		return fmt.Errorf("cannot get token: %w", err)
+	}
+
+	if resp.StatusCode != 200 {
+		return fmt.Errorf("cannot get token: %s", tokenBytes)
+	}
+
+	// save token in config
+	token := string(tokenBytes)
+	ldc.cfg.Token = token
+	ldc.expiryTime = time.Now().AddDate(0, 0, 1)
+
 	return nil
 }
 
-func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
+// do method performs request and returns response as an array of bytes and nil error in case of response status code 200.
+// In any other cases do returns nil response and error.
+// Retries are implemented in case of connection reset errors.
+func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) ([]byte, error) {
+	// set up request headers and body
+	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	if ctype != "" {
-		req.Header.Add("Content-Type", ctype)
-	} else {
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+		req.Header.Set("Content-Type", ctype)
 	}
+
 	req.Header.Set("Accept", "application/json")
 
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-
-	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
-	// 	req = req.Clone(req.Context())
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := ldc.client.Do(req)
-	if err == nil {
-		if resp.StatusCode == 200 {
-			return resp, err
-		}
+	buf, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
 	}
-	// }
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
 
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := ldc.client.Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
+	}
+
+	// retries logic GOES HERE
+	// get http response
+	//var resp *http.Response
+	//for i := uint64(0); i < ldc.cfg.Retries; i++ {
+	//	req := req.Clone(req.Context())
+	//	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+	//
+	//	if i > 0 {
+	//		time.Sleep(5 * time.Second) // no time sleep for the first request
+	//	}
+	//
+	//	resp, err = ldc.client.Do(req)
+	//
+	//	// stop retries on success and close response body
+	//	if resp != nil {
+	//		defer resp.Body.Close()
+	//	}
+	//	if err == nil {
+	//		break
+	//	}
+	//
+	//	// retries in case of connection errors with time sleep
+	//	if isConnectionError(err) {
+	//		continue
+	//	}
+	//
+	//	// return error in case of non-connection error
+	//	return nil, err
+	//}
+
+	// handle http request errors
+	if err != nil {
+		return nil, err
+	}
+	if resp == nil {
+		return nil, fmt.Errorf("got empty response without error")
+	}
+
+	// handle successful request
+	respBytes, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with status code other than 200
+	err = fmt.Errorf("%s", respBytes)
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
 
-func createK8sCloudApiLegacy(req k8s_ca.CreateRequest, token string) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8SCIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(req.MasterCPU), 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(req.MasterNum), 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(req.MasterRAM), 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(req.MasterDisk), 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(req.WorkerCPU), 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(req.WorkerNum), 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(req.WorkerRAM), 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(req.WorkerDisk), 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	_ = writer.WriteField("authkey", token)
-
-	ct := writer.FormDataContentType()
-	writer.Close()
-
-	return reqBody, ct
-}
-
-func createK8sCloudBrokerLegacy(req k8s_cb.CreateRequest, token string) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8CIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(req.MasterCPU, 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(req.MasterNum, 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(req.MasterRAM, 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(req.MasterDisk, 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(req.WorkerCPU, 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(req.WorkerNum, 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(req.WorkerRAM, 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(req.WorkerDisk, 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	_ = writer.WriteField("authkey", token)
-
-	ct := writer.FormDataContentType()
-
-	writer.Close()
-	return reqBody, ct
+func trimLegacyConfig(cfg *config.LegacyConfig) config.LegacyConfig {
+	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
+	return *cfg
 }

pkg/cloudapi/account/create.go

@@ -1,75 +0,0 @@
-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) (bool, error) {
+func (a Account) Delete(ctx context.Context, req DeleteRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/delete"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(result), nil
 }

pkg/cloudapi/account/delete_user.go

@@ -17,10 +17,6 @@ type DeleteUserRequest struct {
 	// ID or emailaddress of the user to remove
 	// Required: true
 	UserID string `url:"userId" json:"userId" validate:"required"`
-
-	// Recursively revoke access rights from owned cloudspaces and vmachines
-	// Required: false
-	RecursiveDelete bool `url:"recursivedelete" json:"recursivedelete"`
 }
 
 // DeleteUser revokes user access from the account

pkg/cloudapi/account/filter_test.go

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

pkg/cloudapi/account/get_consumption.go

@@ -1,58 +0,0 @@
-package account
-
-import (
-	"context"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GetConsumptionRequest struct to download the resources tracking files for an account
-type GetConsumptionRequest struct {
-	// ID an account
-	// Required: true
-	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
-
-	// Epoch represents the start time
-	// Required: true
-	Start uint64 `url:"start" json:"start" validate:"required"`
-
-	// Epoch represents the end time
-	// Required: true
-	End uint64 `url:"end" json:"end" validate:"required"`
-}
-
-// GetConsumption downloads the resources tracking files for an account within a given period
-func (a Account) GetConsumption(ctx context.Context, req GetConsumptionRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/account/getConsumption"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-
-}
-
-// GetConsumptionGet downloads the resources tracking files for an account within a given period
-func (a Account) GetConsumptionGet(ctx context.Context, req GetConsumptionRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/account/getConsumption"
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodGet, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/account/list.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of accounts
@@ -24,6 +26,15 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// 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"`
@@ -35,6 +46,7 @@ type ListRequest struct {
 
 // List gets a list of all accounts the user has access to a ListAccounts struct
 func (a Account) List(ctx context.Context, req ListRequest) (*ListAccounts, error) {
+
 	res, err := a.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
@@ -52,6 +64,11 @@ func (a Account) List(ctx context.Context, req ListRequest) (*ListAccounts, erro
 
 // ListRaw gets a list of all accounts the user has access to as an array of bytes
 func (a Account) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/account/list"
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/account/list_computes.go

@@ -46,6 +46,10 @@ type ListComputesRequest struct {
 	// Required: false
 	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -57,6 +61,7 @@ type ListComputesRequest struct {
 
 // ListComputes gets list all compute instances under specified account, accessible by the user
 func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (*ListComputes, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/account/list_deleted.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get a list of deleted accounts
@@ -27,10 +29,20 @@ type ListDeletedRequest struct {
 	// Find by access control list
 	// Required: false
 	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 }
 
 // ListDeleted gets list of all deleted accounts the user has access to
 func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListAccounts, error) {
+
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/account/listDeleted"
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/account/list_disks.go

@@ -30,6 +30,10 @@ type ListDisksRequest struct {
 	// Required: false
 	Type string `url:"type,omitempty" json:"type,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListDisksRequest struct {
 
 // ListDisks gets list all currently unattached disks under specified account
 func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (*ListDisks, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/account/list_flipgroups.go

@@ -38,6 +38,10 @@ type ListFLIPGroupsRequest struct {
 	// Required: false
 	FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -49,6 +53,7 @@ type ListFLIPGroupsRequest struct {
 
 // ListFLIPGroups gets list all FLIPGroups under specified account, accessible by the user
 func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (*ListFLIPGroups, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/account/list_rg.go

@@ -41,10 +41,15 @@ type ListRGRequest struct {
 	// Find by status
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 }
 
 // ListRG gets list of all resource groups under specified account, accessible by the user
 func (a Account) ListRG(ctx context.Context, req ListRGRequest) (*ListRG, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/account/list_templates.go

@@ -30,6 +30,10 @@ type ListTemplatesRequest struct {
 	// Required: false
 	Type string `url:"type,omitempty" json:"type,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListTemplatesRequest struct {
 
 // ListTemplates gets list of templates which can be managed by this account
 func (a Account) ListTemplates(ctx context.Context, req ListTemplatesRequest) (*ListTemplates, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/account/list_vins.go

@@ -30,6 +30,10 @@ type ListVINSRequest struct {
 	// Required: false
 	ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListVINSRequest struct {
 
 // ListVINS gets list of all ViNSes under specified account, accessible by the user
 func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (*ListVINS, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/account/models.go

@@ -1,7 +1,34 @@
 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"`
 
@@ -46,12 +73,24 @@ 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 []RecordACL `json:"acl"`
+	ACL []ListRecordACL `json:"acl"`
+
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
 
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
@@ -59,6 +98,9 @@ type ItemAccount struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -70,6 +112,9 @@ type ItemAccount struct {
 
 	// Updated time
 	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Zones
+	ZoneIDs []uint64 `json:"zoneIds"`
 }
 
 // List of accounts
@@ -79,6 +124,18 @@ 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
@@ -99,6 +156,9 @@ 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"`
 
@@ -159,14 +219,20 @@ 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"`
 
@@ -176,6 +242,9 @@ type RecordAccount struct {
 	// Company URL
 	CompanyURL string `json:"companyurl"`
 
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
+
 	// Computes
 	Computes Computes `json:"computes"`
 
@@ -191,6 +260,9 @@ type RecordAccount struct {
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Deactivation time
 	DeactivationTime float64 `json:"deactivationTime"`
 
@@ -227,6 +299,9 @@ type RecordAccount struct {
 	// Status
 	Status string `json:"status"`
 
+	// Storage policy ids
+	StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
+
 	// UniqPools
 	UniqPools []interface{} `json:"uniqPools"`
 
@@ -241,6 +316,12 @@ type RecordAccount struct {
 
 	// VINSes
 	VINSes uint64 `json:"vinses"`
+
+	// Zone
+	ZoneIDs []ZoneID `json:"zoneIds"`
+
+	// Zones
+	DefaultZoneID uint64 `json:"defaultZoneId"`
 }
 
 // Main information about compute
@@ -374,6 +455,12 @@ type ItemVINS struct {
 	// External IP
 	ExternalIP string `json:"externalIP"`
 
+	// Extnet ID
+	ExtnetId uint64 `json:"extnetId"`
+
+	// Free IPs
+	FreeIPs int64 `json:"freeIPs"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -500,6 +587,9 @@ 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,6 +3,7 @@ package account
 import (
 	"context"
 	"net/http"
+
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -14,18 +15,18 @@ type RestoreRequest struct {
 }
 
 // Restore restores a deleted account
-func (a Account) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
+func (a Account) Restore(ctx context.Context, req RestoreRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/account/restore"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(result), nil
 }

pkg/cloudapi/account/update.go

@@ -14,6 +14,10 @@ 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"`
@@ -45,6 +49,15 @@ type UpdateRequest struct {
 	// Limit (positive) or disable (0) GPU resources
 	// Required: false
 	GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
+
+	// List of strings with pools
+	// 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.go

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

pkg/cloudapi/audit/audit.go

@@ -0,0 +1,15 @@
+package audit
+
+import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+
+// Structure for creating request to audit
+type Audit struct {
+	client interfaces.Caller
+}
+
+// Builder for audit endpoint
+func New(client interfaces.Caller) *Audit{
+	return &Audit{
+		client: client,
+	}
+}

pkg/cloudapi/audit/filter.go

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

pkg/cloudapi/audit/filter_test.go

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

pkg/cloudapi/audit/get.go

@@ -0,0 +1,46 @@
+package audit
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetRequest struct to get information about account
+type GetRequest struct {
+	// Audit GUID
+	// Required: true
+	AuditGuid string `url:"audit_guid" json:"audit_guid" validate:"required"`
+}
+
+// Get gets information about audit as a RecordAudit struct
+func (a Audit) Get(ctx context.Context, req GetRequest) (*RecordAudit, error) {
+	res, err := a.GetRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := RecordAudit{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about audit as an array of bytes
+func (a Audit) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/audit/get"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/audit/list.go

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

pkg/cloudapi/audit/models.go

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

pkg/cloudapi/bservice/create.go

@@ -25,6 +25,10 @@ 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,6 +16,7 @@ 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/disable.go

@@ -24,7 +24,7 @@ func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudapi/bservice/delete"
+	url := "/cloudapi/bservice/disable"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/bservice/group_add.go

@@ -38,12 +38,9 @@ type GroupAddRequest struct {
 	// Required: true
 	ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
 
-	// Compute driver
-	// should be one of:
-	//	- KVM_X86
-	//	- KVM_PPC
+	// Compute driver like a KVM_X86, etc.
 	// Required: true
-	Driver string `url:"driver" json:"driver" validate:"driver"`
+	Driver string `url:"driver" json:"driver" validate:"required"`
 
 	// Storage endpoint provider ID
 	// Required: false
@@ -72,6 +69,24 @@ 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
+func (r GroupAddRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
 }
 
 // GroupAdd creates new Compute Group within BasicService.

pkg/cloudapi/bservice/group_resize.go

@@ -22,6 +22,12 @@ 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/group_update.go

@@ -43,6 +43,16 @@ type GroupUpdateRequest struct {
 	Force bool `url:"force,omitempty" json:"force,omitempty"`
 }
 
+// GetRAM returns RAM field values
+func (r GroupUpdateRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
+}
+
 // GroupUpdate updates existing Compute group within Basic Service and apply new settings to its computes as necessary
 func (b BService) GroupUpdate(ctx context.Context, req GroupUpdateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)

pkg/cloudapi/bservice/list.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of BasicService instances
@@ -40,6 +42,15 @@ type ListRequest struct {
 	// Required: false
 	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// 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"`
@@ -51,6 +62,7 @@ type ListRequest struct {
 
 // List gets list of BasicService instances associated with the specified Resource Group as a ListBasicServices struct
 func (b BService) List(ctx context.Context, req ListRequest) (*ListBasicServices, error) {
+
 	res, err := b.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
@@ -68,6 +80,11 @@ func (b BService) List(ctx context.Context, req ListRequest) (*ListBasicServices
 
 // ListRaw gets list of BasicService instances associated with the specified Resource Group as an array of bytes
 func (b BService) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/bservice/list"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/bservice/list_deleted.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get list of deleted BasicService instances
@@ -16,6 +18,10 @@ type ListDeletedRequest struct {
 	// Required: false
 	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -27,6 +33,11 @@ type ListDeletedRequest struct {
 
 // ListDeleted gets list of deleted BasicService instances associated with the specified Resource Group
 func (b BService) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListBasicServices, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/bservice/listDeleted"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/bservice/migrate_to_zone.go

@@ -0,0 +1,42 @@
+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,12 +88,15 @@ type RecordBasicService struct {
 
 	// Whether user controlled
 	UserManaged bool `json:"userManaged"`
+
+	// Zone ID
+	ZoneID uint64 `json:"zoneId"`
 }
 
 // Main information about Compute
 type ItemCompute struct {
 	// Account ID
-	AccountID uint64
+	AccountID uint64 `json:"accountId"`
 
 	// Architecture
 	Architecture string `json:"arch"`
@@ -295,6 +298,9 @@ type ItemGroupCompute struct {
 
 	// List of information about OS Users
 	OSUsers ListOSUsers `json:"osUsers"`
+
+	//Chipset
+	Chipset string `json:"chipset"`
 }
 
 // List of Group Computes
@@ -379,6 +385,9 @@ 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

@@ -0,0 +1,42 @@
+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/affinity_rule_add.go

@@ -38,8 +38,9 @@ type AffinityRuleAddRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleAdd add affinity rule

pkg/cloudapi/compute/affinity_rule_remove.go

@@ -38,8 +38,9 @@ type AffinityRuleRemoveRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AffinityRuleRemove remove affinity rule

pkg/cloudapi/compute/anti_affinity_rule_add.go

@@ -38,8 +38,9 @@ type AntiAffinityRuleAddRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleAdd add anti affinity rule

pkg/cloudapi/compute/anti_affinity_rule_remove.go

@@ -38,8 +38,9 @@ type AntiAffinityRuleRemoveRequest struct {
 	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
-	// Required: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	// Not required on purpose: despite required tag on platform, empty string is allowed
+	Value string `url:"value" json:"value"`
 }
 
 // AntiAffinityRuleRemove remove anti affinity rule

pkg/cloudapi/compute/audits.go

@@ -12,11 +12,47 @@ import (
 type AuditsRequest struct {
 	// ID of the compute
 	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+	ComputeID uint64 `url:"compute_id" json:"compute_id" 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))
@@ -24,7 +60,7 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListAudits, err
 
 	url := "/cloudapi/compute/audits"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
 	if err != nil {
 		return nil, err
 	}
@@ -36,5 +72,5 @@ func (c Compute) Audits(ctx context.Context, req AuditsRequest) (ListAudits, err
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/compute/boot_disk_set.go

@@ -8,25 +8,25 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// RepairBootFSRequest struct to repair filesystem
-type RepairBootFSRequest struct {
+// BootDiskSetRequest struct to set boot disk for compute
+type BootDiskSetRequest struct {
 	// ID of compute instance
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 
-	// Reason for action
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
+	// ID of the disk to set as boot
+	// Required: true
+	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 }
 
-// RepairBootFS repairs compute boot disk filesystem
-func (c Compute) RepairBootFS(ctx context.Context, req RepairBootFSRequest) (bool, error) {
+// BootDiskSet sets boot disk for compute
+func (c Compute) BootDiskSet(ctx context.Context, req BootDiskSetRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudbroker/compute/repairBootFs"
+	url := "/cloudapi/compute/bootDiskSet"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/compute/change_ip.go

@@ -0,0 +1,54 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ChangeIPRequest struct to change IP for network
+type ChangeIPRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" 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"`
+
+	// 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"`
+
+	// 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"`
+}
+
+// ChangeIP change reserved IP for compute instance
+func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/changeIp"
+
+	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_mac.go

@@ -0,0 +1,46 @@
+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

@@ -0,0 +1,46 @@
+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

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

pkg/cloudapi/compute/clone.go

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

pkg/cloudapi/compute/clone_abort.go

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

pkg/cloudapi/compute/clone_status.go

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

pkg/cloudapi/compute/create_template.go

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

pkg/cloudapi/compute/create_template_from_blank.go

@@ -0,0 +1,112 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+	"strings"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// CreateTemplateFromBlankRequest struct to create template from boot disk of current compute
+type CreateTemplateFromBlankRequest struct {
+	// ID of the compute to create template from
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Name of the rescue disk
+	// Required: true
+	Name string `url:"name" json:"name" validate:"required"`
+
+	// Boot type of image BIOS or UEFI
+	// Required: true
+	BootType string `url:"boottype" json:"boottype" validate:"imageBootType"`
+
+	// Image type linux, windows or other
+	// 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"`
+
+	// Password for the image
+	// Required: false
+	Password string `url:"password,omitempty" json:"password,omitempty"`
+
+	// Account ID to make the image exclusive
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// Pool for image create
+	// Required: false
+	PoolName string `url:"poolName,omitempty" json:"poolName,omitempty"`
+
+	// Does this machine supports hot resize
+	// Default: false
+	// Required: false
+	HotResize bool `url:"hotresize" json:"hotresize"`
+}
+
+type wrapperCreateTemplateFromBlankRequest struct {
+	CreateTemplateFromBlankRequest
+	AsyncMode bool `url:"asyncMode"`
+}
+
+// CreateTemplateFromBlank creates template from boot disk of current compute in sync mode.
+// It returns id of created compute and error.
+func (c Compute) CreateTemplateFromBlank(ctx context.Context, req CreateTemplateFromBlankRequest) (uint64, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	reqWrapped := wrapperCreateTemplateFromBlankRequest{
+		CreateTemplateFromBlankRequest: req,
+		AsyncMode:                      false,
+	}
+
+	url := "/cloudapi/compute/createTemplateFromBlank"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	if err != nil {
+		return 0, err
+	}
+
+	result, err := strconv.ParseUint(string(res), 10, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return result, nil
+}
+
+// CreateTemplateFromBlankAsync creates template from boot disk of current compute in async mode.
+// It returns guid of task and error.
+func (c Compute) CreateTemplateFromBlankAsync(ctx context.Context, req CreateTemplateFromBlankRequest) (string, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return "", validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	reqWrapped := wrapperCreateTemplateFromBlankRequest{
+		CreateTemplateFromBlankRequest: req,
+		AsyncMode:                      true,
+	}
+
+	url := "/cloudapi/compute/createTemplateFromBlank"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	if err != nil {
+		return "", err
+	}
+
+	result := strings.ReplaceAll(string(res), "\"", "")
+
+	return result, nil
+}

pkg/cloudapi/compute/disk_add.go

@@ -22,6 +22,10 @@ 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
@@ -46,6 +50,14 @@ type DiskAddRequest struct {
 	// Specify image id for create disk from template
 	// Required: false
 	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
+
+	// Desired PCI slot (hex string, e.g. "0x1A")
+	// Required: false
+	PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`
+
+	// Desired bus number (hex string, e.g. "0x03")
+	// Required: false
+	BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
 }
 
 // DiskAdd creates new disk and attach to compute

pkg/cloudapi/compute/disk_attach.go

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

pkg/cloudapi/compute/disk_migrate.go

@@ -0,0 +1,53 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// DiskMigrateRequest struct to migrate compute's disk to target disk
+type DiskMigrateRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// ID source disk
+	// Required: true
+	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
+
+	// ID target disk
+	// Required: true
+	TargetDiskID uint64 `url:"targetDiskId" json:"targetDiskId" validate:"required"`
+
+	// Migration mode. 1 - Data migration and domain update were already completed by third-party software.
+	// Use this if target disk already connected to compute and you only need to save changes for next reboot.
+	// Required: false
+	Mode int64 `url:"mode,omitempty" json:"mode,omitempty"`
+}
+
+// DiskMigrate - migrate compute's disk to target disk. Source disk will be detached, target disk will be attached to the same PCI slot.
+// (WARNING) Current realisation is limited. No actual data migration will be performed.
+// Use this API if target disk already connected to compute and you only need to save changes for next reboot (mode: 1).
+func (c Compute) DiskMigrate(ctx context.Context, req DiskMigrateRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/diskMigrate"
+
+	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/disk_switch_to_replication.go

@@ -0,0 +1,46 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// DiskSwitchToReplicationRequest struct to switch disk to it's replication
+type DiskSwitchToReplicationRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// ID of the disk to switch
+	// Required: true
+	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
+
+	// Delete replication relationship
+	// Required: false
+	StopReplication bool `url:"stopReplication" json:"stopReplication"`
+}
+
+// DiskSwitchToReplication switches disk to it's replication
+func (c Compute) DiskSwitchToReplication(ctx context.Context, req DiskSwitchToReplicationRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/diskSwitchToReplication"
+
+	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/filter_test.go

@@ -48,15 +48,13 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID:      65191,
-					PCISlot: 6,
+					ID: 65191,
 				},
 			},
 			Driver:           "KVM_X86",
 			GID:              212,
 			GUID:             48500,
 			ID:               48500,
-			ImageID:          9884,
 			Interfaces:       []ItemVNFInterface{},
 			LockStatus:       "UNLOCKED",
 			ManagerID:        0,
@@ -64,7 +62,7 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363500,
 			Name:             "test",
-			Pinned:           false,
+			PinnedToStack:    true,
 			RAM:              4096,
 			ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
 			Registered:       true,
@@ -83,7 +81,7 @@ var computes = ListComputes{
 			UserManaged:      true,
 			VGPUs:            []uint64{},
 			VINSConnected:    0,
-			VirtualImageID:   0,
+			ZoneID:           1,
 		},
 		{
 			ACL:               ListACL{},
@@ -111,15 +109,13 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID:      65248,
-					PCISlot: 6,
+					ID: 65248,
 				},
 			},
 			Driver:           "KVM_X86",
 			GID:              212,
 			GUID:             48556,
 			ID:               48556,
-			ImageID:          9884,
 			Interfaces:       []ItemVNFInterface{},
 			LockStatus:       "UNLOCKED",
 			ManagerID:        0,
@@ -127,10 +123,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",
@@ -146,7 +142,7 @@ var computes = ListComputes{
 			UserManaged:      true,
 			VGPUs:            []uint64{},
 			VINSConnected:    0,
-			VirtualImageID:   0,
+			ZoneID:           5,
 		},
 	},
 	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.MethodPost, url, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodGet, 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

@@ -0,0 +1,38 @@
+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_enable.go

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

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,40 @@
+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/guest_agent_feature_update.go

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

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of available computes
@@ -52,6 +54,15 @@ type ListRequest struct {
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// 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"`
@@ -64,6 +75,7 @@ type ListRequest struct {
 // List gets list of the available computes.
 // Filtering based on status is possible
 func (c Compute) List(ctx context.Context, req ListRequest) (*ListComputes, error) {
+
 	res, err := c.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
@@ -81,6 +93,11 @@ func (c Compute) List(ctx context.Context, req ListRequest) (*ListComputes, erro
 
 // ListRaw gets list of the available computes.
 func (c Compute) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/compute/list"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/compute/list_deleted.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get deleted computes list
@@ -44,6 +46,10 @@ type ListDeletedRequest struct {
 	// Required: false
 	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -55,6 +61,11 @@ type ListDeletedRequest struct {
 
 // ListDeleted gets list all deleted computes
 func (c Compute) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListComputes, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudapi/compute/listDeleted"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/compute/list_pci_device.go

@@ -30,6 +30,10 @@ type ListPCIDeviceRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListPCIDeviceRequest struct {
 
 // ListPCIDevice gets list PCI device
 func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) (*ListPCIDevices, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/compute/list_vgpu.go

@@ -26,6 +26,10 @@ type ListVGPURequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListVGPURequest struct {
 
 // ListVGPU gets list vGPU
 func (c Compute) ListVGPU(ctx context.Context, req ListVGPURequest) (*ListVGPUs, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudapi/compute/migrate_to_zone.go

@@ -8,25 +8,25 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// RegistrationRequest struct to set compute registered in RT
-type RegistrationRequest struct {
-	// ID of the Compute
+// MigrateToRGZone struct to move compute to another zone
+type MigrateToZoneRequest struct {
+	// ID of the compute instance to move
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 
-	// Unique compute registration key
+	// ID of the zone to move
 	// Required: true
-	RegistrationKey string `url:"registrationKey" json:"registrationKey" validate:"required"`
+	ZoneID uint64 `url:"zoneId" json:"zoneId " validate:"required"`
 }
 
-// Registration sets compute registered in RT
-func (c Compute) Registration(ctx context.Context, req RegistrationRequest) (bool, error) {
+// MoveToRG moves compute instance to new resource group
+func (c Compute) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	url := "/cloudbroker/compute/registration"
+	url := "/cloudapi/compute/migrateToZone"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

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 {
@@ -214,6 +214,9 @@ type RecordNetAttach struct {
 
 	// List VNF IDs
 	VNFs []uint64 `json:"vnfs"`
+
+	// Maximum transmission unit
+	MTU uint64 `json:"mtu"`
 }
 
 // Detailed information about audit
@@ -235,7 +238,13 @@ type ItemAudit struct {
 }
 
 // List Detailed audits
-type ListAudits []ItemAudit
+type ListAudits struct {
+	// Data
+	Data []ItemAudit `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Short information about audit
 type ItemShortAudit struct {
@@ -296,15 +305,30 @@ type RecordCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
+	// Auto start when node restarted
+	AutoStart bool `json:"autoStart"`
+
 	// Architecture
 	Architecture string `json:"arch"`
 
+	// Boot image ID
+	BootImageID uint64 `json:"boot_image_id"`
+
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
+	// Boot type
+	BootType string `json:"bootType"`
+
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
+	// CD Image Id
+	CdImageId uint64 `json:"cdImageId"`
+
+	// Chipset
+	Chipset string `json:"chipset"`
+
 	// Clone reference
 	CloneReference uint64 `json:"cloneReference"`
 
@@ -314,6 +338,9 @@ type RecordCompute struct {
 	// Compute CI ID
 	ComputeCIID uint64 `json:"computeciId"`
 
+	// CPU Pin
+	CPUPin bool `json:"cpupin"`
+
 	//  Number of cores
 	CPU uint64 `json:"cpus"`
 
@@ -350,6 +377,12 @@ type RecordCompute struct {
 	// GUID
 	GUID uint64 `json:"guid"`
 
+	// HPBacked
+	HPBacked bool `json:"hpBacked"`
+
+	// Hot resize
+	HotResize bool `json:"hotResize"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -362,6 +395,15 @@ type RecordCompute struct {
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
+	// Loader meta iso information
+	LoaderMetaIso LoaderMetaIso `json:"loaderMetaIso"`
+
+	// Live migration job ID
+	LiveMigrationJobID uint64 `json:"live_migration_job_id"`
+
+	// Loader type
+	LoaderType string `json:"loaderType"`
+
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -380,6 +422,18 @@ type RecordCompute struct {
 	// Name
 	Name string `json:"name"`
 
+	// NeedReboot
+	NeedReboot bool `json:"needReboot"`
+
+	// Network interface naming
+	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
+
+	// Numa Affinity
+	NumaAffinity string `json:"numaAffinity"`
+
+	//NumaNodeId
+	NumaNodeId int64 `json:"numaNodeId"`
+
 	// Natable VINS ID
 	NatableVINSID uint64 `json:"natableVinsId"`
 
@@ -395,11 +449,20 @@ 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 or not
-	Pinned bool `json:"pinned"`
+	// Pinned to stack
+	PinnedToStack bool `json:"pinnedToStack"`
+
+	// PreferredCPU
+	PreferredCPU []int64 `json:"preferredCpu"`
+
+	// Qemu_quest
+	QemuQuest QemuQuest `json:"qemu_guest"`
 
 	// Number of RAM
 	RAM uint64 `json:"ram"`
@@ -413,6 +476,9 @@ type RecordCompute struct {
 	// Resource name
 	ResName string `json:"resName"`
 
+	// Reserved Node Cpus
+	ReservedNodeCpus []uint64 `json:"reservedNodeCpus"`
+
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
@@ -449,14 +515,113 @@ type RecordCompute struct {
 	// Userdata
 	Userdata interface{} `json:"userdata"`
 
-	// vGPU IDs
-	VGPUs []uint64 `json:"vgpus"`
+	// vGPUs list
+	VGPUs []VGPUItem `json:"vgpus"`
 
-	// Virtual image ID
-	VirtualImageID uint64 `json:"virtualImageId"`
+	// VNC password
+	VNCPassword string `json:"vncPasswd"`
 
-	// Virtual image name
-	VirtualImageName string `json:"virtualImageName"`
+	// Zone ID
+	// Required: false
+	ZoneID uint64 `json:"zoneId"`
+}
+type LoaderMetaIso struct {
+	// Name
+	DeviceName string `json:"devicename"`
+
+	// Path
+	Path string `json:"path"`
+}
+
+type QemuQuest struct {
+	Enabled              bool     `json:"enabled"`
+	EnabledAgentFeatures []string `json:"enabled_agent_features"`
+	GUID                 string   `json:"guid"`
+	LastUpdate           uint64   `json:"last_update"`
+	User                 string   `json:"user"`
+}
+
+type VGPUItem struct {
+	// ID
+	ID uint64 `json:"id"`
+
+	// GID
+	GID uint64 `json:"gid"`
+
+	// Type
+	Type string `json:"type"`
+
+	// Mode
+	Mode string `json:"mode"`
+
+	// Status
+	Status string `json:"status"`
+
+	// ProfileID
+	ProfileID uint64 `json:"profileId"`
+
+	// RAM
+	RAM uint64 `json:"ram"`
+
+	// LastUpdateTime
+	LastUpdateTime uint64 `json:"lastUpdateTime"`
+
+	// CreatedTime
+	CreatedTime uint64 `json:"createdTime"`
+
+	// DeletedTime
+	DeletedTime uint64 `json:"deletedTime"`
+
+	// VMID
+	VMID uint64 `json:"vmid"`
+
+	// PGPuid
+	PGPuid uint64 `json:"pgpuid"`
+
+	// ReferenceID
+	ReferenceID string `json:"referenceId"`
+
+	// AccountID
+	AccountID uint64 `json:"accountId"`
+
+	// RgID
+	RgID uint64 `json:"rgId"`
+
+	// LastClaimedBy
+	LastClaimedBy uint64 `json:"lastClaimedBy"`
+
+	// PCISlot
+	PCISlot uint64 `json:"pciSlot"`
+
+	// BusNumber
+	BusNumber uint64 `json:"bus_number"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+}
+
+// Information about libvirt settings
+type LibvirtSettings struct {
+	// TX mode
+	TXMode string `json:"txmode"`
+
+	// IO event
+	IOEventFD string `json:"ioeventfd"`
+
+	// Event ID
+	EventIDx string `json:"event_idx"`
+
+	// Number of queues
+	Queues uint64 `json:"queues"`
+
+	// RX queue size
+	RXQueueSize uint64 `json:"rx_queue_size"`
+
+	// TX queue size
+	TXQueueSize uint64 `json:"tx_queue_size"`
+
+	// GUID
+	GUID string `json:"guid"`
 }
 
 // Main information about OS user
@@ -497,6 +662,9 @@ type ListSnapSets []ItemSnapSet
 
 // Main information about VNF
 type ItemVNFInterface struct {
+	// Bus number
+	BusNumber uint64 `json:"bus_number"`
+
 	// Connection ID
 	ConnID uint64 `json:"connId"`
 
@@ -509,6 +677,9 @@ type ItemVNFInterface struct {
 	// Enabled
 	Enabled bool `json:"enabled"`
 
+	// Enable security groups
+	EnableSecGroups bool `json:"enable_secgroups"`
+
 	// FLIPGroup ID
 	FLIPGroupID uint64 `json:"flipgroupId"`
 
@@ -521,9 +692,15 @@ type ItemVNFInterface struct {
 	// Listen SSH or not
 	ListenSSH bool `json:"listenSsh"`
 
+	// Libvirt Settings
+	LibvirtSettings LibvirtSettings `json:"libvirtSettings"`
+
 	// MAC
 	MAC string `json:"mac"`
 
+	// Maximum transmission unit
+	MTU uint64 `json:"mtu"`
+
 	// Name
 	Name string `json:"name"`
 
@@ -536,15 +713,27 @@ type ItemVNFInterface struct {
 	// Network type
 	NetType string `json:"netType"`
 
+	// NodeID
+	NodeID int64 `json:"nodeId"`
+
 	// PCI slot
 	PCISlot int64 `json:"pciSlot"`
 
 	// 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"`
 
@@ -579,9 +768,21 @@ type ItemComputeDisk struct {
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
+	// Bus number
+	BusNumber uint64 `json:"bus_number"`
+
+	// Created by
+	CreatedBy string `json:"createdBy"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Device name
+	DeviceName string `json:"devicename"`
+
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -624,9 +825,6 @@ type ItemComputeDisk struct {
 	// Name
 	Name string `json:"name"`
 
-	// Order
-	Order uint64 `json:"order"`
-
 	// Params
 	Params string `json:"params"`
 
@@ -637,13 +835,13 @@ type ItemComputeDisk struct {
 	Passwd string `json:"passwd"`
 
 	// PCI slot
-	PCISlot int64 `json:"pciSlot"`
+	PCISlot int64 `json:"pci_slot"`
 
 	// Pool
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -651,6 +849,9 @@ type ItemComputeDisk struct {
 	// Reality device number
 	RealityDeviceNumber uint64 `json:"realityDeviceNumber"`
 
+	// Replication
+	Replication ItemReplication `json:"replication"`
+
 	// Resource ID
 	ResID string `json:"resId"`
 
@@ -663,6 +864,9 @@ type ItemComputeDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
+	// Size available
+	SizeAvailable float64 `json:"sizeAvailable"`
+
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -675,14 +879,43 @@ 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"`
 
-	// Virtual machine ID
-	VMID uint64 `json:"vmid"`
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
+
+	// UpdatedTime
+	UpdatedTime uint64 `json:"updatedTime"`
+}
+
+type ItemReplication struct {
+	// DiskID
+	DiskID uint64 `json:"diskId"`
+
+	// PoolID
+	PoolID string `json:"poolId"`
+
+	// Role
+	Role string `json:"role"`
+
+	// SelfVolumeID
+	SelfVolumeID string `json:"selfVolumeId"`
+
+	// StorageID
+	StorageID string `json:"storageId"`
+
+	// VolumeID
+	VolumeID string `json:"volumeId"`
 }
 
 // Main information about snapshot extend
@@ -758,6 +991,7 @@ type IOTune struct {
 type ItemCompute struct {
 	// Access Control List
 	ACL ListACL `json:"acl"`
+
 	// Account ID
 	AccountID uint64 `json:"accountId"`
 
@@ -776,15 +1010,30 @@ type ItemCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
+	// Auto start when node restarted
+	AutoStart bool `json:"autoStart"`
+
 	// Architecture
 	Architecture string `json:"arch"`
 
+	// Boot image ID
+	BootImageID uint64 `json:"boot_image_id"`
+
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
+	// Boot type
+	BootType string `json:"bootType"`
+
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
+	// CD Image Id
+	CdImageId uint64 `json:"cdImageId"`
+
+	// Chipset
+	Chipset string `json:"chipset"`
+
 	// Clone reference
 	CloneReference uint64 `json:"cloneReference"`
 
@@ -794,6 +1043,9 @@ type ItemCompute struct {
 	// Compute CI ID
 	ComputeCIID uint64 `json:"computeciId"`
 
+	// CPU Pin
+	CPUPin bool `json:"cpupin"`
+
 	// Number of cores
 	CPU uint64 `json:"cpus"`
 
@@ -830,15 +1082,24 @@ 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"`
 
@@ -857,12 +1118,33 @@ type ItemCompute struct {
 	// Name
 	Name string `json:"name"`
 
-	// Pinned or not
-	Pinned bool `json:"pinned"`
+	// 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
+	PinnedToStack bool `json:"pinnedToStack"`
+
+	// 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"`
 
@@ -872,6 +1154,9 @@ type ItemCompute struct {
 	// Resource name
 	ResName string `json:"resName"`
 
+	// Reserved Node Cpus
+	ReservedNodeCpus []uint64 `json:"reservedNodeCpus"`
+
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
@@ -914,8 +1199,8 @@ type ItemCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
-	// Virtual image ID
-	VirtualImageID uint64 `json:"virtualImageId"`
+	// Zone ID
+	ZoneID uint64 `json:"zoneId"`
 }
 
 // ListInfoDisks
@@ -925,9 +1210,6 @@ type ListInfoDisks []InfoDisk
 type InfoDisk struct {
 	// ID
 	ID uint64 `json:"id"`
-
-	// PCISlot
-	PCISlot int64 `json:"pciSlot"`
 }
 
 // List information about computes
@@ -942,17 +1224,135 @@ type ListComputes struct {
 // List VGPUs
 type ListVGPUs struct {
 	// Data
-	Data []interface{} `json:"data"`
+	Data []ItemVGPU `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
 
+// Main information about vgpu device
+type ItemVGPU struct {
+	// Account ID
+	AccountID uint64 `json:"accountId"`
+
+	// Created Time
+	CreatedTime uint64 `json:"createdTime"`
+
+	// Deleted Time
+	DeletedTime uint64 `json:"deletedTime"`
+
+	// GID
+	GID uint64 `json:"gid"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Last Claimed By
+	LastClaimedBy uint64 `json:"lastClaimedBy"`
+
+	// Last Update Time
+	LastUpdateTime uint64 `json:"lastUpdateTime"`
+
+	// Mode
+	Mode string `json:"mode"`
+
+	// PCI Slot
+	PCISlot uint64 `json:"pciSlot"`
+
+	// PGPUID
+	PGPUID uint64 `json:"pgpuid"`
+
+	// Profile ID
+	ProfileID uint64 `json:"profileId"`
+
+	// RAM
+	RAM uint64 `json:"ram"`
+
+	// Reference ID
+	ReferenceID string `json:"referenceId"`
+
+	// RG ID
+	RGID uint64 `json:"rgId"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Type
+	Type string `json:"type"`
+
+	// VM ID
+	VMID uint64 `json:"vmid"`
+}
+
+// Main information about PCI device
+type ItemPCIDevice struct {
+	// Compute ID
+	ComputeID uint64 `json:"computeId"`
+
+	// Description
+	Description string `json:"description"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// HwPath
+	HwPath string `json:"hwPath"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Resource group ID
+	RGID uint64 `json:"rgId"`
+
+	// Stack ID
+	StackID uint64 `json:"stackId"`
+
+	// Status
+	Status string `json:"status"`
+
+	// System name
+	SystemName string `json:"systemName"`
+}
+
 // List PCI devices
 type ListPCIDevices struct {
 	// Data
-	Data []interface{} `json:"data"`
+	Data []ItemPCIDevice `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+
+type RecordCloneStatus struct {
+	// Disk ID
+	DiskID int `json:"disk_id"`
+
+	// Clone Status
+	Status CloneStatus `json:"status"`
+}
+
+type CloneStatus struct {
+	// Type
+	Type int `json:"type"`
+
+	// Copy speed
+	Bandwidth int `json:"bandwidth"`
+
+	// Current progress
+	Cur int `json:"cur"`
+
+	// Total size
+	End int `json:"end"`
+
+	// Operation status
+	Ready bool `json:"ready"`
+
+	// Progress percent
+	ProgressPercent int `json:"progress_percent"`
+}

pkg/cloudapi/compute/net_attach.go

@@ -16,9 +16,14 @@ type NetAttachRequest struct {
 
 	// Network type
 	// 'EXTNET' for connect to external network directly
-	// and 'VINS' for connect to ViNS
+	// '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:"computeNetType"`
+	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
 
 	// Network ID for connect to
 	// For EXTNET - external network ID
@@ -29,6 +34,32 @@ type NetAttachRequest struct {
 	// Directly required IP address for new network interface
 	// Required: false
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+
+	// MAC address
+	// 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/pfw_add.go

@@ -24,8 +24,8 @@ type PFWAddRequest struct {
 	PublicPortEnd int64 `url:"publicPortEnd,omitempty" json:"publicPortEnd,omitempty"`
 
 	// Internal base port number
-	// Required: true
-	LocalBasePort uint64 `url:"localBasePort" json:"localBasePort" validate:"required"`
+	// Required: false
+	LocalBasePort uint64 `url:"localBasePort,omitempty" json:"localBasePort,omitempty"`
 
 	// Network protocol
 	// either "tcp" or "udp"

pkg/cloudapi/compute/pin_to_stack.go

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

pkg/cloudapi/compute/redeploy.go

@@ -14,9 +14,17 @@ 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,6 +27,20 @@ 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
+func (r ResizeRequest) GetRAM() map[string]uint64 {
+
+	res := make(map[string]uint64, 1)
+
+	res["RAM"] = r.RAM
+
+	return res
 }
 
 // Resize resizes compute instance

pkg/cloudapi/compute/shared_snapshot_merge_status.go

@@ -0,0 +1,33 @@
+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/snapshot_delete.go

@@ -3,7 +3,6 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
@@ -19,24 +18,52 @@ type SnapshotDeleteRequest struct {
 	Label string `url:"label" json:"label" validate:"required"`
 }
 
+type wrapperSnapshotDeleteRequeststruct struct {
+	SnapshotDeleteRequest
+
+	AsyncMode bool `url:"asyncMode"`
+}
+
 // SnapshotDelete deletes specified compute snapshot
-func (c Compute) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (bool, error) {
+func (c Compute) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	reqWrapped := wrapperSnapshotDeleteRequeststruct{
+		SnapshotDeleteRequest: req,
+		AsyncMode:             false,
 	}
 
 	url := "/cloudapi/compute/snapshotDelete"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
+	return string(res), nil
+}
+
+// SnapshotDeleteAsync deletes specified compute snapshot
+func (c Compute) SnapshotDeleteAsync(ctx context.Context, req SnapshotDeleteRequest) (string, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return "", validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	reqWrapped := wrapperSnapshotDeleteRequeststruct{
+		SnapshotDeleteRequest: req,
+		AsyncMode:             true,
+	}
+
+	url := "/cloudapi/compute/snapshotDelete"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	if err != nil {
+		return "", err
+	}
+
+	return string(res), nil
 }

pkg/cloudapi/compute/update.go

@@ -21,6 +21,54 @@ type UpdateRequest struct {
 	// New description
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
+	// Rule for VM placement with NUMA affinity.
+	// Possible values - none (placement without NUMA affinity),
+	// strict (strictly with NUMA affinity, if not possible - do not start VM),
+	// loose (use NUMA affinity if possible)
+	// Required: false
+	// Default: none
+	NumaAffinity string `url:"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
+	// Required: false
+	CPUPin interface{} `url:"cpupin,omitempty" json:"cpupin,omitempty" validate:"omitempty,isBool"`
+
+	// 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
+	// Required: false
+	HPBacked interface{} `url:"hpBacked,omitempty" json:"hpBacked,omitempty" validate:"omitempty,isBool"`
+
+	// 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

@@ -0,0 +1,42 @@
+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,8 +3,9 @@ package disks
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // CreateRequest struct to create disk
@@ -13,14 +14,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"`
@@ -29,21 +30,6 @@ type CreateRequest struct {
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 
-	// Type of disk
-	//	- B=Boot
-	//	- D=Data
-	//	- T=Temp
-	// Required: true
-	Type string `url:"type" json:"type" validate:"diskType"`
-
-	// Size in GB default is 0
-	// Required: false
-	SSDSize uint64 `url:"ssdSize,omitempty" json:"ssdSize,omitempty"`
-
-	// Max IOPS disk can perform defaults to 2000
-	// Required: false
-	IOPS uint64 `url:"iops,omitempty" json:"iops,omitempty"`
-
 	// Storage endpoint provider ID to create disk
 	// Required: false
 	SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`

pkg/cloudapi/disks/delete.go

@@ -21,10 +21,6 @@ type DeleteRequest struct {
 	// Whether to completely delete the disk, works only with non attached disks
 	// Required: false
 	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
-
-	// Reason to delete
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Delete deletes disk by ID

pkg/cloudapi/disks/delete_disks.go

@@ -14,10 +14,6 @@ type DisksDeleteRequest struct {
 	// Required: true
 	DisksIDs []uint64 `url:"diskIds" json:"diskIds" validate:"required"`
 
-	// Reason for deleting the disks
-	// Required: true
-	Reason string `url:"reason" json:"reason" validate:"required"`
-
 	// Whether to completely delete the disks, works only with non attached disks
 	// Required: false
 	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`