v1.15.2

v1.15.2

pkg/cloudapi/compute/models.go

@@ -86,7 +86,7 @@ type ItemSnapshot struct {
 	// Compute info
 	Compute RecordCompute `json:"compute"`
 
-	// List disk ID
+	// List of disk IDs
 	Disks []uint64 `json:"disks"`
 
 	// GUID
@@ -690,7 +690,10 @@ type ListOSUser []ItemOSUser
 
 // Main information about snapsets
 type ItemSnapSet struct {
-	// List disk IDs
+	// Compute info
+	Compute RecordCompute `json:"compute"`
+
+	// List disk ID
 	Disks []uint64 `json:"disks"`
 
 	// GUID
@@ -699,6 +702,9 @@ type ItemSnapSet struct {
 	// Label
 	Label string `json:"label"`
 
+	// Memory dump image ID
+	MemoryDumpImage uint64 `json:"memory_dump_image"`
+
 	// Timestamp
 	Timestamp uint64 `json:"timestamp"`
 }

pkg/cloudapi/image/list.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -102,6 +103,6 @@ func (i Image) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
 
 	url := "/cloudapi/image/list"
 
-	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := i.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	return res, err
 }

pkg/cloudbroker/account/set_cpu_allocation_ratio.go

@@ -16,7 +16,7 @@ type SetCPUAllocationRatioRequest struct {
 
 	// CPU allocation ratio, i.e. one pCPU = ratio*vCPU
 	// Required: true
-	Ratio float64 `url:"ratio" json:"ratio" validate:"required"`
+	Ratio uint64 `url:"ratio" json:"ratio" validate:"required"`
 }
 
 // SetCPUAllocationRatio sets CPU allocation ratio

pkg/cloudbroker/image/list.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -102,6 +103,6 @@ func (i Image) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
 
 	url := "/cloudbroker/image/list"
 
-	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := i.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	return res, err
 }

pkg/cloudbroker/node/models.go

@@ -161,8 +161,11 @@ type CpuInfo struct {
 	// Flags
 	Flags []string `json:"flags"`
 
-	// Mddel name
+	// Model name
 	ModelName string `json:"model_name"`
+
+	// Max supported generation
+	MaxSupportedGeneration string `json:"max_supported_generation"`
 }
 
 // Main information about node

pkg/cloudbroker/sep/consumption.go

@@ -11,12 +11,12 @@ import (
 // ConsumptionRequest struct to get consumption info
 type ConsumptionRequest struct {
 	// Storage endpoint provider ID
-	// Required: true
-	SEPID uint64 `url:"sep_id" json:"sep_id" validate:"required"`
+	// Required: false
+	SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
 }
 
 // Consumption gets SEP consumption info
-func (s SEP) Consumption(ctx context.Context, req ConsumptionRequest) (*RecordConsumption, error) {
+func (s SEP) Consumption(ctx context.Context, req ConsumptionRequest) (*ListConsumption, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
@@ -29,7 +29,7 @@ func (s SEP) Consumption(ctx context.Context, req ConsumptionRequest) (*RecordCo
 		return nil, err
 	}
 
-	info := RecordConsumption{}
+	info := ListConsumption{}
 
 	err = json.Unmarshal(res, &info)
 	if err != nil {

pkg/cloudbroker/sep/models.go

@@ -47,8 +47,22 @@ type ByPool struct {
 	UsageLimit uint64 `json:"usage_limit"`
 }
 
+// List of Resource groups
+type ListConsumption struct {
+	// Data
+	Data []RecordConsumption `json:"data"`
+
+	// Enrtry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
 // Main information about consumption
 type RecordConsumption struct {
+	// ID
+	ID uint64 `json:"id"`
+
+	// Name
+	Name string `json:"name"`
 	// By pool
 	ByPool map[string]ByPool `json:"byPool"`
 
@@ -57,6 +71,9 @@ type RecordConsumption struct {
 
 	// Type
 	Type string `json:"type"`
+
+	// Consumed by
+	ConsumedBy []uint64 `json:"consumedBy"`
 }
 
 // Main information about URI