v1.6.13

v1.7.6
v1.6.12
2024-03-14 10:17:08 +03:00 · 2024-03-06 17:02:50 +03:00 · 2024-03-06 16:50:27 +03:00 · 2024-02-01 10:50:38 +03:00 · 2024-01-22 13:10:00 +03:00 · 2023-12-18 16:27:15 +03:00
30 changed files with 98 additions and 873 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,4 @@
-## Version 1.7.0
+## Version 1.6.13

-## Feature
- Added support for authorization using the Basis.Virtual Security system. Add client and config
-
-## Bugfix
- Add model ListInfoSnapshots in cloudapi/bservice/models
- Fix func SnapshotList for work with new model cloudapi/bservice/snapshot_list
- Add models ItemAffinityGroup, ListAffinityGroup in cloudapi/rg/models
+### Bugfix
+- Fix url for Disable method in cloudapi/bservice
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ Decort SDK - это библиотека, написанная на языке G
    - Версия 1.4.x Decort-SDK соответствует 3.8.6 версии платформы
    - Версия 1.5.x Decort-SDK соответствует 3.8.7 версии платформы
    - Версия 1.6.x Decort-SDK соответствует 3.8.8 версии платформы
-    - Версия 1.7.х Decort-SDK соответствует 3.8.9 версии платформы

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

