v12.0.0

pkg/cloudbroker/account/account.go

@@ -1,7 +1,7 @@
 // API Actor API for managing account
 package account
 
-import "repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/interfaces"
+import "repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/interfaces"
 
 // Structure for creating request to account
 type Account struct {

pkg/cloudbroker/account/add_storage_policy.go

@@ -0,0 +1,46 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
+)
+
+// AddStoragePolicyRequest struct for adding storage policy to the account
+type AddStoragePolicyRequest struct {
+	// ID of account to add to
+	// Required: true
+	AccountID uint64 `url:"account_id" json:"account_id" validate:"required"`
+
+	// ID of the storage policy to which to connect account
+	// Required: true
+	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
+
+	// Limit storage resources GB. Or -1 unlimit
+	// Required: false
+	Limit int `url:"limit,omitempty" json:"limit,omitempty"`
+}
+
+// AddStoragePolicy add storage policy to the account.
+func (a Account) AddStoragePolicy(ctx context.Context, req AddStoragePolicyRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/add_storage_policy"
+
+	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/cloudbroker/account/add_user.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // AddUserRequest struct for adding permission to access to account for a user

pkg/cloudbroker/account/add_zone.go

@@ -0,0 +1,42 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
+)
+
+// AddZoneRequest struct for adding zone to account for a user
+type AddZoneRequest struct {
+	// ID of account to add to
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// IDs of zones
+	// Required: true
+	ZoneIDs []uint64 `url:"zoneIds" json:"zoneIds" validate:"required"`
+}
+
+// AddUser gives a user access rights.
+func (a Account) AddZone(ctx context.Context, req AddZoneRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/addZone"
+
+	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/cloudbroker/account/audits.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // AuditsRequest struct to give list of account audits

pkg/cloudbroker/account/create.go

@@ -5,7 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/constants"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // CreateRequest struct for creating account
@@ -26,6 +27,10 @@ type CreateRequest struct {
 	// Required: false
 	EmailAddress string `url:"emailaddress,omitempty" json:"emailaddress,omitempty" validate:"omitempty,email"`
 
+	// Storage policies
+	// Required: false
+	StoragePolicies []StoragePolicy `url:"-" json:"storage_policies,omitempty"`
+
 	// Max size of memory in MB
 	// Required: false
 	MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
@@ -60,9 +65,22 @@ type CreateRequest struct {
 	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
 
 	// Advanced compute features,
-	// one of: hugepages, numa, cpupin, vfnic, dpdk, changemac
+	// one of: hugepages, numa, cpupin, vfnic, dpdk, changemac, trunk
 	// Required: false
 	ComputeFeatures []string `url:"computeFeatures,omitempty" json:"computeFeatures,omitempty" validate:"omitempty,computeFeatures"`
+
+	// Default zone ID
+	// Required: false
+	DefaultZoneID uint64 `url:"defaultZoneId,omitempty" json:"defaultZoneId,omitempty"`
+
+	// Zones
+	// Required: false
+	ZoneIDs []uint64 `url:"zoneIds,omitempty" json:"zoneIds,omitempty"`
+}
+
+type StoragePolicy struct {
+	ID    uint64 `url:"id" json:"id"`
+	Limit int    `url:"limit" json:"limit"`
 }
 
 // Create creates account
@@ -75,7 +93,7 @@ func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error)
 
 	url := "/cloudbroker/account/create"
 
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudbroker/account/del_storage_policy.go

@@ -0,0 +1,42 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
+)
+
+// DelStoragePolicyRequest struct for deleting storage policy to the account
+type DelStoragePolicyRequest struct {
+	// ID of account
+	// Required: true
+	AccountID uint64 `url:"account_id" json:"account_id" validate:"required"`
+
+	// ID of the storage policy to which to disconnect account
+	// Required: true
+	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
+}
+
+// DelStoragePolicy delete storage policy to the account.
+func (a Account) DelStoragePolicy(ctx context.Context, req DelStoragePolicyRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/del_storage_policy"
+
+	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/cloudbroker/account/delete.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // DeleteRequest struct to delete account
@@ -20,25 +20,21 @@ type DeleteRequest struct {
 	// Name of account
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`
-
-	// Reason of deleting
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,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) (bool, error) {
+func (a Account) Delete(ctx context.Context, req DeleteRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/account/delete"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(result), nil
 }

pkg/cloudbroker/account/delete_accounts.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // DeleteAccountsRequest struct to delete group of accounts
@@ -19,18 +19,18 @@ type DeleteAccountsRequest struct {
 }
 
 // DeleteAccounts destroys a group of accounts
-func (a Account) DeleteAccounts(ctx context.Context, req DeleteAccountsRequest) (bool, error) {
+func (a Account) DeleteAccounts(ctx context.Context, req DeleteAccountsRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/account/deleteAccounts"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(res), nil
 }

pkg/cloudbroker/account/delete_user.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // DeleteUserRequest struct to revoke access to account

pkg/cloudbroker/account/disable.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // DisableRequest struct to disable account
@@ -13,10 +13,6 @@ type DisableRequest struct {
 	// ID of account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
-
-	// Reason of disabling
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Disable disables an account

pkg/cloudbroker/account/disable_accounts.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // DisableAccountsRequest struct to disable group of accounts
@@ -12,25 +12,21 @@ type DisableAccountsRequest struct {
 	// IDs of accounts
 	// Required: true
 	AccountIDs []uint64 `url:"accountIds" json:"accountIds" validate:"min=1"`
-
-	// Reason of disabling
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // DisableAccounts disables accounts
-func (a Account) DisableAccounts(ctx context.Context, req DisableAccountsRequest) (bool, error) {
+func (a Account) DisableAccounts(ctx context.Context, req DisableAccountsRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/account/disableAccounts"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(res), nil
 }

pkg/cloudbroker/account/enable.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // EnableRequest struct to enable account

pkg/cloudbroker/account/enable_accounts.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // EnableAccountsRequest to enable group of accounts
@@ -15,18 +15,18 @@ type EnableAccountsRequest struct {
 }
 
 // EnableAccounts enables accounts
-func (a Account) EnableAccounts(ctx context.Context, req EnableAccountsRequest) (bool, error) {
+func (a Account) EnableAccounts(ctx context.Context, req EnableAccountsRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/account/enableAccounts"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(res), nil
 }

pkg/cloudbroker/account/filter_test.go

@@ -7,18 +7,7 @@ import (
 var accounts = ListAccounts{
 	Data: []ItemAccount{
 		{
-			Meta: []interface{}{},
 			InfoAccount: InfoAccount{
-				ACL: []ACL{
-					{
-						Explicit:    true,
-						GUID:        "",
-						Right:       "CXDRAU",
-						Status:      "CONFIRMED",
-						Type:        "U",
-						UserGroupID: "not_really_timofey_tkachev_1@decs3o",
-					},
-				},
 				CreatedTime: 1676878820,
 				DeletedTime: 0,
 				ID:          132847,
@@ -26,20 +15,19 @@ var accounts = ListAccounts{
 				Status:      "CONFIRMED",
 				UpdatedTime: 1676645275,
 			},
+			ACL: []ACL{
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "CXDRAU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "not_really_timofey_tkachev_1@decs3o",
+				},
+			},
 		},
 		{
-			Meta: []interface{}{},
 			InfoAccount: InfoAccount{
-				ACL: []ACL{
-					{
-						Explicit:    true,
-						GUID:        "",
-						Right:       "CXDRAU",
-						Status:      "CONFIRMED",
-						Type:        "U",
-						UserGroupID: "timofey_tkachev_1@decs3o",
-					},
-				},
 				CreatedTime: 1676645275,
 				DeletedTime: 1677723401,
 				ID:          132846,
@@ -47,28 +35,19 @@ var accounts = ListAccounts{
 				Status:      "DELETED",
 				UpdatedTime: 1676645275,
 			},
+			ACL: []ACL{
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "CXDRAU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "timofey_tkachev_1@decs3o",
+				},
+			},
 		},
 		{
-			Meta: []interface{}{},
 			InfoAccount: InfoAccount{
-				ACL: []ACL{
-					{
-						Explicit:    true,
-						GUID:        "",
-						Right:       "CXDRAU",
-						Status:      "CONFIRMED",
-						Type:        "U",
-						UserGroupID: "timofey_tkachev_1@decs3o",
-					},
-					{
-						Explicit:    true,
-						GUID:        "",
-						Right:       "CXDRAU",
-						Status:      "CONFIRMED",
-						Type:        "U",
-						UserGroupID: "second_account@decs3o",
-					},
-				},
 				CreatedTime: 1676883850,
 				DeletedTime: 1676883899,
 				ID:          132848,
@@ -76,6 +55,24 @@ var accounts = ListAccounts{
 				Status:      "DELETED",
 				UpdatedTime: 1676878820,
 			},
+			ACL: []ACL{
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "CXDRAU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "timofey_tkachev_1@decs3o",
+				},
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "CXDRAU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "second_account@decs3o",
+				},
+			},
 		},
 	},
 	EntryCount: 3,

pkg/cloudbroker/account/get.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // GetRequest struct to get information about account

pkg/cloudbroker/account/get_resource_consumption.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // GetResourceConsumptionRequest struct for getting resource consumption

pkg/cloudbroker/account/grant_access_templates.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // GrantAccessTemplatesRequest struct to share images with account

pkg/cloudbroker/account/list.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListRequest struct to get list of accounts
@@ -30,6 +30,11 @@ type ListRequest struct {
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 
+	// Sort by zone id
+	// Default value: 0
+	// Required: false
+	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudbroker/account/list_available_templates.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListAvailableTemplatesRequest struct to list templates who sharedWith include accountId

pkg/cloudbroker/account/list_computes.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListComputesRequest struct to a get list of compute instances

pkg/cloudbroker/account/list_deleted.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListDeletedRequest struct to get list of deleted accounts

pkg/cloudbroker/account/list_disks.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListDisksRequest struct to get list of deleted disks

pkg/cloudbroker/account/list_flip_groups.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListFLIPGroupsRequest struct to get list of FLIPGroups

pkg/cloudbroker/account/list_rg.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListRGRequest struct to get list of resource groups

pkg/cloudbroker/account/list_vins.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // ListVINSRequest struct to get list of VINS

pkg/cloudbroker/account/models.go

@@ -46,6 +46,18 @@ type ListResources struct {
 	EntryCount uint64 `json:"entryCount"`
 }
 
+// Policy
+type Policy struct {
+	// Size of the disk
+	DiskSize float64 `json:"disksize"`
+
+	// Max size of the disk
+	DiskSizeMax float64 `json:"disksizemax"`
+
+	// SEPs used
+	SEPs map[string]map[string]DiskUsage `json:"seps"`
+}
+
 type Resource struct {
 	// Number of cores
 	CPU int64 `json:"cpu"`
@@ -70,6 +82,9 @@ type Resource struct {
 
 	// SEPs
 	SEPs map[string]map[string]DiskUsage `json:"seps"`
+
+	// Policies
+	Policies map[string]Policy `json:"policies"`
 }
 
 // Disk usage
@@ -102,6 +117,15 @@ type ACL struct {
 	UserGroupID string `json:"userGroupId"`
 }
 
+// Access Control List with emails field
+type ACLWithEmails struct {
+	// ACL
+	ACL
+
+	// Emails
+	Emails []string `json:"emails"`
+}
+
 // Resource limits
 type ResourceLimits struct {
 	// CuC
@@ -124,6 +148,9 @@ type ResourceLimits struct {
 
 	// GPUUnits
 	GPUUnits float64 `json:"gpu_units"`
+
+	// Storage policies
+	StoragePolicies []StoragePolicy `json:"storage_policy"`
 }
 
 // Main information about account
@@ -131,12 +158,6 @@ type InfoAccount struct {
 	// DCLocation
 	DCLocation string `json:"DCLocation"`
 
-	// CKey
-	CKey string `json:"_ckey"`
-
-	// Access Control List
-	ACL []ACL `json:"acl"`
-
 	// Company
 	Company string `json:"company"`
 
@@ -194,6 +215,9 @@ type InfoAccount struct {
 	// Status
 	Status string `json:"status"`
 
+	// Storage policy ids
+	StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
+
 	// UniqPools
 	UniqPools []string `json:"uniqPools"`
 
@@ -205,21 +229,43 @@ type InfoAccount struct {
 
 	// List of VINS IDs
 	VINS []uint64 `json:"vins"`
+
+	// Default zone ID
+	DefaultZoneID uint64 `json:"defaultZoneId"`
+}
+
+// Deatailed information about the account zone
+type ZoneID struct {
+	// ID of zone
+	ID int64 `json:"id"`
+
+	// Name of zone
+	Name string `json:"name"`
 }
 
 // Deatailed information about account
 type RecordAccount struct {
 	// Main information about account
 	InfoAccount
+
+	// Access Control List
+	ACL []ACLWithEmails `json:"acl"`
+
+	// Zones IDs
+	ZoneIDs []ZoneID `json:"zoneIds"`
 }
 
 // More information about account
 type ItemAccount struct {
-	// Meta
-	Meta []interface{} `json:"_meta"`
+
+	// Access Control List
+	ACL []ACL `json:"acl"`
 
 	// Main information about account
 	InfoAccount
+
+	// Zones
+	ZoneIDs []uint64 `json:"zoneIds"`
 }
 
 // List of accounts

pkg/cloudbroker/account/remove_zone.go

@@ -0,0 +1,42 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
+)
+
+// RemoveZoneRequest struct for removing zone from account for a user
+type RemoveZoneRequest struct {
+	// ID of account to add to
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// IDs of zones
+	// Required: true
+	ZoneIDs []uint64 `url:"zoneIds" json:"zoneIds" validate:"required"`
+}
+
+// RemoveZone removes zones with ids provided from a user.
+func (a Account) RemoveZone(ctx context.Context, req RemoveZoneRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/removeZone"
+
+	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/cloudbroker/account/restore.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/http"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // RestoreRequest struct to restore a deleted account
@@ -12,25 +12,21 @@ type RestoreRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
-
-	// Reason of disabling
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Restore restores a deleted account
-func (a Account) Restore(ctx context.Context, req RestoreRequest) (bool, error) {
+func (a Account) Restore(ctx context.Context, req RestoreRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/account/restore"
 
-	_, err = a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	result, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	return true, nil
+	return string(result), nil
 }

pkg/cloudbroker/account/revoke_access_templates.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // RevokeAccessTemplatesRequest struct to unshare images with account

pkg/cloudbroker/account/serialize.go

@@ -3,7 +3,7 @@ package account
 import (
 	"encoding/json"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/serialization"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/serialization"
 )
 
 // Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.

pkg/cloudbroker/account/set_cpu_allocation_parameter.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // SetCPUAllocationParameterRequest struct for setting CPU allocation parameter

pkg/cloudbroker/account/set_cpu_allocation_ratio.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // SetCPUAllocationRatioRequest struct for setting CPU allocation ratio

pkg/cloudbroker/account/update.go

@@ -5,7 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/constants"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // UpdateRequest struct to update account
@@ -46,6 +47,10 @@ type UpdateRequest struct {
 	// Required: false
 	SendAccessEmails bool `url:"sendAccessEmails" json:"sendAccessEmails"`
 
+	// Storage policies
+	// Required: false
+	StoragePolicies []StoragePolicy `url:"-" json:"storage_policies,omitempty"`
+
 	// Limit (positive) or disable (0) GPU resources
 	// Required: false
 	GPUUnits int64 `url:"gpu_units,omitempty" json:"gpu_units,omitempty"`
@@ -59,6 +64,10 @@ type UpdateRequest struct {
 	// Default: false
 	// Required: false
 	ClearUniqPools bool `url:"clearUniqPools" json:"clearUniqPools"`
+
+	// Default zone ID
+	// Required: false
+	DefaultZoneID uint64 `url:"defaultZoneId,omitempty" json:"defaultZoneId,omitempty"`
 }
 
 // Update updates an account name and resource types and limits
@@ -70,7 +79,7 @@ func (a Account) Update(ctx context.Context, req UpdateRequest) (bool, error) {
 
 	url := "/cloudbroker/account/update"
 
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := a.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
 		return false, err
 	}

pkg/cloudbroker/account/update_compute_features.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // UpdateComputeFeaturesRequest struct to update advanced compute features
@@ -15,7 +15,7 @@ type UpdateComputeFeaturesRequest struct {
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// Advanced compute features,
-	// one of: hugepages, numa, cpupin, vfnic, dpdk, changemac
+	// one of: hugepages, numa, cpupin, vfnic, dpdk, changemac, trunk
 	// Required: false
 	ComputeFeatures []string `url:"computeFeatures,omitempty" json:"computeFeatures,omitempty" validate:"omitempty,computeFeatures"`
 }

pkg/cloudbroker/account/update_resource_types.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // UpdateResourceTypesRequest struct to update resource types in account

pkg/cloudbroker/account/update_user.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/validators"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/validators"
 )
 
 // UpdateUserRequest struct to update user access rights