v1.12.2

pkg/cloudbroker/account/add_storage_policy.go

@@ -0,0 +1,46 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/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/create.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -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" validate:"required"`
+
 	// Max size of memory in MB
 	// Required: false
 	MaxMemoryCapacity int64 `url:"maxMemoryCapacity,omitempty" json:"maxMemoryCapacity,omitempty"`
@@ -73,6 +78,11 @@ type CreateRequest struct {
 	ZoneIDs []uint64 `url:"zoneIds,omitempty" json:"zoneIds,omitempty"`
 }
 
+type StoragePolicy struct {
+	ID    int64 `url:"id" json:"id"`
+	Limit int   `url:"limit" json:"limit"`
+}
+
 // Create creates account
 // Setting a cloud unit maximum to -1 or empty will not put any restrictions on the resource
 func (a Account) Create(ctx context.Context, req CreateRequest) (uint64, error) {
@@ -83,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/decort-golang-sdk/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/list.go

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

@@ -133,6 +133,9 @@ type ResourceLimits struct {
 
 	// GPUUnits
 	GPUUnits float64 `json:"gpu_units"`
+
+	// Storage policies
+	StoragePolicies []StoragePolicy `json:"storage_policy"`
 }
 
 // Main information about account
@@ -200,6 +203,9 @@ type InfoAccount struct {
 	// Status
 	Status string `json:"status"`
 
+	// Storage policy ids
+	StoragePolicyIDs []uint64 `json:"storage_policy_ids"`
+
 	// UniqPools
 	UniqPools []string `json:"uniqPools"`
 
@@ -234,7 +240,7 @@ type RecordAccount struct {
 	ACL []ACLWithEmails `json:"acl"`
 
 	// Zones IDs
-	ZoneIDs []ZoneID
+	ZoneIDs []ZoneID `json:"zoneIds"`
 }
 
 // More information about account
@@ -249,7 +255,7 @@ type ItemAccount struct {
 	InfoAccount
 
 	// Zones
-	ZoneIDs []uint64
+	ZoneIDs []uint64 `json:"zoneIds"`
 }
 
 // List of accounts

pkg/cloudbroker/account/update.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -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"`
@@ -74,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
 	}