@@ -937,7 +936,6 @@ func main() {
    legacyCfg := config.LegacyConfig{
        Username:  "<USERNAME>",
        Password:  "<PASSWORD>",
-        Domain:    "dynamix",
        DecortURL: "https://mr4.digitalenergy.online",
        Retries:   5,
    }
@@ -963,176 +961,3 @@ func main() {

    fmt.Println(res)
 }
-```
-
-## Работа с BVS клиентом
-
-Работа с BVS клиентом применяется для пользователей, которые используют для авторизации BVS.
-
-### Настройка конфигурации BVS клиента
-
-Сначала, необходимо создать переменную конфигурации клиента. Конфигурация состоит как из обязательных, так и необязательных полей.
-
-| Поле          | Тип    | Обязательный | Описание                                                           |
-| ------------- | ------ | ------------ | ------------------------------------------------------------------ |
-| Username      | string | Да           | username legacy пользователя                                       |
-| Password      | string | Да           | пароль legacy пользователя                                         |
-| DecortURL     | string | Да           | URL адрес платформы, с которой будет осуществляться взаимодействие |
-| SSOURL        | string | Да           | URL адрес сервиса аутентификации и авторизации                     |
-| Domain        | string | Да           | Имя домена                                                         |
-| Retries       | uint   | Нет          | Кол-во неудачных попыток выполнения запроса, по умолчанию - 5      |
-| Timeout       | config.Duration | Нет | Таймаут HTTP клиента, по умолчанию - без ограничений               |
-| SSLSkipVerify | bool   | Нет          | Пропуск проверки подлинности сертификата                           |
-
-
-#### Пример конфигурации BVS клиента
-
-```go
-import (
-    "repository.basistech.ru/BASIS/decort-golang-sdk/config"
-)
-
-func main(){
-    // Настройка конфигурации
-    BvsCfg := config.BVSConfig{
-        AppID:     "<APP_ID>",
-        AppSecret: "<APP_SECRET>",
-        Username:  "<USERNAME>",
-        Password:  "<PASSWORD>",
-        SSOURL:    "https://bvs-delta.qa.loc:8443"
-        DecortURL: "https://delta.qa.loc",
-        Domain:    "dynamix"
-        Retries:   5,
-    }
-
-    BvsCfg.SetTimeout(5 * time.Minute)
-}
-```
-
-#### Парсинг BVS конфигурации из файла
-
-Также возможно создать переменную конфигурации из JSON или YAML файла, используя функцию `ParseConfigBVSJSON` (или `ParseConfigBVSYAML`) из пакета config.
-<br>
-*См. пример файлов конфигурации ниже и в директории `samples/`.*
-
-```go
-import (
-	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-)
-
-func main() {
-	// Парсинг конфигурации из YAML-файла
-	BVSCfg := config.ParseConfigBVSYAML("<PATH>")
-}
-```
-
-#### Пример BVS JSON конфигурации
-
-```json
-{
-    "username": "<USERNAME>",
-    "password": "<PASSWORD>",
-    "appId": "<APP_ID>",
-    "appSecret": "<APP_SECRET>",
-    "ssoUrl": "https://bvs-delta.qa.loc:8443",
-    "decortUrl": "https://delta.qa.loc",
-    "domain":    "dynamix",
-    "retries": 5,
-    "timeout": "5m",
-    "sslSkipVerify": false
-}
-```
-
-#### Пример BVS YAML конфигурации
-```yaml
-    username: <USERNAME>
-    password: <PASSWORD>
-    appId: <APP_ID>
-    appSecret: <APP_SECRET>
-    ssoUrl: https://bvs-delta.qa.loc:8443
-    decortUrl: https://delta.qa.loc
-    domain:    dynamix,
-    retries: 5
-    timeout: 5m
-    sslSkipVerify: false
-```
-### Создание BVS клиента
-
-Создание клиента происходит с помощью функции-строителя `NewBVS` из основного пакета `decort-sdk`, для избежания проблем с именами, пакету можно присвоить алиас `decort`. Функция принимает конфигурацию, возвращает структуру `DecortClient`, с помощью которой можно взаимодействовать с платформой.
-
-#### Пример создания BVS клиента
-
-```go
-package main
-
-import (
-    "repository.basistech.ru/BASIS/decort-golang-sdk/config"
-    decort "repository.basistech.ru/BASIS/decort-golang-sdk"
-)
-
-func main() {
-    // Настройка конфигурации
-    BVSCfg := config.BVSConfig{
-        Username:  "<USERNAME>",
-        Password:  "<PASSWORD>",
-        AppID:     "<APPID>",
-        AppSecret: "<APPSECRET>",
-        SSOURL:    "https://bvs-delta.qa.loc:8443"
-        DecortURL: "https://mr4.digitalenergy.online",
-        Domain:    "dynamix",
-        Retries:   5,
-    }
-
-    BVSCfg.SetTimeout(5 * time.Minute)
-
-    // Создание клиента
-    BVSClient := decort.NewBVS(cfg)
-}
-```
-
-#### Пример выполнения запроса
-
-```go
-package main
-
-import (
-	"fmt"
-
-    "repository.basistech.ru/BASIS/decort-golang-sdk/config"
-    decort "repository.basistech.ru/BASIS/decort-golang-sdk"
-)
-
-func main() {
-    // Настройка конфигурации
-    BVSCfg := config.config.BVSConfig{
-        Username:  "<USERNAME>",
-        Password:  "<PASSWORD>",
-        AppID:     "<APPID>",
-        AppSecret: "<APPSECRET>",
-        SSOURL:    "https://bvs-delta.qa.loc:8443"
-        DecortURL: "https://mr4.digitalenergy.online",
-        Domain:    "dynamix",
-        Retries:   5,
-    }
-
-    // Создание клиента
-    BVSClient := decort.NewBVS(cfg)
-    
-    // Создание структуры запроса
-    // CreateRequest - реквест на создание виртуальной машины
-    req := kvmx86.CreateRequest{
-        RGID:    123,
-        Name:    "compute",
-        CPU:     4,
-        RAM:     4096,
-        ImageID: 321,
-    }
-
-    // Выполнение запроса
-    res, err := client.CloudAPI().KVMX86().Create(context.Background(), req)
-    if err != nil {
-        log.Fatal(err)
-    }
-
-    fmt.Println(res)
-}
--- a/client.go
+++ b/client.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"io"
 	"mime/multipart"
@@ -22,8 +21,6 @@ import (
 	k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
 )

-const restmachine = "/restmachine"
-
 // HTTP-client for platform
 type DecortClient struct {
 	decortURL  string
@@ -90,7 +87,7 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 		body = bytes.NewBufferString(values.Encode())
 	}

-	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+restmachine+url, body)
+	req, err := http.NewRequestWithContext(ctx, method, dc.decortURL+"/restmachine"+url, body)
 	if err != nil {
 		return nil, err
 	}
