v1.6.10

.gitignore

@@ -3,8 +3,3 @@ 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,13 +1,4 @@
-## Version 1.11.6
+## Version 1.6.10
 
-### Удалено
-
-#### Account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-553 | Метод `Create` в cloudapi/account |
-
-#### Image
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-552 | Метод `UploadImageFile` в cloudbroker/image |
+## Bugfix
+- Fix panic for nil pointer response reference in client and legacy-client

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 2022 Basis LTD
+Copyright [yyyy] [name of copyright owner]
 
 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

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

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

client.go

@@ -4,12 +4,10 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"encoding/json"
 	"fmt"
 	"io"
 	"mime/multipart"
 	"net/http"
-	"reflect"
 	"strconv"
 	"strings"
 	"sync"
@@ -17,13 +15,13 @@ 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"
 )
 
-// DecortClient is HTTP-client for platform
+// HTTP-client for platform
 type DecortClient struct {
 	decortURL  string
 	client     *http.Client
@@ -54,7 +52,7 @@ func New(cfg config.Config) *DecortClient {
 				},
 			},
 		},
-		cfg:        trimConfig(&cfg),
+		cfg:        cfg,
 		expiryTime: expiryTime,
 		mutex:      &sync.Mutex{},
 	}
@@ -72,15 +70,15 @@ func (dc *DecortClient) CloudBroker() *cloudbroker.CloudBroker {
 
 // DecortApiCall method for sending requests to the platform
 func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-
+	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
+	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
 	var body *bytes.Buffer
 	var ctype string
 
-	byteSlice, ok := params.([]byte)
-	if ok {
-		body = bytes.NewBuffer(byteSlice)
-		// ctype = "application/x-iso9660-image"
-		ctype = "application/octet-stream"
+	if okCa {
+		body, ctype = createK8sCloudApi(k8sCaCreateReq)
+	} else if okCb {
+		body, ctype = createK8sCloudBroker(k8sCbCreateReq)
 	} else {
 		values, err := query.Values(params)
 		if err != nil {
@@ -89,46 +87,18 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 		body = bytes.NewBufferString(values.Encode())
 	}
 
-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+constants.RESTMACHINE+url, body)
+	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/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
 	}
 
 	// perform request
-	respBytes, err := dc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
+	var respBytes []byte
+	respBytes, err = dc.do(req, ctype)
 
 	return respBytes, err
 }
@@ -137,53 +107,41 @@ func (dc *DecortClient) getToken(ctx context.Context) error {
 	dc.mutex.Lock()
 	defer dc.mutex.Unlock()
 
-	// new token is not needed
-	if dc.cfg.Token != "" && !time.Now().After(dc.expiryTime) {
-		return nil
+	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)
 	}
 
-	// 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)
-	dc.cfg.Token = token
-	dc.expiryTime = time.Now().AddDate(0, 0, 1)
-
 	return nil
 }
 
-// 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.Set("Content-Type", ctype)
+		req.Header.Add("Content-Type", ctype)
+	} else {
+		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	}
 
 	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
@@ -194,52 +152,14 @@ func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 		return nil, err
 	}
 
-	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 {
+	if err != nil || resp == nil {
 		return nil, err
 	}
-	if resp == nil {
-		return nil, fmt.Errorf("got empty response without error")
-	}
-
+	defer resp.Body.Close()
+	
 	// handle successful request
 	respBytes, _ := io.ReadAll(resp.Body)
 	if resp.StatusCode == 200 {
@@ -251,127 +171,228 @@ func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
 
-// 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) {
+func createK8sCloudApi(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
 	reqBody := &bytes.Buffer{}
 	writer := multipart.NewWriter(reqBody)
-	values := reflect.ValueOf(params)
-	types := values.Type()
 	defer writer.Close()
-	for i := 0; i < values.NumField(); i++ {
-		if !values.Field(i).IsValid() {
-			continue
-		}
+	if req.OidcCertificate != "" {
+		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
+		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
+	}
 
-		if values.Field(i).IsZero() {
-			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 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.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 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.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()
-	return reqBody, ct, nil
+	return reqBody, ct
 }
 
-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 ""
+func createK8sCloudBroker(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
+	reqBody := &bytes.Buffer{}
+	writer := multipart.NewWriter(reqBody)
+	defer writer.Close()
+	if req.OidcCertificate != "" {
+		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
+		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
 	}
-}
 
-func trimString(el reflect.StructField) string {
-	return strings.TrimSuffix(el.Tag.Get("url"), ",omitempty")
-}
+	_ = 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)
 
-func trimConfig(cfg *config.Config) config.Config {
-	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
-	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
-	return *cfg
+	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()
+	return reqBody, ct
 }

client_bvs.go

@@ -1,395 +0,0 @@
-package decortsdk
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"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"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-)
-
-// BVSDecortClient is HTTP-client for platform
-type BVSDecortClient struct {
-	client    *http.Client
-	cfg       config.BVSConfig
-	mutex     *sync.Mutex
-	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,
-		client: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					//nolint:gosec
-					InsecureSkipVerify: cfg.SSLSkipVerify,
-				},
-			},
-		},
-		cfg:   trimBVSConfig(&cfg),
-		mutex: &sync.Mutex{},
-	}
-}
-
-// CloudAPI builder
-func (bdc *BVSDecortClient) CloudAPI() *cloudapi.CloudAPI {
-	return cloudapi.New(bdc)
-}
-
-// CloudBroker builder
-func (bdc *BVSDecortClient) CloudBroker() *cloudbroker.CloudBroker {
-	return cloudbroker.New(bdc)
-}
-
-// DecortApiCall method for sending requests to the platform
-func (bdc *BVSDecortClient) DecortApiCall(ctx context.Context, method, url string, params interface{}) ([]byte, error) {
-	var body *bytes.Buffer
-	var ctype string
-
-	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 {
-			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()
-
-	// 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)
-
-	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")
-
-	// 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()
-
-	var tokenBytes []byte
-	tokenBytes, err = io.ReadAll(resp.Body)
-	if err != nil {
-		return config.Token{}, fmt.Errorf("cannot get token: %w", err)
-	}
-
-	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
-}
-
-// 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)
-	}
-	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")
-
-	buf, err := io.ReadAll(req.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	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 trimBVSConfig(cfg *config.BVSConfig) config.BVSConfig {
-	cfg.SSOURL = strings.TrimSuffix(cfg.SSOURL, "/")
-	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
-	return *cfg
-}

config/config_bvs.go

@@ -1,216 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"os"
-	"time"
-
-	"gopkg.in/yaml.v3"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type BVSConfig struct {
-	// ServiceAccount username
-	// Required: true
-	// Example : "osh_mikoev"
-	Username string `json:"username" yaml:"username" validate:"required"`
-
-	// ServiceAccount password
-	// Required: true
-	// Example: "[1o>hYkjnJr)HI78q7t&#%8Lm"
-	Password string `json:"password" yaml:"password" validate:"required"`
-
-	// Domain name
-	// Required: true
-	// Example: "dynamix"
-	Domain string `json:"domain" yaml:"domain" validate:"required"`
-
-	// Application (client) identifier for authorization
-	// in the cloud platform controller in oauth2 mode.
-	// Required: true
-	// Example: "ewqfrvea7s890avw804389qwguf234h0otfi3w4eiu"
-	AppID string `json:"appId" yaml:"appId" validate:"required"`
-
-	// Application (client) secret code for authorization
-	// in the cloud platform controller in oauth2 mode.
-	// Example: "frvet09rvesfis0c9erv9fsov0vsdfi09ovds0f"
-	AppSecret string `json:"appSecret" yaml:"appSecret" validate:"required"`
-
-	// Platform authentication service address
-	// Required: true
-	// Example: "https://sso.digitalenergy.online"
-	SSOURL string `json:"ssoUrl" yaml:"ssoUrl" validate:"url"`
-
-	// The address of the platform on which the actions are planned
-	// Required: true
-	// Example: "https://mr4.digitalenergy.online"
-	DecortURL string `json:"decortUrl" yaml:"decortUrl" validate:"url"`
-
-	// JWT platform token
-	// Required: false
-	// Example: "qwqwdfwv68979we0q9bfv7e9sbvd89798qrwv97ff"
-	Token Token `json:"token" yaml:"token"`
-
-	// Amount platform request attempts
-	// Default value: 5
-	// Required: false
-	Retries uint64 `json:"retries" yaml:"retries"`
-
-	// Skip verify
-	// Required: false
-	SSLSkipVerify bool `json:"sslSkipVerify" yaml:"sslSkipVerify"`
-
-	// 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.
-func (c *BVSConfig) SetTimeout(dur time.Duration) {
-	c.Timeout = Duration(dur)
-}
-
-// ParseConfigJSON parses Config from specified JSON-formatted file.
-func ParseConfigBVSJSON(path string) (BVSConfig, error) {
-	file, err := os.ReadFile(path)
-	if err != nil {
-		return BVSConfig{}, err
-	}
-
-	var config BVSConfig
-
-	err = json.Unmarshal(file, &config)
-	if err != nil {
-		return BVSConfig{}, err
-	}
-
-	err = validators.ValidateConfig(config)
-	if err != nil {
-		return BVSConfig{}, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	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)
-	if err != nil {
-		return BVSConfig{}, err
-	}
-
-	var config BVSConfig
-
-	err = yaml.Unmarshal(file, &config)
-	if err != nil {
-		return BVSConfig{}, err
-	}
-
-	err = validators.ValidateConfig(config)
-	if err != nil {
-		return BVSConfig{}, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	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,8 +22,6 @@ 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)
 	}
@@ -42,8 +40,6 @@ 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

@@ -1,8 +0,0 @@
-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,17 +5,15 @@ go 1.20
 require (
 	github.com/go-playground/validator/v10 v10.11.2
 	github.com/google/go-querystring v1.1.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/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.15.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
 )

go.sum

@@ -8,13 +8,10 @@ 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/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 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=
@@ -26,12 +23,12 @@ 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.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/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=

interfaces/caller.go

@@ -6,7 +6,4 @@ import "context"
 type Caller interface {
 	// DecortApiCall method for sending requests to the platform
 	DecortApiCall(ctx context.Context, method, url 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

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

internal/constants/constants.go

@@ -1,18 +0,0 @@
-package constants
-
-const (
-	RESTMACHINE = "/restmachine"
-
-	// RAM_DIVISIBILITY sets divisibility of RAM value
-	RAM_DIVISIBILITY uint64 = 128
-)
-
-var FileName = map[string]string{
-	"OidcCertificate": "ca.crt",
-}
-
-var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
-
-var VersionMap = map[string]string{
-	"4.3.0": "-",
-}

internal/validators/custom.go

@@ -1,44 +1,31 @@
 package validators
 
 import (
-	"errors"
-	"fmt"
-	"net/url"
-	"reflect"
 	"regexp"
 	"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 create.
+// computeDriverValidator is used to validate Driver field in kvmx86/kvmppc create.
 func computeDriverValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeDriverValues)
+	return StringInSlice(fieldValue, computeDriverValues)
 }
 
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	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)
+	return StringInSlice(fieldValue, protoValues)
 }
 
 // accessTypeValidator is used to validate AccessType fields.
 func accessTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, accessTypeValues)
