v1.14.12

.golangci.yml

@@ -1,4 +1,3 @@
-version: "2"
 linters:
   enable:
     - bodyclose
@@ -6,20 +5,19 @@ linters:
     - dogsled
     - errorlint
     - exhaustive
+    - exportloopref
+    - exhaustive
+    #- gocognit
     - goconst
+    #- gocyclo
     - gosec
     - makezero
-    - musttag
+    #- nestif
     - nilerr
-    - noctx
     - prealloc
-    - revive
-    - staticcheck
     - unconvert
     - unparam
-    - unused
+    - noctx
-  exclusions:
+
-    presets:
-      - comments
 issues:
   max-same-issues: 0

CHANGELOG.md

@@ -1,60 +1,15 @@
-## Version 1.16.2
+## Version 1.14.12
 
+Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами  
+Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены  
+Методы `ComputeCISet`, `ComputeCIUnset`, `GetAudits` в cloudbroker/compute и `GetAudits` в cloudapi/compute стали deprecated и будут удалены в следующих версиях  
+Методы `ComputeCISet`, `ComputeCIUnset` в cloudbroker/image стали deprecated и будут удалены в следующих версиях 
 
-### Deprecated
+Все методы группы `.SDN()` находятся в альфа-версии.
 
-Перечисленные методы будут удалены в `v1.17`
+### Исправлено
 
-| Метод | CloudAPI | CloudBroker |
+#### sep
-| --- | --- | --- |
-| `account/AddUser` | :heavy_check_mark: | :heavy_check_mark: |
-| `account/DeleteUser` | :heavy_check_mark: | :heavy_check_mark: |
-| `account/UpdateUser` | :heavy_check_mark: | :heavy_check_mark: |
-| `compute/UserGrant` | :heavy_check_mark: | :heavy_check_mark: |
-| `compute/UserList` | :heavy_check_mark: | :heavy_check_mark: |
-| `compute/UserRevoke` | :heavy_check_mark: | :heavy_check_mark: |
-| `compute/UserUpdate` | :heavy_check_mark: | :heavy_check_mark: |
-| `rg/AccessGrant` | :heavy_check_mark: | :heavy_check_mark: |
-| `rg/AccessRevoke` | :heavy_check_mark: | :heavy_check_mark: |
-| `sep/ConfigFieldEdit` | :x: | :heavy_check_mark: |
-
-
-### Добавлено
-
-#### audit
 | Идентификатор задачи | Описание |
 | --- | --- |
-| BGOS-1025 | Вычисляемое поле `PublicSessionID` в структуры ответа `ItemAudit` и `RecordAudit` в cloudbroker/audit и cloudapi/audit |
+| BGOS-949 | Тип возвращаемого значения в методе `AddConsumerNodes` с `uint64` на `[]uint64` в cloudbroker/sep |
-| BGOS-1025 | Опциональное поле `PublicSessionID` в структуру запроса `ListRequest` в cloudbroker/audit и cloudapi/audit |
-
-#### grid
-| Идентификатор задачи | Описание |
-| --- | --- |
-| BGOS-1028 | Вычисляемое поле `Budget` в структуры ответа `ItemGridList` и `RecordGrid` в cloudbroker/grid |
-
-#### vins
-| Идентификатор задачи | Описание |
-| --- | --- |
-| BGOS-1027 | Вычисляемое поле `QoSPolicies` в структуру ответа `ItemVNFInterface` в cloudbroker/vins и cloudapi/vins |
-
-#### session
-| Идентификатор задачи | Описание |
-| --- | --- |
-| BGOS-1026 | Группа ручек cloudbroker/session |
-
-
-### Изменено
-
-#### network qos policy
-| Идентификатор задачи | Описание |
-| --- | --- |
-| BGOS-1030 | Тип вычисляемых полей `PCPTag` и `DSCPValue` с `uint64` на `*uint64` в структуре ответа `Rule` в cloudapi/qospolicy и cloudbroker/qospolicy |
-| BGOS-1030 | Тип опциональных полей `Name` и `Description` с `string` на `*string` в структуре запроса `UpdateRequest` в cloudapi/qospolicy и cloudbroker/qospolicy |
-
-
-### Удалено
-
-#### compute
-| Идентификатор задачи | Описание |
-| --- | --- |
-| BGOS-1029 | Опциональное поле `Type` из структуры запроса `ListVGPURequest` в cloudbroker/compute и cloudapi/compute |

README.md

@@ -19,8 +19,6 @@ Decort SDK - это библиотека, написанная на языке G
     - Версия 1.12.х Decort-SDK соответствует 4.4.0 версии платформы
     - Версия 1.13.х Decort-SDK соответствует 4.5.0 версии платформы
     - Версия 1.14.х Decort-SDK соответствует 4.6.0 версии платформы
-    - Версия 1.15.х Decort-SDK соответствует 4.7.0 версии платформы
-    - Версия 1.16.х Decort-SDK соответствует 4.8.0 версии платформы
 
 ## Оглавление
 
@@ -126,7 +124,6 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `LB` - управление балансировщиками нагрузки;
 - `Locations` - получение информации о grid площадки;
 - `Prometheus` - получение статистики prometheus;
-- `QoS Policy` - управление политиками качества обслуживания сети;
 - `RG` - управление ресурсными группами аккаунта;
 - `Security group` – управление группами безопасности;
 - `SEP` - управление storage endpoint (sep);
@@ -163,12 +160,10 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `Node` - управление нодами платформы;
 - `PCIDevice` - управление устройствами;
 - `Prometheus` - получение статистики prometheus;
-- `QoS Policy` - управление политиками качества обслуживания сети;
 - `Resmon` - получение статистики resource monitoring;
 - `RG` - управление ресурсными группами аккаунта;
 - `Security group` – управление группами безопасности;
 - `SEP` - управление storage endpoint (sep);
-- `Session` - получение информации о сессиях;
 - `Storage policy` – управление политиками хранения;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
 - `Trunk` - управление транковыми портами;
