v1.8.0

pkg/cloudbroker/account/create.go

@@ -54,6 +54,11 @@ type CreateRequest struct {
 	// i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
 	// Required: false
 	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
+
+	// Advanced compute features,
+	// one of: hugepages, numa, cpupin, vfnic
+	// Required: false
+	ComputeFeatures []string `url:"computeFeatures,omitempty" json:"computeFeatures,omitempty" validate:"omitempty,computeFeatures"`
 }
 
 // Create creates account

pkg/cloudbroker/account/grant_access_templates.go

@@ -0,0 +1,42 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GrantAccessTemplatesRequest struct to share images with account
+type GrantAccessTemplatesRequest struct {
+	// ID an account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// list of image IDs
+	// Required: true
+	ImageIDs []uint64 `url:"imageIds" json:"imageIds" validate:"required"`
+}
+
+// GrantAccessTemplates shares specified images with specified account
+func (a Account) GrantAccessTemplates(ctx context.Context, req GrantAccessTemplatesRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/grantAccessTemplates"
+
+	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

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListRequest struct to get list of accounts
@@ -24,6 +26,10 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -35,6 +41,7 @@ type ListRequest struct {
 
 // List gets list of all accounts the user has access to as a ListAccounts struct
 func (a Account) List(ctx context.Context, req ListRequest) (*ListAccounts, error) {
+
 	res, err := a.ListRaw(ctx, req)
 	if err != nil {
 		return nil, err
@@ -52,6 +59,11 @@ func (a Account) List(ctx context.Context, req ListRequest) (*ListAccounts, erro
 
 // ListRaw gets list of all accounts the user has access to as an array of bytes
 func (a Account) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudbroker/account/list"
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudbroker/account/list_available_templates.go

@@ -0,0 +1,41 @@
+package account
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ListAvailableTemplatesRequest struct to list templates who sharedWith include accountId
+type ListAvailableTemplatesRequest struct {
+	// ID an account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+}
+
+// ListAvailableTemplates lists templates who sharedWith include accountId
+func (a Account) ListAvailableTemplates(ctx context.Context, req ListAvailableTemplatesRequest) ([]uint64, error) {
+
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/listAvailableTemplates"
+
+	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := make([]uint64, 0)
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return list, nil
+}

pkg/cloudbroker/account/list_computes.go

@@ -46,6 +46,10 @@ type ListComputesRequest struct {
 	// Required: false
 	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -57,6 +61,7 @@ type ListComputesRequest struct {
 
 // ListComputes gets list of all compute instances under specified account, accessible by the user
 func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (*ListComputes, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/account/list_deleted.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // ListDeletedRequest struct to get list of deleted accounts
@@ -20,6 +22,10 @@ type ListDeletedRequest struct {
 	// Required: false
 	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -31,6 +37,11 @@ type ListDeletedRequest struct {
 
 // ListDeleted gets list all deleted accounts the user has access to
 func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListAccounts, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
 	url := "/cloudbroker/account/listDeleted"
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)

pkg/cloudbroker/account/list_disks.go

@@ -30,6 +30,10 @@ type ListDisksRequest struct {
 	// Required: false
 	Type string `url:"type,omitempty" json:"type,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListDisksRequest struct {
 
 // ListDisks gets list of all currently unattached disks under specified account
 func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (*ListDisks, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/account/list_flip_groups.go

@@ -38,6 +38,10 @@ type ListFLIPGroupsRequest struct {
 	// Required: false
 	FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -49,6 +53,7 @@ type ListFLIPGroupsRequest struct {
 
 // ListFLIPGroups gets list of all FLIPGroups under specified account, accessible by the user
 func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (*ListFLIPGroups, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/account/list_rg.go

@@ -41,10 +41,15 @@ type ListRGRequest struct {
 	// Find by status
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
 }
 
 // ListRG gets list of all resource groups under specified account, accessible by the user
 func (a Account) ListRG(ctx context.Context, req ListRGRequest) (*ListRG, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/account/list_vins.go

@@ -30,6 +30,10 @@ type ListVINSRequest struct {
 	// Required: false
 	ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -41,6 +45,7 @@ type ListVINSRequest struct {
 
 // ListVINS gets list of all ViNSes under specified account, accessible by the user
 func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (*ListVINS, error) {
+
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))

pkg/cloudbroker/account/models.go

@@ -143,6 +143,9 @@ type InfoAccount struct {
 	// Company URL
 	CompanyURL string `json:"companyurl"`
 
+	// Compute Features
+	ComputeFeatures []string `json:"computeFeatures"`
+
 	// CPU allocation parameter
 	CPUAllocationParameter string `json:"cpu_allocation_parameter"`
 
@@ -530,6 +533,12 @@ type ItemVINS struct {
 	// External IP
 	ExternalIP string `json:"externalIP"`
 
+	// Extnet ID
+	ExtnetId uint64 `json:"extnetId"`
+
+	// Free IPs
+	FreeIPs uint64 `json:"freeIPs"`
+
 	// ID
 	ID uint64 `json:"id"`
 

pkg/cloudbroker/account/revoke_access_templates.go

@@ -0,0 +1,42 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// RevokeAccessTemplatesRequest struct to unshare images with account
+type RevokeAccessTemplatesRequest struct {
+	// ID an account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// list of image IDs
+	// Required: true
+	ImageIDs []uint64 `url:"imageIds" json:"imageIds" validate:"required"`
+}
+
+// RevokeAccessTemplates unshares specified images with specified account
+func (a Account) RevokeAccessTemplates(ctx context.Context, req RevokeAccessTemplatesRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/revokeAccessTemplates"
+
+	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/set_cpu_allocation_parameter.go

@@ -11,7 +11,7 @@ import (
 type SetCPUAllocationParameterRequest struct {
 	// Account ID
 	// Required: true
-	AccountID uint64 `url:"accountId" json:"accoutnId" validate:"required"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// CPU allocation parameter.
 	// If "strict" VM can't be run if not enough CPU resources.

pkg/cloudbroker/account/set_cpu_allocation_ratio.go

@@ -11,7 +11,7 @@ import (
 type SetCPUAllocationRatioRequest struct {
 	// Account ID
 	// Required: true
-	AccountID uint64 `url:"accountId" json:"accoutnId" validate:"required"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// CPU allocation ratio, i.e. one pCPU = ratio*vCPU
 	// if don't set, default value = 0

pkg/cloudbroker/account/update_compute_features.go

@@ -0,0 +1,43 @@
+package account
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// UpdateComputeFeaturesRequest struct to update advanced compute features
+type UpdateComputeFeaturesRequest struct {
+	// ID of account
+	// Required: true
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Advanced compute features,
+	// one of: hugepages, numa, cpupin, vfnic
+	// Required: false
+	ComputeFeatures []string `url:"computeFeatures,omitempty" json:"computeFeatures,omitempty" validate:"omitempty,computeFeatures"`
+}
+
+// UpdateComputeFeatures updates advanced compute features
+func (a Account) UpdateComputeFeatures(ctx context.Context, req UpdateComputeFeaturesRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/account/updateComputeFeatures"
+
+	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
+}