+	return StringInSlice(fieldValue, accessTypeValues)
 }
 
 // resTypesValidator is used to validate ResTypes fields.
@@ -49,7 +36,7 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !IsInSlice(value, resTypesValues) {
+		if !StringInSlice(value, resTypesValues) {
 			return false
 		}
 	}
@@ -61,63 +48,56 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 func driverValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, driverValues)
+	return StringInSlice(fieldValue, driverValues)
 }
 
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, accountCUTypeValues)
+	return StringInSlice(fieldValue, accountCUTypeValues)
 }
 
 // bserviceModeValidator is used to validate Mode field.
 func bserviceModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, bserviceModeValues)
+	return StringInSlice(fieldValue, bserviceModeValues)
 }
 
 // computeTopologyValidator is used to validate Topology field.
 func computeTopologyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeTopologyValues)
+	return StringInSlice(fieldValue, computeTopologyValues)
 }
 
 // computePolicyValidator is used to validate Policy field.
 func computePolicyValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computePolicyValues)
+	return StringInSlice(fieldValue, computePolicyValues)
 }
 
 // computeModeValidator is used to validate Mode field.
 func computeModeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeModeValues)
+	return StringInSlice(fieldValue, computeModeValues)
 }
 
 // computeDiskTypeValidator is used to validate DiskType field.
 func computeDiskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeDiskTypeValues)
+	return StringInSlice(fieldValue, computeDiskTypeValues)
 }
 
 // computeNetTypeValidator is used to validate NetType field.
 func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	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)
+	return StringInSlice(fieldValue, computeNetTypeValues)
 }
 
 // computeOrderValidator is used to validate Order field.
@@ -128,7 +108,7 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, value := range fieldSlice {
-		if !IsInSlice(value, computeOrderValues) {
+		if !StringInSlice(value, computeOrderValues) {
 			return false
 		}
 	}
@@ -140,70 +120,70 @@ func computeOrderValidator(fe validator.FieldLevel) bool {
 func computeDataDisksValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, computeDataDisksValues)
+	return StringInSlice(fieldValue, computeDataDisksValues)
 }
 
 // diskTypeValidator is used to validate Type field.
 func diskTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, diskTypeValues)
+	return StringInSlice(fieldValue, diskTypeValues)
 }
 
 // flipgroupClientTypeValidator is used to validate ClientType field.
 func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, flipgroupClientTypeValues)
+	return StringInSlice(fieldValue, flipgroupClientTypeValues)
 }
 
 // kvmNetTypeValidator is used to validate NetType field.
 func kvmNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, kvmNetTypeValues)
+	return StringInSlice(fieldValue, kvmNetTypeValues)
 }
 
 // lbAlgorithmValidator is used to validate Algorithm field.
 func lbAlgorithmValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, lbAlgorithmValues)
+	return StringInSlice(fieldValue, lbAlgorithmValues)
 }
 
 // rgDefNetValidator is used to validate DefNet field.
 func rgDefNetValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, rgDefNetValues)
+	return StringInSlice(fieldValue, rgDefNetValues)
 }
 
 // rgNetTypeValidator is used to validate NetType field.
 func rgNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, rgNetTypeValues)
+	return StringInSlice(fieldValue, rgNetTypeValues)
 }
 
 // vinsTypeValidator is used to validate Type field.
 func vinsTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, vinsTypeValues)
+	return StringInSlice(fieldValue, vinsTypeValues)
 }
 
 // imageBootTypeValidator is used to validate BootType field.
 func imageBootTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, imageBootTypeValues)
+	return StringInSlice(fieldValue, imageBootTypeValues)
 }
 
 // imageTypeValidator is used to validate ImageType field.
 func imageTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, imageTypeValues)
+	return StringInSlice(fieldValue, imageTypeValues)
 }
 
 // imageDriversValidator is used to validate Drivers field.
