v1.5.1

CHANGELOG.md

@@ -1,4 +1,6 @@
-## Version 1.4.7
+## Version 1.5.1
 
 ### Bugfix
-- Deleted validate:"required" tag from IPCIDR field in cloudapi/vins/createInRg request struct
+- Changed StatelessSepID field type in cloudapi/compute/get and cloudapi/compute/list responde models
+
+- Added oppurtunity to create compute without interface in cloudapi/cloubroker/kvm*/create*

README.md

@@ -9,6 +9,7 @@ Decort SDK - это библиотека, написанная на языке G
     - Версия 1.2.x Decort-SDK соответствует 3.8.5 версии платформы
     - Версия 1.3.x Decort-SDK соответствует 3.8.5 версии платформы
     - Версия 1.4.x Decort-SDK соответствует 3.8.6 версии платформы
+    - Версия 1.5.x Decort-SDK соответствует 3.8.7 версии платформы
 
 ## Оглавление
 

internal/validators/custom.go

@@ -6,6 +6,13 @@ import (
 	"strings"
 )
 
+// computeDriverValidator is used to validate Driver field in kvmx86/kvmppc create.
+func computeDriverValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return StringInSlice(fieldValue, computeDriverValues)
+}
+
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()

internal/validators/messages.go

@@ -107,6 +107,12 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDataDisksValues))
 
+	case "computeDriver":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computeDriverValues))
+
 	// Disk Validators
 	case "diskType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",

internal/validators/validator.go