@@ -99,22 +96,11 @@ func (dc *DecortClient) DecortApiCall(ctx context.Context, method, url string, p
 		return nil, err
 	}

-	resp, err := dc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
+	// perform request
+	var respBytes []byte
+	respBytes, err = dc.do(req, ctype)

-	respBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
-	}
-
-	return respBytes, nil
+	return respBytes, err
 }

 func (dc *DecortClient) getToken(ctx context.Context) error {
@@ -151,7 +137,7 @@ func (dc *DecortClient) getToken(ctx context.Context) error {
 	return nil
 }

-func (dc *DecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
+func (dc *DecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 	if ctype != "" {
 		req.Header.Add("Content-Type", ctype)
 	} else {
@@ -161,25 +147,27 @@ func (dc *DecortClient) do(req *http.Request, ctype string) (*http.Response, err
 	req.Header.Add("Authorization", "bearer "+dc.cfg.Token)
 	req.Header.Set("Accept", "application/json")

-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := dc.client.Do(req)
-
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
+	buf, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
 	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// }
-	// }

+	req.Body = io.NopCloser(bytes.NewBuffer(buf))
+
+	resp, err := dc.client.Do(req)
+	if err != nil || resp == nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	// handle successful request
+	respBytes, _ := io.ReadAll(resp.Body)
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with status code other than 200
+	err = fmt.Errorf("%s", respBytes)
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }

@@ -404,7 +392,7 @@ func createK8sCloudBroker(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
 	}

 	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-	
+
 	ct := writer.FormDataContentType()

 	writer.Close()
--- a/client_bvs.go
+++ b/client_bvs.go
@@ -1,401 +0,0 @@
-package decortsdk
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"mime/multipart"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/google/go-querystring/query"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/config"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi"
-	k8s_ca "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/k8s"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
-	k8s_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/k8s"
-)
-
-// HTTP-client for platform
-type BVSDecortClient struct {
-	client    *http.Client
-	cfg       config.BVSConfig
-	mutex     *sync.Mutex
-	decortURL string
-}
-
-// Сlient builder
-func NewBVS(cfg config.BVSConfig) *BVSDecortClient {
-	if cfg.Retries == 0 {
-		cfg.Retries = 5
-	}
-
-	return &BVSDecortClient{
-		decortURL: cfg.DecortURL,
-		client: &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					//nolint:gosec
-					InsecureSkipVerify: cfg.SSLSkipVerify,
-				},
-			},
-		},
-		cfg:   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) {
-	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
-	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
-	var body *bytes.Buffer
-	var ctype string
-
-	if okCa {
-		body, ctype = createK8sCloudApiBVS(k8sCaCreateReq)
-	} else if okCb {
-		body, ctype = createK8sCloudBrokerBVS(k8sCbCreateReq)
-	} 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+restmachine+url, body)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = bdc.getToken(ctx); err != nil {
-		return nil, err
-	}
-
-	resp, err := bdc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
-	}
-
-	return respBytes, nil
-}
-
-func (bdc *BVSDecortClient) getToken(ctx context.Context) error {
-	bdc.mutex.Lock()
-	defer bdc.mutex.Unlock()
-
-	if !bdc.cfg.Token.Valid() {
-
-		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")
-
-		resp, err := bdc.client.Do(req)
-		if err != nil {
-			return fmt.Errorf("cannot get token: %w", err)
-		}
-
-		tokenBytes, _ := io.ReadAll(resp.Body)
-		resp.Body.Close()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("cannot get token: %s", tokenBytes)
-		}
-
-		err = json.Unmarshal(tokenBytes, &bdc.cfg.Token)
-		if err != nil {
-			return fmt.Errorf("cannot unmarshal token: %s", tokenBytes)
-		}
-	}
-
-	return nil
-}
-
-func (bdc *BVSDecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
-	if ctype != "" {
-		req.Header.Add("Content-Type", ctype)
-	} else {
-		req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
-	}
-	bdc.cfg.Token.SetAuthHeader(req)
-	req.Header.Set("Accept", "application/json")
-
-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < dc.cfg.Retries; i++ {
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := bdc.client.Do(req)
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
-	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// }
-	// }
-
-	return nil, fmt.Errorf("could not execute request: %w", err)
-}
-
-func createK8sCloudApiBVS(req k8s_ca.CreateRequest) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8SCIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(uint64(req.MasterCPU), 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(uint64(req.MasterNum), 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(uint64(req.MasterRAM), 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(uint64(req.MasterDisk), 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(uint64(req.WorkerCPU), 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(uint64(req.WorkerNum), 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(uint64(req.WorkerRAM), 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(uint64(req.WorkerDisk), 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	ct := writer.FormDataContentType()
-	writer.Close()
-
-	return reqBody, ct
-}
-
-func createK8sCloudBrokerBVS(req k8s_cb.CreateRequest) (*bytes.Buffer, string) {
-	reqBody := &bytes.Buffer{}
-	writer := multipart.NewWriter(reqBody)
-	if req.OidcCertificate != "" {
-		part, _ := writer.CreateFormFile("oidcCertificate", "ca.crt")
-		_, _ = io.Copy(part, strings.NewReader(req.OidcCertificate))
-	}
-
-	_ = writer.WriteField("name", req.Name)
-	_ = writer.WriteField("rgId", strconv.FormatUint(req.RGID, 10))
-	_ = writer.WriteField("k8ciId", strconv.FormatUint(req.K8CIID, 10))
-	_ = writer.WriteField("workerGroupName", req.WorkerGroupName)
-	_ = writer.WriteField("networkPlugin", req.NetworkPlugin)
-
-	if req.MasterSEPID != 0 {
-		_ = writer.WriteField("masterSepId", strconv.FormatUint(req.MasterSEPID, 10))
-	}
-	if req.MasterSEPPool != "" {
-		_ = writer.WriteField("masterSepPool", req.MasterSEPPool)
-	}
-	if req.WorkerSEPID != 0 {
-		_ = writer.WriteField("workerSepId", strconv.FormatUint(req.WorkerSEPID, 10))
-	}
-	if req.WorkerSEPPool != "" {
-		_ = writer.WriteField("workerSepPool", req.WorkerSEPPool)
-	}
-
-	if req.Labels != nil {
-		for _, v := range req.Labels {
-			_ = writer.WriteField("labels", v)
-		}
-	}
-	if req.Taints != nil {
-		for _, v := range req.Taints {
-			_ = writer.WriteField("taints", v)
-		}
-	}
-	if req.Annotations != nil {
-		for _, v := range req.Annotations {
-			_ = writer.WriteField("annotations", v)
-		}
-	}
-
-	if req.MasterCPU != 0 {
-		_ = writer.WriteField("masterCpu", strconv.FormatUint(req.MasterCPU, 10))
-	}
-	if req.MasterNum != 0 {
-		_ = writer.WriteField("masterNum", strconv.FormatUint(req.MasterNum, 10))
-	}
-	if req.MasterRAM != 0 {
-		_ = writer.WriteField("masterRam", strconv.FormatUint(req.MasterRAM, 10))
-	}
-	if req.MasterDisk != 0 {
-		_ = writer.WriteField("masterDisk", strconv.FormatUint(req.MasterDisk, 10))
-	}
-	if req.WorkerCPU != 0 {
-		_ = writer.WriteField("workerCpu", strconv.FormatUint(req.WorkerCPU, 10))
-	}
-	if req.WorkerNum != 0 {
-		_ = writer.WriteField("workerNum", strconv.FormatUint(req.WorkerNum, 10))
-	}
-	if req.WorkerRAM != 0 {
-		_ = writer.WriteField("workerRam", strconv.FormatUint(req.WorkerRAM, 10))
-	}
-	if req.WorkerDisk != 0 {
-		_ = writer.WriteField("workerDisk", strconv.FormatUint(req.WorkerDisk, 10))
-	}
-	if req.ExtNetID != 0 {
-		_ = writer.WriteField("extnetId", strconv.FormatUint(req.ExtNetID, 10))
-	}
-	if req.VinsId != 0 {
-		_ = writer.WriteField("vinsId", strconv.FormatUint(req.VinsId, 10))
-	}
-	if !req.WithLB {
-		_ = writer.WriteField("withLB", strconv.FormatBool(req.WithLB))
-	}
-
-	_ = writer.WriteField("highlyAvailableLB", strconv.FormatBool(req.HighlyAvailable))
-
-	if req.AdditionalSANs != nil {
-		for _, v := range req.AdditionalSANs {
-			_ = writer.WriteField("additionalSANs", v)
-		}
-	}
-	if req.InitConfiguration != "" {
-		_ = writer.WriteField("initConfiguration", req.InitConfiguration)
-	}
-	if req.ClusterConfiguration != "" {
-		_ = writer.WriteField("clusterConfiguration", req.ClusterConfiguration)
-	}
-	if req.KubeletConfiguration != "" {
-		_ = writer.WriteField("kubeletConfiguration", req.KubeletConfiguration)
-	}
-	if req.KubeProxyConfiguration != "" {
-		_ = writer.WriteField("kubeProxyConfiguration", req.KubeProxyConfiguration)
-	}
-	if req.JoinConfiguration != "" {
-		_ = writer.WriteField("joinConfiguration", req.JoinConfiguration)
-	}
-	if req.Description != "" {
-		_ = writer.WriteField("desc", req.Description)
-	}
-	if req.UserData != "" {
-		_ = writer.WriteField("userData", req.UserData)
-	}
-
-	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-
-	ct := writer.FormDataContentType()
-
-	writer.Close()
-	return reqBody, ct
-}
--- a/config/config_bvs.go
+++ b/config/config_bvs.go
@@ -1,116 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"os"
-	"time"
-
-	"golang.org/x/oauth2"
-	"gopkg.in/yaml.v3"
-	"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"`
-
-	// 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 oauth2.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"`
-}
-
-// 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
-}
-
-// 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
-}
--- a/go.mod
+++ b/go.mod
@@ -5,20 +5,15 @@ go 1.20
 require (
 	github.com/go-playground/validator/v10 v10.11.2
 	github.com/google/go-querystring v1.1.0
-	golang.org/x/oauth2 v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
 )

 require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/net v0.16.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -8,13 +8,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
 github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.2 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.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 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/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
@@ -28,29 +23,13 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
-golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/crypto v0.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=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/internal/validators/values.go
+++ b/internal/validators/values.go
@@ -39,7 +39,7 @@ var (

 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}

-	networkPluginValues = []string{"flannel", "weawenet", "calico"}
+	networkPluginValues = []string{"flannel", "weavenet", "calico"}

 	strictLooseValues = []string{"strict", "loose"}

--- a/legacy-client.go
+++ b/legacy-client.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"io"
 	"mime/multipart"
@@ -78,7 +77,7 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st

 	k8sCaCreateReq, okCa := params.(k8s_ca.CreateRequest)
 	k8sCbCreateReq, okCb := params.(k8s_cb.CreateRequest)
-	
+
 	var body *bytes.Buffer
 	var ctype string

@@ -93,28 +92,17 @@ func (ldc *LegacyDecortClient) DecortApiCall(ctx context.Context, method, url st
 		}
 		body = bytes.NewBufferString(values.Encode() + fmt.Sprintf("&authkey=%s", ldc.cfg.Token))
 	}
-	
-	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+restmachine+url, body)
+
+	req, err := http.NewRequestWithContext(ctx, method, ldc.decortURL+"/restmachine"+url, body)
 	if err != nil {
 		return nil, err
 	}

-	resp, err := ldc.do(req, ctype)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
+	// perform request
+	var respBytes []byte
+	respBytes, err = ldc.do(req, ctype)

-	respBytes, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	if resp.StatusCode != 200 {
-		return nil, errors.New(string(respBytes))
-	}
-
-	return respBytes, nil
+	return respBytes, err
 }

 func (ldc *LegacyDecortClient) getToken(ctx context.Context) error {
@@ -148,7 +136,7 @@ func (ldc *LegacyDecortClient) getToken(ctx context.Context) error {
 	return nil
 }

-func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) (*http.Response, error) {
+func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) ([]byte, error) {
 	if ctype != "" {
 		req.Header.Add("Content-Type", ctype)
 	} else {
@@ -156,26 +144,30 @@ func (ldc *LegacyDecortClient) do(req *http.Request, ctype string) (*http.Respon
 	}
 	req.Header.Set("Accept", "application/json")

-	// var resp *http.Response
-	// var err error
-	buf, _ := io.ReadAll(req.Body)
-	// req = req.Clone(req.Context())
-
-	// for i := uint64(0); i < ldc.cfg.Retries; i++ {
-
-	req.Body = io.NopCloser(bytes.NewBuffer(buf))
-	resp, err := ldc.client.Do(req)
-
-	// if err == nil {
-	if resp.StatusCode == 200 {
-		return resp, err
+	buf, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
 	}
-	respBytes, _ := io.ReadAll(resp.Body)
-	err = fmt.Errorf("%s", respBytes)
-	resp.Body.Close()
-	// 	}
-	// }
+	req.Body.Close()
+	req.Body = io.NopCloser(bytes.NewBuffer(buf))

+	resp, err := ldc.client.Do(req)
+	if err != nil || resp == nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	// handle successful request
+	respBytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode == 200 {
+		return respBytes, nil
+	}
+
+	// handle errors with status code other than 200
+	err = fmt.Errorf("%s", respBytes)
 	return nil, fmt.Errorf("could not execute request: %w", err)
 }

@@ -402,7 +394,7 @@ func createK8sCloudBrokerLegacy(req k8s_cb.CreateRequest, token string) (*bytes.
 	}

 	_ = writer.WriteField("extnetOnly", strconv.FormatBool(req.ExtNetOnly))
-	
+
 	_ = writer.WriteField("authkey", token)

 	ct := writer.FormDataContentType()
--- a/pkg/cloudapi/bservice/disable.go
+++ b/pkg/cloudapi/bservice/disable.go
@@ -24,7 +24,7 @@ func (b BService) Disable(ctx context.Context, req DisableRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}

-	url := "/cloudapi/bservice/delete"
+	url := "/cloudapi/bservice/disable"

 	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
--- a/pkg/cloudapi/bservice/models.go
+++ b/pkg/cloudapi/bservice/models.go
@@ -168,9 +168,6 @@ type ItemSnapshot struct {
 	Valid bool `json:"valid"`
 }

-// List of Snapshot
-type ListSnapshots []ItemSnapshot
-
 // List of Snapshots
 type ListInfoSnapshots struct {
 	// Data
@@ -180,6 +177,9 @@ type ListInfoSnapshots struct {
 	EntryCount uint64 `json:"entryCount"`
 }

+// List of Snapshots inside RecordBasicService
+type ListSnapshots []ItemSnapshot
+
 // Main information about Group
 type RecordGroup struct {
 	// Account ID
--- a/pkg/cloudapi/compute/affinity_rule_add.go
+++ b/pkg/cloudapi/compute/affinity_rule_add.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AffinityRuleAdd add affinity rule
--- a/pkg/cloudapi/compute/affinity_rule_remove.go
+++ b/pkg/cloudapi/compute/affinity_rule_remove.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AffinityRuleRemove remove affinity rule
--- a/pkg/cloudapi/compute/anti_affinity_rule_add.go
+++ b/pkg/cloudapi/compute/anti_affinity_rule_add.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AntiAffinityRuleAdd add anti affinity rule
--- a/pkg/cloudapi/compute/anti_affinity_rule_remove.go
+++ b/pkg/cloudapi/compute/anti_affinity_rule_remove.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AntiAffinityRuleRemove remove anti affinity rule
--- a/pkg/cloudapi/k8s/create.go
+++ b/pkg/cloudapi/k8s/create.go
@@ -29,7 +29,7 @@ type CreateRequest struct {
 	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`

 	// Network plugin
-	// Must be one of these values: flannel, weawenet, calico
+	// Must be one of these values: flannel, weavenet, calico
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`

--- a/pkg/cloudapi/rg/ids.go
+++ b/pkg/cloudapi/rg/ids.go
@@ -53,12 +53,3 @@ func (lrc ListResourceConsumption) IDs() []uint64 {
 	}
 	return res
 }
-
-// IDs gets array of ResourceGroupIDs from ListAffinityGroup struct
-func (lag ListAffinityGroup) IDs() []uint64 {
-	res := make([]uint64, 0, len(lag))
-	for _, ag := range lag {
-		res = append(res, ag.ID)
-	}
-	return res
-}
--- a/pkg/cloudapi/rg/models.go
+++ b/pkg/cloudapi/rg/models.go
@@ -340,7 +340,6 @@ type ItemAffinityGroup struct {
 // List of affinity group
 type ListAffinityGroup []ItemAffinityGroup

-// List of affinity groups
 type ListAffinityGroups struct {
 	// Data
 	Data []map[string]ListAffinityGroup `json:"data"`
--- a/pkg/cloudbroker/compute/affinity_rule_add.go
+++ b/pkg/cloudbroker/compute/affinity_rule_add.go
@@ -40,8 +40,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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AffinityRuleAdd adds affinity rule
--- a/pkg/cloudbroker/compute/affinity_rule_remove.go
+++ b/pkg/cloudbroker/compute/affinity_rule_remove.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AffinityRuleRemove remove affinity rule
--- a/pkg/cloudbroker/compute/anti_affinity_rule_add.go
+++ b/pkg/cloudbroker/compute/anti_affinity_rule_add.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AntiAffinityRuleAdd adds anti affinity rule
--- a/pkg/cloudbroker/compute/anti_affinity_rule_remove.go
+++ b/pkg/cloudbroker/compute/anti_affinity_rule_remove.go
@@ -38,8 +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: true
-	Value string `url:"value" json:"value" validate:"required"`
+	// Required: false
+	Value string `url:"value" json:"value"`
 }

 // AntiAffinityRuleRemove removes anti affinity rule
--- a/pkg/cloudbroker/compute/ids.go
+++ b/pkg/cloudbroker/compute/ids.go
@@ -43,4 +43,4 @@ func (lpd ListPCIDevices) IDs() []uint64 {
 		res = append(res, pd.ID)
 	}
 	return res
-}
+}
--- a/pkg/cloudbroker/compute/models.go
+++ b/pkg/cloudbroker/compute/models.go
@@ -721,7 +721,7 @@ type RecordCompute struct {
 }

 // Information about of disk IDs
-type ListInfoDisks []InfoDisk 
+type ListInfoDisks []InfoDisk

 // Main information about compute for list
 type ItemCompute struct {
--- a/pkg/cloudbroker/k8ci/create.go
+++ b/pkg/cloudbroker/k8ci/create.go
@@ -60,7 +60,7 @@ type CreateRequest struct {
 	MaxWorkerCount uint64 `url:"maxWorkerCount" json:"maxWorkerCount" validate:"required"`

 	// Network plugins
-	// Values of slice must be flannel, weawenet or calico
+	// Values of slice must be flannel, weavenet or calico
 	//Required: true
 	NetworkPlugins []string `url:"networkPlugins" json:"networkPlugins" validate:"required,networkPlugins"`
 }
--- a/pkg/cloudbroker/k8ci/delete.go
+++ b/pkg/cloudbroker/k8ci/delete.go
@@ -16,7 +16,7 @@ type DeleteRequest struct {

 	// Delete permanently or not
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }

 // Delete deletes K8CI by ID
--- a/pkg/cloudbroker/k8s/create.go
+++ b/pkg/cloudbroker/k8s/create.go
@@ -29,7 +29,7 @@ type CreateRequest struct {
 	WorkerGroupName string `url:"workerGroupName" json:"workerGroupName" validate:"required,workerGroupName"`

 	// Network plugin
-	// Must be one of these values: flunnel, weawenet, calico
+	// Must be one of these values: flannel, weavenet, calico
 	// Required: true
 	NetworkPlugin string `url:"networkPlugin" json:"networkPlugin" validate:"required,networkPlugin"`

--- a/pkg/cloudbroker/k8s/delete.go
+++ b/pkg/cloudbroker/k8s/delete.go
@@ -17,7 +17,7 @@ type DeleteRequest struct {
 	// True if cluster is destroyed permanently.
 	// Otherwise it can be restored from recycle bin
 	// Required: false
-	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+	Permanently bool `url:"permanently" json:"permanently"`
 }

 // Delete deletes kubernetes cluster
--- a/samples/config/bvs-config.json
+++ b/samples/config/bvs-config.json
@@ -1,12 +0,0 @@
-{
-    "username": "<USERNAME>",
-    "password": "<PASSWORD>",
-    "appId": "<APP_ID>",
-    "appSecret": "<APP_SECRET>",
-    "ssoUrl": "https://bvs-delta.qa.loc:8443",
-    "decortUrl": "https://delta.qa.loc",
-    "domain":    "dynamix",
-    "retries": 5,
-    "timeout": "5m",
-    "sslSkipVerify": false
-}
--- a/samples/config/bvs-config.yml
+++ b/samples/config/bvs-config.yml
@@ -1,10 +0,0 @@
-username: <USERNAME>
-password: <PASSWORD>
-appId: <APP_ID>
-appSecret: <APP_SECRET>
-ssoUrl: https://bvs-delta.qa.loc:8443
-decortUrl: https://delta.qa.loc
-domain:    dynamix,
-retries: 5
-timeout: 5m
-sslSkipVerify: false
Author	SHA1	Message	Date
loskutovanl	55027a1605	v1.6.13	2024-03-14 10:17:08 +03:00
loskutovanl	de9cca4053	v1.7.6	2024-03-06 17:02:50 +03:00
loskutovanl	83bf1fb1fa	v1.6.12	2024-03-06 16:50:27 +03:00
loskutovanl	16cad7a3e7	v1.7.5	2024-02-01 10:50:38 +03:00
loskutovanl	96273d2a12	v1.7.4	2024-01-22 13:10:00 +03:00
loskutovanl	d4065938ac	v1.7.3	2023-12-18 16:27:15 +03:00
Sergey Kisil	cd741b7f11	v1.7.2	2023-11-29 15:57:26 +03:00
Sergey Kisil	a85ad3acd5	v1.7.1	2023-11-15 12:03:31 +03:00