@@ -342,7 +337,6 @@ func main() {
     - `pkg/cloudapi/lb` - для `LB`
     - `pkg/cloudapi/locations` - для `Locations`
     - `pkg/cloudapi/prometheus` - для `Prometheus`
-    - `pkg/cloudapi/qospolicy` - для `QoS Policy`
     - `pkg/cloudapi/rg` - для `RG`
     - `pkg/cloudapi/secgroup` - для `Security group`
     - `pkg/cloudapi/sep` - для `SEP`
@@ -374,12 +368,10 @@ func main() {
     - `pkg/cloudbroker/node` - для `Node`
     - `pkg/cloudbroker/pcidevice` - для `PCIDevice`
     - `pkg/cloudbroker/prometheus` - для `Prometheus`
-    - `pkg/cloudbroker/qospolicy` - для `QoS Policy`
     - `pkg/cloudbroker/resmon` - для `Resmon`
     - `pkg/cloudbroker/rg` - для `RG`
     - `pkg/cloudbroker/secgroup` - для `Security group`
     - `pkg/cloudbroker/sep` - для `SEP`
-    - `pkg/cloudbroker/session` - для `Session`
     - `pkg/cloudbroker/stpolicy` - для `Storage policy`
     - `pkg/cloudbroker/tasks` - для `Tasks`
     - `pkg/cloudbroker/trunk` - для `Trunk`
@@ -544,7 +536,6 @@ func main() {
     - `.LB()` - для работы с `LB`
     - `.Locations()` - для работы с `Locations`
     - `.Prometheus()` - для работы с `Prometheus`
-    - `.QoSPolicy()` - для работы с `QoS Policy`
     - `.RG()` - для работы с `RG`
     - `.SecurityGroup()` - для работы с `Security Group`
     - `.SEP()` - для работы с `SEP`
@@ -578,12 +569,11 @@ func main() {
     - `.Node()` - для работы с `Node`
     - `.PCIDevice()` - для работы с `PCIDevice`
     - `.Prometheus()` - для работы с `Prometheus`
-    - `.QoSPolicy()` - для работы с `QoS Policy`
     - `.Resmon()` - для работы с `Resmon`
+    - `.ResourceOptimizer()` - для работы с `ResourceOptimizer`
     - `.RG()` - для работы с `RG`
     - `.SecurityGroup()` - для работы с `Security Group`
     - `.SEP()` - для работы с `SEP`
-    - `.Session()` - для работы с `Session`
     - `.StPolicy()` - для работы с `Storage Policy`
     - `.Tasks()` - для работы с `Tasks`
     - `.Trunk()` - для работы с `Trunk`

client.go

@@ -34,12 +34,8 @@ type DecortClient struct {
 	mutex      *sync.Mutex
 }
 
-// Client builder
+// Сlient builder
 func New(cfg config.Config) *DecortClient {
-	if err := validators.ValidateConfig(cfg); err != nil {
-		panic(validators.ValidationErrors(validators.GetErrors(err)))
-	}
-
 	if cfg.Retries == 0 {
 		cfg.Retries = 5
 	}

client_bvs.go

@@ -16,7 +16,6 @@ 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"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
@@ -39,10 +38,6 @@ type tokenJSON struct {
 
 // Сlient builder
 func NewBVS(cfg config.BVSConfig) *BVSDecortClient {
-	if err := validators.ValidateConfig(cfg); err != nil {
-		panic(validators.ValidationErrors(validators.GetErrors(err)))
-	}
-
 	if cfg.Retries == 0 {
 		cfg.Retries = 5
 	}

internal/constants/constants.go

@@ -28,8 +28,6 @@ var FileName = map[string]string{
 var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
 
 var VersionMap = map[string]string{
-	"4.8.0": "-",
-	"4.7.0": "-",
 	"4.6.0": "-",
 	"4.5.0": "-",
 	"4.4.0": "-",

internal/validators/custom.go

@@ -350,10 +350,6 @@ func isBoolTypeValidator(fe validator.FieldLevel) bool {
 	return fe.Field().CanConvert(reflect.TypeOf(true))
 }
 
-func isStringTypeValidator(fe validator.FieldLevel) bool {
-	return fe.Field().Kind() == reflect.String
-}
-
 func urlValidartor(fl validator.FieldLevel) bool {
 	fieldValues := fl.Field().String()
 
@@ -468,35 +464,3 @@ func sepTechStatusValidator(fe validator.FieldLevel) bool {
 
 	return IsInSlice(fieldValue, sepTechStatusValues)
 }
-
-// pciDeviceHWPathValidator is used to validate PCI device hardware path fields (e.g. 0000:81:00.0)
-func pciDeviceHWPathValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	ok, _ := regexp.MatchString(`^[0-9a-fA-F]{4}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-7]$`, fieldValue)
-	return ok
-}
-
-// sepNameValidator is used to validate SEP name fields
-func sepNameValidator(fe validator.FieldLevel) bool {
-	ok, _ := regexp.MatchString(`^[a-zA-Zа-яА-ЯёЁ0-9][a-zA-Zа-яА-ЯёЁ0-9_.\[\]()\-]*$`, fe.Field().String())
-	return ok
-}
-
-// sepDescriptionValidator is used to validate SEP description fields
-func sepDescriptionValidator(fe validator.FieldLevel) bool {
-	ok, _ := regexp.MatchString(`^[a-zA-Zа-яА-ЯёЁ0-9_.\[\]()\-]*$`, fe.Field().String())
-	return ok
-}
-
-func watchdogActionValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, watchdogActionValues)
-}
-
-func memoryBalloonModeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, memoryBalloonModeValues)
-}

internal/validators/messages.go

@@ -15,10 +15,6 @@ func errorMessage(fe validator.FieldError) string {
 	// Common Validators
 	case "required":
 		return fmt.Sprintf("%s %s is required", prefix, fe.Field())
-	case "required_without_all":
-		return fmt.Sprintf("%s at least one of the following must be specified: %s",
-			prefix,
-			joinValues(append([]string{fe.Field()}, strings.Fields(fe.Param())...)))
 	case "gt":
 		return fmt.Sprintf("%s %s can't be less or equal to zero", prefix, fe.Field())
 	case "min":
@@ -29,12 +25,8 @@ func errorMessage(fe validator.FieldError) string {
 		return fmt.Sprintf("%s %s: unexpected URL format", prefix, fe.Field())
 	case "email":
 		return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())
-	case "mac":
-		return fmt.Sprintf("%s %s: unexpected MAC address format", prefix, fe.Field())
 	case "isBool":
 		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
-	case "isString":
-		return fmt.Sprintf("%s %s: must be string type", prefix, fe.Field())
 
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",

internal/validators/validator.go

@@ -231,11 +231,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("isString", isStringTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("url", urlValidartor)
 	if err != nil {
 		return err
@@ -311,30 +306,5 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("pciDeviceHWPath", pciDeviceHWPathValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("sepName", sepNameValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("sepDescription", sepDescriptionValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("watchdogAction", watchdogActionValidator)
-	if err != nil {
-		return err
-	}
-
-	err = validate.RegisterValidation("memoryBalloonMode", memoryBalloonModeValidator)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }

internal/validators/values.go

@@ -47,7 +47,7 @@ var (
 
 	vmActionValues = []string{"stop", "move"}
 
-	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac", "trunk", "vgpu", "pcidevice"}
+	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac", "trunk"}
 
 	networkInterfaceNamingValues = []string{"eth", "ens"}
 
@@ -80,10 +80,6 @@ var (
 	ipTypeValues = []string{"v4, v6"}
 
 	sepTechStatusValues = []string{"ENABLED", "DISABLED"}
-
-	watchdogActionValues = []string{"reset", "shutdown", "poweroff", "pause", "none"}
-
-	memoryBalloonModeValues = []string{"auto", "legacy", "none"}
 )
 
 const (

legacy-client.go

@@ -16,7 +16,6 @@ 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"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/sdn"
@@ -33,10 +32,6 @@ type LegacyDecortClient struct {
 
 // Legacy client builder
 func NewLegacy(cfg config.LegacyConfig) *LegacyDecortClient {
-	if err := validators.ValidateConfig(cfg); err != nil {
-		panic(validators.ValidationErrors(validators.GetErrors(err)))
-	}
-
 	if cfg.Retries == 0 {
 		cfg.Retries = 5
 	}

pkg/cloudapi/account/add_acl_access.go

@@ -1,40 +0,0 @@
-package account
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// AddACLAccessRequest adds ACL access to an account
-type AddACLAccessRequest struct {
-	ID          uint64   `url:"id"          json:"id" validate:"required"`
-	AccessType  string   `url:"accesstype"  json:"accesstype" validate:"required"`
-	Usernames   []string `url:"usernames,omitempty"   json:"usernames,omitempty"`
-	APIAccesses []uint64 `url:"apiaccesses,omitempty" json:"apiaccesses,omitempty"`
-}
-
-// AddACLAccess adds ACL access to an account.
-func (a Account) AddACLAccess(ctx context.Context, req AddACLAccessRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/account/add_acl_access"
-
-	res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/account/add_user.go

@@ -27,8 +27,6 @@ type AddUserRequest struct {
 }
 
 // AddUser gives a user access rights.
-//
-// Deprecated: will be removed in SDK v1.17
 func (a Account) AddUser(ctx context.Context, req AddUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/account/audits.go

@@ -0,0 +1,40 @@
+package account
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// AuditsRequest struct to give list of account audits
+type AuditsRequest struct {
+	// ID of the account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+}
+
+// Audits gets audit records for the specified account object
+func (a Account) Audits(ctx context.Context, req AuditsRequest) (ListAudits, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/audits"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListAudits{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return list, nil
+}

pkg/cloudapi/account/del_acl_access.go

@@ -1,39 +0,0 @@
-package account
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// DelACLAccessRequest deletes ACL access from an account
-type DelACLAccessRequest struct {
-	ID          uint64   `url:"id"          json:"id" validate:"required"`
-	Usernames   []string `url:"usernames,omitempty"   json:"usernames,omitempty"`
-	APIAccesses []uint64 `url:"apiaccesses,omitempty" json:"apiaccesses,omitempty"`
-}
-
-// DelACLAccess deletes ACL access from an account.
-func (a Account) DeleteACLAccess(ctx context.Context, req DelACLAccessRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/account/del_acl_access"
-
-	res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/account/delete.go

@@ -0,0 +1,36 @@
+package account
+
+import (
+	"context"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// DeleteRequest struct to delete account
+type DeleteRequest struct {
+	// ID of account to delete
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Whether to completely delete the account
+	// Required: false
+	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
+}
+
+// Delete completes delete an account from the system Returns true if account is deleted or was already deleted or never existed
+func (a Account) Delete(ctx context.Context, req DeleteRequest) (string, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return "", validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/delete"
+
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return "", err
+	}
+
+	return string(result), nil
+}

pkg/cloudapi/account/delete_user.go

@@ -20,8 +20,6 @@ type DeleteUserRequest struct {
 }
 
 // DeleteUser revokes user access from the account
-//
-// Deprecated: will be removed in SDK v1.17
 func (a Account) DeleteUser(ctx context.Context, req DeleteUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/account/disable_enable.go

@@ -0,0 +1,60 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// DisableEnableRequest struct to change status of account
+type DisableEnableRequest struct {
+	// ID of account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+}
+
+// Disable disables an account
+func (a Account) Disable(ctx context.Context, req DisableEnableRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/disable"
+
+	res, err := a.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
+}
+
+// Enable enables an account
+func (a Account) Enable(ctx context.Context, req DisableEnableRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/enable"
+
+	res, err := a.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/account/get_consumed_cloud_units_by_type.go

@@ -0,0 +1,51 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetConsumedCloudUnitsByTypeRequest struct to calculate the currently consumed cloud units of the specified type for all cloudspaces and resource groups in the account
+type GetConsumedCloudUnitsByTypeRequest struct {
+	// ID an account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Cloud unit resource type
+	// Required: true
+	CUType string `url:"cutype" json:"cutype" validate:"required,accountCUType"`
+}
+
+// GetConsumedCloudUnitsByType calculates the currently consumed cloud units of the specified type for all cloudspaces
+// and resource groups in the account.
+// Possible types of cloud units are include:
+//
+//   - CU_M: returns consumed memory in MB
+//   - CU_C: returns number of virtual cpu cores
+//   - CU_D: returns consumed virtual disk storage in GB
+//   - CU_DM: returns consumed max virtual disk storage in GB
+//   - CU_I: returns number of public IPs
+//   - gpu_units: return number of GPU units
+func (a Account) GetConsumedCloudUnitsByType(ctx context.Context, req GetConsumedCloudUnitsByTypeRequest) (float64, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return 0, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/getConsumedCloudUnitsByType"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return 0, err
+	}
+
+	result, err := strconv.ParseFloat(string(res), 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return result, nil
+}

pkg/cloudapi/account/get_reserved_account_units.go

@@ -0,0 +1,47 @@
+package account
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetReservedAccountUnitsRequest struct to calculate the reserved units for all cloudspaces and resource groups in the account
+type GetReservedAccountUnitsRequest struct {
+	// ID an account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+}
+
+// GetReservedAccountUnits calculates the reserved units for all cloudspaces and resource groups in the account.
+// Calculated cloud units are returned in a dict which includes:
+//
+//   - CU_M: reserved memory in MB
+//   - CU_C: number of cpu cores
+//   - CU_D: reserved vdisk storage in GB
+//   - CU_DM: reserved max vdisk storage in GB
+//   - CU_I: number of public IPs
+func (a Account) GetReservedAccountUnits(ctx context.Context, req GetReservedAccountUnitsRequest) (*ResourceLimits, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/account/getReservedAccountUnits"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := ResourceLimits{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}

pkg/cloudapi/account/models.go

@@ -19,6 +19,9 @@ type ListRecordACL struct {
 
 	// Account owner ID
 	UgroupID string `json:"userGroupId"`
+
+	// Is it possible to remove
+	CanBeDeleted bool `json:"canBeDeleted"`
 }
 
 // Access Control List
@@ -200,56 +203,11 @@ type ListResourceConsumption struct {
 
 // Information about computes
 type Computes struct {
-	// Number of starting computes
-	Starting uint64 `json:"STARTING"`
-
 	// Number of started computes
-	Started uint64 `json:"STARTED"`
+	Started uint64 `json:"started"`
-
-	// Number of stopping computes
-	Stopping uint64 `json:"STOPPING"`
 
 	// Number of stopped computes
-	Stopped uint64 `json:"STOPPED"`
+	Stopped uint64 `json:"stopped"`
-
-	// Number of paused computes
-	Paused uint64 `json:"PAUSED"`
-
-	// Number of pausing computes
-	Pausing uint64 `json:"PAUSING"`
-
-	// Number of merging computes
-	Merge uint64 `json:"MERGE"`
-
-	// Number of migrating computes
-	Migrating uint64 `json:"MIGRATING"`
-
-	// Number of computes migrating in
-	MigratingIn uint64 `json:"MIGRATING_IN"`
-
-	// Number of computes migrating out
-	MigratingOut uint64 `json:"MIGRATING_OUT"`
-
-	// Number of computes in down status
-	Down uint64 `json:"DOWN"`
-
-	// Number of scheduled computes
-	Scheduled uint64 `json:"SCHEDULED"`
-
-	// Number of computes with stopped backup
-	BackupStopped uint64 `json:"BACKUP_STOPPED"`
-
-	// Number of computes with running backup
-	BackupRunning uint64 `json:"BACKUP_RUNNING"`
-
-	// Number of computes creating a snapshot
-	Snapcreate uint64 `json:"SNAPCREATE"`
-
-	// Number of cloning computes
-	Cloning uint64 `json:"CLONING"`
-
-	// Number of computes being rolled back
-	Rollback uint64 `json:"ROLLBACK"`
 }
 
 // Information about machines
@@ -294,7 +252,7 @@ type RecordAccount struct {
 	CPUAllocationParameter string `json:"cpu_allocation_parameter"`
 
 	// CPU allocation ratio
-	CPUAllocationRatio uint64 `json:"cpu_allocation_ratio"`
+	CPUAllocationRatio float64 `json:"cpu_allocation_ratio"`
 
 	// Created by
 	CreatedBy string `json:"createdBy"`
@@ -497,9 +455,6 @@ type ItemVINS struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Enable Default Gateway
-	EnableDefaultGateway bool `json:"enable_default_gateway"`
-
 	// External IP
 	ExternalIP string `json:"externalIP"`
 
@@ -569,56 +524,11 @@ type ListAudits []ItemAudit
 
 // Information compute in resource group
 type RGComputes struct {
-	// Number of starting computes
-	Starting uint64 `json:"STARTING"`
-
 	// Number of started computes
-	Started uint64 `json:"STARTED"`
+	Started uint64 `json:"Started"`
-
-	// Number of stopping computes
-	Stopping uint64 `json:"STOPPING"`
 
 	// Number of stopped computes
-	Stopped uint64 `json:"STOPPED"`
+	Stopped uint64 `json:"Stopped"`
-
-	// Number of paused computes
-	Paused uint64 `json:"PAUSED"`
-
-	// Number of pausing computes
-	Pausing uint64 `json:"PAUSING"`
-
-	// Number of merging computes
-	Merge uint64 `json:"MERGE"`
-
-	// Number of migrating computes
-	Migrating uint64 `json:"MIGRATING"`
-
-	// Number of computes migrating in
-	MigratingIn uint64 `json:"MIGRATING_IN"`
-
-	// Number of computes migrating out
-	MigratingOut uint64 `json:"MIGRATING_OUT"`
-
-	// Number of computes in down status
-	Down uint64 `json:"DOWN"`
-
-	// Number of scheduled computes
-	Scheduled uint64 `json:"SCHEDULED"`
-
-	// Number of computes with stopped backup
-	BackupStopped uint64 `json:"BACKUP_STOPPED"`
-
-	// Number of computes with running backup
-	BackupRunning uint64 `json:"BACKUP_RUNNING"`
-
-	// Number of computes creating a snapshot
-	Snapcreate uint64 `json:"SNAPCREATE"`
-
-	// Number of cloning computes
-	Cloning uint64 `json:"CLONING"`
-
-	// Number of computes being rolled back
-	Rollback uint64 `json:"ROLLBACK"`
 }
 
 // Resources of Resource group

pkg/cloudapi/account/update_acl_access.go

@@ -1,40 +0,0 @@
-package account
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// UpdateACLAccessRequest updates ACL access in an account
-type UpdateACLAccessRequest struct {
-	ID          uint64   `url:"id"          json:"id" validate:"required"`
-	AccessType  string   `url:"accesstype"  json:"accesstype" validate:"required"`
-	Usernames   []string `url:"usernames,omitempty"   json:"usernames,omitempty"`
-	APIAccesses []uint64 `url:"apiaccesses,omitempty" json:"apiaccesses,omitempty"`
-}
-
-// UpdateACLAccess updates ACL access in an account.
-func (a Account) UpdateACLAccess(ctx context.Context, req UpdateACLAccessRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/account/update_acl_access"
-
-	res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/account/update_user.go

@@ -27,8 +27,6 @@ type UpdateUserRequest struct {
 }
 
 // UpdateUser updates user access rights
-//
-// Deprecated: will be removed in SDK v1.17
 func (a Account) UpdateUser(ctx context.Context, req UpdateUserRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/audit/list.go

@@ -90,9 +90,6 @@ type ListRequest struct {
 	// Exclude audit lines from response
 	// Required: false
 	ExcludeAuditLines bool `url:"exclude_audit_lines,omitempty" json:"exclude_audit_lines,omitempty"`
-
-	// Public Session ID
-	PublicSessionID string `json:"public_session_id"`
 }
 
 // List gets audit records for the specified account object

pkg/cloudapi/audit/models.go

@@ -2,6 +2,7 @@ package audit
 
 // Main info about audit
 type RecordAudit struct {
+
 	// Arguments
 	Arguments string `json:"args"`
 
@@ -40,9 +41,6 @@ type RecordAudit struct {
 
 	// User
 	User string `json:"user"`
-
-	// Public Session ID
-	PublicSessionID string `json:"public_session_id"`
 }
 
 // Main info about audit
@@ -83,9 +81,6 @@ type ItemAudit struct {
 	// User
 	User string `json:"user"`
 
-	// Public Session ID
-	PublicSessionID string `json:"public_session_id"`
-
 	// TTL
 	TTL string `json:"_ttl"`
 }

pkg/cloudapi/bservice/group_add.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -63,9 +62,9 @@ type GroupAddRequest struct {
 	// Required: false
 	TimeoutStart uint64 `url:"timeoutStart,omitempty" json:"timeoutStart,omitempty"`
 
-	// Meta data for working group computes, format yaml string or json object
+	// Meta data for working group computes, format YAML "user_data": 1111
 	// Required: false
-	UserData interface{} `url:"userData,omitempty" json:"userData,omitempty"`
+	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
 
 	// Chipset "i440fx" or "Q35
 	// Default value : Q35
@@ -98,7 +97,7 @@ func (b BService) GroupAdd(ctx context.Context, req GroupAddRequest) (uint64, er
 
 	url := "/cloudapi/bservice/groupAdd"
 
-	res, err := b.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudapi/compute/abort_shared_snapshot_merge.go

@@ -18,11 +18,6 @@ type AbortSharedSnapshotMergeRequest struct {
 	Label string `url:"label" json:"label" validate:"required"`
 }
 
-type wrapperAbortSharedSnapshotMergeRequest struct {
-	AbortSharedSnapshotMergeRequest
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // AbortSharedSnapshotMerge shared snapshots merge abort
 func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (string, error) {
 	err := validators.ValidateRequest(req)
@@ -30,36 +25,9 @@ func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSn
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperAbortSharedSnapshotMergeRequest{
-		AbortSharedSnapshotMergeRequest: req,
-		AsyncMode:                       false,
-	}
-
 	url := "/cloudapi/compute/abort_shared_snapshot_merge"
 
-	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 string(res), nil
-}
-
-// AbortSharedSnapshotMergeAsync shared snapshots merge abort in async mode
-func (c Compute) AbortSharedSnapshotMergeAsync(ctx context.Context, req AbortSharedSnapshotMergeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperAbortSharedSnapshotMergeRequest{
-		AbortSharedSnapshotMergeRequest: req,
-		AsyncMode:                       true,
-	}
-
-	url := "/cloudapi/compute/abort_shared_snapshot_merge"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return "", err
 	}

pkg/cloudapi/compute/add_acl_access.go

@@ -1,40 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// AddACLAccessRequest adds ACL access to a vm
-type AddACLAccessRequest struct {
-	ID          uint64   `url:"id"          json:"id" validate:"required"`
-	AccessType  string   `url:"accesstype"  json:"accesstype" validate:"required"`
-	Usernames   []string `url:"usernames,omitempty"   json:"usernames,omitempty"`
-	APIAccesses []uint64 `url:"apiaccesses,omitempty" json:"apiaccesses,omitempty"`
-}
-
-// AddACLAccess adds ACL access to a vm.
-func (c Compute) AddACLAccess(ctx context.Context, req AddACLAccessRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/add_acl_access"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/audits.go

@@ -0,0 +1,76 @@
+package compute
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// AuditsRequest struct to get audit records
+type AuditsRequest struct {
+	// ID of the compute
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+
+	// Find all audits after point in time
+	// Required: false
+	TimestampAT uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
+
+	// Find all audits before point in time
+	// Required: false
+	TimestampTO uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
+
+	// Find by user
+	// Required: false
+	User string `url:"user,omitempty" json:"user,omitempty"`
+
+	// Find by api endpoints
+	// Required: false
+	Call string `url:"call,omitempty" json:"call,omitempty"`
+
+	// Sort by one of supported fields, format ±<field>
+	// Required: false
+	SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by HTTP min status code
+	// Required: false
+	MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
+
+	// Find by HTTP max status code
+	// Required: false
+	MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
+}
+
+// Audits gets audit records for the specified compute object
+func (c Compute) Audits(ctx context.Context, req AuditsRequest) (*ListAudits, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/audits"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListAudits{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}

pkg/cloudapi/compute/cd_eject.go

@@ -15,12 +15,6 @@ type CDEjectRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperCDEjectRequest struct {
-	CDEjectRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // CDEject eject CD image to compute's CD-ROM
 func (c Compute) CDEject(ctx context.Context, req CDEjectRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) CDEject(ctx context.Context, req CDEjectRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperCDEjectRequest{
-		CDEjectRequest: req,
-		AsyncMode:      false,
-	}
-
 	url := "/cloudapi/compute/cdEject"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -44,28 +33,5 @@ func (c Compute) CDEject(ctx context.Context, req CDEjectRequest) (bool, error)
 	if err != nil {
 		return false, err
 	}
-
 	return result, nil
 }
-
-// CDEjectAsync ejects CD image to compute's CD-ROM with AsyncMode
-func (c Compute) CDEjectAsync(ctx context.Context, req CDEjectRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperCDEjectRequest{
-		CDEjectRequest: req,
-		AsyncMode:      true,
-	}
-
-	url := "/cloudapi/compute/cdEject"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/cd_insert.go

@@ -19,12 +19,6 @@ type CDInsertRequest struct {
 	CDROMID uint64 `url:"cdromId" json:"cdromId" validate:"required"`
 }
 
-type wrapperCDInsertRequest struct {
-	CDInsertRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // CDInsert insert new CD image to compute's CD-ROM
 func (c Compute) CDInsert(ctx context.Context, req CDInsertRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -32,14 +26,9 @@ func (c Compute) CDInsert(ctx context.Context, req CDInsertRequest) (bool, error
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperCDInsertRequest{
-		CDInsertRequest: req,
-		AsyncMode:       false,
-	}
-
 	url := "/cloudapi/compute/cdInsert"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -48,28 +37,5 @@ func (c Compute) CDInsert(ctx context.Context, req CDInsertRequest) (bool, error
 	if err != nil {
 		return false, err
 	}
-
 	return result, nil
 }
-
-// CDInsertAsync inserts new CD image to compute's CD-ROM with AsyncMode
-func (c Compute) CDInsertAsync(ctx context.Context, req CDInsertRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperCDInsertRequest{
-		CDInsertRequest: req,
-		AsyncMode:       true,
-	}
-
-	url := "/cloudapi/compute/cdInsert"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/change_ip.go

@@ -31,12 +31,6 @@ type ChangeIPRequest struct {
 	IPAddr string `url:"ip_addr" json:"ip_addr" validate:"required"`
 }
 
-type wrapperChangeIPRequest struct {
-	ChangeIPRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // ChangeIP change reserved IP for compute instance
 func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -44,14 +38,9 @@ func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperChangeIPRequest{
-		ChangeIPRequest: req,
-		AsyncMode:       false,
-	}
-
 	url := "/cloudapi/compute/changeIp"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -63,25 +52,3 @@ func (c Compute) ChangeIP(ctx context.Context, req ChangeIPRequest) (bool, error
 
 	return result, nil
 }
-
-// ChangeIPAsync change reserved IP for compute instance with AsyncMode
-func (c Compute) ChangeIPAsync(ctx context.Context, req ChangeIPRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperChangeIPRequest{
-		ChangeIPRequest: req,
-		AsyncMode:       true,
-	}
-
-	url := "/cloudapi/compute/changeIp"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/change_link_state.go

@@ -3,9 +3,8 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
-
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+	"strconv"
 )
 
 // ChangeLinkStateRequest struct to change link state
@@ -24,12 +23,6 @@ type ChangeLinkStateRequest struct {
 	State string `url:"state" json:"state" validate:"required,interfaceState"`
 }
 
-type wrapperChangeLinkStateRequest struct {
-	ChangeLinkStateRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // ChangeLinkState changes the status link virtual of compute
 func (c Compute) ChangeLinkState(ctx context.Context, req ChangeLinkStateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -37,14 +30,9 @@ func (c Compute) ChangeLinkState(ctx context.Context, req ChangeLinkStateRequest
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperChangeLinkStateRequest{
-		ChangeLinkStateRequest: req,
-		AsyncMode:              false,
-	}
-
 	url := "/cloudapi/compute/changeLinkState"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -53,28 +41,5 @@ func (c Compute) ChangeLinkState(ctx context.Context, req ChangeLinkStateRequest
 	if err != nil {
 		return false, err
 	}
-
 	return result, nil
 }
-
-// ChangeLinkStateAsync changes the status link virtual of compute with AsyncMode
-func (c Compute) ChangeLinkStateAsync(ctx context.Context, req ChangeLinkStateRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperChangeLinkStateRequest{
-		ChangeLinkStateRequest: req,
-		AsyncMode:              true,
-	}
-
-	url := "/cloudapi/compute/changeLinkState"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/change_mtu.go

@@ -23,12 +23,6 @@ type ChangeMTURequest struct {
 	MTU uint64 `url:"mtu" json:"mtu" validate:"required" validate:"omitempty,mtu"`
 }
 
-type wrapperChangeMTURequest struct {
-	ChangeMTURequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // ChangeMTU change MTU for compute instance
 func (c Compute) ChangeMTU(ctx context.Context, req ChangeMTURequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) ChangeMTU(ctx context.Context, req ChangeMTURequest) (bool, err
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperChangeMTURequest{
-		ChangeMTURequest: req,
-		AsyncMode:        false,
-	}
-
 	url := "/cloudapi/compute/change_mtu"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) ChangeMTU(ctx context.Context, req ChangeMTURequest) (bool, err
 
 	return result, nil
 }
-
-// ChangeMTUAsync change MTU for compute instance with AsyncMode
-func (c Compute) ChangeMTUAsync(ctx context.Context, req ChangeMTURequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperChangeMTURequest{
-		ChangeMTURequest: req,
-		AsyncMode:        true,
-	}
-
-	url := "/cloudapi/compute/change_mtu"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/change_qos_policies.go

@@ -1,84 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-type ChangeQoSPoliciesRequest struct {
-	// Compute ID
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-
-	// Interface IP or MAC address
-	// Required: true
-	Interface string `url:"interface" json:"interface" validate:"required"`
-
-	// List of QoS Policy IDs to assign to this interface
-	// Required: false
-	QoSPolicyIDs []uint64 `url:"qos_policy_ids,omitempty" json:"qos_policy_ids,omitempty"`
-}
-
-type wrapperChangeQoSPoliciesRequest struct {
-	ChangeQoSPoliciesRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
-// ChangeQoSPolicies change qos policies for compute
-func (c Compute) ChangeQoSPolicies(ctx context.Context, req ChangeQoSPoliciesRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperChangeQoSPoliciesRequest{
-		ChangeQoSPoliciesRequest: req,
-		AsyncMode:                false,
-	}
-
-	url := "/cloudapi/compute/change_qos_policies"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, reqWrapped)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
-
-// ChangeQoSPolicies change qos policies for compute with AsyncMode
-func (c Compute) ChangeQoSPoliciesAsync(ctx context.Context, req ChangeQoSPoliciesRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperChangeQoSPoliciesRequest{
-		ChangeQoSPoliciesRequest: req,
-		AsyncMode:                true,
-	}
-
-	url := "/cloudapi/compute/change_qos_policies"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, reqWrapped)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/change_secutity_group.go

@@ -27,12 +27,6 @@ type ChangeSecGroupsRequest struct {
 	EnableSecGroups interface{} `url:"enable_secgroups,omitempty" json:"enable_secgroups,omitempty" validate:"omitempty,isBool"`
 }
 
-type wrapperChangeSecGroupsRequest struct {
-	ChangeSecGroupsRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // ChangeSecGroups changes security groups for compute
 func (c Compute) ChangeSecGroups(ctx context.Context, req ChangeSecGroupsRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -40,14 +34,9 @@ func (c Compute) ChangeSecGroups(ctx context.Context, req ChangeSecGroupsRequest
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperChangeSecGroupsRequest{
-		ChangeSecGroupsRequest: req,
-		AsyncMode:              false,
-	}
-
 	url := "/cloudapi/compute/change_security_groups"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -59,25 +48,3 @@ func (c Compute) ChangeSecGroups(ctx context.Context, req ChangeSecGroupsRequest
 
 	return result, nil
 }
-
-// ChangeSecGroupsAsync changes security groups for compute with AsyncMode
-func (c Compute) ChangeSecGroupsAsync(ctx context.Context, req ChangeSecGroupsRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperChangeSecGroupsRequest{
-		ChangeSecGroupsRequest: req,
-		AsyncMode:              true,
-	}
-
-	url := "/cloudapi/compute/change_security_groups"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/clone.go

@@ -44,12 +44,6 @@ type CloneRequest struct {
 	SEPID uint64 `url:"sep_id" json:"sep_id"`
 }
 
-type wrapperCloneRequest struct {
-	CloneRequest
-
-	AsyncMode bool `url:"asyncMode" json:"asyncMode"`
-}
-
 // Clone clones compute instance
 func (c Compute) Clone(ctx context.Context, req CloneRequest) (string, error) {
 	err := validators.ValidateRequest(req)
@@ -57,36 +51,9 @@ func (c Compute) Clone(ctx context.Context, req CloneRequest) (string, error) {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperCloneRequest{
-		CloneRequest: req,
-		AsyncMode:    false,
-	}
-
 	url := "/cloudapi/compute/clone"
 
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, reqWrapped)
+	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}
-
-// CloneAsync clones compute instance with AsyncMode
-func (c Compute) CloneAsync(ctx context.Context, req CloneRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperCloneRequest{
-		CloneRequest: req,
-		AsyncMode:    true,
-	}
-
-	url := "/cloudapi/compute/clone"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, reqWrapped)
 	if err != nil {
 		return "", err
 	}

pkg/cloudapi/compute/del_acl_access.go

@@ -1,39 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// DeleteACLAccessRequest deletes ACL access from a vm
-type DeleteACLAccessRequest struct {
-	ID          uint64   `url:"id"          json:"id" validate:"required"`
-	Usernames   []string `url:"usernames,omitempty"   json:"usernames,omitempty"`
-	APIAccesses []uint64 `url:"apiaccesses,omitempty" json:"apiaccesses,omitempty"`
-}
-
-// DeleteACLAccess deletes ACL access from a vm.
-func (c Compute) DeleteACLAccess(ctx context.Context, req DeleteACLAccessRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/del_acl_access"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/delete.go

@@ -23,12 +23,6 @@ type DeleteRequest struct {
 	DetachDisks bool `url:"detachDisks,omitempty" json:"detachDisks,omitempty"`
 }
 
-type wrapperDeleteRequest struct {
-	DeleteRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Delete deletes compute
 func (c Compute) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDeleteRequest{
-		DeleteRequest: req,
-		AsyncMode:     false,
-	}
-
 	url := "/cloudapi/compute/delete"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 
 	return result, nil
 }
-
-// DeleteAsync deletes compute with AsyncMode
-func (c Compute) DeleteAsync(ctx context.Context, req DeleteRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDeleteRequest{
-		DeleteRequest: req,
-		AsyncMode:     true,
-	}
-
-	url := "/cloudapi/compute/delete"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/delete_cpu_alignment_profile.go

@@ -1,39 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// DeleteCPUAlignmentProfileRequest struct to delete CPU alignment profile for computes
-type DeleteCPUAlignmentProfileRequest struct {
-	// IDs of the compute instances
-	// Required: true
-	ComputeIDs []uint64 `url:"compute_ids" json:"compute_ids" validate:"min=1"`
-}
-
-// DeleteCPUAlignmentProfile deletes CPU alignment profile for computes
-func (c Compute) DeleteCPUAlignmentProfile(ctx context.Context, req DeleteCPUAlignmentProfileRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/delete_cpu_alignment_profile"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/disable.go

@@ -15,12 +15,6 @@ type DisableRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperDisableRequest struct {
-	DisableRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Disable disables compute
 func (c Compute) Disable(ctx context.Context, req DisableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) Disable(ctx context.Context, req DisableRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDisableRequest{
-		DisableRequest: req,
-		AsyncMode:      false,
-	}
-
 	url := "/cloudapi/compute/disable"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) Disable(ctx context.Context, req DisableRequest) (bool, error)
 
 	return result, nil
 }
-
-// DisableAsync disables compute with AsyncMode
-func (c Compute) DisableAsync(ctx context.Context, req DisableRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDisableRequest{
-		DisableRequest: req,
-		AsyncMode:      true,
-	}
-
-	url := "/cloudapi/compute/disable"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_add.go

@@ -51,16 +51,6 @@ type DiskAddRequest struct {
 	// Desired bus number (hex string, e.g. "0x03")
 	// Required: false
 	BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
-
-	// Mount disk in read-only mode
-	// Required: false
-	ReadOnly bool `url:"read_only,omitempty" json:"read_only,omitempty"`
-}
-
-type wrapperDiskAddRequest struct {
-	DiskAddRequest
-
-	AsyncMode bool `url:"asyncMode"`
 }
 
 // DiskAdd creates new disk and attach to compute
@@ -70,14 +60,9 @@ func (c Compute) DiskAdd(ctx context.Context, req DiskAddRequest) (uint64, error
 		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskAddRequest{
-		DiskAddRequest: req,
-		AsyncMode:      false,
-	}
-
 	url := "/cloudapi/compute/diskAdd"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
@@ -89,25 +74,3 @@ func (c Compute) DiskAdd(ctx context.Context, req DiskAddRequest) (uint64, error
 
 	return result, nil
 }
-
-// DiskAddAsync creates new disk and attach to compute with AsyncMode
-func (c Compute) DiskAddAsync(ctx context.Context, req DiskAddRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskAddRequest{
-		DiskAddRequest: req,
-		AsyncMode:      true,
-	}
-
-	url := "/cloudapi/compute/diskAdd"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_attach.go

@@ -25,16 +25,6 @@ type DiskAttachRequest struct {
 	// Desired bus number (hex string, e.g. "0x03")
 	// Required: false
 	BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
-
-	// Mount disk in read-only mode
-	// Required: false
-	ReadOnly bool `url:"read_only,omitempty" json:"read_only,omitempty"`
-}
-
-type wrapperDiskAttachRequest struct {
-	DiskAttachRequest
-
-	AsyncMode bool `url:"asyncMode"`
 }
 
 // DiskAttach attach disk to compute
@@ -44,14 +34,9 @@ func (c Compute) DiskAttach(ctx context.Context, req DiskAttachRequest) (bool, e
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskAttachRequest{
-		DiskAttachRequest: req,
-		AsyncMode:         false,
-	}
-
 	url := "/cloudapi/compute/diskAttach"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -63,25 +48,3 @@ func (c Compute) DiskAttach(ctx context.Context, req DiskAttachRequest) (bool, e
 
 	return result, nil
 }
-
-// DiskAttachAsync attaches disk to compute with AsyncMode
-func (c Compute) DiskAttachAsync(ctx context.Context, req DiskAttachRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskAttachRequest{
-		DiskAttachRequest: req,
-		AsyncMode:         true,
-	}
-
-	url := "/cloudapi/compute/diskAttach"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_del.go

@@ -23,12 +23,6 @@ type DiskDelRequest struct {
 	Permanently bool `url:"permanently" json:"permanently"`
 }
 
-type wrapperDiskDelRequest struct {
-	DiskDelRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // DiskDel delete disk and detach from compute
 func (c Compute) DiskDel(ctx context.Context, req DiskDelRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) DiskDel(ctx context.Context, req DiskDelRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskDelRequest{
-		DiskDelRequest: req,
-		AsyncMode:      false,
-	}
-
 	url := "/cloudapi/compute/diskDel"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) DiskDel(ctx context.Context, req DiskDelRequest) (bool, error)
 
 	return result, nil
 }
-
-// DiskDelAsync deletes disk and detaches from compute with AsyncMode
-func (c Compute) DiskDelAsync(ctx context.Context, req DiskDelRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskDelRequest{
-		DiskDelRequest: req,
-		AsyncMode:      true,
-	}
-
-	url := "/cloudapi/compute/diskDel"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_detach.go

@@ -19,12 +19,6 @@ type DiskDetachRequest struct {
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 }
 
-type wrapperDiskDetachRequest struct {
-	DiskDetachRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // DiskDetach detach disk from compute
 func (c Compute) DiskDetach(ctx context.Context, req DiskDetachRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -32,14 +26,9 @@ func (c Compute) DiskDetach(ctx context.Context, req DiskDetachRequest) (bool, e
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskDetachRequest{
-		DiskDetachRequest: req,
-		AsyncMode:         false,
-	}
-
 	url := "/cloudapi/compute/diskDetach"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -51,25 +40,3 @@ func (c Compute) DiskDetach(ctx context.Context, req DiskDetachRequest) (bool, e
 
 	return result, nil
 }
-
-// DiskDetachAsync detaches disk from compute with AsyncMode
-func (c Compute) DiskDetachAsync(ctx context.Context, req DiskDetachRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskDetachRequest{
-		DiskDetachRequest: req,
-		AsyncMode:         true,
-	}
-
-	url := "/cloudapi/compute/diskDetach"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_qos.go

@@ -23,12 +23,6 @@ type DiskQOSRequest struct {
 	Limits string `url:"limits" json:"limits" validate:"required"`
 }
 
-type wrapperDiskQOSRequest struct {
-	DiskQOSRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // DiskQOS change QoS of the disk
 func (c Compute) DiskQOS(ctx context.Context, req DiskQOSRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) DiskQOS(ctx context.Context, req DiskQOSRequest) (bool, error)
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskQOSRequest{
-		DiskQOSRequest: req,
-		AsyncMode:      false,
-	}
-
 	url := "/cloudapi/compute/diskQos"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) DiskQOS(ctx context.Context, req DiskQOSRequest) (bool, error)
 
 	return result, nil
 }
-
-// DiskQOSAsync changes QoS of the disk with AsyncMode
-func (c Compute) DiskQOSAsync(ctx context.Context, req DiskQOSRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskQOSRequest{
-		DiskQOSRequest: req,
-		AsyncMode:      true,
-	}
-
-	url := "/cloudapi/compute/diskQos"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_resize.go

@@ -23,12 +23,6 @@ type DiskResizeRequest struct {
 	Size uint64 `url:"size" json:"size" validate:"required"`
 }
 
-type wrapperDiskResizeRequest struct {
-	DiskResizeRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // DiskResize change disk size
 func (c Compute) DiskResize(ctx context.Context, req DiskResizeRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) DiskResize(ctx context.Context, req DiskResizeRequest) (bool, e
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskResizeRequest{
-		DiskResizeRequest: req,
-		AsyncMode:         false,
-	}
-
 	url := "/cloudapi/compute/diskResize"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) DiskResize(ctx context.Context, req DiskResizeRequest) (bool, e
 
 	return result, nil
 }
-
-// DiskResizeAsync changes disk size with AsyncMode
-func (c Compute) DiskResizeAsync(ctx context.Context, req DiskResizeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskResizeRequest{
-		DiskResizeRequest: req,
-		AsyncMode:         true,
-	}
-
-	url := "/cloudapi/compute/diskResize"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/disk_switch_to_replication.go

@@ -23,12 +23,6 @@ type DiskSwitchToReplicationRequest struct {
 	StopReplication bool `url:"stopReplication" json:"stopReplication"`
 }
 
-type wrapperDiskSwitchToReplicationRequest struct {
-	DiskSwitchToReplicationRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // DiskSwitchToReplication switches disk to it's replication
 func (c Compute) DiskSwitchToReplication(ctx context.Context, req DiskSwitchToReplicationRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) DiskSwitchToReplication(ctx context.Context, req DiskSwitchToRe
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperDiskSwitchToReplicationRequest{
-		DiskSwitchToReplicationRequest: req,
-		AsyncMode:                      false,
-	}
-
 	url := "/cloudapi/compute/diskSwitchToReplication"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) DiskSwitchToReplication(ctx context.Context, req DiskSwitchToRe
 
 	return result, nil
 }
-
-// DiskSwitchToReplicationAsync switches disk to it's replication with AsyncMode
-func (c Compute) DiskSwitchToReplicationAsync(ctx context.Context, req DiskSwitchToReplicationRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperDiskSwitchToReplicationRequest{
-		DiskSwitchToReplicationRequest: req,
-		AsyncMode:                      true,
-	}
-
-	url := "/cloudapi/compute/diskSwitchToReplication"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/get_acl_access.go

@@ -1,44 +0,0 @@
-package compute
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GetACLAccessRequest struct to get detailed information about ACL account in a vm
-type GetACLAccessRequest struct {
-	ID uint64 `url:"id"          json:"id" validate:"required"`
-}
-
-// Get gets current configuration of the ACL access in a vm as a RecordRGACLAccess struct
-func (c Compute) GetACLAccess(ctx context.Context, req GetACLAccessRequest) (*RecordComputeACLAccess, error) {
-	res, err := c.GetACLAccessRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := RecordComputeACLAccess{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetACLAccessRaw gets current configuration of the ACL access in a vm as an array of bytes
-func (c Compute) GetACLAccessRaw(ctx context.Context, req GetACLAccessRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/get_acl_access"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	return res, err
-}

pkg/cloudapi/compute/get_audits.go

@@ -0,0 +1,40 @@
+package compute
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetAuditsRequest struct to get compute audits
+type GetAuditsRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+}
+
+// GetAudits gets compute audits
+func (c Compute) GetAudits(ctx context.Context, req GetAuditsRequest) (ListShortAudits, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/getAudits"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListShortAudits{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return list, nil
+}

pkg/cloudapi/compute/get_cpu_alignment_profile.go

@@ -1,46 +0,0 @@
-package compute
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// GetCPUAlignmentProfileRequest struct to get CPU alignment profile for compute
-type GetCPUAlignmentProfileRequest struct {
-	// ID of the compute instance
-	// Required: true
-	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
-}
-
-// GetCPUAlignmentProfile gets CPU alignment profile for compute
-func (c Compute) GetCPUAlignmentProfile(ctx context.Context, req GetCPUAlignmentProfileRequest) (*CPUAlignmentProfile, error) {
-	res, err := c.GetCPUAlignmentProfileRaw(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := CPUAlignmentProfile{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}
-
-// GetCPUAlignmentProfileRaw gets CPU alignment profile for compute as an array of bytes
-func (c Compute) GetCPUAlignmentProfileRaw(ctx context.Context, req GetCPUAlignmentProfileRequest) ([]byte, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/get_cpu_alignment_profile"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodGet, url, req)
-	return res, err
-}

pkg/cloudapi/compute/guest_agent_disable.go

@@ -15,12 +15,6 @@ type GuestAgentDisableRequest struct {
 	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
 }
 
-type wrapperGuestAgentDisableRequest struct {
-	GuestAgentDisableRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Disable guest agent at a specific compute
 func (c Compute) GuestAgentDisable(ctx context.Context, req GuestAgentDisableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) GuestAgentDisable(ctx context.Context, req GuestAgentDisableReq
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperGuestAgentDisableRequest{
-		GuestAgentDisableRequest: req,
-		AsyncMode:                false,
-	}
-
 	url := "/cloudapi/compute/guest_agent_disable"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) GuestAgentDisable(ctx context.Context, req GuestAgentDisableReq
 
 	return result, nil
 }
-
-// GuestAgentDisableAsync disables guest agent at a specific compute with AsyncMode
-func (c Compute) GuestAgentDisableAsync(ctx context.Context, req GuestAgentDisableRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperGuestAgentDisableRequest{
-		GuestAgentDisableRequest: req,
-		AsyncMode:                true,
-	}
-
-	url := "/cloudapi/compute/guest_agent_disable"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/guest_agent_enable.go

@@ -15,12 +15,6 @@ type GuestAgentEnableRequest struct {
 	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
 }
 
-type wrapperGuestAgentEnableRequest struct {
-	GuestAgentEnableRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Enable guest agent at a specific compute
 func (c Compute) GuestAgentEnable(ctx context.Context, req GuestAgentEnableRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) GuestAgentEnable(ctx context.Context, req GuestAgentEnableReque
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperGuestAgentEnableRequest{
-		GuestAgentEnableRequest: req,
-		AsyncMode:               false,
-	}
-
 	url := "/cloudapi/compute/guest_agent_enable"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) GuestAgentEnable(ctx context.Context, req GuestAgentEnableReque
 
 	return result, nil
 }
-
-// GuestAgentEnableAsync enables guest agent at a specific compute with AsyncMode
-func (c Compute) GuestAgentEnableAsync(ctx context.Context, req GuestAgentEnableRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperGuestAgentEnableRequest{
-		GuestAgentEnableRequest: req,
-		AsyncMode:               true,
-	}
-
-	url := "/cloudapi/compute/guest_agent_enable"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/guest_agent_execute.go

@@ -23,12 +23,6 @@ type GuestAgentExecuteRequest struct {
 	Arguments string `url:"arguments" json:"arguments" validate:"required"`
 }
 
-type wrapperGuestAgentExecuteRequest struct {
-	GuestAgentExecuteRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Execute guest agent command
 func (c Compute) GuestAgentExecuteRequest(ctx context.Context, req GuestAgentExecuteRequest) (map[string]interface{}, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) GuestAgentExecuteRequest(ctx context.Context, req GuestAgentExe
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperGuestAgentExecuteRequest{
-		GuestAgentExecuteRequest: req,
-		AsyncMode:                false,
-	}
-
 	url := "/cloudapi/compute/guest_agent_execute"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
@@ -57,25 +46,3 @@ func (c Compute) GuestAgentExecuteRequest(ctx context.Context, req GuestAgentExe
 
 	return result, nil
 }
-
-// GuestAgentExecuteRequestAsync executes guest agent command with AsyncMode
-func (c Compute) GuestAgentExecuteRequestAsync(ctx context.Context, req GuestAgentExecuteRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperGuestAgentExecuteRequest{
-		GuestAgentExecuteRequest: req,
-		AsyncMode:                true,
-	}
-
-	url := "/cloudapi/compute/guest_agent_execute"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/guest_agent_feature_update.go

@@ -15,12 +15,6 @@ type GuestAgentFeatureUpdateRequest struct {
 	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
 }
 
-type wrapperGuestAgentFeatureUpdateRequest struct {
-	GuestAgentFeatureUpdateRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Feature update guest agent
 func (c Compute) GuestAgentFeatureUpdate(ctx context.Context, req GuestAgentFeatureUpdateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) GuestAgentFeatureUpdate(ctx context.Context, req GuestAgentFeat
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperGuestAgentFeatureUpdateRequest{
-		GuestAgentFeatureUpdateRequest: req,
-		AsyncMode:                      false,
-	}
-
 	url := "/cloudapi/compute/guest_agent_feature_update"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) GuestAgentFeatureUpdate(ctx context.Context, req GuestAgentFeat
 
 	return result, nil
 }
-
-// GuestAgentFeatureUpdateAsync feature updates guest agent with AsyncMode
-func (c Compute) GuestAgentFeatureUpdateAsync(ctx context.Context, req GuestAgentFeatureUpdateRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperGuestAgentFeatureUpdateRequest{
-		GuestAgentFeatureUpdateRequest: req,
-		AsyncMode:                      true,
-	}
-
-	url := "/cloudapi/compute/guest_agent_feature_update"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/list_pci_device.go

@@ -14,6 +14,10 @@ type ListPCIDeviceRequest struct {
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
 	// Find by device id
 	// Required: false
 	DevID uint64 `url:"devId,omitempty" json:"devId,omitempty"`

pkg/cloudapi/compute/list_vgpu.go

@@ -18,6 +18,10 @@ type ListVGPURequest struct {
 	// Required: false
 	GPUID uint64 `url:"gpuId,omitempty" json:"gpuId,omitempty"`
 
+	// Find by type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,omitempty"`
+
 	// Find by status
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`

pkg/cloudapi/compute/migrate_to_zone.go

@@ -19,12 +19,6 @@ type MigrateToZoneRequest struct {
 	ZoneID uint64 `url:"zoneId" json:"zoneId " validate:"required"`
 }
 
-type wrapperMigrateToZoneRequest struct {
-	MigrateToZoneRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // MoveToRG moves compute instance to new resource group
 func (c Compute) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -32,14 +26,9 @@ func (c Compute) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (b
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperMigrateToZoneRequest{
-		MigrateToZoneRequest: req,
-		AsyncMode:            false,
-	}
-
 	url := "/cloudapi/compute/migrateToZone"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -51,25 +40,3 @@ func (c Compute) MigrateToZone(ctx context.Context, req MigrateToZoneRequest) (b
 
 	return result, nil
 }
-
-// MigrateToZoneAsync moves compute to another zone with AsyncMode
-func (c Compute) MigrateToZoneAsync(ctx context.Context, req MigrateToZoneRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperMigrateToZoneRequest{
-		MigrateToZoneRequest: req,
-		AsyncMode:            true,
-	}
-
-	url := "/cloudapi/compute/migrateToZone"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/models.go

@@ -83,10 +83,7 @@ type ListUsageSnapshots []ItemUsageSnapshot
 
 // Main information about snapshot
 type ItemSnapshot struct {
-	// Compute info
+	// List disk ID
-	Compute RecordCompute `json:"compute"`
-
-	// List of disk IDs
 	Disks []uint64 `json:"disks"`
 
 	// GUID
@@ -95,9 +92,6 @@ type ItemSnapshot struct {
 	// Label
 	Label string `json:"label"`
 
-	// Memory dump image ID
-	MemoryDumpImage uint64 `json:"memory_dump_image"`
-
 	// Timestamp
 	Timestamp uint64 `json:"timestamp"`
 }
@@ -182,9 +176,6 @@ type RecordNetAttach struct {
 	// Enabled
 	Enabled bool `json:"enabled"`
 
-	// Enable default gateway
-	EnableDefaultGateway bool `json:"enable_default_gateway"`
-
 	// Enable security groups
 	EnableSecGroups bool `json:"enable_secgroups"`
 
@@ -365,9 +356,6 @@ type RecordCompute struct {
 	// List clone IDs
 	Clones []uint64 `json:"clones"`
 
-	// Clock
-	Clock string `json:"clock"`
-
 	// Compute CI ID
 	ComputeCIID uint64 `json:"computeciId"`
 
@@ -446,9 +434,6 @@ type RecordCompute struct {
 	// Manager type
 	ManagerType string `json:"managerType"`
 
-	// Memory balloon mode
-	MemoryBalloonMode string `json:"memory_balloon_mode"`
-
 	// Migration job
 	MigrationJob uint64 `json:"migrationjob"`
 
@@ -497,9 +482,6 @@ type RecordCompute struct {
 	// PreferredCPU
 	PreferredCPU []int64 `json:"preferredCpu"`
 
-	// CPU alignment profile
-	CPUAlignmentProfile CPUAlignmentProfile `json:"cpu_alignment_profile"`
-
 	// Qemu_quest
 	QemuQuest QemuQuest `json:"qemu_guest"`
 
@@ -515,9 +497,6 @@ type RecordCompute struct {
 	// Registered or not
 	Registered bool `json:"registered"`
 
-	// Whether a compute has been resized online
-	ResizedOnline bool `json:"resizedOnline"`
-
 	// Resource name
 	ResName string `json:"resName"`
 
@@ -561,317 +540,7 @@ type RecordCompute struct {
 	Userdata interface{} `json:"userdata"`
 
 	// vGPUs list
-	VGPUs []ItemVGPU `json:"vgpus"`
+	VGPUs []VGPUItem `json:"vgpus"`
-
-	// VNC password
-	VNCPassword string `json:"vncPasswd"`
-
-	// Watchdog action
-	WatchdogAction string `json:"watchdog_action"`
-
-	// Weight
-	Weight uint64 `json:"weight"`
-
-	// Zone ID
-	// Required: false
-	ZoneID uint64 `json:"zoneId"`
-}
-
-// Detailed information about ACL Access in a compute
-type RecordComputeACLAccess struct {
-	// Data
-	Data DataACL `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
-
-// Data ACL
-type DataACL struct {
-	// RG ACL list
-	RGACLList []RGACL `json:"rgACL"`
-
-	// Account ACL list
-	AccountACLList []AccountACL `json:"accountACL"`
-
-	// Compute ACL list
-	ComputeACLList []ComputeACL `json:"computeACL"`
-}
-
-// RG ACL info
-type RGACL struct {
-	Right       string `json:"right"`
-	GUID        string `json:"guid"`
-	UserGroupID string `json:"userGroupId"`
-	Status      string `json:"status"`
-	Type        string `json:"type"`
-	Explicit    bool   `json:"explicit"`
-}
-
-// Account ACL info
-type AccountACL struct {
-	Right       string `json:"right"`
-	GUID        string `json:"guid"`
-	UserGroupID string `json:"userGroupId"`
-	Status      string `json:"status"`
-	Type        string `json:"type"`
-	Explicit    bool   `json:"explicit"`
-}
-
-// Compute ACL info
-
-type ComputeACL struct {
-	Right       string `json:"right"`
-	GUID        string `json:"guid"`
-	UserGroupID string `json:"userGroupId"`
-	Status      string `json:"status"`
-	Type        string `json:"type"`
-	Explicit    bool   `json:"explicit"`
-}
-
-type SnapRecordCompute struct {
-	// Access Control List
-	ACL ListACL `json:"acl"`
-
-	// Account ID
-	AccountID uint64 `json:"accountId"`
-
-	// Account name
-	AccountName string `json:"accountName"`
-
-	// Affinity label
-	AffinityLabel string `json:"affinityLabel"`
-
-	// List affinity rules
-	AffinityRules ListRules `json:"affinityRules"`
-
-	// Affinity weight
-	AffinityWeight uint64 `json:"affinityWeight"`
-
-	// List anti affinity rules
-	AntiAffinityRules ListRules `json:"antiAffinityRules"`
-
-	// Auto start when node restarted
-	AutoStart bool `json:"autoStart"`
-
-	// Architecture
-	Architecture string `json:"arch"`
-
-	// Boot image ID
-	BootImageID uint64 `json:"boot_image_id"`
-
-	// Boot order
-	BootOrder []string `json:"bootOrder"`
-
-	// Boot type
-	BootType string `json:"bootType"`
-
-	// Boot disk size
-	BootDiskSize uint64 `json:"bootdiskSize"`
-
-	// CD Image Id
-	CdImageId uint64 `json:"cdImageId"`
-
-	// Chipset
-	Chipset string `json:"chipset"`
-
-	// Clone reference
-	CloneReference uint64 `json:"cloneReference"`
-
-	// List clone IDs
-	Clones []uint64 `json:"clones"`
-
-	// Clock
-	Clock string `json:"clock"`
-
-	// Compute CI ID
-	ComputeCIID uint64 `json:"computeciId"`
-
-	// CPU Pin
-	CPUPin bool `json:"cpupin"`
-
-	//  Number of cores
-	CPU uint64 `json:"cpus"`
-
-	// Created by
-	CreatedBy string `json:"createdBy"`
-
-	// Created time
-	CreatedTime uint64 `json:"createdTime"`
-
-	// Custom fields items
-	CustomFields map[string]interface{} `json:"customFields"`
-
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
-	// Deleted time
-	DeletedTime uint64 `json:"deletedTime"`
-
-	// Description
-	Description string `json:"desc"`
-
-	// Devices
-	Devices interface{} `json:"devices"`
-
-	// List disks in compute
-	Disks ListComputeDisks `json:"disks"`
-
-	// Driver
-	Driver string `json:"driver"`
-
-	// Grid ID
-	GID uint64 `json:"gid"`
-
-	// GUID
-	GUID uint64 `json:"guid"`
-
-	// HPBacked
-	HPBacked bool `json:"hpBacked"`
-
-	// Hot resize
-	HotResize bool `json:"hotResize"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// Image ID
-	ImageID uint64 `json:"imageId"`
-
-	// Image name
-	ImageName string `json:"imageName"`
-
-	// List interfaces
-	Interfaces ListInterfaces `json:"interfaces"`
-
-	// Loader meta iso information
-	LoaderMetaIso LoaderMetaIso `json:"loaderMetaIso"`
-
-	// Live migration job ID
-	LiveMigrationJobID uint64 `json:"live_migration_job_id"`
-
-	// Loader type
-	LoaderType string `json:"loaderType"`
-
-	// Lock status
-	LockStatus string `json:"lockStatus"`
-
-	// Manager ID
-	ManagerID uint64 `json:"managerId"`
-
-	// Manager type
-	ManagerType string `json:"managerType"`
-
-	// Migration job
-	MigrationJob uint64 `json:"migrationjob"`
-
-	// Milestones
-	Milestones uint64 `json:"milestones"`
-
-	// Name
-	Name string `json:"name"`
-
-	// NeedReboot
-	NeedReboot bool `json:"needReboot"`
-
-	// Network interface naming
-	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
-
-	// Node ID
-	NodeID uint64 `json:"node_id"`
-
-	// Numa Affinity
-	NumaAffinity string `json:"numaAffinity"`
-
-	//NumaNodeId
-	NumaNodeId int64 `json:"numaNodeId"`
-
-	// Natable VINS ID
-	NatableVINSID uint64 `json:"natableVinsId"`
-
-	// Natable VINS IP
-	NatableVINSIP string `json:"natableVinsIp"`
-
-	// Natable VINS Name
-	NatableVINSName string `json:"natableVinsName"`
-
-	// Natable VINS network
-	NatableVINSNetwork string `json:"natableVinsNetwork"`
-
-	// Natable VINS network name
-	NatableVINSNetworkName string `json:"natableVinsNetworkName"`
-
-	// Name of OS
-	OSVersion string `json:"os_version"`
-
-	// List OS Users
-	OSUsers ListOSUser `json:"osUsers"`
-
-	// Pinned to node
-	PinnedToNode int64 `json:"pinnedToNode"`
-
-	// PreferredCPU
-	PreferredCPU []int64 `json:"preferredCpu"`
-
-	// CPU alignment profile
-	CPUAlignmentProfile CPUAlignmentProfile `json:"cpu_alignment_profile"`
-
-	// Qemu_quest
-	QemuQuest QemuQuest `json:"qemu_guest"`
-
-	// ReadOnly indicates read-only mode state
-	ReadOnly bool `json:"read_only"`
-
-	// Number of RAM
-	RAM uint64 `json:"ram"`
-
-	// Reference ID
-	ReferenceID string `json:"referenceId"`
-
-	// Registered or not
-	Registered bool `json:"registered"`
-
-	// Resource name
-	ResName string `json:"resName"`
-
-	// Reserved Node Cpus
-	ReservedNodeCpus []uint64 `json:"reservedNodeCpus"`
-
-	// Resource group ID
-	RGID uint64 `json:"rgId"`
-
-	// Resource group name
-	RGName string `json:"rgName"`
-
-	// Stateless SepID
-	StatelessSepID int64 `json:"statelessSepId"`
-
-	// Stateless SepType
-	StatelessSepType string `json:"statelessSepType"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Tags
-	Tags map[string]string `json:"tags"`
-
-	// Tech status
-	TechStatus string `json:"techStatus"`
-
-	// Updated by
-	UpdatedBy string `json:"updatedBy"`
-
-	// Updated time
-	UpdatedTime uint64 `json:"updatedTime"`
-
-	// User Managed or not
-	UserManaged bool `json:"userManaged"`
-
-	// Userdata
-	Userdata interface{} `json:"userdata"`
-
-	// vGPUs list
-	VGPUs []ItemVGPU `json:"vgpus"`
 
 	// VNC password
 	VNCPassword string `json:"vncPasswd"`
@@ -883,7 +552,6 @@ type SnapRecordCompute struct {
 	// Required: false
 	ZoneID uint64 `json:"zoneId"`
 }
-
 type LoaderMetaIso struct {
 	// Name
 	DeviceName string `json:"devicename"`
@@ -900,10 +568,63 @@ type QemuQuest struct {
 	User                 string   `json:"user"`
 }
 
-type CPUAlignmentProfile struct {
+type VGPUItem struct {
-	Model  string `json:"model"`
+	// ID
-	Name   string `json:"name"`
+	ID uint64 `json:"id"`
-	Vendor string `json:"vendor"`
+
+	// 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
@@ -950,10 +671,7 @@ type ListOSUser []ItemOSUser
 
 // Main information about snapsets
 type ItemSnapSet struct {
-	// Compute info
+	// List disk IDs
-	Compute SnapRecordCompute `json:"compute"`
-
-	// List disk ID
 	Disks []uint64 `json:"disks"`
 
 	// GUID
@@ -962,9 +680,6 @@ type ItemSnapSet struct {
 	// Label
 	Label string `json:"label"`
 
-	// Memory dump image ID
-	MemoryDumpImage uint64 `json:"memory_dump_image"`
-
 	// Timestamp
 	Timestamp uint64 `json:"timestamp"`
 }
@@ -989,9 +704,6 @@ type ItemVNFInterface struct {
 	// Enabled
 	Enabled bool `json:"enabled"`
 
-	// Enable default gateway
-	EnableDefaultGateway bool `json:"enable_default_gateway"`
-
 	// Enable security groups
 	EnableSecGroups bool `json:"enable_secgroups"`
 
@@ -1037,9 +749,6 @@ type ItemVNFInterface struct {
 	// QOS
 	QOS QOS `json:"qos"`
 
-	// List of QoS Policy IDs
-	QoSPolicies []uint64 `json:"qos_policies"`
-
 	// List of security groups
 	SecGroups []uint64 `json:"security_groups"`
 
@@ -1083,8 +792,8 @@ type ItemComputeDisk struct {
 	// Account ID
 	AccountID uint64 `json:"accountId"`
 
-	// Discard
+	// BLK Discard
-	Discard string `json:"discard"`
+	BLKDiscard bool `json:"blkdiscard"`
 
 	// Block Size
 	BlockSize string `json:"block_size"`
@@ -1229,9 +938,6 @@ type ItemComputeDisk struct {
 
 	// UpdatedTime
 	UpdatedTime uint64 `json:"updatedTime"`
-
-	// Read-only
-	ReadOnly bool `json:"read_only"`
 }
 
 type ItemReplication struct {
@@ -1262,9 +968,6 @@ type SnapshotExtend struct {
 	// Label
 	Label string `json:"label"`
 
-	// Pool name
-	PoolName string `json:"poolName"`
-
 	// Reference ID
 	ReferenceID string `json:"referenceId"`
 
@@ -1376,9 +1079,6 @@ type ItemCompute struct {
 	// Clone reference
 	CloneReference uint64 `json:"cloneReference"`
 
-	// Clock
-	Clock string `json:"clock"`
-
 	// List clone IDs
 	Clones []uint64 `json:"clones"`
 
@@ -1451,9 +1151,6 @@ type ItemCompute struct {
 	// Manager type
 	ManagerType string `json:"managerType"`
 
-	// Memory balloon mode
-	MemoryBalloonMode string `json:"memory_balloon_mode"`
-
 	// Migration job
 	MigrationJob uint64 `json:"migrationjob"`
 
@@ -1463,9 +1160,6 @@ type ItemCompute struct {
 	// Name
 	Name string `json:"name"`
 
-	// Node ID
-	NodeID uint64 `json:"node_id"`
-
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
@@ -1490,9 +1184,6 @@ type ItemCompute struct {
 	// Name of OS
 	OSVersion string `json:"os_version"`
 
-	// CPU alignment profile
-	CPUAlignmentProfile CPUAlignmentProfile `json:"cpu_alignment_profile"`
-
 	// Qemu_quest
 	QemuQuest QemuQuest `json:"qemu_guest"`
 
@@ -1505,9 +1196,6 @@ type ItemCompute struct {
 	// Registered
 	Registered bool `json:"registered"`
 
-	// Whether a compute has been resized online
-	ResizedOnline bool `json:"resizedOnline"`
-
 	// Resource name
 	ResName string `json:"resName"`
 
@@ -1556,9 +1244,6 @@ type ItemCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
-	// Watchdog action
-	WatchdogAction string `json:"watchdog_action"`
-
 	// Weight
 	Weight uint64 `json:"weight"`
 
@@ -1576,12 +1261,6 @@ type InfoDisk struct {
 
 	// SEP ID
 	SepID int64 `json:"sepId"`
-
-	// Image ID
-	ImageID uint64 `json:"imageId"`
-
-	// Read-only
-	ReadOnly bool `json:"read_only"`
 }
 
 // List information about computes
@@ -1604,59 +1283,59 @@ type ListVGPUs struct {
 
 // Main information about vgpu device
 type ItemVGPU struct {
-	// Account IDs
+	// Account ID
-	AccountIDs []uint64 `json:"account_ids"`
+	AccountID uint64 `json:"accountId"`
 
-	// Bus number
+	// Created Time
-	BusNumber int `json:"bus_number"`
+	CreatedTime uint64 `json:"createdTime"`
 
-	// ComputeID
+	// Deleted Time
-	ComputeID uint64 `json:"compute_id"`
+	DeletedTime uint64 `json:"deletedTime"`
 
-	// Created time
+	// GID
-	CreatedTime uint64 `json:"created_time"`
-
-	// Deleted time
-	DeletedTime uint64 `json:"deleted_time"`
-
-	// Device Reference
-	DeviceReference string `json:"device_reference"`
-
-	//Grid ID
 	GID uint64 `json:"gid"`
 
 	// GUID
 	GUID uint64 `json:"guid"`
 
-	// VGPU ID
+	// ID
 	ID uint64 `json:"id"`
 
-	// Last Update time
+	// Last Claimed By
-	LastUpdateTime uint64 `json:"last_update_time"`
+	LastClaimedBy uint64 `json:"lastClaimedBy"`
 
-	// Mdev UUID
+	// Last Update Time
-	MdevUUID string `json:"mdev_uuid"`
+	LastUpdateTime uint64 `json:"lastUpdateTime"`
 
-	// Parent PCI Address
+	// Mode
-	ParentPCIAddress string `json:"parent_pci_address"`
+	Mode string `json:"mode"`
 
 	// PCI Slot
-	PCISlot uint64 `json:"pci_slot"`
+	PCISlot uint64 `json:"pciSlot"`
 
-	// PGPU ID
+	// PGPUID
-	PGPUID uint64 `json:"pgpu_id"`
+	PGPUID uint64 `json:"pgpuid"`
 
-	// Profile Reference
+	// Profile ID
-	ProfileReference string `json:"profile_reference"`
+	ProfileID uint64 `json:"profileId"`
 
-	// Profile Name
+	// RAM
-	ProfileName string `json:"profile_name"`
+	RAM uint64 `json:"ram"`
 
-	// Split Mode
+	// Reference ID
-	SplitMode string `json:"split_mode"`
+	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
@@ -1679,8 +1358,8 @@ type ItemPCIDevice struct {
 	// Name
 	Name string `json:"name"`
 
-	// Account IDs
+	// Resource group ID
-	AccountIDs []uint64 `json:"account_ids"`
+	RGID uint64 `json:"rgId"`
 
 	// Node ID
 	NodeID uint64 `json:"nodeId"`

pkg/cloudapi/compute/move_to_rg.go

@@ -34,12 +34,6 @@ type MoveToRGRequest struct {
 	ForceStop bool `url:"forceStop,omitempty" json:"forceStop,omitempty"`
 }
 
-type wrapperMoveToRGRequest struct {
-	MoveToRGRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // MoveToRG moves compute instance to new resource group
 func (c Compute) MoveToRG(ctx context.Context, req MoveToRGRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -47,14 +41,9 @@ func (c Compute) MoveToRG(ctx context.Context, req MoveToRGRequest) (bool, error
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperMoveToRGRequest{
-		MoveToRGRequest: req,
-		AsyncMode:       false,
-	}
-
 	url := "/cloudapi/compute/moveToRg"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -66,25 +55,3 @@ func (c Compute) MoveToRG(ctx context.Context, req MoveToRGRequest) (bool, error
 
 	return result, nil
 }
-
-// MoveToRGAsync moves compute instance to new resource group with AsyncMode
-func (c Compute) MoveToRGAsync(ctx context.Context, req MoveToRGRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperMoveToRGRequest{
-		MoveToRGRequest: req,
-		AsyncMode:       true,
-	}
-
-	url := "/cloudapi/compute/moveToRg"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/net_attach.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -54,9 +53,9 @@ type NetAttachRequest struct {
 	// Required: false
 	SDNSegmentID string `url:"sdn_segment_id,omitempty" json:"sdn_segment_id,omitempty"`
 
-	// SDN Object Group IDs
+	// SDN Object Group ID
 	// Required: false
-	SDNObjectGroupIDs []string `url:"sdn_object_group_ids,omitempty" json:"sdn_object_group_ids,omitempty"`
+	SDNObjectGroupID string `url:"sdn_object_group_id,omitempty" json:"sdn_object_group_id,omitempty"`
 
 	// SDN Logical Port Display Name
 	// Required: false
@@ -82,21 +81,6 @@ type NetAttachRequest struct {
 	// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
 	// Required: false
 	Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
-
-	// Flag indicating whether default gateway is enabled for this interface
-	// Required: false
-	// Default: true
-	EnableDefaultGateway interface{} `url:"enable_default_gateway,omitempty" json:"enable_default_gateway,omitempty" validate:"omitempty,isBool"`
-
-	// List of QoS Policy IDs to apply to this interface (default: []), Allow used only with netType VINS, EXTNET and DPDK
-	// Required: false
-	QoSPolicies []uint64 `url:"qos_policies,omitempty" json:"qos_policies,omitempty"`
-}
-
-type wrapperNetAttachRequest struct {
-	NetAttachRequest
-
-	AsyncMode bool `url:"asyncMode" json:"asyncMode"`
 }
 
 // NetAttach attaches network to compute and gets info about network
@@ -106,14 +90,9 @@ func (c Compute) NetAttach(ctx context.Context, req NetAttachRequest) (*RecordNe
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperNetAttachRequest{
-		NetAttachRequest: req,
-		AsyncMode:        false,
-	}
-
 	url := "/cloudapi/compute/netAttach"
 
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
@@ -127,25 +106,3 @@ func (c Compute) NetAttach(ctx context.Context, req NetAttachRequest) (*RecordNe
 
 	return &info, nil
 }
-
-// NetAttachAsync attaches network to compute with AsyncMode
-func (c Compute) NetAttachAsync(ctx context.Context, req NetAttachRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperNetAttachRequest{
-		NetAttachRequest: req,
-		AsyncMode:        true,
-	}
-
-	url := "/cloudapi/compute/netAttach"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/net_detach.go

@@ -23,12 +23,6 @@ type NetDetachRequest struct {
 	MAC string `url:"mac,omitempty" json:"mac,omitempty"`
 }
 
-type wrapperNetDetachRequest struct {
-	NetDetachRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // NetDetach detaches network from compute
 func (c Compute) NetDetach(ctx context.Context, req NetDetachRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -36,14 +30,9 @@ func (c Compute) NetDetach(ctx context.Context, req NetDetachRequest) (bool, err
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperNetDetachRequest{
-		NetDetachRequest: req,
-		AsyncMode:        false,
-	}
-
 	url := "/cloudapi/compute/netDetach"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +44,3 @@ func (c Compute) NetDetach(ctx context.Context, req NetDetachRequest) (bool, err
 
 	return result, nil
 }
-
-// NetDetachAsync detaches network from compute with AsyncMode
-func (c Compute) NetDetachAsync(ctx context.Context, req NetDetachRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperNetDetachRequest{
-		NetDetachRequest: req,
-		AsyncMode:        true,
-	}
-
-	url := "/cloudapi/compute/netDetach"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/pause.go

@@ -15,12 +15,6 @@ type PauseRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperPauseRequest struct {
-	PauseRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Pause pause compute
 func (c Compute) Pause(ctx context.Context, req PauseRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) Pause(ctx context.Context, req PauseRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperPauseRequest{
-		PauseRequest: req,
-		AsyncMode:    false,
-	}
-
 	url := "/cloudapi/compute/pause"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) Pause(ctx context.Context, req PauseRequest) (bool, error) {
 
 	return result, nil
 }
-
-// PauseAsync pauses compute with AsyncMode
-func (c Compute) PauseAsync(ctx context.Context, req PauseRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperPauseRequest{
-		PauseRequest: req,
-		AsyncMode:    true,
-	}
-
-	url := "/cloudapi/compute/pause"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/pfw_add.go

@@ -33,12 +33,6 @@ type PFWAddRequest struct {
 	Proto string `url:"proto" json:"proto" validate:"proto"`
 }
 
-type wrapperPFWAddRequest struct {
-	PFWAddRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // PFWAdd add port forward rule
 func (c Compute) PFWAdd(ctx context.Context, req PFWAddRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -46,14 +40,9 @@ func (c Compute) PFWAdd(ctx context.Context, req PFWAddRequest) (uint64, error)
 		return 0, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperPFWAddRequest{
-		PFWAddRequest: req,
-		AsyncMode:     false,
-	}
-
 	url := "/cloudapi/compute/pfwAdd"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return 0, err
 	}
@@ -65,25 +54,3 @@ func (c Compute) PFWAdd(ctx context.Context, req PFWAddRequest) (uint64, error)
 
 	return result, nil
 }
-
-// PFWAddAsync adds port forward rule with AsyncMode
-func (c Compute) PFWAddAsync(ctx context.Context, req PFWAddRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperPFWAddRequest{
-		PFWAddRequest: req,
-		AsyncMode:     true,
-	}
-
-	url := "/cloudapi/compute/pfwAdd"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/pfw_del.go

@@ -36,12 +36,6 @@ type PFWDelRequest struct {
 	Proto string `url:"proto,omitempty" json:"proto,omitempty"`
 }
 
-type wrapperPFWDelRequest struct {
-	PFWDelRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // PFWDel deletes port forward rule
 func (c Compute) PFWDel(ctx context.Context, req PFWDelRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -49,14 +43,9 @@ func (c Compute) PFWDel(ctx context.Context, req PFWDelRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperPFWDelRequest{
-		PFWDelRequest: req,
-		AsyncMode:     false,
-	}
-
 	url := "/cloudapi/compute/pfwDel"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -68,25 +57,3 @@ func (c Compute) PFWDel(ctx context.Context, req PFWDelRequest) (bool, error) {
 
 	return result, nil
 }
-
-// PFWDelAsync deletes port forward rule with AsyncMode
-func (c Compute) PFWDelAsync(ctx context.Context, req PFWDelRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperPFWDelRequest{
-		PFWDelRequest: req,
-		AsyncMode:     true,
-	}
-
-	url := "/cloudapi/compute/pfwDel"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/pin_to_node.go

@@ -20,12 +20,6 @@ type PinToNodeRequest struct {
 	AutoStart bool `url:"autoStart" json:"autoStart"`
 }
 
-type wrapperPinToNodeRequest struct {
-	PinToNodeRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // PinToNode pin compute to current node
 func (c Compute) PinToNode(ctx context.Context, req PinToNodeRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -33,14 +27,9 @@ func (c Compute) PinToNode(ctx context.Context, req PinToNodeRequest) (bool, err
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperPinToNodeRequest{
-		PinToNodeRequest: req,
-		AsyncMode:        false,
-	}
-
 	url := "/cloudapi/compute/pin_to_node"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -52,25 +41,3 @@ func (c Compute) PinToNode(ctx context.Context, req PinToNodeRequest) (bool, err
 
 	return result, nil
 }
-
-// PinToNodeAsync pins compute to current node with AsyncMode
-func (c Compute) PinToNodeAsync(ctx context.Context, req PinToNodeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperPinToNodeRequest{
-		PinToNodeRequest: req,
-		AsyncMode:        true,
-	}
-
-	url := "/cloudapi/compute/pin_to_node"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/power_cycle.go

@@ -15,12 +15,6 @@ type PowerCycleRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperPowerCycleRequest struct {
-	PowerCycleRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // PowerCycle makes force stop and start compute
 func (c Compute) PowerCycle(ctx context.Context, req PowerCycleRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) PowerCycle(ctx context.Context, req PowerCycleRequest) (bool, e
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperPowerCycleRequest{
-		PowerCycleRequest: req,
-		AsyncMode:         false,
-	}
-
 	url := "/cloudapi/compute/powerCycle"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) PowerCycle(ctx context.Context, req PowerCycleRequest) (bool, e
 
 	return result, nil
 }
-
-// PowerCycleAsync makes force stop and start compute with AsyncMode
-func (c Compute) PowerCycleAsync(ctx context.Context, req PowerCycleRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperPowerCycleRequest{
-		PowerCycleRequest: req,
-		AsyncMode:         true,
-	}
-
-	url := "/cloudapi/compute/powerCycle"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/reboot.go

@@ -15,12 +15,6 @@ type RebootRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperRebootRequest struct {
-	RebootRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Reboot reboots compute
 func (c Compute) Reboot(ctx context.Context, req RebootRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) Reboot(ctx context.Context, req RebootRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperRebootRequest{
-		RebootRequest: req,
-		AsyncMode:     false,
-	}
-
 	url := "/cloudapi/compute/reboot"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) Reboot(ctx context.Context, req RebootRequest) (bool, error) {
 
 	return result, nil
 }
-
-// RebootAsync reboots compute with AsyncMode
-func (c Compute) RebootAsync(ctx context.Context, req RebootRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperRebootRequest{
-		RebootRequest: req,
-		AsyncMode:     true,
-	}
-
-	url := "/cloudapi/compute/reboot"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/redeploy.go

@@ -44,12 +44,6 @@ type RedeployRequest struct {
 	ForceStop bool `url:"forceStop,omitempty" json:"forceStop,omitempty"`
 }
 
-type wrapperRedeployRequest struct {
-	RedeployRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Redeploy redeploys compute
 func (c Compute) Redeploy(ctx context.Context, req RedeployRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -57,14 +51,9 @@ func (c Compute) Redeploy(ctx context.Context, req RedeployRequest) (bool, error
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperRedeployRequest{
-		RedeployRequest: req,
-		AsyncMode:       false,
-	}
-
 	url := "/cloudapi/compute/redeploy"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -76,25 +65,3 @@ func (c Compute) Redeploy(ctx context.Context, req RedeployRequest) (bool, error
 
 	return result, nil
 }
-
-// RedeployAsync redeploys compute with AsyncMode
-func (c Compute) RedeployAsync(ctx context.Context, req RedeployRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperRedeployRequest{
-		RedeployRequest: req,
-		AsyncMode:       true,
-	}
-
-	url := "/cloudapi/compute/redeploy"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/reset.go

@@ -15,12 +15,6 @@ type ResetRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperResetRequest struct {
-	ResetRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Reset resets compute
 func (c Compute) Reset(ctx context.Context, req ResetRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) Reset(ctx context.Context, req ResetRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperResetRequest{
-		ResetRequest: req,
-		AsyncMode:    false,
-	}
-
 	url := "/cloudapi/compute/reset"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) Reset(ctx context.Context, req ResetRequest) (bool, error) {
 
 	return result, nil
 }
-
-// ResetAsync resets compute with AsyncMode
-func (c Compute) ResetAsync(ctx context.Context, req ResetRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperResetRequest{
-		ResetRequest: req,
-		AsyncMode:    true,
-	}
-
-	url := "/cloudapi/compute/reset"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/resize.go

@@ -43,12 +43,6 @@ func (r ResizeRequest) GetRAM() map[string]uint64 {
 	return res
 }
 
-type wrapperResizeRequest struct {
-	ResizeRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Resize resizes compute instance
 func (c Compute) Resize(ctx context.Context, req ResizeRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -56,14 +50,9 @@ func (c Compute) Resize(ctx context.Context, req ResizeRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperResizeRequest{
-		ResizeRequest: req,
-		AsyncMode:     false,
-	}
-
 	url := "/cloudapi/compute/resize"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -75,25 +64,3 @@ func (c Compute) Resize(ctx context.Context, req ResizeRequest) (bool, error) {
 
 	return result, nil
 }
-
-// ResizeAsync resizes compute instance with AsyncMode
-func (c Compute) ResizeAsync(ctx context.Context, req ResizeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperResizeRequest{
-		ResizeRequest: req,
-		AsyncMode:     true,
-	}
-
-	url := "/cloudapi/compute/resize"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/restore.go

@@ -3,7 +3,6 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
@@ -15,54 +14,16 @@ type RestoreRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperRestoreRequest struct {
-	RestoreRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Restore restores compute from recycle bin
-func (c Compute) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
+func (c Compute) Restore(ctx context.Context, req RestoreRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperRestoreRequest{
-		RestoreRequest: req,
-		AsyncMode:      false,
-	}
-
-	url := "/cloudapi/compute/restore"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}
-
-// RestoreAsync restores compute from recycle bin with AsyncMode
-func (c Compute) RestoreAsync(ctx context.Context, req RestoreRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperRestoreRequest{
-		RestoreRequest: req,
-		AsyncMode:      true,
-	}
-
 	url := "/cloudapi/compute/restore"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return "", err
 	}

pkg/cloudapi/compute/resume.go

@@ -15,12 +15,6 @@ type ResumeRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 }
 
-type wrapperResumeRequest struct {
-	ResumeRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Resume resume Compute from paused state
 func (c Compute) Resume(ctx context.Context, req ResumeRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -28,14 +22,9 @@ func (c Compute) Resume(ctx context.Context, req ResumeRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperResumeRequest{
-		ResumeRequest: req,
-		AsyncMode:     false,
-	}
-
 	url := "/cloudapi/compute/resume"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -47,25 +36,3 @@ func (c Compute) Resume(ctx context.Context, req ResumeRequest) (bool, error) {
 
 	return result, nil
 }
-
-// ResumeAsync resumes Compute from paused state with AsyncMode
-func (c Compute) ResumeAsync(ctx context.Context, req ResumeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperResumeRequest{
-		ResumeRequest: req,
-		AsyncMode:     true,
-	}
-
-	url := "/cloudapi/compute/resume"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/set_cpu_alignment_profile.go

@@ -1,43 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// SetCPUAlignmentProfileRequest struct to set CPU alignment profile for computes
-type SetCPUAlignmentProfileRequest struct {
-	// IDs of the compute instances
-	// Required: true
-	ComputeIDs []int64 `url:"compute_ids" json:"compute_ids" validate:"min=1"`
-
-	// CPU alignment profile name
-	// Required: true
-	CPUAlignmentProfile string `url:"cpu_alignment_profile" json:"cpu_alignment_profile" validate:"required"`
-}
-
-// SetCPUAlignmentProfile sets CPU alignment profile for computes
-func (c Compute) SetCPUAlignmentProfile(ctx context.Context, req SetCPUAlignmentProfileRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/set_cpu_alignment_profile"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/snapshot_create.go

@@ -20,33 +20,18 @@ type SnapshotCreateRequest struct {
 	// Maximum length: 36 characters
 	// Required: true
 	Label string `url:"label" json:"label" validate:"required,max=36,excludesall=<>"`
-
-	// Create snapshot with memory dump
-	// Required: false
-	// Default: false
-	WithMemory bool `url:"with_memory" json:"with_memory"`
 }
 
-type wrapperSnapshotCreateRequest struct {
+// SnapshotCreate create compute snapshot
-	SnapshotCreateRequest
-	AsyncMode bool `url:"asyncMode"`
-}
-
-// SnapshotCreate creates compute snapshot
 func (c Compute) SnapshotCreate(ctx context.Context, req SnapshotCreateRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperSnapshotCreateRequest{
-		SnapshotCreateRequest: req,
-		AsyncMode:             false,
-	}
-
 	url := "/cloudapi/compute/snapshotCreate"
 
-	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
 	}
@@ -55,25 +40,3 @@ func (c Compute) SnapshotCreate(ctx context.Context, req SnapshotCreateRequest)
 
 	return result, nil
 }
-
-// SnapshotCreateAsync creates compute snapshot in async mode
-func (c Compute) SnapshotCreateAsync(ctx context.Context, req SnapshotCreateRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperSnapshotCreateRequest{
-		SnapshotCreateRequest: req,
-		AsyncMode:             true,
-	}
-
-	url := "/cloudapi/compute/snapshotCreate"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/snapshot_rollback.go

@@ -17,16 +17,6 @@ type SnapshotRollbackRequest struct {
 	// Text label of snapshot to rollback
 	// Required: true
 	Label string `url:"label" json:"label" validate:"required"`
-
-	// Rollback with memory dump restore
-	// Required: false
-	// Default: true
-	WithMemory interface{} `url:"with_memory,omitempty" json:"with_memory,omitempty" validate:"omitempty,isBool"`
-}
-
-type wrapperSnapshotRollbackRequest struct {
-	SnapshotRollbackRequest
-	AsyncMode bool `url:"asyncMode"`
 }
 
 // SnapshotRollback rollbacks specified compute snapshot
@@ -36,14 +26,9 @@ func (c Compute) SnapshotRollback(ctx context.Context, req SnapshotRollbackReque
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperSnapshotRollbackRequest{
-		SnapshotRollbackRequest: req,
-		AsyncMode:               false,
-	}
-
 	url := "/cloudapi/compute/snapshotRollback"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -55,25 +40,3 @@ func (c Compute) SnapshotRollback(ctx context.Context, req SnapshotRollbackReque
 
 	return result, nil
 }
-
-// SnapshotRollbackAsync rollbacks specified compute snapshot in async mode
-func (c Compute) SnapshotRollbackAsync(ctx context.Context, req SnapshotRollbackRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperSnapshotRollbackRequest{
-		SnapshotRollbackRequest: req,
-		AsyncMode:               true,
-	}
-
-	url := "/cloudapi/compute/snapshotRollback"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/start.go

@@ -19,12 +19,6 @@ type StartRequest struct {
 	AltBootID uint64 `url:"altBootId,omitempty" json:"altBootId,omitempty"`
 }
 
-type wrapperStartRequest struct {
-	StartRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Start starts compute
 func (c Compute) Start(ctx context.Context, req StartRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -32,14 +26,9 @@ func (c Compute) Start(ctx context.Context, req StartRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperStartRequest{
-		StartRequest: req,
-		AsyncMode:    false,
-	}
-
 	url := "/cloudapi/compute/start"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -51,25 +40,3 @@ func (c Compute) Start(ctx context.Context, req StartRequest) (bool, error) {
 
 	return result, nil
 }
-
-// StartAsync starts compute with AsyncMode
-func (c Compute) StartAsync(ctx context.Context, req StartRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperStartRequest{
-		StartRequest: req,
-		AsyncMode:    true,
-	}
-
-	url := "/cloudapi/compute/start"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/stop.go

@@ -19,12 +19,6 @@ type StopRequest struct {
 	Force bool `url:"force,omitempty" json:"force,omitempty"`
 }
 
-type wrapperStopRequest struct {
-	StopRequest
-
-	AsyncMode bool `url:"asyncMode"`
-}
-
 // Stop stops compute
 func (c Compute) Stop(ctx context.Context, req StopRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -32,14 +26,9 @@ func (c Compute) Stop(ctx context.Context, req StopRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	reqWrapped := wrapperStopRequest{
-		StopRequest: req,
-		AsyncMode:   false,
-	}
-
 	url := "/cloudapi/compute/stop"
 
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return false, err
 	}
@@ -51,25 +40,3 @@ func (c Compute) Stop(ctx context.Context, req StopRequest) (bool, error) {
 
 	return result, nil
 }
-
-// StopAsync stops compute with AsyncMode
-func (c Compute) StopAsync(ctx context.Context, req StopRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	reqWrapped := wrapperStopRequest{
-		StopRequest: req,
-		AsyncMode:   true,
-	}
-
-	url := "/cloudapi/compute/stop"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/compute/update.go

@@ -69,21 +69,6 @@ type UpdateRequest struct {
 	// The OS version that will be installed on the virtual machine
 	// Required: false
 	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
-
-	// Clock type for the VM
-	// Required: false
-	// Default: null
-	Clock string `url:"clock,omitempty" json:"clock,omitempty"`
-
-	// Watchdog action
-	// Required: false
-	// Default: reset
-	WatchdogAction string `url:"watchdog_action,omitempty" json:"watchdog_action,omitempty" validate:"omitempty,watchdogAction"`
-
-	// Memory balloon mode. One of ["auto","legacy","none"]
-	// Required: false
-	// Default: "auto"
-	MemoryBalloonMode string `url:"memory_balloon_mode,omitempty" json:"memory_balloon_mode,omitempty" validate:"omitempty,memoryBalloonMode"`
 }
 
 // Update updates some properties of the compute

pkg/cloudapi/compute/update_acl_access.go

@@ -1,40 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// UpdateACLAccessRequest updates ACL access in a vm
-type UpdateACLAccessRequest struct {
-	ID          uint64   `url:"id"          json:"id" validate:"required"`
-	AccessType  string   `url:"accesstype"  json:"accesstype" validate:"required"`
-	Usernames   []string `url:"usernames,omitempty"   json:"usernames,omitempty"`
-	APIAccesses []uint64 `url:"apiaccesses,omitempty" json:"apiaccesses,omitempty"`
-}
-
-// UpdateACLAccess updates ACL access in a vm.
-func (c Compute) UpdateACLAccess(ctx context.Context, req UpdateACLAccessRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/compute/update_acl_access"
-
-	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}

pkg/cloudapi/compute/user_grant.go

@@ -28,8 +28,6 @@ type UserGrantRequest struct {
 }
 
 // UserGrant grants user access to the compute
-//
-// Deprecated: will be removed in SDK v1.17
 func (c Compute) UserGrant(ctx context.Context, req UserGrantRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/compute/user_list.go

@@ -16,8 +16,6 @@ type UserListRequest struct {
 }
 
 // UserList gets users list for compute
-//
-// Deprecated: will be removed in SDK v1.17
 func (c Compute) UserList(ctx context.Context, req UserListRequest) (*ListUsers, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/compute/user_revoke.go

@@ -20,8 +20,6 @@ type UserRevokeRequest struct {
 }
 
 // UserRevoke revokes user access to the compute
-//
-// Deprecated: will be removed in SDK v1.17
 func (c Compute) UserRevoke(ctx context.Context, req UserRevokeRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/compute/user_update.go

@@ -28,8 +28,6 @@ type UserUpdateRequest struct {
 }
 
 // UserUpdate updates user access to the compute
-//
-// Deprecated: will be removed in SDK v1.17
 func (c Compute) UserUpdate(ctx context.Context, req UserUpdateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudapi/disks/change_disk_storage_policy.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -20,12 +19,6 @@ type ChangeDiskStoragePolicyRequest struct {
 	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
 }
 
-type wrapperChangeDiskStoragePolicyRequest struct {
-	ChangeDiskStoragePolicyRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // ChangeDiskStoragePolicy changes storage policy for disk
 func (d Disks) ChangeDiskStoragePolicy(ctx context.Context, req ChangeDiskStoragePolicyRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -35,12 +28,7 @@ func (d Disks) ChangeDiskStoragePolicy(ctx context.Context, req ChangeDiskStorag
 
 	url := "/cloudapi/disks/change_disk_storage_policy"
 
-	wrappedReq := wrapperChangeDiskStoragePolicyRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ChangeDiskStoragePolicyRequest: req,
-		AsyncMode:                      false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -52,30 +40,3 @@ func (d Disks) ChangeDiskStoragePolicy(ctx context.Context, req ChangeDiskStorag
 
 	return result, nil
 }
-
-// ChangeDiskStoragePolicyAsync changes storage policy for disk in async mode
-func (d Disks) ChangeDiskStoragePolicyAsync(ctx context.Context, req ChangeDiskStoragePolicyRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/change_disk_storage_policy"
-
-	wrappedReq := wrapperChangeDiskStoragePolicyRequest{
-		ChangeDiskStoragePolicyRequest: req,
-		AsyncMode:                      true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/create.go

@@ -39,13 +39,7 @@ type CreateRequest struct {
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 }
 
-type wrapperCreateRequest struct {
+// Create creates a disk
-	CreateRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
-// Create creates a disk in sync mode
 func (d Disks) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
@@ -54,12 +48,7 @@ func (d Disks) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 
 	url := "/cloudapi/disks/create"
 
-	wrappedReq := wrapperCreateRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		CreateRequest: req,
-		AsyncMode:     false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return 0, err
 	}
@@ -71,25 +60,3 @@ func (d Disks) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 
 	return result, nil
 }
-
-// Create creates a disk in async mode
-func (d Disks) CreateAsync(ctx context.Context, req CreateRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/create"
-
-	wrappedReq := wrapperCreateRequest{
-		CreateRequest: req,
-		AsyncMode:     true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	return string(res), nil
-}

pkg/cloudapi/disks/delete.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -24,12 +23,6 @@ type DeleteRequest struct {
 	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
 }
 
-type wrapperDeleteRequest struct {
-	DeleteRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // Delete deletes disk by ID
 func (d Disks) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -39,12 +32,7 @@ func (d Disks) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 
 	url := "/cloudapi/disks/delete"
 
-	wrappedReq := wrapperDeleteRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		DeleteRequest: req,
-		AsyncMode:     false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -56,30 +44,3 @@ func (d Disks) Delete(ctx context.Context, req DeleteRequest) (bool, error) {
 
 	return result, nil
 }
-
-// DeleteAsync deletes disk by ID in async mode
-func (d Disks) DeleteAsync(ctx context.Context, req DeleteRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/delete"
-
-	wrappedReq := wrapperDeleteRequest{
-		DeleteRequest: req,
-		AsyncMode:     true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/delete_disks.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -20,12 +19,6 @@ type DisksDeleteRequest struct {
 	Permanently bool `url:"permanently,omitempty" json:"permanently,omitempty"`
 }
 
-type wrapperDisksDeleteRequest struct {
-	DisksDeleteRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // DeleteDisks deletes multiple disks permanently
 func (d Disks) DeleteDisks(ctx context.Context, req DisksDeleteRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -35,12 +28,7 @@ func (d Disks) DeleteDisks(ctx context.Context, req DisksDeleteRequest) (bool, e
 
 	url := "/cloudapi/disks/deleteDisks"
 
-	wrappedReq := wrapperDisksDeleteRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		DisksDeleteRequest: req,
-		AsyncMode:          false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -52,30 +40,3 @@ func (d Disks) DeleteDisks(ctx context.Context, req DisksDeleteRequest) (bool, e
 
 	return result, nil
 }
-
-// DeleteDisksAsync deletes multiple disks permanently in async mode
-func (d Disks) DeleteDisksAsync(ctx context.Context, req DisksDeleteRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/deleteDisks"
-
-	wrappedReq := wrapperDisksDeleteRequest{
-		DisksDeleteRequest: req,
-		AsyncMode:          true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/ids.go

@@ -25,4 +25,4 @@ func (lsd ListSearchDisks) IDs() []uint64 {
 		res = append(res, d.ID)
 	}
 	return res
-}
+}

pkg/cloudapi/disks/limitio.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -72,12 +71,6 @@ type LimitIORequest struct {
 	SizeIOPSSec uint64 `url:"size_iops_sec,omitempty" json:"size_iops_sec,omitempty"`
 }
 
-type wrapperLimitIORequest struct {
-	LimitIORequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // LimitIO limit IO for a certain disk
 // total and read/write options are not allowed to be combined
 // see http://libvirt.org/formatdomain.html#elementsDisks iotune section for more details
@@ -89,12 +82,7 @@ func (d Disks) LimitIO(ctx context.Context, req LimitIORequest) (bool, error) {
 
 	url := "/cloudapi/disks/limitIO"
 
-	wrappedReq := wrapperLimitIORequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		LimitIORequest: req,
-		AsyncMode:      false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -106,32 +94,3 @@ func (d Disks) LimitIO(ctx context.Context, req LimitIORequest) (bool, error) {
 
 	return result, nil
 }
-
-// LimitIOAsync limits IO for a certain disk in async mode
-// total and read/write options are not allowed to be combined
-// see http://libvirt.org/formatdomain.html#elementsDisks iotune section for more details
-func (d Disks) LimitIOAsync(ctx context.Context, req LimitIORequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/limitIO"
-
-	wrappedReq := wrapperLimitIORequest{
-		LimitIORequest: req,
-		AsyncMode:      true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/list.go

@@ -28,7 +28,7 @@ type ListRequest struct {
 
 	// Find by status
 	// Required: false
-	Status []string `url:"status,omitempty" json:"status,omitempty"`
+	Status string `url:"status,omitempty" json:"status,omitempty"`
 
 	// Find by shared, true or false
 	// Required: false

pkg/cloudapi/disks/models.go

@@ -11,8 +11,8 @@ type ItemDisk struct {
 	// Account name
 	AccountName string `json:"accountName"`
 
-	// Discard
+	// BLK Discard
-	Discard string `json:"discard"`
+	BLKDiscard bool `json:"blkdiscard"`
 
 	// Block size of disk
 	BlockSize string `json:"block_size"`
@@ -20,9 +20,6 @@ type ItemDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
-	// Computes read only
-	ComputesReadOnly map[string]bool `json:"computes_read_only"`
-
 	//Created by
 	CreatedBy string `json:"createdBy"`
 
@@ -169,8 +166,8 @@ type ItemDiskUnattached struct {
 	// Access Control List
 	ACL map[string]interface{} `json:"acl"`
 
-	// Discard
+	// BLK Discard
-	Discard string `json:"discard"`
+	BLKDiscard bool `json:"blkdiscard"`
 
 	// Block size of disk
 	BlockSize string `json:"block_size"`
@@ -331,10 +328,6 @@ type ItemSnapshot struct {
 	// Label
 	Label string `json:"label"`
 
-	// Pool name
-	PoolName string `json:"poolName"`
-
-	// Reference ID
 	ReferenceID string `json:"referenceId"`
 
 	// Resource ID
@@ -406,8 +399,8 @@ type RecordDisk struct {
 	// Account name
 	AccountName string `json:"accountName"`
 
-	// Discard
+	// BLK Discard
-	Discard string `json:"discard"`
+	BLKDiscard bool `json:"blkdiscard"`
 
 	// Block size of disk
 	BlockSize string `json:"block_size"`
@@ -415,9 +408,6 @@ type RecordDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
-	// Computes read only
-	ComputesReadOnly map[string]bool `json:"computes_read_only"`
-
 	// Created by
 	CreatedBy string `json:"createdBy"`
 

pkg/cloudapi/disks/rename.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -20,12 +19,6 @@ type RenameRequest struct {
 	Name string `url:"name" json:"name" validate:"required"`
 }
 
-type wrapperRenameRequest struct {
-	RenameRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // Rename renames disk
 func (d Disks) Rename(ctx context.Context, req RenameRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -35,12 +28,7 @@ func (d Disks) Rename(ctx context.Context, req RenameRequest) (bool, error) {
 
 	url := "/cloudapi/disks/rename"
 
-	wrappedReq := wrapperRenameRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		RenameRequest: req,
-		AsyncMode:     false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -52,30 +40,3 @@ func (d Disks) Rename(ctx context.Context, req RenameRequest) (bool, error) {
 
 	return result, nil
 }
-
-// RenameAsync renames disk in async mode
-func (d Disks) RenameAsync(ctx context.Context, req RenameRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/rename"
-
-	wrappedReq := wrapperRenameRequest{
-		RenameRequest: req,
-		AsyncMode:     true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/replicate.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -32,12 +31,6 @@ type ReplicateRequest struct {
 	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
 }
 
-type wrapperReplicateRequest struct {
-	ReplicateRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // Replicate 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
@@ -49,12 +42,7 @@ func (d Disks) Replicate(ctx context.Context, req ReplicateRequest) (uint64, err
 
 	url := "/cloudapi/disks/replicate"
 
-	wrappedReq := wrapperReplicateRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ReplicateRequest: req,
-		AsyncMode:        false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return 0, err
 	}
@@ -66,32 +54,3 @@ func (d Disks) Replicate(ctx context.Context, req ReplicateRequest) (uint64, err
 
 	return result, nil
 }
-
-// ReplicateAsync creates an empty disk in chosen SEP and pool combination in async mode.
-// Starts replication between chosen disk and newly created disk
-// Note: only TATLIN type SEP are supported for replications between
-func (d Disks) ReplicateAsync(ctx context.Context, req ReplicateRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicate"
-
-	wrappedReq := wrapperReplicateRequest{
-		ReplicateRequest: req,
-		AsyncMode:        true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/replication_resume.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -16,12 +15,6 @@ type ReplicationResumeRequest struct {
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 }
 
-type wrapperReplicationResumeRequest struct {
-	ReplicationResumeRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // ReplicationResume resume suspended replication
 func (d Disks) ReplicationResume(ctx context.Context, req ReplicationResumeRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -31,12 +24,7 @@ func (d Disks) ReplicationResume(ctx context.Context, req ReplicationResumeReque
 
 	url := "/cloudapi/disks/replicationResume"
 
-	wrappedReq := wrapperReplicationResumeRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ReplicationResumeRequest: req,
-		AsyncMode:                false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -48,30 +36,3 @@ func (d Disks) ReplicationResume(ctx context.Context, req ReplicationResumeReque
 
 	return result, nil
 }
-
-// ReplicationResumeAsync resumes suspended replication in async mode
-func (d Disks) ReplicationResumeAsync(ctx context.Context, req ReplicationResumeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationResume"
-
-	wrappedReq := wrapperReplicationResumeRequest{
-		ReplicationResumeRequest: req,
-		AsyncMode:                true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/replication_reverse.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -16,12 +15,6 @@ type ReplicationReverseRequest struct {
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 }
 
-type wrapperReplicationReverseRequest struct {
-	ReplicationReverseRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // ReplicationReverse change role between disks replications
 func (d Disks) ReplicationReverse(ctx context.Context, req ReplicationReverseRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -31,12 +24,7 @@ func (d Disks) ReplicationReverse(ctx context.Context, req ReplicationReverseReq
 
 	url := "/cloudapi/disks/replicationReverse"
 
-	wrappedReq := wrapperReplicationReverseRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ReplicationReverseRequest: req,
-		AsyncMode:                 false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -48,30 +36,3 @@ func (d Disks) ReplicationReverse(ctx context.Context, req ReplicationReverseReq
 
 	return result, nil
 }
-
-// ReplicationReverseAsync changes role between disks replications in async mode
-func (d Disks) ReplicationReverseAsync(ctx context.Context, req ReplicationReverseRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationReverse"
-
-	wrappedReq := wrapperReplicationReverseRequest{
-		ReplicationReverseRequest: req,
-		AsyncMode:                 true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/replication_start.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -20,12 +19,6 @@ type ReplicationStartRequest struct {
 	TargetDiskID uint64 `url:"targetDiskId" json:"targetDiskId" validate:"required"`
 }
 
-type wrapperReplicationStartRequest struct {
-	ReplicationStartRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // 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) {
@@ -36,12 +29,7 @@ func (d Disks) ReplicationStart(ctx context.Context, req ReplicationStartRequest
 
 	url := "/cloudapi/disks/replicationStart"
 
-	wrappedReq := wrapperReplicationStartRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ReplicationStartRequest: req,
-		AsyncMode:               false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -53,31 +41,3 @@ func (d Disks) ReplicationStart(ctx context.Context, req ReplicationStartRequest
 
 	return result, nil
 }
-
-// ReplicationStartAsync starts replication between two chosen disks in async mode. 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) ReplicationStartAsync(ctx context.Context, req ReplicationStartRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationStart"
-
-	wrappedReq := wrapperReplicationStartRequest{
-		ReplicationStartRequest: req,
-		AsyncMode:               true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/replication_stop.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -16,12 +15,6 @@ type ReplicationStopRequest struct {
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 }
 
-type wrapperReplicationStopRequest struct {
-	ReplicationStopRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // ReplicationStop remove replication between disks completely
 func (d Disks) ReplicationStop(ctx context.Context, req ReplicationStopRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
@@ -31,12 +24,7 @@ func (d Disks) ReplicationStop(ctx context.Context, req ReplicationStopRequest)
 
 	url := "/cloudapi/disks/replicationStop"
 
-	wrappedReq := wrapperReplicationStopRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ReplicationStopRequest: req,
-		AsyncMode:              false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -48,30 +36,3 @@ func (d Disks) ReplicationStop(ctx context.Context, req ReplicationStopRequest)
 
 	return result, nil
 }
-
-// ReplicationStopAsync removes replication between disks completely in async mode
-func (d Disks) ReplicationStopAsync(ctx context.Context, req ReplicationStopRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationStop"
-
-	wrappedReq := wrapperReplicationStopRequest{
-		ReplicationStopRequest: req,
-		AsyncMode:              true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/replication_suspend.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -16,12 +15,6 @@ type ReplicationSuspendRequest struct {
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 }
 
-type wrapperReplicationSuspendRequest struct {
-	ReplicationSuspendRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // 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)
@@ -31,12 +24,7 @@ func (d Disks) ReplicationSuspend(ctx context.Context, req ReplicationSuspendReq
 
 	url := "/cloudapi/disks/replicationSuspend"
 
-	wrappedReq := wrapperReplicationSuspendRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ReplicationSuspendRequest: req,
-		AsyncMode:                 false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -48,30 +36,3 @@ func (d Disks) ReplicationSuspend(ctx context.Context, req ReplicationSuspendReq
 
 	return result, nil
 }
-
-// ReplicationSuspendAsync pauses replication with possibility to resume from pause moment in async mode
-func (d Disks) ReplicationSuspendAsync(ctx context.Context, req ReplicationSuspendRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/replicationSuspend"
-
-	wrappedReq := wrapperReplicationSuspendRequest{
-		ReplicationSuspendRequest: req,
-		AsyncMode:                 true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}

pkg/cloudapi/disks/resize.go

@@ -2,7 +2,6 @@ package disks
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -20,12 +19,6 @@ type ResizeRequest struct {
 	Size uint64 `url:"size" json:"size" validate:"required"`
 }
 
-type wrapperResizeRequest struct {
-	ResizeRequest
-
-	AsyncMode bool `url:"async_mode" json:"async_mode"`
-}
-
 // 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.
@@ -38,12 +31,7 @@ func (d Disks) Resize2(ctx context.Context, req ResizeRequest) (bool, error) {
 
 	url := "/cloudapi/disks/resize2"
 
-	wrappedReq := wrapperResizeRequest{
+	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-		ResizeRequest: req,
-		AsyncMode:     false,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
 	if err != nil {
 		return false, err
 	}
@@ -55,33 +43,3 @@ func (d Disks) Resize2(ctx context.Context, req ResizeRequest) (bool, error) {
 
 	return result, nil
 }
-
-// Resize2Async resizes disk in async mode
-// 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 "old" virtual machines. Only unassigned disks and disks, assigned with computes.
-func (d Disks) Resize2Async(ctx context.Context, req ResizeRequest) (string, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return "", validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/resize2"
-
-	wrappedReq := wrapperResizeRequest{
-		ResizeRequest: req,
-		AsyncMode:     true,
-	}
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, wrappedReq)
-	if err != nil {
-		return "", err
-	}
-
-	var result string
-	if err := json.Unmarshal(res, &result); err != nil {
-		return "", err
-	}
-
-	return result, nil
-}