@@ -30,6 +30,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("accessType", accessTypeValidator)
 	if err != nil {
 		return err

internal/validators/values.go

@@ -17,6 +17,7 @@ var (
 	computeNetTypeValues   = []string{"EXTNET", "VINS"}
 	computeOrderValues     = []string{"cdrom", "network", "hd"}
 	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
+	computeDriverValues    = []string{"KVM_X86", "SVA_KVM_X86"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 

pkg/cloudapi/account/get_resource_consumption.go

@@ -16,7 +16,7 @@ type GetResourceConsumptionRequest struct {
 }
 
 // GetResourceConsumption show amount of consumed and reserved resources (cpu, ram, disk) by specific account
-func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*ItemResourceConsumption, error) {
+func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*RecordResourceConsumption, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -26,7 +26,7 @@ func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceCons
 
 	url := "/cloudapi/account/getResourceConsumption"
 
-	info := ItemResourceConsumption{}
+	info := RecordResourceConsumption{}
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudapi/account/list_templates.go

@@ -12,15 +12,35 @@ import (
 type ListTemplatesRequest struct {
 	// ID an account
 	// Required: true
-    AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// Include deleted images
 	// Required: false
-	IncludeDeleted bool `url:"includedeleted" json:"includedeleted"`
+	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
+
+	// Find by image id
+	// Required: false
+	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,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"`
 }
 
 // ListTemplates gets list templates which can be managed by this account
-func (a Account) ListTemplates(ctx context.Context, req ListTemplatesRequest) (ListTemplates, error) {
+func (a Account) ListTemplates(ctx context.Context, req ListTemplatesRequest) (*ListTemplates, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -42,5 +62,5 @@ func (a Account) ListTemplates(ctx context.Context, req ListTemplatesRequest) (L
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/models.go

@@ -33,7 +33,7 @@ type ResourceLimits struct {
 	CUD float64 `json:"CU_D"`
 
 	// Max disk size, GB
-	CU_DM float64 `json:"CU_DM"`
+	CUDM float64 `json:"CU_DM"`
 
 	// Number of public IP addresses
 	CUI float64 `json:"CU_I"`
@@ -115,6 +115,14 @@ type DiskUsage struct {
 	DiskSizeMax float64 `json:"disksizemax"`
 }
 
+// Information about resource consumption
+type RecordResourceConsumption struct {
+	ItemResourceConsumption
+
+	// Resource limits
+	ResourceLimits ResourceLimits `json:"resourceLimits"`
+}
+
 // Information about resources
 type ItemResourceConsumption struct {
 	// Current information about resources
@@ -557,7 +565,13 @@ type ItemTemplate struct {
 }
 
 // List of templates
-type ListTemplates []ItemTemplate
+type ListTemplates struct {
+	// Data
+	Data []ItemTemplate `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about FLIPGroup
 type ItemFLIPGroup struct {

pkg/cloudapi/compute/delete_custom_fields.go

@@ -0,0 +1,40 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// Request struct for deleting compute's custome fields
+type DeleteCustomFieldsRequest struct {
+	// ID of the compute
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+}
+
+// DeleteCustomFields deletes computes custom fields
+func (c Compute) DeleteCustomFields(ctx context.Context, req DeleteCustomFieldsRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
+	}
+
+	url := "/cloudapi/compute/deleteCustomFields"
+
+	res, err := c.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/compute/disk_add.go

@@ -22,11 +22,6 @@ type DiskAddRequest struct {
 	// Required: true
 	Size uint64 `url:"size" json:"size" validate:"required"`
 
-	// Storage endpoint provider ID
-	// By default the same with boot disk
-	// Required: false
-	SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
-
 	// Type of the disk
 	// Should be one of:
 	//	- D
@@ -34,6 +29,11 @@ type DiskAddRequest struct {
 	// Required: false
 	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" validate:"omitempty,computeDiskType"`
 
+	// Storage endpoint provider ID
+	// By default the same with boot disk
+	// Required: false
+	SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
+
 	// Pool name
 	// By default will be chosen automatically
 	// Required: false

pkg/cloudapi/compute/get_custom_fields.go

@@ -8,19 +8,15 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
-// Request struct for get list GPU for compute
-type ListGPURequest struct {
-	// ID of compute instance
+// Request struct for getting Compute's customFields
+type GetCustomFieldsRequest struct {
+	// Compute ID
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
-
-	// Also list destroyed
-	// Required: false
-	ListDestroyed bool `url:"list_destroyed,omitempty" json:"list_destroyed,omitempty"`
 }
 
-// ListVGPU gets list GPU for compute
-func (c Compute) ListGPU(ctx context.Context, req ListGPURequest) ([]interface{}, error) {
+// GetCustomFields gets Compute's customFields
+func (c Compute) GetCustomFields(ctx context.Context, req GetCustomFieldsRequest) (interface{}, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -28,19 +24,19 @@ func (c Compute) ListGPU(ctx context.Context, req ListGPURequest) ([]interface{}
 		}
 	}
 
-	url := "/cloudbroker/compute/listGpu"
+	url := "/cloudapi/compute/getCustomFields"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
 
-	list := make([]interface{}, 0)
+	var info interface{}
 
-	err = json.Unmarshal(res, &list)
+	err = json.Unmarshal(res, &info)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &info, nil
 }

pkg/cloudapi/compute/models.go

@@ -14,6 +14,14 @@ type RecordACL struct {
 	RGACL ListACL `json:"rgAcl"`
 }
 
+type ListUsers struct {
+	// Data
+	Data RecordACL `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
 type Explicit bool
 
 func (e *Explicit) UnmarshalJSON(b []byte) error {
@@ -89,7 +97,13 @@ type ItemSnapshot struct {
 }
 
 // List of snapshots
-type ListSnapShots []ItemSnapshot
+type ListSnapShots struct {
+	// Data
+	Data []ItemSnapshot `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about port forward
 type ItemPFW struct {
@@ -116,7 +130,13 @@ type ItemPFW struct {
 }
 
 // List port forwards
-type ListPFWs []ItemPFW
+type ListPFWs struct {
+	// Data
+	Data []ItemPFW `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about affinity relations
 type RecordAffinityRelations struct {
@@ -403,7 +423,7 @@ type RecordCompute struct {
 	SnapSets ListSnapSets `json:"snapSets"`
 
 	// Stateless SepID
-	StatelessSepID uint64 `json:"statelessSepId"`
+	StatelessSepID int64 `json:"statelessSepId"`
 
 	// Stateless SepType
 	StatelessSepType string `json:"statelessSepType"`
@@ -862,7 +882,7 @@ type ItemCompute struct {
 	SnapSets ListSnapSets `json:"snapSets"`
 
 	// Stateless SepID
-	StatelessSepID uint64 `json:"statelessSepId"`
+	StatelessSepID int64 `json:"statelessSepId"`
 
 	// Stateless SepType
 	StatelessSepType string `json:"statelessSepType"`

pkg/cloudapi/compute/pfw_list.go

@@ -16,7 +16,7 @@ type PFWListRequest struct {
 }
 
 // PFWList gets compute port forwards list
-func (c Compute) PFWList(ctx context.Context, req PFWListRequest) (ListPFWs, error) {
+func (c Compute) PFWList(ctx context.Context, req PFWListRequest) (*ListPFWs, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +38,5 @@ func (c Compute) PFWList(ctx context.Context, req PFWListRequest) (ListPFWs, err
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/compute/set_custom_fields.go

@@ -0,0 +1,43 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+// Request struct for setting customFields values for the Compute
+type SetCustomFieldsRequest struct {
+	// ID of the compute
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Custom fields for Compute. Must be dict.
+	// Required: true
+	CustomFields string `url:"customFields" json:"customFields" validate:"required"`
+}
+
+// SetCustomFields sets customFields values for the Compute
+func (c Compute) SetCustomFields(ctx context.Context, req SetCustomFieldsRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
+	}
+
+	url := "/cloudapi/compute/setCustomFields"
+
+	res, err := c.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/compute/snapshot_list.go

@@ -16,7 +16,7 @@ type SnapshotListRequest struct {
 }
 
 // SnapshotList gets list compute snapshots
-func (c Compute) SnapshotList(ctx context.Context, req SnapshotListRequest) (ListSnapShots, error) {
+func (c Compute) SnapshotList(ctx context.Context, req SnapshotListRequest) (*ListSnapShots, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +38,5 @@ func (c Compute) SnapshotList(ctx context.Context, req SnapshotListRequest) (Lis
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/compute/user_list.go

@@ -16,7 +16,7 @@ type UserListRequest struct {
 }
 
 // UserList gets users list for compute
-func (c Compute) UserList(ctx context.Context, req UserListRequest) (*RecordACL, error) {
+func (c Compute) UserList(ctx context.Context, req UserListRequest) (*ListUsers, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,7 +31,7 @@ func (c Compute) UserList(ctx context.Context, req UserListRequest) (*RecordACL,
 		return nil, err
 	}
 
-	list := RecordACL{}
+	list := ListUsers{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/computeci.go

@@ -1,10 +0,0 @@
-package cloudapi
-
-import (
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/computeci"
-)
-
-// Accessing the ComputeCI method group
-func (ca *CloudAPI) ComputeCI() *computeci.ComputeCI {
-	return computeci.New(ca.client)
-}

pkg/cloudapi/computeci/computeci.go

@@ -1,18 +0,0 @@
-// API Actor for managing ComputeCI. This actor is a final API for admin to manage ComputeCI
-package computeci
-
-import (
-	"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
-)
-
-// Structure for creating request to computeci
-type ComputeCI struct {
-	client interfaces.Caller
-}
-
-// Builder for computeci endpoints
-func New(client interfaces.Caller) *ComputeCI {
-	return &ComputeCI{
-		client,
-	}
-}

pkg/cloudapi/computeci/filter.go

@@ -1,53 +0,0 @@
-package computeci
-
-// FilterByID returns ListComputeCI with specified ID.
-func (lci ListComputeCI) FilterByID(id uint64) ListComputeCI {
-	predicate := func(ic ItemComputeCI) bool {
-		return ic.ID == id
-	}
-
-	return lci.FilterFunc(predicate)
-}
-
-// FilterByName returns ListComputeCI with specified Name.
-func (lci ListComputeCI) FilterByName(name string) ListComputeCI {
-	predicate := func(ic ItemComputeCI) bool {
-		return ic.Name == name
-	}
-
-	return lci.FilterFunc(predicate)
-}
-
-// FilterByStatus returns ListComputeCI with specified Status.
-func (lci ListComputeCI) FilterByStatus(status string) ListComputeCI {
-	predicate := func(ic ItemComputeCI) bool {
-		return ic.Status == status
-	}
-
-	return lci.FilterFunc(predicate)
-}
-
-// FilterFunc allows filtering ListComputeCI based on a user-specified predicate.
-func (lci ListComputeCI) FilterFunc(predicate func(ItemComputeCI) bool) ListComputeCI {
-	var result ListComputeCI
-
-	for _, item := range lci.Data {
-		if predicate(item) {
-			result.Data = append(result.Data, item)
-		}
-	}
-
-	result.EntryCount = uint64(len(result.Data))
-
-	return result
-}
-
-// FindOne returns first found ItemComputeCI
-// If none was found, returns an empty struct.
-func (lci ListComputeCI) FindOne() ItemComputeCI {
-	if lci.EntryCount == 0 {
-		return ItemComputeCI{}
-	}
-
-	return lci.Data[0]
-}

pkg/cloudapi/computeci/filter_test.go

@@ -1,98 +0,0 @@
-package computeci
-
-import "testing"
-
-var computeciItems = ListComputeCI{
-	Data: []ItemComputeCI{
-		{
-			CustomFields: map[string]interface{}{},
-			Description:  "",
-			Drivers: []string{
-				"KVM_X86",
-			},
-			GUID:     1,
-			ID:       1,
-			Name:     "computeci_1",
-			Status:   "ENABLED",
-			Template: "",
-		},
-		{
-			CustomFields: map[string]interface{}{},
-			Description:  "",
-			Drivers: []string{
-				"KVM_X86",
-			},
-			GUID:     2,
-			ID:       2,
-			Name:     "computeci_2",
-			Status:   "ENABLED",
-			Template: "",
-		},
-		{
-			CustomFields: map[string]interface{}{},
-			Description:  "",
-			Drivers: []string{
-				"SVA_KVM_X86",
-			},
-			GUID:     3,
-			ID:       3,
-			Name:     "computeci_3",
-			Status:   "DISABLED",
-			Template: "",
-		},
-	},
-	EntryCount: 3,
-}
-
-func TestFilterByID(t *testing.T) {
-	actual := computeciItems.FilterByID(2).FindOne()
-
-	if actual.ID != 2 {
-		t.Fatal("expected ID 2, found: ", actual.ID)
-	}
-}
-
-func TestFilterByName(t *testing.T) {
-	actual := computeciItems.FilterByName("computeci_3").FindOne()
-
-	if actual.Name != "computeci_3" {
-		t.Fatal("expected Name 'computeci_2', found: ", actual.Name)
-	}
-}
-
-func TestFilterByStatus(t *testing.T) {
-	actual := computeciItems.FilterByStatus("ENABLED")
-
-	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual.Data))
-	}
-
-	for _, item := range actual.Data {
-		if item.Status != "ENABLED" {
-			t.Fatal("expected Status 'ENABLED', found: ", item.Status)
-		}
-	}
-}
-
-func TestFilterFunc(t *testing.T) {
-	actual := computeciItems.FilterFunc(func(icc ItemComputeCI) bool {
-		for _, item := range icc.Drivers {
-			if item == "KVM_X86" {
-				return true
-			}
-		}
-		return false
-	})
-
-	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual.Data))
-	}
-
-	for _, item := range actual.Data {
-		for _, driver := range item.Drivers {
-			if driver != "KVM_X86" {
-				t.Fatal("expected 'KVM_X86' Driver, found: ", driver)
-			}
-		}
-	}
-}

pkg/cloudapi/computeci/get.go

@@ -1,42 +0,0 @@
-package computeci
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// Request struct for information about computeci
-type GetRequest struct {
-	// ID of the Compute CI
-	// Required: true
-	ComputeCIID uint64 `url:"computeciId" json:"computeciId" validate:"required"`
-}
-
-// Get gets information about computeci by ID
-func (c ComputeCI) Get(ctx context.Context, req GetRequest) (*ItemComputeCI, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		for _, validatonError := range validators.GetErrors(err) {
-			return nil, validators.ValidationError(validatonError)
-		}
-	}
-
-	url := "/cloudapi/computeci/get"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	info := ItemComputeCI{}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}

pkg/cloudapi/computeci/list.go

@@ -1,53 +0,0 @@
-package computeci
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-)
-
-// Request struct for get list of computeci
-type ListRequest struct {
-	// Find by name
-	// Required: false
-	Name string `url:"name,omitempty" json:"name,omitempty"`
-
-	// Find by computeci ID
-	// Required: false
-	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
-
-	// Find by drivers
-	// Find by computeci ID
-	Drivers []string `url:"drivers,omitempty" json:"drivers,omitempty"`
-
-	// If true list deleted instances as well
-	// Required: false
-	IncludeDeleted bool `url:"includeDeleted,omitempty" json:"includeDeleted,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"`
-}
-
-// List gets list of computeci instances
-func (c ComputeCI) List(ctx context.Context, req ListRequest) (*ListComputeCI, error) {
-	url := "/cloudapi/computeci/list"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListComputeCI{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}

pkg/cloudapi/computeci/models.go

@@ -1,35 +0,0 @@
-package computeci
-
-// Main information about computeci
-type ItemComputeCI struct {
-	// Custom fields
-	CustomFields map[string]interface{} `json:"customFields"`
-
-	// Description
-	Description string `json:"desc"`
-
-	// List drivers
-	Drivers []string `json:"drivers"`
-
-	// GUID
-	GUID uint64 `json:"guid"`
-
-	// ID
-	ID uint64 `json:"id"`
-
-	// Name
-	Name string `json:"name"`
-
-	// Status
-	Status string `json:"status"`
-
-	// Template
-	Template string `json:"template"`
-}
-
-// List of computeci instances
-type ListComputeCI struct {
-	Data []ItemComputeCI `json:"data"`
-
-	EntryCount uint64 `json:"entryCount"`
-}

pkg/cloudapi/computeci/serialize.go

@@ -1,43 +0,0 @@
-package computeci
-
-import (
-	"encoding/json"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
-)
-
-// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
-//
-// In order to serialize with indent make sure to follow these guidelines:
-//   - First argument -> prefix
-//   - Second argument -> indent
-func (lci ListComputeCI) Serialize(params ...string) (serialization.Serialized, error) {
-	if lci.EntryCount == 0 {
-		return []byte{}, nil
-	}
-
-	if len(params) > 1 {
-		prefix := params[0]
-		indent := params[1]
-
-		return json.MarshalIndent(lci, prefix, indent)
-	}
-
-	return json.Marshal(lci)
-}
-
-// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
-//
-// In order to serialize with indent make sure to follow these guidelines:
-//   - First argument -> prefix
-//   - Second argument -> indent
-func (ic ItemComputeCI) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(params) > 1 {
-		prefix := params[0]
-		indent := params[1]
-
-		return json.MarshalIndent(ic, prefix, indent)
-	}
-
-	return json.Marshal(ic)
-}

pkg/cloudapi/disks/list_unattached.go

@@ -24,10 +24,6 @@ type ListUnattachedRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
-	// Find by shared, true or false
-	// Required: false
-	Shared bool `url:"shared,omitempty" json:"shared,omitempty"`
-
 	// Type of the disks
 	// Required: false
 	Type string `url:"type,omitempty" json:"type,omitempty"`

pkg/cloudapi/extnet/list_computes.go

@@ -13,10 +13,26 @@ type ListComputesRequest struct {
 	// Filter by account ID
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by rg ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by compute ID
+	// Required: false
+	ComputeID uint64 `url:"computeId,omitempty" json:"computeId,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"`
 }
 
 // ListComputes gets computes from account with extnets
-func (e ExtNet) ListComputes(ctx context.Context, req ListComputesRequest) (ListExtNetComputes, error) {
+func (e ExtNet) ListComputes(ctx context.Context, req ListComputesRequest) (*ListExtNetComputes, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +54,5 @@ func (e ExtNet) ListComputes(ctx context.Context, req ListComputesRequest) (List
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/extnet/models.go

@@ -59,7 +59,13 @@ type ItemExtNetCompute struct {
 }
 
 // List of information about computes with external network
-type ListExtNetComputes []ItemExtNetCompute
+type ListExtNetComputes struct {
+	// Data
+	Data []ItemExtNetCompute `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // QOS
 type QOS struct {
@@ -118,6 +124,12 @@ type Excluded struct {
 	// ClientType
 	ClientType string `json:"clientType"`
 
+	// Domain name
+	DomainName string `json:"domainname"`
+
+	// Host name
+	HostName string `json:"hostname"`
+
 	// IP
 	IP string `json:"ip"`
 

pkg/cloudapi/flipgroup/create.go

@@ -45,7 +45,7 @@ type CreateRequest struct {
 }
 
 // Create method will create a new FLIPGorup in the specified Account
-func (f FLIPGroup) Create(ctx context.Context, req CreateRequest) (*RecordFLIPGroup, error) {
+func (f FLIPGroup) Create(ctx context.Context, req CreateRequest) (*RecordFLIPGroupCreated, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -60,7 +60,7 @@ func (f FLIPGroup) Create(ctx context.Context, req CreateRequest) (*RecordFLIPGr
 		return nil, err
 	}
 
-	info := RecordFLIPGroup{}
+	info := RecordFLIPGroupCreated{}
 
 	err = json.Unmarshal(res, &info)
 	if err != nil {

pkg/cloudapi/flipgroup/get.go

@@ -16,7 +16,7 @@ type GetRequest struct {
 }
 
 // Get gets details of the specified Floating IP group
-func (f FLIPGroup) Get(ctx context.Context, req GetRequest) (*ItemFLIPGroup, error) {
+func (f FLIPGroup) Get(ctx context.Context, req GetRequest) (*RecordFLIPGroup, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,7 +31,7 @@ func (f FLIPGroup) Get(ctx context.Context, req GetRequest) (*ItemFLIPGroup, err
 		return nil, err
 	}
 
-	info := ItemFLIPGroup{}
+	info := RecordFLIPGroup{}
 
 	err = json.Unmarshal(res, &info)
 	if err != nil {

pkg/cloudapi/flipgroup/models.go

@@ -1,7 +1,7 @@
 package flipgroup
 
 // Main information about FLIPGroup
-type RecordFLIPGroup struct {
+type RecordFLIPGroupCreated struct {
 	// Default GW
 	DefaultGW string `json:"defaultGW"`
 
@@ -18,6 +18,89 @@ type RecordFLIPGroup struct {
 	NetMask uint64 `json:"netmask"`
 }
 
+type RecordFLIPGroup struct {
+	// Account ID
+	AccountID uint64 `json:"accountId"`
+
+	// Account name
+	AccountName string `json:"accountName"`
+
+	// List of client IDs
+	ClientIDs []uint64 `json:"clientIds"`
+
+	// Client names
+	ClientNames []string `json:"clientNames"`
+
+	// Client type
+	ClientType string `json:"clientType"`
+
+	// Connection ID
+	ConnID uint64 `json:"connId"`
+
+	// Connection type
+	ConnType string `json:"connType"`
+
+	// Created by
+	CreatedBy string `json:"createdBy"`
+
+	// Created time
+	CreatedTime uint64 `json:"createdTime"`
+
+	// Default GW
+	DefaultGW string `json:"defaultGW"`
+
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
+	// Deleted time
+	DeletedTime uint64 `json:"deletedTime"`
+
+	// Description
+	Description string `json:"desc"`
+
+	// Grid ID
+	GID uint64 `json:"gid"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// IP
+	IP string `json:"ip"`
+
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Network ID
+	NetID uint64 `json:"netId"`
+
+	// Network type
+	NetType string `json:"netType"`
+
+	// Network
+	Network string `json:"network"`
+
+	// Resource group ID
+	RGID uint64 `json:"rgId"`
+
+	// Resource group name
+	RGName string `json:"rgName"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
+
+	// Updated time
+	UpdatedTime uint64 `json:"updatedTime"`
+}
+
 // Detailed information about FLIPGroup
 type ItemFLIPGroup struct {
 	// CKey

pkg/cloudapi/kvmppc/create.go

@@ -2,12 +2,30 @@ package kvmppc
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
+type Interface struct {
+	// Network type
+	// Should be one of:
+	//	- VINS
+	//	- EXTNET
+	NetType string `url:"netType" json:"netType" validate:"required,kvmNetType"`
+
+	// Network ID for connect to,
+	// for EXTNET - external network ID,
+	// for VINS - VINS ID,
+	NetID uint64 `url:"netId" json:"netId" validate:"required"`
+
+	// IP address to assign to this VM when connecting to the specified network
+	// Required: false
+	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+}
+
 // Request struct for create KVM PowerPC VM
 type CreateRequest struct {
 	// ID of the resource group, which will own this VM
@@ -45,24 +63,11 @@ type CreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for ViNS - ViNS ID,
-	// when netType is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Input data for cloud-init facility
 	// Required: false
@@ -85,6 +90,11 @@ type CreateRequest struct {
 	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
 }
 
+type wrapperCreateRequest struct {
+	CreateRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // Create creates KVM PowerPC VM based on specified OS image
 func (k KVMPPC) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -94,9 +104,31 @@ func (k KVMPPC) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateRequest{
+		CreateRequest: req,
+		Interfaces:    interfaces,
+	}
+
 	url := "/cloudapi/kvmppc/create"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudapi/kvmppc/create_blank.go

@@ -2,6 +2,7 @@ package kvmppc
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -31,7 +32,7 @@ type CreateBlankRequest struct {
 	// Required: true
 	BootDisk uint64 `url:"bootDisk" json:"bootDisk" validate:"required"`
 
-	// ID of SEP to create boot disk on.
+	// ID of SEP to create boot disk on
 	// Uses images SEP ID if not set
 	// Required: true
 	SEPID uint64 `url:"sepId" json:"sepId" validate:"required"`
@@ -40,30 +41,22 @@ type CreateBlankRequest struct {
 	// Required: true
 	Pool string `url:"pool" json:"pool" validate:"required"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Text description of this VM
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }
 
+type wrapperCreateBlankRequest struct {
+	CreateBlankRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // CreateBlank creates KVM PowerPC VM from scratch
 func (k KVMPPC) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -73,9 +66,31 @@ func (k KVMPPC) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateBlankRequest{
+		CreateBlankRequest: req,
+		Interfaces:         interfaces,
+	}
+
 	url := "/cloudapi/kvmppc/createBlank"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudapi/kvmx86/create.go

@@ -2,6 +2,7 @@ package kvmx86
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -63,7 +64,10 @@ type CreateRequest struct {
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
 	// Slice of structs with net interface description.
-	Interfaces []Interface `url:"interfaces,omitempty" json:"interfaces,omitempty" validate:"omitempty,min=1,dive"`
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
+	// Required: false
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Input data for cloud-init facility
 	// Required: false
@@ -84,6 +88,19 @@ type CreateRequest struct {
 	// Compute purpose
 	// Required: false
 	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
+
+	// Custom fields for compute. Must be a dict
+	// Required: false
+	CustomFields string `url:"customFields,omitempty" json:"customFields,omitempty"`
+
+	// Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
+	// Required: false
+	Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
+}
+
+type wrapperCreateRequest struct {
+	CreateRequest
+	Interfaces []string `url:"interfaces,omitempty"`
 }
 
 // Create creates KVM x86 VM based on specified OS image
@@ -95,9 +112,31 @@ func (k KVMX86) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateRequest{
+		CreateRequest: req,
+		Interfaces:    interfaces,
+	}
+
 	url := "/cloudapi/kvmx86/create"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudapi/kvmx86/create_blank.go

@@ -2,6 +2,7 @@ package kvmx86
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -41,12 +42,25 @@ type CreateBlankRequest struct {
 	Pool string `url:"pool" json:"pool" validate:"required"`
 
 	// Slice of structs with net interface description.
-	Interfaces []Interface `url:"interfaces,omitempty" json:"interfaces,omitempty" validate:"omitempty,min=1,dive"`
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
+	// Required: false
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
+
+	// Type of compute Stateful (KVM_X86) or Stateless (SVA_KVM_X86)
+	// Required: false
+	Driver string `url:"driver,omitempty" json:"driver,omitempty" validate:"omitempty,computeDriver"`
+
 	// Text description of this VM
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }
 
+type wrapperCreateBlankRequest struct {
+	CreateBlankRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // CreateBlank creates KVM x86 VM from scratch
 func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -56,9 +70,31 @@ func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateBlankRequest{
+		CreateBlankRequest: req,
+		Interfaces:         interfaces,
+	}
+
 	url := "/cloudapi/kvmx86/createBlank"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudapi/rg/affinity_group_computes.go

@@ -20,7 +20,7 @@ type AffinityGroupComputesRequest struct {
 }
 
 // AffinityGroupComputes gets list of all computes with their relationships to another computes
-func (r RG) AffinityGroupComputes(ctx context.Context, req AffinityGroupComputesRequest) (ListAffinityGroups, error) {
+func (r RG) AffinityGroupComputes(ctx context.Context, req AffinityGroupComputesRequest) (ListAffinityGroupsComputes, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -35,7 +35,7 @@ func (r RG) AffinityGroupComputes(ctx context.Context, req AffinityGroupComputes
 		return nil, err
 	}
 
-	list := ListAffinityGroups{}
+	list := ListAffinityGroupsComputes{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/rg/affinity_groups_list.go

@@ -16,7 +16,7 @@ type AffinityGroupsListRequest struct {
 }
 
 // AffinityGroupsList gets all currently defined affinity groups in this resource group with compute IDs
-func (r RG) AffinityGroupsList(ctx context.Context, req AffinityGroupsListRequest) (map[string][]uint64, error) {
+func (r RG) AffinityGroupsList(ctx context.Context, req AffinityGroupsListRequest) (*ListAffinityGroups, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,7 +31,7 @@ func (r RG) AffinityGroupsList(ctx context.Context, req AffinityGroupsListReques
 		return nil, err
 	}
 
-	list := map[string][]uint64{}
+	list := &ListAffinityGroups{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/rg/models.go

@@ -53,6 +53,9 @@ type ItemResourceConsumption struct {
 	// Reserved information about resources
 	Reserved Resource `json:"Reserved"`
 
+	// Resource limits
+	ResourceLimits ResourceLimits `json:"resourceLimits"`
+
 	// Resource group ID
 	RGID uint64 `json:"rgid"`
 }
@@ -302,7 +305,7 @@ type ResourceLimits struct {
 }
 
 // Main information about affinity group
-type ItemAffinityGroup struct {
+type ItemAffinityGroupComputes struct {
 	// Compute ID
 	ComputeID uint64 `json:"computeId"`
 
@@ -326,7 +329,15 @@ type ItemAffinityGroup struct {
 }
 
 // List of affinity groups
-type ListAffinityGroups []ItemAffinityGroup
+type ListAffinityGroupsComputes []ItemAffinityGroupComputes
+
+type ListAffinityGroups struct {
+	// Data
+	Data map[string][]uint64 `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about audit
 type ItemAudit struct {

pkg/cloudapi/rg/usage.go

@@ -37,6 +37,7 @@ func (r RG) Usage(ctx context.Context, req UsageRequest) (*RecordResourceUsage,
 
 	info := RecordResourceUsage{}
 	err = json.Unmarshal(res, &info)
+
 	if err != nil {
 		return nil, err
 	}

pkg/cloudapi/sizes/filter.go

@@ -22,21 +22,23 @@ func (ls ListSizes) FilterByName(name string) ListSizes {
 func (ls ListSizes) FilterFunc(predicate func(ItemSize) bool) ListSizes {
 	var result ListSizes
 
-	for _, item := range ls {
+	for _, item := range ls.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(result.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemSize
 // If none was found, returns an empty struct.
 func (ls ListSizes) FindOne() ItemSize {
-	if len(ls) == 0 {
+	if len(ls.Data) == 0 {
 		return ItemSize{}
 	}
 
-	return ls[0]
+	return ls.Data[0]
 }

pkg/cloudapi/sizes/filter_test.go

@@ -3,30 +3,33 @@ package sizes
 import "testing"
 
 var sizeItems = ListSizes{
-	{
-		Description: "",
-		Disks:       []uint64{},
-		ID:          1,
-		Memory:      512,
-		Name:        "size_1",
-		VCPUs:       2,
-	},
-	{
-		Description: "",
-		Disks:       []uint64{},
-		ID:          2,
-		Memory:      1024,
-		Name:        "size_2",
-		VCPUs:       4,
-	},
-	{
-		Description: "",
-		Disks:       []uint64{},
-		ID:          2,
-		Memory:      2048,
-		Name:        "size_3",
-		VCPUs:       6,
+	Data: []ItemSize{
+		{
+			Description: "",
+			Disks:       []uint64{},
+			ID:          1,
+			Memory:      512,
+			Name:        "size_1",
+			VCPUs:       2,
+		},
+		{
+			Description: "",
+			Disks:       []uint64{},
+			ID:          2,
+			Memory:      1024,
+			Name:        "size_2",
+			VCPUs:       4,
+		},
+		{
+			Description: "",
+			Disks:       []uint64{},
+			ID:          2,
+			Memory:      2048,
+			Name:        "size_3",
+			VCPUs:       6,
+		},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -50,11 +53,11 @@ func TestFilterFunc(t *testing.T) {
 		return is.Memory > 512
 	})
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Memory <= 512 {
 			t.Fatal("expected Memory greater than 512, found: ", item.Memory)
 		}

pkg/cloudapi/sizes/list.go

@@ -26,7 +26,7 @@ type ListRequest struct {
 }
 
 // List gets list the available flavors, filtering can be based on the user which is doing the request
-func (s Sizes) List(ctx context.Context, req ListRequest) (ListSizes, error) {
+func (s Sizes) List(ctx context.Context, req ListRequest) (*ListSizes, error) {
 	url := "/cloudapi/sizes/list"
 
 	res, err := s.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -34,7 +34,7 @@ func (s Sizes) List(ctx context.Context, req ListRequest) (ListSizes, error) {
 		return nil, err
 	}
 
-	list := ListSizes{}
+	list := &ListSizes{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/sizes/models.go

@@ -22,4 +22,10 @@ type ItemSize struct {
 }
 
 // List of configured available flavors
-type ListSizes []ItemSize
+type ListSizes struct {
+	// Data
+	Data []ItemSize `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/sizes/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (ls ListSizes) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(ls) == 0 {
+	if len(ls.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudapi/vins/extnet_list.go

@@ -16,7 +16,7 @@ type ExtNetListRequest struct {
 }
 
 // ExtNetList show list of VINS external network connections
-func (v VINS) ExtNetList(ctx context.Context, req ExtNetListRequest) (ListExtNets, error) {
+func (v VINS) ExtNetList(ctx context.Context, req ExtNetListRequest) (*ListExtNets, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,7 +31,7 @@ func (v VINS) ExtNetList(ctx context.Context, req ExtNetListRequest) (ListExtNet
 		return nil, err
 	}
 
-	list := ListExtNets{}
+	list := &ListExtNets{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/vins/ip_list.go

@@ -16,7 +16,7 @@ type IPListRequest struct {
 }
 
 // IPList show DHCP IP reservations on VINS
-func (v VINS) IPList(ctx context.Context, req IPListRequest) (ListIPs, error) {
+func (v VINS) IPList(ctx context.Context, req IPListRequest) (*ListIPs, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,7 +31,7 @@ func (v VINS) IPList(ctx context.Context, req IPListRequest) (ListIPs, error) {
 		return nil, err
 	}
 
-	list := ListIPs{}
+	list := &ListIPs{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudapi/vins/models.go

@@ -104,7 +104,13 @@ type ItemExtNet struct {
 }
 
 // List of external networks
-type ListExtNets []ItemExtNet
+type ListExtNets struct {
+	// Data
+	Data []ItemExtNet `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about IP
 type ItemIP struct {
@@ -131,7 +137,13 @@ type ItemIP struct {
 }
 
 // List of IPs
-type ListIPs []ItemIP
+type ListIPs struct {
+	// Data
+	Data []ItemIP `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about VNF device
 type RecordVNFDev struct {
@@ -671,7 +683,13 @@ type ItemNATRule struct {
 }
 
 // List of NAT rules
-type ListNATRules []ItemNATRule
+type ListNATRules struct {
+	// Data
+	Data []ItemNATRule `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about reservation
 type ItemReservation struct {

pkg/cloudapi/vins/nat_rule_list.go

@@ -16,7 +16,7 @@ type NATRuleListRequest struct {
 }
 
 // NATRuleList gets list of NAT (port forwarding) rules
-func (v VINS) NATRuleList(ctx context.Context, req NATRuleListRequest) (ListNATRules, error) {
+func (v VINS) NATRuleList(ctx context.Context, req NATRuleListRequest) (*ListNATRules, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,7 +31,7 @@ func (v VINS) NATRuleList(ctx context.Context, req NATRuleListRequest) (ListNATR
 		return nil, err
 	}
 
-	list := ListNATRules{}
+	list := &ListNATRules{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudbroker/account/get_resource_consumption.go

@@ -16,7 +16,7 @@ type GetResourceConsumptionRequest struct {
 }
 
 // GetResourceConsumption show amount of consumed and reserved resources (cpu, ram, disk) by specific account
-func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*RecordResources, error) {
+func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*RecordResourceConsumption, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -26,7 +26,7 @@ func (a Account) GetResourceConsumption(ctx context.Context, req GetResourceCons
 
 	url := "/cloudbroker/account/getResourceConsumption"
 
-	info := RecordResources{}
+	info := RecordResourceConsumption{}
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {

pkg/cloudbroker/account/models.go

@@ -21,7 +21,13 @@ type ItemAudit struct {
 // List of audits
 type ListAudits []ItemAudit
 
-type RecordResources struct {
+type RecordResourceConsumption struct {
+	ItemResourceConsumption
+
+	ResourceLimits ResourceLimits `json:"resourceLimits"`
+}
+
+type ItemResourceConsumption struct {
 	// Current information about resources
 	Current Resource `json:"Current"`
 
@@ -34,7 +40,7 @@ type RecordResources struct {
 
 type ListResources struct {
 	// Data
-	Data []RecordResources `json:"data"`
+	Data []ItemResourceConsumption `json:"data"`
 
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`

pkg/cloudbroker/extnet/models.go

@@ -137,7 +137,7 @@ type RecordExtNet struct {
 	DNS []string `json:"dns"`
 
 	// List excludes
-	Excluded []string `json:"excluded"`
+	Excluded ListReservations `json:"excluded"`
 
 	// Gateway
 	Gateway string `json:"gateway"`

pkg/cloudbroker/k8s/create.go

@@ -103,7 +103,7 @@ type CreateRequest struct {
 	// Create kubernetes cluster with masters nodes behind load balancer if true.
 	// Otherwise give all cluster nodes direct external addresses from selected external network
 	// Required: false
-	WithLB bool `url:"withLB,omitempty" json:"withLB,omitempty"`
+	WithLB bool `url:"withLB" json:"withLB"`
 
 	// Text description of this kubernetes cluster
 	// Required: false

pkg/cloudbroker/k8s/filter.go

@@ -76,21 +76,23 @@ func (lkc ListK8S) FilterByDeletedBy(deletedBy string) ListK8S {
 func (lkc ListK8S) FilterFunc(predicate func(ItemK8S) bool) ListK8S {
 	var result ListK8S
 
-	for _, item := range lkc {
+	for _, item := range lkc.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(result.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemK8S
 // If none was found, returns an empty struct.
 func (lkc ListK8S) FindOne() ItemK8S {
-	if len(lkc) == 0 {
+	if len(lkc.Data) == 0 {
 		return ItemK8S{}
 	}
 
-	return lkc[0]
+	return lkc.Data[0]
 }

pkg/cloudbroker/k8s/filter_test.go

@@ -3,96 +3,99 @@ package k8s
 import "testing"
 
 var k8sItems = ListK8S{
-	ItemK8S{
-		AccountID:      1,
-		AccountName:    "test_1",
-		ACL:            []interface{}{},
-		BServiceID:     1,
-		CIID:           1,
-		Config:         nil,
-		CreatedBy:      "test_user",
-		CreatedTime:    132454563,
-		DeletedBy:      "",
-		DeletedTime:    0,
-		Description:    "",
-		ExtNetID:       1,
-		GID:            0,
-		GUID:           1,
-		ID:             1,
-		LBID:           1,
-		Milestones:     999999,
-		Name:           "k8s_1",
-		RGID:           1,
-		RGName:         "rg_1",
-		ServiceAccount: ServiceAccount{},
-		SSHKey:         "sample_key",
-		Status:         "ENABLED",
-		TechStatus:     "STARTED",
-		UpdatedBy:      "",
-		UpdatedTime:    0,
-		VINSID:         0,
-		WorkersGroup:   []RecordK8SGroup{},
-	},
-	ItemK8S{
-		AccountID:      2,
-		AccountName:    "test_2",
-		ACL:            []interface{}{},
-		BServiceID:     2,
-		CIID:           2,
-		Config:         nil,
-		CreatedBy:      "test_user",
-		CreatedTime:    132454638,
-		DeletedBy:      "",
-		DeletedTime:    0,
-		Description:    "",
-		ExtNetID:       2,
-		GID:            0,
-		GUID:           2,
-		ID:             2,
-		LBID:           2,
-		Milestones:     999999,
-		Name:           "k8s_2",
-		RGID:           2,
-		RGName:         "rg_2",
-		ServiceAccount: ServiceAccount{},
-		SSHKey:         "sample_key",
-		Status:         "ENABLED",
-		TechStatus:     "STARTED",
-		UpdatedBy:      "",
-		UpdatedTime:    0,
-		VINSID:         0,
-		WorkersGroup:   []RecordK8SGroup{},
-	},
-	ItemK8S{
-		AccountID:      3,
-		AccountName:    "test_3",
-		ACL:            []interface{}{},
-		BServiceID:     3,
-		CIID:           3,
-		Config:         nil,
-		CreatedBy:      "test_user",
-		CreatedTime:    132454682,
-		DeletedBy:      "",
-		DeletedTime:    0,
-		Description:    "",
-		ExtNetID:       3,
-		GID:            0,
-		GUID:           3,
-		ID:             3,
-		LBID:           3,
-		Milestones:     999999,
-		Name:           "k8s_3",
-		RGID:           3,
-		RGName:         "rg_3",
-		ServiceAccount: ServiceAccount{},
-		SSHKey:         "sample_key",
-		Status:         "DISABLED",
-		TechStatus:     "STOPPED",
-		UpdatedBy:      "",
-		UpdatedTime:    0,
-		VINSID:         0,
-		WorkersGroup:   []RecordK8SGroup{},
+	Data: []ItemK8S{
+		{
+			AccountID:      1,
+			AccountName:    "test_1",
+			ACL:            []interface{}{},
+			BServiceID:     1,
+			CIID:           1,
+			Config:         nil,
+			CreatedBy:      "test_user",
+			CreatedTime:    132454563,
+			DeletedBy:      "",
+			DeletedTime:    0,
+			Description:    "",
+			ExtNetID:       1,
+			GID:            0,
+			GUID:           1,
+			ID:             1,
+			LBID:           1,
+			Milestones:     999999,
+			Name:           "k8s_1",
+			RGID:           1,
+			RGName:         "rg_1",
+			ServiceAccount: ServiceAccount{},
+			SSHKey:         "sample_key",
+			Status:         "ENABLED",
+			TechStatus:     "STARTED",
+			UpdatedBy:      "",
+			UpdatedTime:    0,
+			VINSID:         0,
+			WorkersGroup:   []RecordK8SGroup{},
+		},
+		{
+			AccountID:      2,
+			AccountName:    "test_2",
+			ACL:            []interface{}{},
+			BServiceID:     2,
+			CIID:           2,
+			Config:         nil,
+			CreatedBy:      "test_user",
+			CreatedTime:    132454638,
+			DeletedBy:      "",
+			DeletedTime:    0,
+			Description:    "",
+			ExtNetID:       2,
+			GID:            0,
+			GUID:           2,
+			ID:             2,
+			LBID:           2,
+			Milestones:     999999,
+			Name:           "k8s_2",
+			RGID:           2,
+			RGName:         "rg_2",
+			ServiceAccount: ServiceAccount{},
+			SSHKey:         "sample_key",
+			Status:         "ENABLED",
+			TechStatus:     "STARTED",
+			UpdatedBy:      "",
+			UpdatedTime:    0,
+			VINSID:         0,
+			WorkersGroup:   []RecordK8SGroup{},
+		},
+		{
+			AccountID:      3,
+			AccountName:    "test_3",
+			ACL:            []interface{}{},
+			BServiceID:     3,
+			CIID:           3,
+			Config:         nil,
+			CreatedBy:      "test_user",
+			CreatedTime:    132454682,
+			DeletedBy:      "",
+			DeletedTime:    0,
+			Description:    "",
+			ExtNetID:       3,
+			GID:            0,
+			GUID:           3,
+			ID:             3,
+			LBID:           3,
+			Milestones:     999999,
+			Name:           "k8s_3",
+			RGID:           3,
+			RGName:         "rg_3",
+			ServiceAccount: ServiceAccount{},
+			SSHKey:         "sample_key",
+			Status:         "DISABLED",
+			TechStatus:     "STOPPED",
+			UpdatedBy:      "",
+			UpdatedTime:    0,
+			VINSID:         0,
+			WorkersGroup:   []RecordK8SGroup{},
+		},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -130,11 +133,11 @@ func TestFilterByRGID(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := k8sItems.FilterByStatus("ENABLED")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "ENABLED" {
 			t.Fatal("expected Status 'ENABLED', found: ", item.Status)
 		}
@@ -144,11 +147,11 @@ func TestFilterByStatus(t *testing.T) {
 func TestFilterByTechStatus(t *testing.T) {
 	actual := k8sItems.FilterByTechStatus("STARTED")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.TechStatus != "STARTED" {
 			t.Fatal("expected TechStatus 'STARTED', found: ", item.TechStatus)
 		}
@@ -158,11 +161,11 @@ func TestFilterByTechStatus(t *testing.T) {
 func TestFilterByCreatedBy(t *testing.T) {
 	actual := k8sItems.FilterByCreatedBy("test_user")
 
-	if len(actual) != 3 {
-		t.Fatal("expected 3 found, actual: ", len(actual))
+	if len(actual.Data) != 3 {
+		t.Fatal("expected 3 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.CreatedBy != "test_user" {
 			t.Fatal("expected CreatedBy 'test_user', found: ", item.CreatedBy)
 		}
@@ -172,8 +175,8 @@ func TestFilterByCreatedBy(t *testing.T) {
 func TestFilterByDeletedBy(t *testing.T) {
 	actual := k8sItems.FilterByDeletedBy("test_user")
 
-	if len(actual) != 0 {
-		t.Fatal("expected 0 found, actual: ", len(actual))
+	if len(actual.Data) != 0 {
+		t.Fatal("expected 0 found, actual: ", len(actual.Data))
 	}
 }
 
@@ -191,7 +194,7 @@ func TestFilterFunc(t *testing.T) {
 func TestSortByCreatedTime(t *testing.T) {
 	actual := k8sItems.SortByCreatedTime(false)
 
-	if actual[0].CreatedTime != 132454563 || actual[2].CreatedTime != 132454682 {
+	if actual.Data[0].CreatedTime != 132454563 || actual.Data[2].CreatedTime != 132454682 {
 		t.Fatal("expected ascending sort, seems to be inversed")
 	}
 }

pkg/cloudbroker/k8s/list.go

@@ -8,6 +8,38 @@ import (
 
 // Request struct for get list information K8S
 type ListRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by IP address
+	// Required: false
+	IPAddress string `url:"ipAddress,omitempty" json:"ipAddress,omitempty"`
+
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by lbId
+	// Required: false
+	LBID uint64 `url:"lbId,omitempty" json:"lbId,omitempty"`
+
+	// Find by basicServiceId
+	// Required: false
+	BasicServiceID uint64 `url:"basicServiceId,omitempty" json:"basicServiceId,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by techStatus
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
 	// Include deleted clusters in result
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
@@ -22,7 +54,7 @@ type ListRequest struct {
 }
 
 // List gets list all kubernetes clusters
-func (k K8S) List(ctx context.Context, req ListRequest) (ListK8S, error) {
+func (k K8S) List(ctx context.Context, req ListRequest) (*ListK8S, error) {
 
 	url := "/cloudbroker/k8s/list"
 
@@ -38,5 +70,5 @@ func (k K8S) List(ctx context.Context, req ListRequest) (ListK8S, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/k8s/list_deleted.go

@@ -8,6 +8,34 @@ import (
 
 // Request struct for get list deleted kubernetes cluster
 type ListDeletedRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by IP address
+	// Required: false
+	IPAddress string `url:"ipAddress,omitempty" json:"ipAddress,omitempty"`
+
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by lbId
+	// Required: false
+	LBID uint64 `url:"lbId,omitempty" json:"lbId,omitempty"`
+
+	// Find by basicServiceId
+	// Required: false
+	BasicServiceID uint64 `url:"basicServiceId,omitempty" json:"basicServiceId,omitempty"`
+
+	// Find by techStatus
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -18,7 +46,7 @@ type ListDeletedRequest struct {
 }
 
 // ListDeleted gets all deleted kubernetes clusters
-func (k K8S) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListK8S, error) {
+func (k K8S) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListK8S, error) {
 
 	url := "/cloudbroker/k8s/listDeleted"
 
@@ -34,5 +62,5 @@ func (k K8S) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListK8S,
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/k8s/models.go

@@ -295,4 +295,10 @@ type ServiceAccount struct {
 }
 
 // List K8S
-type ListK8S []ItemK8S
+type ListK8S struct {
+	// Data
+	Data []ItemK8S `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/k8s/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (lkc ListK8S) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(lkc) == 0 {
+	if len(lkc.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudbroker/k8s/sorting.go

@@ -6,16 +6,16 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (lkc ListK8S) SortByCreatedTime(inverse bool) ListK8S {
-	if len(lkc) < 2 {
+	if len(lkc.Data) < 2 {
 		return lkc
 	}
 
-	sort.Slice(lkc, func(i, j int) bool {
+	sort.Slice(lkc.Data, func(i, j int) bool {
 		if inverse {
-			return lkc[i].CreatedTime > lkc[j].CreatedTime
+			return lkc.Data[i].CreatedTime > lkc.Data[j].CreatedTime
 		}
 
-		return lkc[i].CreatedTime < lkc[j].CreatedTime
+		return lkc.Data[i].CreatedTime < lkc.Data[j].CreatedTime
 	})
 
 	return lkc
@@ -25,16 +25,16 @@ func (lkc ListK8S) SortByCreatedTime(inverse bool) ListK8S {
 //
 // If inverse param is set to true, the order is reversed.
 func (lkc ListK8S) SortByUpdatedTime(inverse bool) ListK8S {
-	if len(lkc) < 2 {
+	if len(lkc.Data) < 2 {
 		return lkc
 	}
 
-	sort.Slice(lkc, func(i, j int) bool {
+	sort.Slice(lkc.Data, func(i, j int) bool {
 		if inverse {
-			return lkc[i].UpdatedTime > lkc[j].UpdatedTime
+			return lkc.Data[i].UpdatedTime > lkc.Data[j].UpdatedTime
 		}
 
-		return lkc[i].UpdatedTime < lkc[j].UpdatedTime
+		return lkc.Data[i].UpdatedTime < lkc.Data[j].UpdatedTime
 	})
 
 	return lkc
@@ -44,16 +44,16 @@ func (lkc ListK8S) SortByUpdatedTime(inverse bool) ListK8S {
 //
 // If inverse param is set to true, the order is reversed.
 func (lkc ListK8S) SortByDeletedTime(inverse bool) ListK8S {
-	if len(lkc) < 2 {
+	if len(lkc.Data) < 2 {
 		return lkc
 	}
 
-	sort.Slice(lkc, func(i, j int) bool {
+	sort.Slice(lkc.Data, func(i, j int) bool {
 		if inverse {
-			return lkc[i].DeletedTime > lkc[j].DeletedTime
+			return lkc.Data[i].DeletedTime > lkc.Data[j].DeletedTime
 		}
 
-		return lkc[i].DeletedTime < lkc[j].DeletedTime
+		return lkc.Data[i].DeletedTime < lkc.Data[j].DeletedTime
 	})
 
 	return lkc

pkg/cloudbroker/kvmppc/create.go

@@ -2,12 +2,30 @@ package kvmppc
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
+type Interface struct {
+	// Network type
+	// Should be one of:
+	//	- VINS
+	//	- EXTNET
+	NetType string `url:"netType" json:"netType" validate:"required,kvmNetType"`
+
+	// Network ID for connect to,
+	// for EXTNET - external network ID,
+	// for VINS - VINS ID,
+	NetID uint64 `url:"netId" json:"netId" validate:"required"`
+
+	// IP address to assign to this VM when connecting to the specified network
+	// Required: false
+	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+}
+
 // Request struct for create KVM PowerPC VM
 type CreateRequest struct {
 	// ID of the resource group, which will own this VM
@@ -45,24 +63,11 @@ type CreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Input data for cloud-init facility
 	// Required: false
@@ -76,10 +81,6 @@ type CreateRequest struct {
 	// Required: false
 	Start bool `url:"start,omitempty" json:"start,omitempty"`
 
-	// Stack ID
-	// Required: false
-	StackID uint64 `url:"stackId,omitempty" json:"stackId,omitempty"`
-
 	// System name
 	// Required: false
 	IS string `url:"IS,omitempty" json:"IS,omitempty"`
@@ -87,10 +88,11 @@ type CreateRequest struct {
 	// Compute purpose
 	// Required: false
 	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
+}
 
-	// Reason for action
-	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
+type wrapperCreateRequest struct {
+	CreateRequest
+	Interfaces []string `url:"interfaces,omitempty"`
 }
 
 // Create creates KVM PowerPC VM based on specified OS image
@@ -102,9 +104,31 @@ func (k KVMPPC) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateRequest{
+		CreateRequest: req,
+		Interfaces:    interfaces,
+	}
+
 	url := "/cloudbroker/kvmppc/create"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudbroker/kvmppc/create_blank.go

@@ -2,6 +2,7 @@ package kvmppc
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -40,30 +41,22 @@ type CreateBlankRequest struct {
 	// Required: true
 	Pool string `url:"pool" json:"pool" validate:"required"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Text description of this VM
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }
 
+type wrapperCreateBlankRequest struct {
+	CreateBlankRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // CreateBlank creates KVM PowerPC VM from scratch
 func (k KVMPPC) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -73,9 +66,31 @@ func (k KVMPPC) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateBlankRequest{
+		CreateBlankRequest: req,
+		Interfaces:         interfaces,
+	}
+
 	url := "/cloudbroker/kvmppc/createBlank"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudbroker/kvmppc/mass_create.go

@@ -48,20 +48,11 @@ type MassCreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice.
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Input data for cloud-init facility
 	// Required: false
@@ -80,6 +71,11 @@ type MassCreateRequest struct {
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
+type wrapperMassCreateRequest struct {
+	MassCreateRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // MassCreate creates KVM PPC computes based on specified OS image
 func (k KVMPPC) MassCreate(ctx context.Context, req MassCreateRequest) ([]uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -89,9 +85,31 @@ func (k KVMPPC) MassCreate(ctx context.Context, req MassCreateRequest) ([]uint64
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return nil, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperMassCreateRequest{
+		MassCreateRequest: req,
+		Interfaces:        interfaces,
+	}
+
 	url := "/cloudbroker/kvmppc/massCreate"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return nil, err
 	}

pkg/cloudbroker/kvmx86/create.go

@@ -2,12 +2,30 @@ package kvmx86
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
+type Interface struct {
+	// Network type
+	// Should be one of:
+	//	- VINS
+	//	- EXTNET
+	NetType string `url:"netType" json:"netType" validate:"required,kvmNetType"`
+
+	// Network ID for connect to,
+	// for EXTNET - external network ID,
+	// for VINS - VINS ID,
+	NetID uint64 `url:"netId" json:"netId" validate:"required"`
+
+	// IP address to assign to this VM when connecting to the specified network
+	// Required: false
+	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+}
+
 // Request struct for create KVM x86 VM
 type CreateRequest struct {
 	// ID of the resource group, which will own this VM
@@ -45,24 +63,11 @@ type CreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Input data for cloud-init facility
 	// Required: false
@@ -88,11 +93,20 @@ type CreateRequest struct {
 	// Required: false
 	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
 
+	// Custom fields for Compute. Must be dict
+	// Required: false
+	CustomField string `url:"customFields,omitempty" json:"customFields,omitempty"`
+
 	// Reason for action
 	// Required: false
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
+type wrapperCreateRequest struct {
+	CreateRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // Create creates KVM PowerPC VM based on specified OS image
 func (k KVMX86) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -102,9 +116,31 @@ func (k KVMX86) Create(ctx context.Context, req CreateRequest) (uint64, error) {
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateRequest{
+		CreateRequest: req,
+		Interfaces:    interfaces,
+	}
+
 	url := "/cloudbroker/kvmx86/create"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudbroker/kvmx86/create_blank.go

@@ -2,6 +2,7 @@ package kvmx86
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strconv"
 
@@ -40,30 +41,22 @@ type CreateBlankRequest struct {
 	// Required: true
 	Pool string `url:"pool" json:"pool" validate:"required"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Text description of this VM
 	// Required: false
 	Description string `url:"desc,omitempty" json:"desc,omitempty"`
 }
 
+type wrapperCreateBlankRequest struct {
+	CreateBlankRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // CreateBlank creates KVM x86 VM from scratch
 func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -73,9 +66,31 @@ func (k KVMX86) CreateBlank(ctx context.Context, req CreateBlankRequest) (uint64
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return 0, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperCreateBlankRequest{
+		CreateBlankRequest: req,
+		Interfaces:         interfaces,
+	}
+
 	url := "/cloudbroker/kvmx86/createBlank"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudbroker/kvmx86/mass_create.go

@@ -48,24 +48,11 @@ type MassCreateRequest struct {
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
 
-	// Network type
-	// Should be one of:
-	//	- VINS
-	//	- EXTNET
-	//	- NONE
+	// Slice of structs with net interface description.
+	// If not specified, compute will be created with default interface from RG.
+	// To create compute without interfaces, pass initialized empty slice .
 	// Required: false
-	NetType string `url:"netType,omitempty" json:"netType,omitempty" validate:"omitempty,kvmNetType"`
-
-	// Network ID for connect to,
-	// for EXTNET - external network ID,
-	// for VINS - VINS ID,
-	// when network type is not "NONE"
-	// Required: false
-	NetID uint64 `url:"netId,omitempty" json:"netId,omitempty"`
-
-	// IP address to assign to this VM when connecting to the specified network
-	// Required: false
-	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
+	Interfaces []Interface `url:"-" json:"interfaces,omitempty" validate:"omitempty,dive"`
 
 	// Input data for cloud-init facility
 	// Required: false
@@ -84,6 +71,11 @@ type MassCreateRequest struct {
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
+type wrapperMassCreateRequest struct {
+	MassCreateRequest
+	Interfaces []string `url:"interfaces,omitempty"`
+}
+
 // MassCreate creates KVM x86 computes based on specified OS image
 func (k KVMX86) MassCreate(ctx context.Context, req MassCreateRequest) ([]uint64, error) {
 	err := validators.ValidateRequest(req)
@@ -93,9 +85,31 @@ func (k KVMX86) MassCreate(ctx context.Context, req MassCreateRequest) ([]uint64
 		}
 	}
 
+	var interfaces []string
+
+	if req.Interfaces != nil && len(req.Interfaces) != 0 {
+		interfaces = make([]string, 0, len(req.Interfaces))
+
+		for i := range req.Interfaces {
+			b, err := json.Marshal(req.Interfaces[i])
+			if err != nil {
+				return nil, err
+			}
+
+			interfaces = append(interfaces, string(b))
+		}
+	} else if req.Interfaces != nil && len(req.Interfaces) == 0 {
+		interfaces = []string{"[]"}
+	}
+
+	reqWrapped := wrapperMassCreateRequest{
+		MassCreateRequest: req,
+		Interfaces:        interfaces,
+	}
+
 	url := "/cloudbroker/kvmx86/massCreate"
 
-	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := k.client.DecortApiCall(ctx, http.MethodPost, url, reqWrapped)
 	if err != nil {
 		return nil, err
 	}

pkg/cloudbroker/lb/backend_create.go

@@ -67,7 +67,7 @@ type BackendCreateRequest struct {
 	Weight uint64 `url:"weight,omitempty" json:"weight,omitempty"`
 }
 
-// BackendCreate creates new backend on the specified load balancer
+// BackendCreate creates new backend on the specified load balancer  
 func (lb LB) BackendCreate(ctx context.Context, req BackendCreateRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {

pkg/cloudbroker/lb/create.go

@@ -19,10 +19,6 @@ type CreateRequest struct {
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
-	// OS image ID to create load balancer from
-	// Required: false
-	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
-
 	// External network to connect this load balancer to
 	// Required: true
 	ExtNetID uint64 `url:"extnetId" json:"extnetId" validate:"required"`

pkg/cloudbroker/lb/filter.go

@@ -44,7 +44,7 @@ func (ll ListLB) FilterByImageID(imageID uint64) ListLB {
 }
 
 // FilterByK8SID returns ListLB used by specified K8S cluster.
-func (ll ListLB) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (ListLB, error) {
+func (ll ListLB) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (*ListLB, error) {
 	caller := k8s.New(decortClient)
 
 	req := k8s.GetRequest{
@@ -60,28 +60,32 @@ func (ll ListLB) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient i
 		return cluster.LBID == rlb.ID
 	}
 
-	return ll.FilterFunc(predicate), nil
+	res := ll.FilterFunc(predicate)
+
+	return &res, nil
 }
 
 // FilterFunc allows filtering ListLB based on a user-specified predicate.
 func (ll ListLB) FilterFunc(predicate func(RecordLB) bool) ListLB {
 	var result ListLB
 
-	for _, item := range ll {
+	for _, item := range ll.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(result.Data))
+
 	return result
 }
 
 // FindOne returns first found RecordLB
 // If none was found, returns an empty struct.
 func (ll ListLB) FindOne() RecordLB {
-	if len(ll) == 0 {
+	if len(ll.Data) == 0 {
 		return RecordLB{}
 	}
 
-	return ll[0]
+	return ll.Data[0]
 }

pkg/cloudbroker/lb/filter_test.go

@@ -3,99 +3,102 @@ package lb
 import "testing"
 
 var lbs = ListLB{
-	RecordLB{
-		HAMode:        true,
-		CKey:          "",
-		Meta:          []interface{}{},
-		ACL:           []interface{}{},
-		Backends:      []ItemBackend{},
-		CreatedBy:     "test_user_1",
-		CreatedTime:   1636667448,
-		DeletedBy:     "",
-		DeletedTime:   0,
-		Description:   "",
-		DPAPIPassword: "0000",
-		DPAPIUser:     "api_user",
-		ExtNetID:      2522,
-		Frontends:     []ItemFrontend{},
-		GID:           212,
-		GUID:          1,
-		ID:            1,
-		ImageID:       2121,
-		Milestones:    129000,
-		Name:          "k8s-lb-test-1",
-		PrimaryNode:   Node{},
-		RGID:          25090,
-		RGName:        "",
-		SecondaryNode: Node{},
-		Status:        "ENABLED",
-		TechStatus:    "STARTED",
-		UpdatedBy:     "",
-		UpdatedTime:   0,
-		VINSID:        101,
-	},
-	RecordLB{
-		HAMode:        false,
-		CKey:          "",
-		Meta:          []interface{}{},
-		ACL:           []interface{}{},
-		Backends:      []ItemBackend{},
-		CreatedBy:     "test_user_2",
-		CreatedTime:   1636667506,
-		DeletedBy:     "",
-		DeletedTime:   0,
-		Description:   "",
-		DPAPIPassword: "0000",
-		DPAPIUser:     "api_user_2",
-		ExtNetID:      2524,
-		Frontends:     []ItemFrontend{},
-		GID:           212,
-		GUID:          2,
-		ID:            2,
-		ImageID:       2129,
-		Milestones:    129013,
-		Name:          "k8s-lb-test-2",
-		PrimaryNode:   Node{},
-		RGID:          25092,
-		RGName:        "",
-		SecondaryNode: Node{},
-		Status:        "ENABLED",
-		TechStatus:    "STOPPED",
-		UpdatedBy:     "",
-		UpdatedTime:   0,
-		VINSID:        102,
-	},
-	RecordLB{
-		HAMode:        true,
-		CKey:          "",
-		Meta:          []interface{}{},
-		ACL:           []interface{}{},
-		Backends:      []ItemBackend{},
-		CreatedBy:     "te2t_user_3",
-		CreatedTime:   1636667534,
-		DeletedBy:     "",
-		DeletedTime:   0,
-		Description:   "",
-		DPAPIPassword: "0000",
-		DPAPIUser:     "api_user_3",
-		ExtNetID:      2536,
-		Frontends:     []ItemFrontend{},
-		GID:           212,
-		GUID:          3,
-		ID:            3,
-		ImageID:       2139,
-		Milestones:    129025,
-		Name:          "k8s-lb-test-3",
-		PrimaryNode:   Node{},
-		RGID:          25106,
-		RGName:        "",
-		SecondaryNode: Node{},
-		Status:        "DISABLED",
-		TechStatus:    "STOPPED",
-		UpdatedBy:     "",
-		UpdatedTime:   0,
-		VINSID:        118,
+	Data: []RecordLB{
+		{
+			HAMode:        true,
+			CKey:          "",
+			Meta:          []interface{}{},
+			ACL:           []interface{}{},
+			Backends:      []ItemBackend{},
+			CreatedBy:     "test_user_1",
+			CreatedTime:   1636667448,
+			DeletedBy:     "",
+			DeletedTime:   0,
+			Description:   "",
+			DPAPIPassword: "0000",
+			DPAPIUser:     "api_user",
+			ExtNetID:      2522,
+			Frontends:     []ItemFrontend{},
+			GID:           212,
+			GUID:          1,
+			ID:            1,
+			ImageID:       2121,
+			Milestones:    129000,
+			Name:          "k8s-lb-test-1",
+			PrimaryNode:   Node{},
+			RGID:          25090,
+			RGName:        "",
+			SecondaryNode: Node{},
+			Status:        "ENABLED",
+			TechStatus:    "STARTED",
+			UpdatedBy:     "",
+			UpdatedTime:   0,
+			VINSID:        101,
+		},
+		{
+			HAMode:        false,
+			CKey:          "",
+			Meta:          []interface{}{},
+			ACL:           []interface{}{},
+			Backends:      []ItemBackend{},
+			CreatedBy:     "test_user_2",
+			CreatedTime:   1636667506,
+			DeletedBy:     "",
+			DeletedTime:   0,
+			Description:   "",
+			DPAPIPassword: "0000",
+			DPAPIUser:     "api_user_2",
+			ExtNetID:      2524,
+			Frontends:     []ItemFrontend{},
+			GID:           212,
+			GUID:          2,
+			ID:            2,
+			ImageID:       2129,
+			Milestones:    129013,
+			Name:          "k8s-lb-test-2",
+			PrimaryNode:   Node{},
+			RGID:          25092,
+			RGName:        "",
+			SecondaryNode: Node{},
+			Status:        "ENABLED",
+			TechStatus:    "STOPPED",
+			UpdatedBy:     "",
+			UpdatedTime:   0,
+			VINSID:        102,
+		},
+		{
+			HAMode:        true,
+			CKey:          "",
+			Meta:          []interface{}{},
+			ACL:           []interface{}{},
+			Backends:      []ItemBackend{},
+			CreatedBy:     "te2t_user_3",
+			CreatedTime:   1636667534,
+			DeletedBy:     "",
+			DeletedTime:   0,
+			Description:   "",
+			DPAPIPassword: "0000",
+			DPAPIUser:     "api_user_3",
+			ExtNetID:      2536,
+			Frontends:     []ItemFrontend{},
+			GID:           212,
+			GUID:          3,
+			ID:            3,
+			ImageID:       2139,
+			Milestones:    129025,
+			Name:          "k8s-lb-test-3",
+			PrimaryNode:   Node{},
+			RGID:          25106,
+			RGName:        "",
+			SecondaryNode: Node{},
+			Status:        "DISABLED",
+			TechStatus:    "STOPPED",
+			UpdatedBy:     "",
+			UpdatedTime:   0,
+			VINSID:        118,
+		},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -135,7 +138,7 @@ func TestFilterFunc(t *testing.T) {
 		return rl.Status == "DISABLED"
 	})
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "DISABLED" {
 			t.Fatal("expected Status 'DISABLED', found: ", item.Status)
 		}
@@ -145,7 +148,7 @@ func TestFilterFunc(t *testing.T) {
 func TestSortByCreatedTime(t *testing.T) {
 	actual := lbs.SortByCreatedTime(true)
 
-	if actual[0].CreatedTime != 1636667534 || actual[2].CreatedTime != 1636667448 {
+	if actual.Data[0].CreatedTime != 1636667534 || actual.Data[2].CreatedTime != 1636667448 {
 		t.Fatal("expected descending order, found ascending")
 	}
 }

pkg/cloudbroker/lb/list.go

@@ -8,6 +8,38 @@ import (
 
 // Request struct for get list of load balancers
 type ListRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by account ID
+	// Required: false
+	AccountID uint64 `url:"accountID,omitempty" json:"accountID,omitempty"`
+
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by tech status
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by frontend Ip
+	// Required: false
+	FrontIP string `url:"frontIp,omitempty" json:"frontIp,omitempty"`
+
+	// Find by backend Ip
+	// Required: false
+	BackIP string `url:"backIp,omitempty" json:"backIp,omitempty"`
+
 	// Included deleted load balancers
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
@@ -22,7 +54,7 @@ type ListRequest struct {
 }
 
 // List gets list all load balancers
-func (lb LB) List(ctx context.Context, req ListRequest) (ListLB, error) {
+func (lb LB) List(ctx context.Context, req ListRequest) (*ListLB, error) {
 	url := "/cloudbroker/lb/list"
 
 	res, err := lb.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,6 +69,6 @@ func (lb LB) List(ctx context.Context, req ListRequest) (ListLB, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 
 }

pkg/cloudbroker/lb/list_deleted.go

@@ -8,6 +8,34 @@ import (
 
 // Request struct for get list of deleted load balancers
 type ListDeletedRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by account ID
+	// Required: false
+	AccountID uint64 `url:"accountID,omitempty" json:"accountID,omitempty"`
+
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by tech status
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by frontend Ip
+	// Required: false
+	FrontIP string `url:"frontIp,omitempty" json:"frontIp,omitempty"`
+
+	// Find by backend Ip
+	// Required: false
+	BackIP string `url:"backIp,omitempty" json:"backIp,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -18,7 +46,7 @@ type ListDeletedRequest struct {
 }
 
 // ListDeleted gets list of deleted load balancers
-func (lb LB) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListLB, error) {
+func (lb LB) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListLB, error) {
 	url := "/cloudbroker/lb/listDeleted"
 
 	res, err := lb.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,6 +61,6 @@ func (lb LB) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListLB, e
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 
 }

pkg/cloudbroker/lb/models.go

@@ -134,7 +134,13 @@ type Node struct {
 }
 
 // List of load balancers
-type ListLB []RecordLB
+type ListLB struct {
+	// Data
+	Data []RecordLB `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Detailed information about load balancer
 type RecordLB struct {

pkg/cloudbroker/lb/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (ll ListLB) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(ll) == 0 {
+	if len(ll.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudbroker/lb/sorting.go

@@ -6,16 +6,16 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (ll ListLB) SortByCreatedTime(inverse bool) ListLB {
-	if len(ll) < 2 {
+	if len(ll.Data) < 2 {
 		return ll
 	}
 
-	sort.Slice(ll, func(i, j int) bool {
+	sort.Slice(ll.Data, func(i, j int) bool {
 		if inverse {
-			return ll[i].CreatedTime > ll[j].CreatedTime
+			return ll.Data[i].CreatedTime > ll.Data[j].CreatedTime
 		}
 
-		return ll[i].CreatedTime < ll[j].CreatedTime
+		return ll.Data[i].CreatedTime < ll.Data[j].CreatedTime
 	})
 
 	return ll
@@ -25,16 +25,16 @@ func (ll ListLB) SortByCreatedTime(inverse bool) ListLB {
 //
 // If inverse param is set to true, the order is reversed.
 func (ll ListLB) SortByUpdatedTime(inverse bool) ListLB {
-	if len(ll) < 2 {
+	if len(ll.Data) < 2 {
 		return ll
 	}
 
-	sort.Slice(ll, func(i, j int) bool {
+	sort.Slice(ll.Data, func(i, j int) bool {
 		if inverse {
-			return ll[i].UpdatedTime > ll[j].UpdatedTime
+			return ll.Data[i].UpdatedTime > ll.Data[j].UpdatedTime
 		}
 
-		return ll[i].UpdatedTime < ll[j].UpdatedTime
+		return ll.Data[i].UpdatedTime < ll.Data[j].UpdatedTime
 	})
 
 	return ll
@@ -44,16 +44,16 @@ func (ll ListLB) SortByUpdatedTime(inverse bool) ListLB {
 //
 // If inverse param is set to true, the order is reversed.
 func (ll ListLB) SortByDeletedTime(inverse bool) ListLB {
-	if len(ll) < 2 {
+	if len(ll.Data) < 2 {
 		return ll
 	}
 
-	sort.Slice(ll, func(i, j int) bool {
+	sort.Slice(ll.Data, func(i, j int) bool {
 		if inverse {
-			return ll[i].DeletedTime > ll[j].DeletedTime
+			return ll.Data[i].DeletedTime > ll.Data[j].DeletedTime
 		}
 
-		return ll[i].DeletedTime < ll[j].DeletedTime
+		return ll.Data[i].DeletedTime < ll.Data[j].DeletedTime
 	})
 
 	return ll

pkg/cloudbroker/pcidevice/list.go

@@ -6,11 +6,41 @@ import (
 	"net/http"
 )
 
+type ListRequest struct {
+	// Find by id
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by computeId
+	// Required: false
+	ComputeID uint64 `url:"computeId,omitempty" json:"computeId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by rgId
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,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"`
+}
+
 // List gets list all pci devices
-func (p PCIDevice) List(ctx context.Context) (ListPCIDevices, error) {
+func (p PCIDevice) List(ctx context.Context, req ListRequest) (*ListPCIDevices, error) {
 	url := "/cloudbroker/pcidevice/list"
 
-	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, nil)
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
@@ -22,5 +52,5 @@ func (p PCIDevice) List(ctx context.Context) (ListPCIDevices, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/pcidevice/models.go

@@ -40,4 +40,11 @@ type ItemPCIDevice struct {
 }
 
 // List PCI devices
-type ListPCIDevices []ItemPCIDevice
+type ListPCIDevices struct {
+	// Data
+	Data []ItemPCIDevice `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+

pkg/cloudbroker/pcidevice/serialize.go

@@ -11,7 +11,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (l ListPCIDevices) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(l) == 0 {
+	if len(l.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudbroker/rg/affinity_groups_list.go

@@ -16,7 +16,7 @@ type AffinityGroupsListRequest struct {
 }
 
 // AffinityGroupsList gets all currently defined affinity groups in this resource group with compute IDs
-func (r RG) AffinityGroupsList(ctx context.Context, req AffinityGroupsListRequest) (map[string][]uint64, error) {
+func (r RG) AffinityGroupsList(ctx context.Context, req AffinityGroupsListRequest) (*ListAffinityGroup, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,12 +31,12 @@ func (r RG) AffinityGroupsList(ctx context.Context, req AffinityGroupsListReques
 		return nil, err
 	}
 
-	list := make(map[string][]uint64)
+	list := ListAffinityGroup{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/filter.go

@@ -67,21 +67,23 @@ func (lrg ListRG) FilterByDefNetID(defNetID int64) ListRG {
 func (lrg ListRG) FilterFunc(predicate func(ItemRG) bool) ListRG {
 	var result ListRG
 
-	for _, item := range lrg {
+	for _, item := range lrg.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(result.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemRG.
 // If none was found, returns an empty struct.
 func (lrg ListRG) FindOne() ItemRG {
-	if len(lrg) == 0 {
+	if len(lrg.Data) == 0 {
 		return ItemRG{}
 	}
 
-	return lrg[0]
+	return lrg.Data[0]
 }

pkg/cloudbroker/rg/filter_test.go

@@ -3,140 +3,143 @@ package rg
 import "testing"
 
 var rgs = ListRG{
-	{
-		AccountID:   1,
-		AccountName: "std",
-		ACL: []ACL{
-			{
-				Explicit:    true,
-				GUID:        "",
-				Right:       "ARCXDU",
-				Status:      "CONFIRMED",
-				Type:        "U",
-				UserGroupID: "sample_user_1@decs3o",
+	Data: []ItemRG{
+		{
+			AccountID:   1,
+			AccountName: "std",
+			ACL: []ACL{
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "ARCXDU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "sample_user_1@decs3o",
+				},
 			},
-		},
-		CreatedBy:        "sample_user_1@decs3o",
-		CreatedTime:      1676645305,
-		DefNetID:         1,
-		DefNetType:       "NONE",
-		DeletedBy:        "",
-		DeletedTime:      0,
-		Description:      "",
-		GID:              212,
-		GUID:             7971,
-		ID:               7971,
-		LockStatus:       "UNLOCKED",
-		Milestones:       363459,
-		Name:             "rg_1",
-		RegisterComputes: false,
-		ResourceLimits: ResourceLimits{
-			CUC:      -1,
-			CuD:      -1,
-			CUI:      -1,
-			CUM:      -1,
-			CUNP:     -1,
-			GPUUnits: -1,
-		},
-		Secret:      "",
-		Status:      "CREATED",
-		UpdatedBy:   "",
-		UpdatedTime: 0,
-		VINS:        []uint64{},
-		VMs:         []uint64{},
-		ResTypes:    []string{},
-		UniqPools:   []string{},
-	},
-	{
-		AccountID:   2,
-		AccountName: "std_2",
-		ACL: []ACL{
-			{
-				Explicit:    true,
-				GUID:        "",
-				Right:       "ARCXDU",
-				Status:      "CONFIRMED",
-				Type:        "U",
-				UserGroupID: "sample_user_1@decs3o",
+			CreatedBy:        "sample_user_1@decs3o",
+			CreatedTime:      1676645305,
+			DefNetID:         1,
+			DefNetType:       "NONE",
+			DeletedBy:        "",
+			DeletedTime:      0,
+			Description:      "",
+			GID:              212,
+			GUID:             7971,
+			ID:               7971,
+			LockStatus:       "UNLOCKED",
+			Milestones:       363459,
+			Name:             "rg_1",
+			RegisterComputes: false,
+			ResourceLimits: ResourceLimits{
+				CUC:      -1,
+				CuD:      -1,
+				CUI:      -1,
+				CUM:      -1,
+				CUNP:     -1,
+				GPUUnits: -1,
 			},
+			Secret:      "",
+			Status:      "CREATED",
+			UpdatedBy:   "",
+			UpdatedTime: 0,
+			VINS:        []uint64{},
+			VMs:         []uint64{},
+			ResTypes:    []string{},
+			UniqPools:   []string{},
 		},
-		CreatedBy:        "sample_user_1@decs3o",
-		CreatedTime:      1676645461,
-		DefNetID:         2,
-		DefNetType:       "NONE",
-		DeletedBy:        "",
-		DeletedTime:      0,
-		Description:      "",
-		GID:              212,
-		GUID:             7972,
-		ID:               7972,
-		LockStatus:       "UNLOCKED",
-		Milestones:       363468,
-		Name:             "rg_2",
-		RegisterComputes: false,
-		ResourceLimits: ResourceLimits{
-			CUC:      -1,
-			CuD:      -1,
-			CUI:      -1,
-			CUM:      -1,
-			CUNP:     -1,
-			GPUUnits: -1,
-		},
-		Secret:      "",
-		Status:      "CREATED",
-		UpdatedBy:   "",
-		UpdatedTime: 0,
-		VINS:        []uint64{},
-		VMs:         []uint64{},
-		ResTypes:    []string{},
-		UniqPools:   []string{},
-	},
-	{
-		AccountID:   3,
-		AccountName: "std_3",
-		ACL: []ACL{
-			{
-				Explicit:    true,
-				GUID:        "",
-				Right:       "ARCXDU",
-				Status:      "CONFIRMED",
-				Type:        "U",
-				UserGroupID: "sample_user_2@decs3o",
+		{
+			AccountID:   2,
+			AccountName: "std_2",
+			ACL: []ACL{
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "ARCXDU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "sample_user_1@decs3o",
+				},
 			},
+			CreatedBy:        "sample_user_1@decs3o",
+			CreatedTime:      1676645461,
+			DefNetID:         2,
+			DefNetType:       "NONE",
+			DeletedBy:        "",
+			DeletedTime:      0,
+			Description:      "",
+			GID:              212,
+			GUID:             7972,
+			ID:               7972,
+			LockStatus:       "UNLOCKED",
+			Milestones:       363468,
+			Name:             "rg_2",
+			RegisterComputes: false,
+			ResourceLimits: ResourceLimits{
+				CUC:      -1,
+				CuD:      -1,
+				CUI:      -1,
+				CUM:      -1,
+				CUNP:     -1,
+				GPUUnits: -1,
+			},
+			Secret:      "",
+			Status:      "CREATED",
+			UpdatedBy:   "",
+			UpdatedTime: 0,
+			VINS:        []uint64{},
+			VMs:         []uint64{},
+			ResTypes:    []string{},
+			UniqPools:   []string{},
 		},
-		CreatedBy:        "sample_user_2@decs3o",
-		CreatedTime:      1676645548,
-		DefNetID:         3,
-		DefNetType:       "NONE",
-		DeletedBy:        "",
-		DeletedTime:      0,
-		Description:      "",
-		GID:              212,
-		GUID:             7973,
-		ID:               7973,
-		LockStatus:       "kjLOCKED",
-		Milestones:       363471,
-		Name:             "rg_3",
-		RegisterComputes: false,
-		ResourceLimits: ResourceLimits{
-			CUC:      -1,
-			CuD:      -1,
-			CUI:      -1,
-			CUM:      -1,
-			CUNP:     -1,
-			GPUUnits: -1,
+		{
+			AccountID:   3,
+			AccountName: "std_3",
+			ACL: []ACL{
+				{
+					Explicit:    true,
+					GUID:        "",
+					Right:       "ARCXDU",
+					Status:      "CONFIRMED",
+					Type:        "U",
+					UserGroupID: "sample_user_2@decs3o",
+				},
+			},
+			CreatedBy:        "sample_user_2@decs3o",
+			CreatedTime:      1676645548,
+			DefNetID:         3,
+			DefNetType:       "NONE",
+			DeletedBy:        "",
+			DeletedTime:      0,
+			Description:      "",
+			GID:              212,
+			GUID:             7973,
+			ID:               7973,
+			LockStatus:       "kjLOCKED",
+			Milestones:       363471,
+			Name:             "rg_3",
+			RegisterComputes: false,
+			ResourceLimits: ResourceLimits{
+				CUC:      -1,
+				CuD:      -1,
+				CUI:      -1,
+				CUM:      -1,
+				CUNP:     -1,
+				GPUUnits: -1,
+			},
+			Secret:      "",
+			Status:      "DISABLED",
+			UpdatedBy:   "",
+			UpdatedTime: 0,
+			VINS:        []uint64{},
+			VMs: []uint64{
+				48500,
+			},
+			ResTypes:  []string{},
+			UniqPools: []string{},
 		},
-		Secret:      "",
-		Status:      "DISABLED",
-		UpdatedBy:   "",
-		UpdatedTime: 0,
-		VINS:        []uint64{},
-		VMs: []uint64{
-			48500,
-		},
-		ResTypes:  []string{},
-		UniqPools: []string{},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -158,11 +161,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByCreatedBy(t *testing.T) {
 	actual := rgs.FilterByCreatedBy("sample_user_1@decs3o")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.CreatedBy != "sample_user_1@decs3o" {
 			t.Fatal("expected CreatedBy 'sample_user_1@decs3o', found: ", item.CreatedBy)
 		}
@@ -172,11 +175,11 @@ func TestFilterByCreatedBy(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := rgs.FilterByStatus("CREATED")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "CREATED" {
 			t.Fatal("expected Status 'ENABLED', found: ", item.Status)
 		}
@@ -186,11 +189,11 @@ func TestFilterByStatus(t *testing.T) {
 func TestFilterByLockStatus(t *testing.T) {
 	actual := rgs.FilterByLockStatus("UNLOCKED")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.LockStatus != "UNLOCKED" {
 			t.Fatal("expected LockStatus 'UNLOCKED', found: ", item.LockStatus)
 		}
@@ -200,11 +203,11 @@ func TestFilterByLockStatus(t *testing.T) {
 func TestFilterByDefNetType(t *testing.T) {
 	actual := rgs.FilterByDefNetType("NONE")
 
-	if len(actual) != 3 {
-		t.Fatal("expected 3 found, actual: ", len(actual))
+	if len(actual.Data) != 3 {
+		t.Fatal("expected 3 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.DefNetType != "NONE" {
 			t.Fatal("expected DefNetType 'NONE', found: ", item.DefNetType)
 		}
@@ -224,11 +227,11 @@ func TestFilterFunc(t *testing.T) {
 		return len(ir.VMs) > 0
 	})
 
-	if len(actual) < 1 {
-		t.Fatal("expected 1 found, actual: ", len(actual))
+	if len(actual.Data) < 1 {
+		t.Fatal("expected 1 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if len(item.VMs) < 1 {
 			t.Fatal("expected VMs to contain at least 1 element, found empty")
 		}
@@ -238,7 +241,7 @@ func TestFilterFunc(t *testing.T) {
 func TestSortByCreatedTime(t *testing.T) {
 	actual := rgs.SortByCreatedTime(true)
 
-	if actual[0].CreatedTime != 1676645548 || actual[2].CreatedTime != 1676645305 {
+	if actual.Data[0].CreatedTime != 1676645548 || actual.Data[2].CreatedTime != 1676645305 {
 		t.Fatal("expected descending order, found ascending")
 	}
 }

pkg/cloudbroker/rg/get_resource_consumption.go

@@ -0,0 +1,42 @@
+package rg
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// Request struct for get detailed information about resource consumption for ResGroup
+type GetResourceConsumptionRequest struct {
+	// Resource group ID
+	// Required: true
+	RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
+}
+
+// GetResourceConsumption gets resource consumption of the resource group
+func (r RG) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*ItemResourceConsumption, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
+	}
+
+	url := "/cloudbroker/rg/getResourceConsumption"
+
+	res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := ItemResourceConsumption{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}

pkg/cloudbroker/rg/list.go

@@ -8,6 +8,34 @@ import (
 
 // Request struct for get list of resource groups
 type ListRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by account ID
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// Find by name account
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Find by created after time (unix timestamp)
+	// Required: false
+	CreatedAfter uint64 `url:"createdAfter,omitempty" json:"createdAfter,omitempty"`
+
+	// Find by created before time (unix timestamp)
+	// Required: false
+	CreatedBefore uint64 `url:"createdBefore,omitempty" json:"createdBefore,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
 	// Included deleted resource groups
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
@@ -22,7 +50,7 @@ type ListRequest struct {
 }
 
 // List gets list of all resource groups the user has access to
-func (r RG) List(ctx context.Context, req ListRequest) (ListRG, error) {
+func (r RG) List(ctx context.Context, req ListRequest) (*ListRG, error) {
 	url := "/cloudbroker/rg/list"
 
 	res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,5 +65,5 @@ func (r RG) List(ctx context.Context, req ListRequest) (ListRG, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/list_computes.go

@@ -14,13 +14,49 @@ type ListComputesRequest struct {
 	// Required: true
 	RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
 
-	// Reason for action
+	// Find by compute id
 	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
+	ComputeID uint64 `url:"computeId,omitempty" json:"computeId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// ID an account
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// Find by tech status
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by ip address
+	// Required: false
+	IPAddress string `url:"ipAddress,omitempty" json:"ipAddress,omitempty"`
+
+	// Find by external network name
+	// Required: false
+	ExtNetName string `url:"extNetName,omitempty" json:"extNetName,omitempty"`
+
+	// Find by external network id
+	// Required: false
+	ExtNetID uint64 `url:"extNetId,omitempty" json:"extNetId,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"`
 }
 
 // ListComputes gets list of all compute instances under specified resource group, accessible by the user
-func (r RG) ListComputes(ctx context.Context, req ListComputesRequest) (ListComputes, error) {
+func (r RG) ListComputes(ctx context.Context, req ListComputesRequest) (*ListComputes, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -42,5 +78,5 @@ func (r RG) ListComputes(ctx context.Context, req ListComputesRequest) (ListComp
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/list_deleted.go

@@ -8,6 +8,34 @@ import (
 
 // Request struct for get list deleted resource groups
 type ListDeletedRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by account ID
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// Find by name account
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Find by created after time (unix timestamp)
+	// Required: false
+	CreatedAfter uint64 `url:"createdAfter,omitempty" json:"createdAfter,omitempty"`
+
+	// Find by created before time (unix timestamp)
+	// Required: false
+	CreatedBefore uint64 `url:"createdBefore,omitempty" json:"createdBefore,omitempty"`
+
+	// Find by status lock
+	// Required: false
+	LockStatus string `url:"lockStatus,omitempty" json:"lockStatus,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -18,7 +46,7 @@ type ListDeletedRequest struct {
 }
 
 // ListDeleted gets list all deleted resource groups the user has access to
-func (r RG) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListRG, error) {
+func (r RG) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListRG, error) {
 	url := "/cloudbroker/rg/listDeleted"
 
 	res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +61,5 @@ func (r RG) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListRG, er
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/list_lb.go

@@ -13,10 +13,46 @@ type ListLBRequest struct {
 	// Resource group ID
 	// Required: true
 	RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
+
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by account ID
+	// Required: false
+	AccountID uint64 `url:"accountID,omitempty" json:"accountID,omitempty"`
+
+	// Find by tech status
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by frontend Ip
+	// Required: false
+	FrontIP string `url:"frontIp,omitempty" json:"frontIp,omitempty"`
+
+	// Find by backend Ip
+	// Required: false
+	BackIP string `url:"backIp,omitempty" json:"backIp,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"`
 }
 
 // ListLB gets list all load balancers in the specified resource group, accessible by the user
-func (r RG) ListLB(ctx context.Context, req ListLBRequest) (ListLB, error) {
+func (r RG) ListLB(ctx context.Context, req ListLBRequest) (*ListLB, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +74,5 @@ func (r RG) ListLB(ctx context.Context, req ListLBRequest) (ListLB, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/list_pfw.go

@@ -16,7 +16,7 @@ type ListPFWRequest struct {
 }
 
 // ListPFW gets list port forward rules for the specified resource group
-func (r RG) ListPFW(ctx context.Context, req ListPFWRequest) (ListPFW, error) {
+func (r RG) ListPFW(ctx context.Context, req ListPFWRequest) (*ListPFW, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +38,5 @@ func (r RG) ListPFW(ctx context.Context, req ListPFWRequest) (ListPFW, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/list_resource_consumption.go

@@ -0,0 +1,26 @@
+package rg
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+)
+
+// ListResourceConsumption gets resource consumptions of the resource groups
+func (r RG) ListResourceConsumption(ctx context.Context) (*ListResourceConsumption, error) {
+	url := "/cloudbroker/rg/listResourceConsumption"
+
+	res, err := r.client.DecortApiCall(ctx, http.MethodPost, url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListResourceConsumption{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}

pkg/cloudbroker/rg/list_vins.go

@@ -14,13 +14,33 @@ type ListVINSRequest struct {
 	// Required: true
 	RGID uint64 `url:"rgId" json:"rgId" validate:"required"`
 
-	// Reason for action
+	// Find by name
 	// Required: false
-	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// ID an account
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// Find by ip extnet address
+	// Required: false
+	ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
+
+	// Find by vins id
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,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"`
 }
 
 // ListVINS gets list all ViNSes under specified resource group, accessible by the user
-func (r RG) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, error) {
+func (r RG) ListVINS(ctx context.Context, req ListVINSRequest) (*ListVINS, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -42,5 +62,5 @@ func (r RG) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, error)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/rg/models.go

@@ -30,7 +30,7 @@ type Reservation struct {
 	DiskSize float64 `json:"disksize"`
 
 	// Max disk size
-	DiskSizeMax uint64 `json:"disksizemax"`
+	DiskSizeMax float64 `json:"disksizemax"`
 
 	// External IPs
 	ExtIPs int64 `json:"extips"`
@@ -54,16 +54,26 @@ type DiskUsage struct {
 	DiskSize float64 `json:"disksize"`
 
 	// Disk size max
-	DiskSizeMax uint64 `json:"disksizemax"`
+	DiskSizeMax float64 `json:"disksizemax"`
 }
 
 // Resources usage information
-type Resources struct {
+type ItemResourceConsumption struct {
 	// Current information
-	Current Reservation `json:"Current"`
+	Consumed Reservation `json:"Consumed"`
 
 	// Reserved information
 	Reserved Reservation `json:"Reserved"`
+
+	RGID uint64 `json:"rgid"`
+}
+
+type ListResourceConsumption struct {
+	// Data
+	Data []ItemResourceConsumption `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
 }
 
 // Access Control List
@@ -98,6 +108,9 @@ type ResourceLimits struct {
 	// CUD
 	CuD float64 `json:"CU_D"`
 
+	// CUDM
+	CUDM float64 `json:"CU_DM"`
+
 	// CUI
 	CUI float64 `json:"CU_I"`
 
@@ -113,9 +126,6 @@ type ResourceLimits struct {
 
 // Detailed information about resource group
 type RecordRG struct {
-	// Resource information
-	Resources Resources `json:"Resources"`
-
 	// Main information about resource group
 	ItemRG
 }
@@ -158,6 +168,9 @@ type ItemRG struct {
 	// Description
 	Description string `json:"desc"`
 
+	// Dirty
+	Dirty bool `json:"dirty"`
+
 	// Grid ID
 	GID uint64 `json:"gid"`
 
@@ -208,7 +221,13 @@ type ItemRG struct {
 }
 
 // List resource groups
-type ListRG []ItemRG
+type ListRG struct {
+	// Data
+	Data []ItemRG `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about affinity group
 type ItemAffinityGroupCompute struct {
@@ -337,7 +356,13 @@ type ItemCompute struct {
 }
 
 // List computes
-type ListComputes []ItemCompute
+type ListComputes struct {
+	// Data
+	Data []ItemCompute `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about VINS
 type ItemVINS struct {
@@ -394,7 +419,13 @@ type ItemVINS struct {
 }
 
 // List VINSes
-type ListVINS []ItemVINS
+type ListVINS struct {
+	// Data
+	Data []ItemVINS `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about port forward
 type ItemPFW struct {
@@ -424,7 +455,13 @@ type ItemPFW struct {
 }
 
 // List PFWs
-type ListPFW []ItemPFW
+type ListPFW struct {
+	// Data
+	Data []ItemPFW `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Server settings
 type ServerSettings struct {
@@ -640,4 +677,18 @@ type ItemLB struct {
 }
 
 // List load balancers
-type ListLB []ItemLB
+type ListLB struct {
+	// Data
+	Data []ItemLB `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
+type ListAffinityGroup struct {
+	// Data
+	Data map[string][]uint64 `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/rg/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (lrg ListRG) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(lrg) == 0 {
+	if len(lrg.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudbroker/rg/sorting.go

@@ -6,16 +6,16 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (lrg ListRG) SortByCreatedTime(inverse bool) ListRG {
-	if len(lrg) < 2 {
+	if len(lrg.Data) < 2 {
 		return lrg
 	}
 
-	sort.Slice(lrg, func(i, j int) bool {
+	sort.Slice(lrg.Data, func(i, j int) bool {
 		if inverse {
-			return lrg[i].CreatedTime > lrg[j].CreatedTime
+			return lrg.Data[i].CreatedTime > lrg.Data[j].CreatedTime
 		}
 
-		return lrg[i].CreatedTime < lrg[j].CreatedTime
+		return lrg.Data[i].CreatedTime < lrg.Data[j].CreatedTime
 	})
 
 	return lrg
@@ -25,16 +25,16 @@ func (lrg ListRG) SortByCreatedTime(inverse bool) ListRG {
 //
 // If inverse param is set to true, the order is reversed.
 func (lrg ListRG) SortByUpdatedTime(inverse bool) ListRG {
-	if len(lrg) < 2 {
+	if len(lrg.Data) < 2 {
 		return lrg
 	}
 
-	sort.Slice(lrg, func(i, j int) bool {
+	sort.Slice(lrg.Data, func(i, j int) bool {
 		if inverse {
-			return lrg[i].UpdatedTime > lrg[j].UpdatedTime
+			return lrg.Data[i].UpdatedTime > lrg.Data[j].UpdatedTime
 		}
 
-		return lrg[i].UpdatedTime < lrg[j].UpdatedTime
+		return lrg.Data[i].UpdatedTime < lrg.Data[j].UpdatedTime
 	})
 
 	return lrg
@@ -44,16 +44,16 @@ func (lrg ListRG) SortByUpdatedTime(inverse bool) ListRG {
 //
 // If inverse param is set to true, the order is reversed.
 func (lrg ListRG) SortByDeletedTime(inverse bool) ListRG {
-	if len(lrg) < 2 {
+	if len(lrg.Data) < 2 {
 		return lrg
 	}
 
-	sort.Slice(lrg, func(i, j int) bool {
+	sort.Slice(lrg.Data, func(i, j int) bool {
 		if inverse {
-			return lrg[i].DeletedTime > lrg[j].DeletedTime
+			return lrg.Data[i].DeletedTime > lrg.Data[j].DeletedTime
 		}
 
-		return lrg[i].DeletedTime < lrg[j].DeletedTime
+		return lrg.Data[i].DeletedTime < lrg.Data[j].DeletedTime
 	})
 
 	return lrg

pkg/cloudbroker/sep/filter.go

@@ -49,21 +49,23 @@ func (lsep ListSEP) FilterByType(sepType string) ListSEP {
 func (lsep ListSEP) FilterFunc(predicate func(RecordSEP) bool) ListSEP {
 	var result ListSEP
 
-	for _, item := range lsep {
+	for _, item := range lsep.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(result.Data))
+
 	return result
 }
 
 // FindOne returns first found RecordSEP
 // If none was found, returns an empty struct.
 func (lsep ListSEP) FindOne() RecordSEP {
-	if len(lsep) == 0 {
+	if len(lsep.Data) == 0 {
 		return RecordSEP{}
 	}
 
-	return lsep[0]
+	return lsep.Data[0]
 }

pkg/cloudbroker/sep/filter_test.go

@@ -3,110 +3,113 @@ package sep
 import "testing"
 
 var seps = ListSEP{
-	{
-		CKey: "",
-		Meta: []interface{}{
-			"osismodel",
-			"cloudbroker",
-			"sep",
-			1,
-		},
-		Config: map[string]interface{}{
-			"API_IPs": []string{
-				"10.212.3.61",
-				"10.212.3.62",
-				"10.212.3.63",
+	Data: []RecordSEP{
+		{
+			CKey: "",
+			Meta: []interface{}{
+				"osismodel",
+				"cloudbroker",
+				"sep",
+				1,
 			},
-		},
-		ConsumedBy: []uint64{
-			27,
-		},
-		Description: "",
-		GID:         212,
-		GUID:        1,
-		ID:          1,
-		Milestones:  278329,
-		Name:        "sep_1",
-		ObjStatus:   "CREATED",
-		ProvidedBy: []uint64{
-			24,
-			35,
-			29,
-		},
-		SharedWith: []uint64{},
-		TechStatus: "ENABLED",
-		Type:       "DES",
-	},
-	{
-		CKey: "",
-		Meta: []interface{}{
-			"osismodel",
-			"cloudbroker",
-			"sep",
-			1,
-		},
-		Config: map[string]interface{}{
-			"API_IPs": []string{
-				"10.212.3.64",
-				"10.212.3.65",
-				"10.212.3.66",
+			Config: map[string]interface{}{
+				"API_IPs": []string{
+					"10.212.3.61",
+					"10.212.3.62",
+					"10.212.3.63",
+				},
 			},
-		},
-		ConsumedBy: []uint64{
-			32,
-			26,
-		},
-		Description: "",
-		GID:         212,
-		GUID:        2,
-		ID:          2,
-		Milestones:  278337,
-		Name:        "sep_2",
-		ObjStatus:   "CREATED",
-		ProvidedBy: []uint64{
-			36,
-			42,
-			35,
-		},
-		SharedWith: []uint64{},
-		TechStatus: "ENABLED",
-		Type:       "DES",
-	},
-	{
-		CKey: "",
-		Meta: []interface{}{
-			"osismodel",
-			"cloudbroker",
-			"sep",
-			1,
-		},
-		Config: map[string]interface{}{
-			"API_IPs": []string{
-				"10.212.3.67",
-				"10.212.3.68",
-				"10.212.3.69",
+			ConsumedBy: []uint64{
+				27,
 			},
+			Description: "",
+			GID:         212,
+			GUID:        1,
+			ID:          1,
+			Milestones:  278329,
+			Name:        "sep_1",
+			ObjStatus:   "CREATED",
+			ProvidedBy: []uint64{
+				24,
+				35,
+				29,
+			},
+			SharedWith: []uint64{},
+			TechStatus: "ENABLED",
+			Type:       "DES",
 		},
-		ConsumedBy: []uint64{
-			38,
-			28,
+		{
+			CKey: "",
+			Meta: []interface{}{
+				"osismodel",
+				"cloudbroker",
+				"sep",
+				1,
+			},
+			Config: map[string]interface{}{
+				"API_IPs": []string{
+					"10.212.3.64",
+					"10.212.3.65",
+					"10.212.3.66",
+				},
+			},
+			ConsumedBy: []uint64{
+				32,
+				26,
+			},
+			Description: "",
+			GID:         212,
+			GUID:        2,
+			ID:          2,
+			Milestones:  278337,
+			Name:        "sep_2",
+			ObjStatus:   "CREATED",
+			ProvidedBy: []uint64{
+				36,
+				42,
+				35,
+			},
+			SharedWith: []uint64{},
+			TechStatus: "ENABLED",
+			Type:       "DES",
 		},
-		Description: "",
-		GID:         212,
-		GUID:        3,
-		ID:          3,
-		Milestones:  278345,
-		Name:        "sep_3",
-		ObjStatus:   "DESTROYED",
-		ProvidedBy: []uint64{
-			49,
-			48,
-			41,
+		{
+			CKey: "",
+			Meta: []interface{}{
+				"osismodel",
+				"cloudbroker",
+				"sep",
+				1,
+			},
+			Config: map[string]interface{}{
+				"API_IPs": []string{
+					"10.212.3.67",
+					"10.212.3.68",
+					"10.212.3.69",
+				},
+			},
+			ConsumedBy: []uint64{
+				38,
+				28,
+			},
+			Description: "",
+			GID:         212,
+			GUID:        3,
+			ID:          3,
+			Milestones:  278345,
+			Name:        "sep_3",
+			ObjStatus:   "DESTROYED",
+			ProvidedBy: []uint64{
+				49,
+				48,
+				41,
+			},
+			SharedWith: []uint64{},
+			TechStatus: "DISABLED",
+			Type:       "DES",
 		},
-		SharedWith: []uint64{},
-		TechStatus: "DISABLED",
-		Type:       "DES",
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -128,11 +131,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByObjStatus(t *testing.T) {
 	actual := seps.FilterByObjStatus("CREATED")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.ObjStatus != "CREATED" {
 			t.Fatal("expected ObjStatus 'CREATED', found: ", item.ObjStatus)
 		}
@@ -142,11 +145,11 @@ func TestFilterByObjStatus(t *testing.T) {
 func TestFilterByTechStatus(t *testing.T) {
 	actual := seps.FilterByTechStatus("ENABLED")
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.TechStatus != "ENABLED" {
 			t.Fatal("expected TechStatus 'ENABLED', found: ", item.TechStatus)
 		}
@@ -156,11 +159,11 @@ func TestFilterByTechStatus(t *testing.T) {
 func TestFilterByType(t *testing.T) {
 	actual := seps.FilterByType("DES")
 
-	if len(actual) != 3 {
-		t.Fatal("expected 3 found, actual: ", len(actual))
+	if len(actual.Data) != 3 {
+		t.Fatal("expected 3 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Type != "DES" {
 			t.Fatal("expected Type 'DES', found: ", item.Type)
 		}
@@ -172,11 +175,11 @@ func TestFilterFunc(t *testing.T) {
 		return len(rs.ConsumedBy) > 1
 	})
 
-	if len(actual) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if len(item.ConsumedBy) <= 1 {
 			t.Fatal("expected ConsumedBy to contain more than 1 element, found: ", len(item.ConsumedBy))
 		}

pkg/cloudbroker/sep/list.go

@@ -8,6 +8,34 @@ import (
 
 // Request struct for get list of SEPs
 type ListRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by gId
+	// Required: false
+	GID uint64 `url:"gId,omitempty" json:"gId,omitempty"`
+
+	// Find by sep type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,omitempty"`
+
+	// Find by provided physical node id
+	// Required: false
+	ProvidedBy uint64 `url:"providedBy,omitempty" json:"providedBy,omitempty"`
+
+	// Find by techStatus
+	// Required: false
+	TechStatus string `url:"techStatus,omitempty" json:"techStatus,omitempty"`
+
+	// Find by consumed physical node id
+	// Required: false
+	ConsumedBy uint64 `url:"consumedBy,omitempty" json:"consumedBy,omitempty"`
+
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
@@ -18,7 +46,7 @@ type ListRequest struct {
 }
 
 // List gets list of SEPs
-func (s SEP) List(ctx context.Context, req ListRequest) (ListSEP, error) {
+func (s SEP) List(ctx context.Context, req ListRequest) (*ListSEP, error) {
 	url := "/cloudbroker/sep/list"
 
 	res, err := s.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +61,5 @@ func (s SEP) List(ctx context.Context, req ListRequest) (ListSEP, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/sep/models.go

@@ -124,4 +124,10 @@ type RecordSEP struct {
 }
 
 // List SEPs
-type ListSEP []RecordSEP
+type ListSEP struct {
+	// Data
+	Data []RecordSEP `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/sep/serialize.go

@@ -12,7 +12,7 @@ import (
 //   - First argument -> prefix
 //   - Second argument -> indent
 func (lsep ListSEP) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(lsep) == 0 {
+	if len(lsep.Data) == 0 {
 		return []byte{}, nil
 	}
 

pkg/cloudbroker/tasks/list.go

@@ -18,7 +18,7 @@ type ListRequest struct {
 }
 
 // List gets list user API task with status PROCESSING
-func (t Tasks) List(ctx context.Context, req ListRequest) (ListTasks, error) {
+func (t Tasks) List(ctx context.Context, req ListRequest) (*ListTasks, error) {
 	url := "/cloudbroker/tasks/list"
 
 	res, err := t.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +33,5 @@ func (t Tasks) List(ctx context.Context, req ListRequest) (ListTasks, error) {
 		return nil, err
 	}
 
-	return item, nil
+	return &item, nil
 }

pkg/cloudbroker/tasks/models.go

@@ -45,6 +45,13 @@ func (r *InfoResult) UnmarshalJSON(b []byte) error {
 
 // Detailed information about task
 type RecordTask struct {
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
+
+	ItemTask
+}
+
+type ItemTask struct {
 	// Audit ID
 	AuditID string `json:"auditId"`
 
@@ -74,4 +81,10 @@ type RecordTask struct {
 }
 
 // List of tasks
-type ListTasks []RecordTask
+type ListTasks struct {
+	// Data
+	Data []ItemTask `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/vgpu/list.go

@@ -8,6 +8,38 @@ import (
 
 // Request struct for getting list of VGPU
 type ListRequest struct {
+	// Find by id
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by vgpu status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by vgpu type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,omitempty"`
+
+	// Find by vgpu mode
+	// Required: false
+	Mode string `url:"mode,omitempty" json:"mode,omitempty"`
+
+	// Find by id resgroup
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by account id
+	// Required: false
+	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+
+	// Find by compute id
+	// Required: false
+	ComputeID uint64 `url:"computeId,omitempty" json:"computeId,omitempty"`
+
+	// Find by pgpu id
+	// Required: false
+	PGPUID uint64 `url:"pgpuId,omitempty" json:"pgpuId,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -18,7 +50,7 @@ type ListRequest struct {
 }
 
 // List gets list all VGPU
-func (v VGPU) List(ctx context.Context, req ListRequest) (ListVGPU, error) {
+func (v VGPU) List(ctx context.Context, req ListRequest) (*ListVGPU, error) {
 	url := "/cloudbroker/vgpu/list"
 
 	res, err := v.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +65,5 @@ func (v VGPU) List(ctx context.Context, req ListRequest) (ListVGPU, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/vgpu/models.go

@@ -63,4 +63,10 @@ type ItemVGPU struct {
 }
 
 // List of VGPU
-type ListVGPU []ItemVGPU
+type ListVGPU struct {
+	// Data
+	Data []ItemVGPU `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}