@@ -214,7 +194,7 @@ func imageDriversValidator(fe validator.FieldLevel) bool {
 	}
 
 	for _, item := range fieldSlice {
-		if !IsInSlice(item, imageDriversValues) {
+		if !StringInSlice(item, imageDriversValues) {
 			return false
 		}
 	}
@@ -226,14 +206,14 @@ func imageDriversValidator(fe validator.FieldLevel) bool {
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, imageArchitectureValues)
+	return StringInSlice(fieldValue, imageArchitectureValues)
 }
 
 // sepFieldTypeValidator is used to validate FieldType field.
 func sepFieldTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, sepFieldTypeValues)
+	return StringInSlice(fieldValue, sepFieldTypeValues)
 }
 
 // hwPathValidator is used to validate HWPath field.
@@ -250,7 +230,7 @@ func networkPluginValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return IsInSlice(fieldValue, networkPluginValues)
+	return StringInSlice(fieldValue, networkPluginValues)
 }
 
 // networkPluginsValidator is used to validate NetworkPlugins field
@@ -263,7 +243,7 @@ func networkPluginsValidator(fe validator.FieldLevel) bool {
 	for _, item := range fieldSlice {
 		item = strings.ToLower(item)
 
-		if !IsInSlice(item, networkPluginValues) {
+		if !StringInSlice(item, networkPluginValues) {
 			return false
 		}
 	}
@@ -275,35 +255,14 @@ func interfaceStateValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	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)
+	return StringInSlice(fieldValue, interfaceStateValues)
 }
 
 func strictLooseValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 	fieldValue = strings.ToLower(fieldValue)
 
-	return IsInSlice(fieldValue, strictLooseValues)
+	return StringInSlice(fieldValue, strictLooseValues)
 }
 
 // name workerGroup must be more 3 symbol
@@ -313,132 +272,3 @@ 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)
-}
-
-// sepTypeValidator is used to validate sepType fields
-func sepTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, sepTypeValues)
-}
-
-// 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...)
-}

internal/validators/helper.go

@@ -34,7 +34,7 @@ func GetErrors(err error) validator.ValidationErrors {
 	return err.(validator.ValidationErrors)
 }
 
-func IsInSlice(str string, target []string) bool {
+func StringInSlice(str string, target []string) bool {
 	for _, v := range target {
 		if v == str {
 			return true
@@ -42,12 +42,3 @@ func IsInSlice(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,8 +25,6 @@ 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 "isBool":
-		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
 	case "driver":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -52,13 +50,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(protoValues))
 
-	// apiGroup Validators
-	case "apiGroup":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(apiGroupValues))
-
 	// Account Validators
 	case "accountCUType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -98,18 +89,6 @@ 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,
@@ -154,7 +133,7 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
-	// KVM_X86 Validators
+	// KVM_X86/KVM_PPC Validators
 	case "kvmNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -250,89 +229,6 @@ 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))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -25,7 +25,6 @@ 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
@@ -36,11 +35,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("accessType", accessTypeValidator)
 	if err != nil {
 		return err
@@ -111,11 +105,6 @@ 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
@@ -191,100 +180,10 @@ 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("sepType", sepTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/validators/values.go

@@ -1,9 +1,7 @@
 package validators
 
 var (
-	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
-
-	driverValues     = []string{"KVM_X86"}
+	driverValues     = []string{"KVM_X86", "KVM_PPC"}
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
@@ -12,70 +10,38 @@ 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"}
-	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK"}
-	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"}
+	computeOrderValues     = []string{"cdrom", "network", "hd"}
+	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
+	computeDriverValues    = []string{"KVM_X86", "SVA_KVM_X86"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
-	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
-	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC", "DPDK"}
+	kvmNetTypeValues = []string{"EXTNET", "VINS", "NONE"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
 	rgDefNetValues  = []string{"PRIVATE", "PUBLIC", "NONE"}
 	rgNetTypeValues = []string{"PUBLIC", "PRIVATE"}
 
-	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
+	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDE"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
-	imageTypeValues         = []string{"windows", "linux", "unknown"}
+	imageTypeValues         = []string{"windows", "linux", "other"}
 	imageDriversValues      = []string{"KVM_X86"}
-	imageArchitectureValues = []string{"X86_64"}
+	imageArchitectureValues = []string{"X86_64", "PPC64_LE"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
 
-	networkPluginValues = []string{"flannel", "weavenet", "calico"}
+	networkPluginValues = []string{"flannel", "weawenet", "calico"}
 
 	strictLooseValues = []string{"strict", "loose"}
 
 	interfaceStateValues = []string{"on", "off"}
-
-	actionValues = []string{"power_on", "shutdown", "force_shutdown", "reboot"}
-
-	vmActionValues = []string{"stop", "move"}
-
-	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac"}
-
-	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"}
-)
-
-const (
-	mtuMin = 1
-
-	mtuMax = 9216
 )

legacy-client.go

@@ -6,20 +6,23 @@ import (
 	"crypto/tls"
 	"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"
 )
 
-// LegacyDecortClient is Legacy HTTP-client for platform
+// Legacy HTTP-client for platform
 type LegacyDecortClient struct {
 	decortURL  string
 	client     *http.Client
@@ -50,7 +53,7 @@ func NewLegacy(cfg config.LegacyConfig) *LegacyDecortClient {
 				},
 			},
 		},
-		cfg:        trimLegacyConfig(&cfg),
+		cfg:        cfg,
 		expiryTime: expiryTime,
 		mutex:      &sync.Mutex{},
 	}
@@ -68,18 +71,20 @@ 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
 
-	byteSlice, ok := params.([]byte)
-	if ok {
-		body = bytes.NewBuffer(byteSlice)
-		ctype = "application/octet-stream"
+	if okCa {
+		body, ctype = createK8sCloudApiLegacy(k8sCaCreateReq, ldc.cfg.Token)
+	} else if okCb {
+		body, ctype = createK8sCloudBrokerLegacy(k8sCbCreateReq, ldc.cfg.Token)
 	} else {
 		values, err := query.Values(params)
 		if err != nil {
@@ -88,41 +93,14 @@ 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+constants.RESTMACHINE+url, body)
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/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
-	}
+	var respBytes []byte
+	respBytes, err = ldc.do(req, ctype)
 
 	return respBytes, err
 }
@@ -131,108 +109,60 @@ func (ldc *LegacyDecortClient) getToken(ctx context.Context) error {
 	ldc.mutex.Lock()
 	defer ldc.mutex.Unlock()
 
-	// new token is not needed
-	if ldc.cfg.Token != "" && !time.Now().After(ldc.expiryTime) {
-		return nil
+	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)
 	}
 
-	// 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
 }
 
-// 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.Set("Content-Type", ctype)
+		req.Header.Add("Content-Type", ctype)
+	} else {
+		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	}
-
 	req.Header.Set("Accept", "application/json")
 
 	buf, err := io.ReadAll(req.Body)
 	if err != nil {
 		return nil, err
 	}
-
 	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 {
+	if err != nil || resp == nil {
 		return nil, err
 	}
-	if resp == nil {
-		return nil, fmt.Errorf("got empty response without error")
-	}
+	defer resp.Body.Close()
+	
 
 	// handle successful request
-	respBytes, _ := io.ReadAll(resp.Body)
+	respBytes, err := io.ReadAll(resp.Body)
+	if err!= nil {
+		return nil, err
+	}
 	if resp.StatusCode == 200 {
 		return respBytes, nil
 	}
@@ -242,7 +172,232 @@ func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) ([]byte, erro
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }
 
-func trimLegacyConfig(cfg *config.LegacyConfig) config.LegacyConfig {
-	cfg.DecortURL = strings.TrimSuffix(cfg.DecortURL, "/")
-	return *cfg
+func createK8sCloudApiLegacy(req k8s_ca.CreateRequest, token string) (*bytes.Buffer, string) {
+	reqBody := &bytes.Buffer{}
+	writer := multipart.NewWriter(reqBody)
+	defer writer.Close()
+	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()
+	return reqBody, ct
+}
+
+func createK8sCloudBrokerLegacy(req k8s_cb.CreateRequest, token string) (*bytes.Buffer, string) {
+	reqBody := &bytes.Buffer{}
+	writer := multipart.NewWriter(reqBody)
+	defer writer.Close()
+	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()
+	return reqBody, ct
 }

pkg/cloudapi/account/create.go

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

pkg/cloudapi/account/delete_user.go

@@ -17,6 +17,10 @@ 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/disable_enable.go

@@ -13,10 +13,6 @@ type DisableEnableRequest struct {
 	// ID of account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
-
-	// Reason of disabling
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Disable disables an account

pkg/cloudapi/account/get_consumption.go

@@ -0,0 +1,58 @@
+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,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of accounts
@@ -26,10 +24,6 @@ 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"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,7 +35,6 @@ 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
@@ -59,11 +52,6 @@ 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,10 +46,6 @@ 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"`
@@ -61,7 +57,6 @@ 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,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get a list of deleted accounts
@@ -29,20 +27,10 @@ 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,10 +30,6 @@ 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"`
@@ -45,7 +41,6 @@ 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,10 +38,6 @@ 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"`
@@ -53,7 +49,6 @@ 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,15 +41,10 @@ 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,10 +30,6 @@ 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"`
@@ -45,7 +41,6 @@ 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,10 +30,6 @@ 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"`
@@ -45,7 +41,6 @@ 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

@@ -53,18 +53,12 @@ type ItemAccount struct {
 	// Access Control List
 	ACL []RecordACL `json:"acl"`
 
-	// Compute Features
-	ComputeFeatures []string `json:"computeFeatures"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// ID
 	ID uint64 `json:"id"`
 
@@ -182,9 +176,6 @@ type RecordAccount struct {
 	// Company URL
 	CompanyURL string `json:"companyurl"`
 
-	// Compute Features
-	ComputeFeatures []string `json:"computeFeatures"`
-
 	// Computes
 	Computes Computes `json:"computes"`
 
@@ -200,9 +191,6 @@ type RecordAccount struct {
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// Deactivation time
 	DeactivationTime float64 `json:"deactivationTime"`
 
@@ -386,12 +374,6 @@ 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"`
 
@@ -518,9 +500,6 @@ type ItemRG struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Description
-	Description string `json:"desc"`
-
 	// Resource group ID
 	RGID uint64 `json:"id"`
 

pkg/cloudapi/account/update.go

@@ -14,10 +14,6 @@ type UpdateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
-	// Description
-	// Required: false
-	Description string `url:"desc,omitempty" json:"desc,omitempty"`
-
 	// Name of the account
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
@@ -49,11 +45,6 @@ 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"`
 }
 
 // Update updates an account name and resource types and limits

pkg/cloudapi/audit.go

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

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

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

@@ -1,41 +0,0 @@
-package audit
-
-// Main info about audit
-type RecordAudit struct {
-
-	// Arguments
-	Arguments string `json:"args"`
-
-	// Call
-	Call string `json:"call"`
-
-	// GUID
-	GUID string `json:"guid"`
-
-	// 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"`
-}

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/disable"
+	url := "/cloudapi/bservice/delete"
 
 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/bservice/group_add.go

@@ -41,6 +41,7 @@ type GroupAddRequest struct {
 	// Compute driver
 	// should be one of:
 	//	- KVM_X86
+	//	- KVM_PPC
 	// Required: true
 	Driver string `url:"driver" json:"driver" validate:"driver"`
 
@@ -71,20 +72,6 @@ type GroupAddRequest struct {
 	// Meta data for working group computes, format YAML "user_data": 1111
 	// Required: false
 	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
-
-	//Chipset "i440fx" or "Q35
-	//Required: false
-	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset,omitempty"`
-}
-
-// 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,12 +22,6 @@ type GroupResizeRequest struct {
 	// Required: true
 	Count int64 `url:"count" json:"count" validate:"required"`
 
-	//Chipset for new computes, either i440fx or Q35 (i440fx by default)
-	//Available values : i440fx, Q35
-	//Default value : i440fx
-	//Required: true
-	Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`
-
 	// Either delta or absolute value of computes
 	// Should be one of:
 	//	- ABSOLUTE

pkg/cloudapi/bservice/group_update.go

@@ -43,16 +43,6 @@ 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,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of BasicService instances
@@ -42,10 +40,6 @@ 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"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -57,7 +51,6 @@ 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
@@ -75,11 +68,6 @@ 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,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get list of deleted BasicService instances
@@ -18,10 +16,6 @@ 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"`
@@ -33,11 +27,6 @@ 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/models.go

@@ -93,7 +93,7 @@ type RecordBasicService struct {
 // Main information about Compute
 type ItemCompute struct {
 	// Account ID
-	AccountID uint64 `json:"accountId"`
+	AccountID uint64
 
 	// Architecture
 	Architecture string `json:"arch"`
@@ -168,17 +168,8 @@ type ItemSnapshot struct {
 	Valid bool `json:"valid"`
 }
 
-// List of Snapshot
-type ListSnapshots []ItemSnapshot
-
 // List of Snapshots
-type ListInfoSnapshots struct {
-	// Data
-	Data ListSnapshots `json:"data"`
-
-	// EntryCount
-	EntryCount uint64 `json:"entryCount"`
-}
+type ListSnapshots []ItemSnapshot
 
 // Main information about Group
 type RecordGroup struct {
@@ -295,9 +286,6 @@ type ItemGroupCompute struct {
 
 	// List of information about OS Users
 	OSUsers ListOSUsers `json:"osUsers"`
-
-	//Chipset
-	Chipset string `json:"chipset"`
 }
 
 // List of Group Computes

pkg/cloudapi/bservice/snapshot_list.go

@@ -16,7 +16,7 @@ type SnapshotListRequest struct {
 }
 
 // SnapshotList gets list existing snapshots of the Basic Service
-func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListInfoSnapshots, error) {
+func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (ListSnapshots, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
@@ -29,12 +29,12 @@ func (b BService) SnapshotList(ctx context.Context, req SnapshotListRequest) (*L
 		return nil, err
 	}
 
-	list := ListInfoSnapshots{}
+	list := ListSnapshots{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return &list, nil
+	return list, nil
 }

pkg/cloudapi/compute/affinity_rule_add.go

@@ -38,9 +38,8 @@ 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: false
-	// Not required on purpose: despite required tag on platform, empty string is allowed
-	Value string `url:"value" json:"value"`
+	// Required: true
+	Value string `url:"value" json:"value" validate:"required"`
 }
 
 // AffinityRuleAdd add affinity rule

pkg/cloudapi/compute/affinity_rule_remove.go

@@ -38,9 +38,8 @@ 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: false
-	// Not required on purpose: despite required tag on platform, empty string is allowed
-	Value string `url:"value" json:"value"`
+	// Required: true
+	Value string `url:"value" json:"value" validate:"required"`
 }
 
 // AffinityRuleRemove remove affinity rule

pkg/cloudapi/compute/anti_affinity_rule_add.go

@@ -38,9 +38,8 @@ 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: false
-	// Not required on purpose: despite required tag on platform, empty string is allowed
-	Value string `url:"value" json:"value"`
+	// Required: true
+	Value string `url:"value" json:"value" validate:"required"`
 }
 
 // AntiAffinityRuleAdd add anti affinity rule

pkg/cloudapi/compute/anti_affinity_rule_remove.go

@@ -38,9 +38,8 @@ 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: false
-	// Not required on purpose: despite required tag on platform, empty string is allowed
-	Value string `url:"value" json:"value"`
+	// Required: true
+	Value string `url:"value" json:"value" validate:"required"`
 }
 
 // AntiAffinityRuleRemove remove anti affinity rule

pkg/cloudapi/compute/change_ip.go

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

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

pkg/cloudapi/compute/clone.go

@@ -25,11 +25,6 @@ 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"`
 }
 
 // Clone clones compute instance

pkg/cloudapi/compute/create_template.go

@@ -23,7 +23,7 @@ type CreateTemplateRequest struct {
 type wrapperCreateTemplateRequest struct {
 	CreateTemplateRequest
 
-	AsyncMode bool `url:"asyncMode"`
+	Async bool `url:"async"`
 }
 
 // CreateTemplate create template from compute instance
@@ -35,7 +35,7 @@ func (c Compute) CreateTemplate(ctx context.Context, req CreateTemplateRequest)
 
 	reqWrapped := wrapperCreateTemplateRequest{
 		CreateTemplateRequest: req,
-		AsyncMode:                 false,
+		Async:                 false,
 	}
 
 	url := "/cloudapi/compute/createTemplate"
@@ -62,7 +62,7 @@ func (c Compute) CreateTemplateAsync(ctx context.Context, req CreateTemplateRequ
 
 	reqWrapped := wrapperCreateTemplateRequest{
 		CreateTemplateRequest: req,
-		AsyncMode:                 true,
+		Async:                 true,
 	}
 
 	url := "/cloudapi/compute/createTemplate"

pkg/cloudapi/compute/create_template_from_blank.go

@@ -1,108 +0,0 @@
-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"`
-
-	// 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_migrate.go

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

@@ -1,46 +0,0 @@
-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,7 +48,8 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID: 65191,
+					ID:      65191,
+					PCISlot: 6,
 				},
 			},
 			Driver:           "KVM_X86",
@@ -63,7 +64,7 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363500,
 			Name:             "test",
-			PinnedToStack:    true,
+			Pinned:           false,
 			RAM:              4096,
 			ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
 			Registered:       true,
@@ -110,7 +111,8 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID: 65248,
+					ID:      65248,
+					PCISlot: 6,
 				},
 			},
 			Driver:           "KVM_X86",
@@ -125,10 +127,10 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363853,
 			Name:             "compute_2",
+			Pinned:           false,
 			RAM:              4096,
 			ReferenceID:      "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
 			Registered:       true,
-			PinnedToStack:    true,
 			ResName:          "compute-48556",
 			RGID:             79727,
 			RGName:           "sdk_negative_fields_test",

pkg/cloudapi/compute/get_log.go

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

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of available computes
@@ -54,10 +52,6 @@ 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"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -70,7 +64,6 @@ 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
@@ -88,11 +81,6 @@ 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,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get deleted computes list
@@ -46,10 +44,6 @@ 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"`
@@ -61,11 +55,6 @@ 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,10 +30,6 @@ 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"`
@@ -45,7 +41,6 @@ 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,10 +26,6 @@ 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"`
@@ -45,7 +41,6 @@ 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/models.go

@@ -214,9 +214,6 @@ type RecordNetAttach struct {
 
 	// List VNF IDs
 	VNFs []uint64 `json:"vnfs"`
-
-	// Maximum transmission unit
-	MTU uint64 `json:"mtu"`
 }
 
 // Detailed information about audit
@@ -299,27 +296,15 @@ type RecordCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
-	// Auto start when node restarted
-	AutoStart bool `json:"autoStart"`
-
 	// Architecture
 	Architecture string `json:"arch"`
 
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
-	// Boot type
-	BootType string `json:"bootType"`
-
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
-	// CD Image Id
-	CdImageId uint64 `json:"cdImageId"`
-
-	// Chipset
-	Chipset string `json:"chipset"`
-
 	// Clone reference
 	CloneReference uint64 `json:"cloneReference"`
 
@@ -329,9 +314,6 @@ type RecordCompute struct {
 	// Compute CI ID
 	ComputeCIID uint64 `json:"computeciId"`
 
-	// CPU Pin
-	CPUPin bool `json:"cpupin"`
-
 	//  Number of cores
 	CPU uint64 `json:"cpus"`
 
@@ -368,12 +350,6 @@ type RecordCompute struct {
 	// GUID
 	GUID uint64 `json:"guid"`
 
-	// HPBacked
-	HPBacked bool `json:"hpBacked"`
-
-	// Hot resize
-	HotResize bool `json:"hotResize"`
-
 	// ID
 	ID uint64 `json:"id"`
 
@@ -386,9 +362,6 @@ type RecordCompute struct {
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
-	// Loader type
-	LoaderType string `json:"loaderType"`
-
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -407,18 +380,6 @@ 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"`
 
@@ -437,11 +398,8 @@ type RecordCompute struct {
 	// List OS Users
 	OSUsers ListOSUser `json:"osUsers"`
 
-	// Pinned to stack
-	PinnedToStack bool `json:"pinnedToStack"`
-
-	// PreferredCPU
-	PreferredCPU []int64 `json:"preferredCpu"`
+	// Pinned or not
+	Pinned bool `json:"pinned"`
 
 	// Number of RAM
 	RAM uint64 `json:"ram"`
@@ -455,9 +413,6 @@ type RecordCompute struct {
 	// Resource name
 	ResName string `json:"resName"`
 
-	// Reserved Node Cpus
-	ReservedNodeCpus []uint64 `json:"reservedNodeCpus"`
-
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
@@ -494,100 +449,14 @@ type RecordCompute struct {
 	// Userdata
 	Userdata interface{} `json:"userdata"`
 
-	// vGPUs list
-	VGPUs []VGPUItem `json:"vgpus"`
+	// vGPU IDs
+	VGPUs []uint64 `json:"vgpus"`
 
 	// Virtual image ID
 	VirtualImageID uint64 `json:"virtualImageId"`
 
 	// Virtual image name
 	VirtualImageName string `json:"virtualImageName"`
-
-	// VNC password
-	VNCPassword string `json:"vncPasswd"`
-}
-
-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
@@ -628,9 +497,6 @@ type ListSnapSets []ItemSnapSet
 
 // Main information about VNF
 type ItemVNFInterface struct {
-	// Bus number
-	BusNumber uint64 `json:"bus_number"`
-
 	// Connection ID
 	ConnID uint64 `json:"connId"`
 
@@ -655,15 +521,9 @@ 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"`
 
@@ -676,9 +536,6 @@ type ItemVNFInterface struct {
 	// Network type
 	NetType string `json:"netType"`
 
-	// NodeID
-	NodeID int64 `json:"nodeId"`
-
 	// PCI slot
 	PCISlot int64 `json:"pciSlot"`
 
@@ -722,9 +579,6 @@ type ItemComputeDisk struct {
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
-	// Bus number
-	BusNumber uint64 `json:"bus_number"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
@@ -783,13 +637,13 @@ type ItemComputeDisk struct {
 	Passwd string `json:"passwd"`
 
 	// PCI slot
-	PCISlot int64 `json:"pci_slot"`
+	PCISlot int64 `json:"pciSlot"`
 
 	// Pool
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -797,9 +651,6 @@ type ItemComputeDisk struct {
 	// Reality device number
 	RealityDeviceNumber uint64 `json:"realityDeviceNumber"`
 
-	// Replication
-	Replication ItemReplication `json:"replication"`
-
 	// Resource ID
 	ResID string `json:"resId"`
 
@@ -812,9 +663,6 @@ type ItemComputeDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -833,33 +681,10 @@ type ItemComputeDisk struct {
 	// Type
 	Type string `json:"type"`
 
-	// Updated by
-	UpdatedBy string `json:"updatedBy"`
-
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 }
 
-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
 type SnapshotExtend struct {
 	// GUID
@@ -933,7 +758,6 @@ type IOTune struct {
 type ItemCompute struct {
 	// Access Control List
 	ACL ListACL `json:"acl"`
-
 	// Account ID
 	AccountID uint64 `json:"accountId"`
 
@@ -952,27 +776,15 @@ type ItemCompute struct {
 	// List anti affinity rules
 	AntiAffinityRules ListRules `json:"antiAffinityRules"`
 
-	// Auto start when node restarted
-	AutoStart bool `json:"autoStart"`
-
 	// Architecture
 	Architecture string `json:"arch"`
 
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
-	// Boot type
-	BootType string `json:"bootType"`
-
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
-	// CD Image Id
-	CdImageId uint64 `json:"cdImageId"`
-
-	// Chipset
-	Chipset string `json:"chipset"`
-
 	// Clone reference
 	CloneReference uint64 `json:"cloneReference"`
 
@@ -982,9 +794,6 @@ type ItemCompute struct {
 	// Compute CI ID
 	ComputeCIID uint64 `json:"computeciId"`
 
-	// CPU Pin
-	CPUPin bool `json:"cpupin"`
-
 	// Number of cores
 	CPU uint64 `json:"cpus"`
 
@@ -1021,12 +830,6 @@ type ItemCompute struct {
 	// GUID
 	GUID uint64 `json:"guid"`
 
-	// Hot resize
-	HotResize bool `json:"hotResize"`
-
-	// HPBacked
-	HPBacked bool `json:"hpBacked"`
-
 	// ID
 	ID uint64 `json:"id"`
 
@@ -1036,9 +839,6 @@ type ItemCompute struct {
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
-	// Loader type
-	LoaderType string `json:"loaderType"`
-
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -1057,23 +857,8 @@ type ItemCompute 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"`
-
-	// Pinned to stack
-	PinnedToStack bool `json:"pinnedToStack"`
-
-	// PreferredCPU
-	PreferredCPU []int64 `json:"preferredCpu"`
+	// Pinned or not
+	Pinned bool `json:"pinned"`
 
 	// Number of RAM
 	RAM uint64 `json:"ram"`
@@ -1087,9 +872,6 @@ type ItemCompute struct {
 	// Resource name
 	ResName string `json:"resName"`
 
-	// Reserved Node Cpus
-	ReservedNodeCpus []uint64 `json:"reservedNodeCpus"`
-
 	// Resource group ID
 	RGID uint64 `json:"rgId"`
 
@@ -1143,6 +925,9 @@ type ListInfoDisks []InfoDisk
 type InfoDisk struct {
 	// ID
 	ID uint64 `json:"id"`
+
+	// PCISlot
+	PCISlot int64 `json:"pciSlot"`
 }
 
 // List information about computes
@@ -1157,106 +942,16 @@ type ListComputes struct {
 // List VGPUs
 type ListVGPUs struct {
 	// Data
-	Data []ItemVGPU `json:"data"`
+	Data []interface{} `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 []ItemPCIDevice `json:"data"`
+	Data []interface{} `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`

pkg/cloudapi/compute/net_attach.go

@@ -16,11 +16,9 @@ type NetAttachRequest struct {
 
 	// Network type
 	// 'EXTNET' for connect to external network directly
-	// 'VINS' for connect to ViNS
-	// 'VFNIC' for connect to vfpool
-	// 'DPDK' for connect to DPDK
+	// and 'VINS' for connect to ViNS
 	// Required: true
-	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
+	NetType string `url:"netType" json:"netType" validate:"computeNetType"`
 
 	// Network ID for connect to
 	// For EXTNET - external network ID
@@ -31,14 +29,6 @@ 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 DPDK type, must be 1-9216
-	// Required: false
-	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
 }
 
 // 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: false
-	LocalBasePort uint64 `url:"localBasePort,omitempty" json:"localBasePort,omitempty"`
+	// Required: true
+	LocalBasePort uint64 `url:"localBasePort" json:"localBasePort" validate:"required"`
 
 	// Network protocol
 	// either "tcp" or "udp"

pkg/cloudapi/compute/pin_to_stack.go

@@ -13,30 +13,25 @@ type PinToStackRequest struct {
 	// ID of the compute instance
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Auto start when node restarted
-	// Required: false
-	// Default: false
-	AutoStart bool `url:"autoStart" json:"autoStart"`
 }
 
 // PinToStack pin compute to current stack
-func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (bool, error) {
+func (c Compute) PinToStack(ctx context.Context, req PinToStackRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/pinToStack"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return 0, err
 	}
 
-	result, err := strconv.ParseBool(string(res))
+	result, err := strconv.ParseUint(string(res), 10, 64)
 	if err != nil {
-		return false, err
+		return 0, err
 	}
 
 	return result, nil

pkg/cloudapi/compute/resize.go

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

@@ -3,6 +3,7 @@ package compute
 import (
 	"context"
 	"net/http"
+	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
@@ -18,52 +19,24 @@ 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) (string, error) {
+func (c Compute) SnapshotDelete(ctx context.Context, req SnapshotDeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperSnapshotDeleteRequeststruct{
-		SnapshotDeleteRequest: req,
-		AsyncMode:             false,
+		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/snapshotDelete"
 
-	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
+		return false, err
 	}
 
-	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
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
 }

pkg/cloudapi/compute/update.go

@@ -21,50 +21,6 @@ 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"`
 }
 
 // Update updates some properties of the compute

pkg/cloudapi/disks/create.go

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

pkg/cloudapi/disks/delete.go

@@ -21,6 +21,10 @@ 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,6 +14,10 @@ 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"`

pkg/cloudapi/disks/filter_test.go

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

pkg/cloudapi/disks/from_platform_disk.go

@@ -1,122 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// FromPlatformDiskRequest struct to create template from platform disk
-type FromPlatformDiskRequest struct {
-	// ID of the disk
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" 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"`
-
-	// Binary architecture of this image
-	// Should be:
-	//	- X86_64
-	// Required: true
-	Architecture string `url:"architecture" json:"architecture" validate:"imageArchitecture"`
-
-	// Username for the image
-	// Required: false
-	Username string `url:"username,omitempty" json:"username,omitempty"`
-
-	// 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"`
-
-	// List of types of compute suitable for image
-	// Example: [ "KVM_X86" ]
-	// Required: true
-	Drivers []string `url:"drivers" json:"drivers" validate:"required"`
-
-	// Does this machine supports hot resize
-	// Required: false
-	HotResize bool `url:"hotresize" json:"hotresize"`
-
-	// Bootable image
-	// Required: true
-	Bootable bool `url:"bootable" json:"bootable"`
-}
-
-type wrapperFromPlatformDiskRequest struct {
-	FromPlatformDiskRequest
-	AsyncMode bool `url:"asyncMode"`
-}
-
-// FromPlatformDisk creates template from platform disk in sync mode.
-// It returns id of created disk and error.
-func (d Disks) FromPlatformDisk(ctx context.Context, req FromPlatformDiskRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/fromPlatformDisk"
-
-	reqWrapped := wrapperFromPlatformDiskRequest{
-		FromPlatformDiskRequest: req,
-		AsyncMode:               false,
-	}
-
-	res, err := d.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
-}
-
-// FromPlatformDiskAsync creates template from platform disk in async mode.
-// It returns guid of task and error.
-func (d Disks) FromPlatformDiskAsync(ctx context.Context, req FromPlatformDiskRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/fromPlatformDisk"
-
-	reqWrapped := wrapperFromPlatformDiskRequest{
-		FromPlatformDiskRequest: req,
-		AsyncMode:               true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	result := strings.ReplaceAll(string(res), "\"", "")
-
-	return result, nil
-}

pkg/cloudapi/disks/list.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of disks
@@ -32,7 +30,7 @@ type ListRequest struct {
 
 	// Find by shared, true or false
 	// Required: false
-	Shared interface{} `url:"shared,omitempty" json:"shared,omitempty" validate:"omitempty,isBool"`
+	Shared bool `url:"shared,omitempty" json:"shared,omitempty"`
 
 	// ID of the account the disks belong to
 	// Required: false
@@ -50,10 +48,6 @@ type ListRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,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"`
@@ -65,7 +59,6 @@ type ListRequest struct {
 
 // List gets list of the created disks belonging to an account as a ListDisks struct
 func (d Disks) List(ctx context.Context, req ListRequest) (*ListDisks, error) {
-
 	res, err := d.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
@@ -83,11 +76,6 @@ func (d Disks) List(ctx context.Context, req ListRequest) (*ListDisks, error) {
 
 // ListRaw gets list of the created disks belonging to an account as an array of bytes
 func (d Disks) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
 	url := "/cloudapi/disks/list"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/disks/list_deleted.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get list of deleted disks
@@ -28,7 +26,7 @@ type ListDeletedRequest struct {
 
 	// Find by shared, true or false
 	// Required: false
-	Shared interface{} `url:"shared,omitempty" json:"shared,omitempty" validate:"omitempty,isBool"`
+	Shared bool `url:"shared,omitempty" json:"shared,omitempty"`
 
 	// ID of the account the disks belong to
 	// Required: false
@@ -38,10 +36,6 @@ type ListDeletedRequest 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"`
@@ -53,11 +47,6 @@ type ListDeletedRequest struct {
 
 // ListDeleted gets list the deleted disks belonging to an account
 func (d Disks) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListDisks, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
 	url := "/cloudapi/disks/listDeleted"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/disks/list_types.go

@@ -4,19 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListTypesRequest struct to get list types of disks
 type ListTypesRequest struct {
 	// Show detailed disk types by seps
 	// Required: true
-	Detailed bool `url:"detailed" json:"detailed"`
-
-	// Sort by one of supported fields, format +|-(field)
-	// Required: false
-	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+	Detailed bool `url:"detailed" json:"detailed" validate:"required"`
 
 	// Page number
 	// Required: false
@@ -29,11 +23,6 @@ type ListTypesRequest struct {
 
 // ListTypes gets list defined disk types
 func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) (*ListTypes, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
 	url := "/cloudapi/disks/listTypes"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/disks/list_unattached.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListUnattachedRequest struct to get list of unattached disk
@@ -42,10 +40,6 @@ type ListUnattachedRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,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,11 +51,6 @@ type ListUnattachedRequest struct {
 
 // ListUnattached gets list of unattached disks
 func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (*ListDisksUnattached, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
 	url := "/cloudapi/disks/listUnattached"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/disks/models.go

@@ -14,15 +14,9 @@ type ItemDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
-	//Created by
-	CreatedBy string `json:"createdBy"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -56,9 +50,6 @@ type ItemDisk struct {
 	// Machine name
 	MachineName string `json:"machineName"`
 
-	// Milestones
-	Milestones uint64 `json:"milestones"`
-
 	// Name
 	Name string `json:"name"`
 
@@ -78,14 +69,11 @@ type ItemDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
 
-	// Replication
-	Replication ItemReplication `json:"replication"`
-
 	// Resource ID
 	ResID string `json:"resId"`
 
@@ -104,9 +92,6 @@ type ItemDisk struct {
 	// SepID
 	SepID uint64 `json:"sepId"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -127,12 +112,6 @@ type ItemDisk struct {
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
-
-	// Update time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Updated by
-	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemDiskUnattached struct {
@@ -218,7 +197,7 @@ type ItemDiskUnattached struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
@@ -283,10 +262,8 @@ type ListDisks struct {
 
 // List of unattached disks
 type ListDisksUnattached struct {
-	// Data
 	Data []ItemDiskUnattached `json:"data"`
 
-	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
 
@@ -372,15 +349,9 @@ type RecordDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
-	// Created by
-	CreatedBy string `json:"createdBy"`
-
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -408,15 +379,6 @@ type RecordDisk struct {
 	// IOTune
 	IOTune IOTune `json:"iotune"`
 
-	// Machine ID
-	MachineID uint64 `json:"machineId"`
-
-	// Machine name
-	MachineName string `json:"machineName"`
-
-	// Milestones
-	Milestones uint64 `json:"milestones"`
-
 	// Name
 	Name string `json:"name"`
 
@@ -436,14 +398,11 @@ type RecordDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo map[string]uint64 `json:"presentTo"`
+	PresentTo []uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
 
-	// Replication
-	Replication ItemReplication `json:"replication"`
-
 	// Resource ID
 	ResID string `json:"resId"`
 
@@ -462,9 +421,6 @@ type RecordDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
-	// Size available
-	SizeAvailable float64 `json:"sizeAvailable"`
-
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -485,32 +441,6 @@ type RecordDisk struct {
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
-
-	// Update time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Updated by
-	UpdatedBy string `json:"updatedBy"`
-}
-
-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"`
 }
 
 type ListTypes struct {

pkg/cloudapi/disks/replicate.go

@@ -1,52 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicateRequest struct to create an empty disk in chosen SEP and pool combination.
-type ReplicateRequest struct {
-	// Id of the disk to replicate. This disk will become master in replication
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-
-	// Name of replica disk to create
-	// Required: true
-	Name string `url:"name" json:"name" validate:"required"`
-
-	// ID of SEP to create slave disk
-	// Required: true
-	SepID uint64 `url:"sepId" json:"sepId" validate:"required"`
-
-	// Pool name to create slave disk in
-	// Required: true
-	PoolName string `url:"poolName" json:"poolName" validate:"required"`
-}
-
-// Create an empty disk in chosen SEP and pool combination.
-// Starts replication between chosen disk and newly created disk
-// Note: only TATLIN type SEP are supported for replications between
-func (d Disks) Replicate(ctx context.Context, req ReplicateRequest) (uint64, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicate"
-
-	res, err := d.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/disks/replication_resume.go

@@ -1,38 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicationResume struct to resume suspended replication
-type ReplicationResumeRequest struct {
-	// Id of the disk
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-}
-
-// ReplicationResume resume suspended replication
-func (d Disks) ReplicationResume(ctx context.Context, req ReplicationResumeRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationResume"
-
-	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/replication_reverse.go

@@ -1,38 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicationReverseRequest struct to change role between disks replications
-type ReplicationReverseRequest struct {
-	// Id of the disk
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-}
-
-// ReplicationReverse change role between disks replications
-func (d Disks) ReplicationReverse(ctx context.Context, req ReplicationReverseRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationReverse"
-
-	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/replication_start.go

@@ -1,43 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicationStartRequest struct to starts replication between two chosen disks
-type ReplicationStartRequest struct {
-	// Id of the disk to replicate. Primary disk in replication
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-
-	// ID of target disk. Secondary disk in replication
-	// Required: true
-	TargetDiskID uint64 `url:"targetDiskId" json:"targetDiskId" validate:"required"`
-}
-
-// ReplicationStart starts replication between two chosen disks. It's required for both disks to have same size to avoid replication conflicts
-// Note: Source disk's SEP and target SEP supported only of TATLIN type.
-func (d Disks) ReplicationStart(ctx context.Context, req ReplicationStartRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationStart"
-
-	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/replication_status.go

@@ -1,32 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicationStatusRequest struct to get replication status
-type ReplicationStatusRequest struct {
-	// Id of the disk
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-}
-
-// ReplicationStatus get replication status
-func (d Disks) ReplicationStatus(ctx context.Context, req ReplicationStatusRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationStatus"
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/disks/replication_stop.go

@@ -1,38 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicationStopRequest struct to remove replication between disks completely
-type ReplicationStopRequest struct {
-	// Id of the disk
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-}
-
-// ReplicationStop remove replication between disks completely
-func (d Disks) ReplicationStop(ctx context.Context, req ReplicationStopRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationStop"
-
-	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/replication_suspend.go

@@ -1,38 +0,0 @@
-package disks
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ReplicationSuspendRequest struct to pause replication with possibility to resume from pause moment
-type ReplicationSuspendRequest struct {
-	// Id of the disk
-	// Required: true
-	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
-}
-
-// ReplicationSuspend pause replication with possibility to resume from pause moment
-func (d Disks) ReplicationSuspend(ctx context.Context, req ReplicationSuspendRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationSuspend"
-
-	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/resize.go

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

pkg/cloudapi/disks/restore.go

@@ -13,6 +13,10 @@ type RestoreRequest struct {
 	// ID of the disk to restore
 	// Required: true
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
+
+	// Reason for restoring the disk
+	// Required: true
+	Reason string `url:"reason" json:"reason" validate:"required"`
 }
 
 // Restore restores a deleted unattached disk from recycle bin

pkg/cloudapi/disks/search.go

@@ -18,14 +18,6 @@ type SearchRequest struct {
 	// If false, then disks having one of the statuses are not listed
 	// Required: false
 	ShowAll bool `url:"show_all,omitempty" json:"show_all,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"`
 }
 
 // Search searches disks

pkg/cloudapi/dpdknet.go

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

pkg/cloudapi/dpdknet/dpdknet.go

@@ -1,15 +0,0 @@
-package dpdknet
-
-import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
-
-// Structure for creating request to DPDK network
-type DPDKNet struct {
-	client interfaces.Caller
-}
-
-// Builder for dpdk endpoints
-func New(client interfaces.Caller) *DPDKNet {
-	return &DPDKNet{
-		client,
-	}
-}

pkg/cloudapi/dpdknet/get.go

@@ -1,46 +0,0 @@
-package dpdknet
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GetRequest struct to get information about DPDK network
-type GetRequest struct {
-	// ID of the DPDK network
-	// Required: true
-	DPDKID uint64 `url:"dpdkId" json:"dpdkId" validate:"required"`
-}
-
-// Get DPDK network details as a RecordDPDKNet struct
-func (d DPDKNet) Get(ctx context.Context, req GetRequest) (*RecordDPDKNet, error) {
-	res, err := d.GetRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := RecordDPDKNet{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetRaw gets DPDK network details as an array of bytes
-func (d DPDKNet) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/dpdknet/get"
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/dpdknet/list.go

@@ -1,79 +0,0 @@
-package dpdknet
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ListRequest struct to get list of DPDK networks
-type ListRequest struct {
-	// Find by id
-	// Required: false
-	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
-
-	// Find by gid
-	// Required: false
-	GID uint64 `url:"gid,omitempty" json:"gid,omitempty"`
-
-	// Find by name
-	// Required: false
-	Name string `url:"name,omitempty" json:"name,omitempty"`
-
-	// Find by description
-	// Required: false
-	Description string `url:"description,omitempty" json:"description,omitempty"`
-
-	// Find by status
-	// Required: false
-	Status string `url:"status,omitempty" json:"status,omitempty"`
-
-	// Find by computeIDs
-	// Required: false
-	ComputeIDs []uint64 `url:"computeIds,omitempty" json:"computeIds,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"`
-
-	// Page size
-	// Required: false
-	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
-}
-
-// List gets list of the created DPDK networks belonging to an account as a ListDPDKNet struct
-func (d DPDKNet) List(ctx context.Context, req ListRequest) (*ListDPDKNet, error) {
-
-	res, err := d.ListRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListDPDKNet{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}
-
-// ListRaw gets list of the created DPDK networks belonging to an account as an array of bytes
-func (d DPDKNet) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/dpdknet/list"
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/dpdknet/models.go

@@ -1,92 +0,0 @@
-package dpdknet
-
-// Detailed information about DPDK network
-type RecordDPDKNet struct {
-	// List of accounts with access
-	AccountAccess []uint64 `json:"accountAccess"`
-
-	// Created time
-	CreatedTime uint64 `json:"createdTime"`
-
-	// Updated time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Description
-	Description string `json:"description"`
-
-	// Grid ID
-	GID uint64 `json:"gid"`
-
-	// Guid ID
-	GUID uint64 `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// Name
-	Name string `json:"name"`
-
-	// List of resource groups with access
-	RGAccess []uint64 `json:"rgAccess"`
-
-	// Status
-	Status string `json:"status"`
-
-	// OVS bridge
-	OVSBridge string `json:"ovsBridge"`
-
-	// Vlan ID
-	VlanID uint64 `json:"vlanId"`
-
-	// Compute IDs
-	ComputeIDs []uint64 `json:"computeIds"`
-}
-
-type ListDPDKNet struct {
-	// Data
-	Data []ItemDPDKNet `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
-
-type ItemDPDKNet struct {
-	// List of accounts with access
-	AccountAccess []uint64 `json:"accountAccess"`
-
-	// Created time
-	CreatedTime uint64 `json:"createdTime"`
-
-	// Updated time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Description
-	Description string `json:"description"`
-
-	// Grid ID
-	GID uint64 `json:"gid"`
-
-	// Guid ID
-	GUID uint64 `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// Name
-	Name string `json:"name"`
-
-	// List of resource groups with access
-	RGAccess []uint64 `json:"rgAccess"`
-
-	// Status
-	Status string `json:"status"`
-
-	// OVS bridge
-	OVSBridge string `json:"ovsBridge"`
-
-	// Vlan ID
-	VlanID uint64 `json:"vlanId"`
-
-	// Compute IDs
-	ComputeIDs []uint64 `json:"computeIds"`
-}

pkg/cloudapi/extnet/get_reserved_ip.go

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

pkg/cloudapi/extnet/list.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of external network
@@ -38,10 +36,6 @@ 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"`
-
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -49,15 +43,10 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
-
-	//openVswitch bridge name
-	//Required: false
-	OVSBridge string `url:"ovsBridge,omitempty" json:"ovsBridge,omitempty"`
 }
 
 // List gets list of all available external networks as a ListExtNets struct
 func (e ExtNet) List(ctx context.Context, req ListRequest) (*ListExtNets, error) {
-
 	res, err := e.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
@@ -75,11 +64,6 @@ func (e ExtNet) List(ctx context.Context, req ListRequest) (*ListExtNets, error)
 
 // ListRaw gets list of all available external networks as an array of bytes
 func (e ExtNet) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
 	url := "/cloudapi/extnet/list"
 
 	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudapi/extnet/list_computes.go

@@ -22,10 +22,6 @@ type ListComputesRequest struct {
 	// Required: false
 	ComputeID uint64 `url:"computeId,omitempty" json:"computeId,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"`
@@ -37,7 +33,6 @@ type ListComputesRequest struct {
 
 // ListComputes gets computes from account with extnets
 func (e ExtNet) ListComputes(ctx context.Context, req ListComputesRequest) (*ListExtNetComputes, error) {
-
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))