v1.5.0-gamma2

pkg/cloudapi/account/filter.go

@@ -62,7 +62,7 @@ func (la ListAccounts) FilterFunc(predicate func(ItemAccount) bool) ListAccounts
 // FindOne returns first found ItemAccount.
 // If none was found, returns an empty struct.
 func (la ListAccounts) FindOne() ItemAccount {
-	if la.EntryCount == 0 {
+	if len(la.Data) == 0 {
 		return ItemAccount{}
 	}
 

pkg/cloudapi/account/list.go

@@ -14,7 +14,7 @@ type ListRequest struct {
 
 	// Find by name
 	// Required: false
-	Name string `urL:"name,omitempty" json:"name,omitempty"`
+	Name string `url:"name,omitempty" json:"name,omitempty"`
 
 	// Find by access control list
 	// Required: false

pkg/cloudapi/account/list_computes.go

@@ -13,10 +13,50 @@ type ListComputesRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by compute id
+	// 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 resource group name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,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 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 all compute instances under specified account, accessible by the user
-func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (ListComputes, error) {
+func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (*ListComputes, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +78,5 @@ func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (Lis
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_deleted.go

@@ -15,6 +15,18 @@ type ListDeletedRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// 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 access control list
+	// Required: false
+	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
 }
 
 // ListDeleted gets list all deleted accounts the user has access to

pkg/cloudapi/account/list_disks.go

@@ -13,10 +13,34 @@ type ListDisksRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by disk id
+	// Required: false
+	DiskID uint64 `url:"diskId,omitempty" json:"diskId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize uint64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Type of the disks
+	// 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"`
 }
 
 // ListDisks gets list all currently unattached disks under specified account
-func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (ListDisks, error) {
+func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (*ListDisks, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +62,5 @@ func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (ListDisks
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_flipgroups.go

@@ -10,13 +10,45 @@ import (
 
 // Request struct for get list FLIPGroups
 type ListFLIPGroupsRequest struct {
-	// ID an account
+	// ID of the account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by vinsId
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
+
+	// Find by VINS name
+	// Required: false
+	VINSName string `url:"vinsName,omitempty" json:"vinsName,omitempty"`
+
+	// Find by external network id
+	// Required: false
+	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`
+
+	// Find by IP
+	// Required: false
+	ByIP string `url:"byIp,omitempty" json:"byIp,omitempty"`
+
+	// Find by flipGroup Id
+	// Required: false
+	FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,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"`
 }
 
 // ListFLIPGroups gets list all FLIPGroups under specified account, accessible by the user
-func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (ListFLIPGroups, error) {
+func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (*ListFLIPGroups, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +70,5 @@ func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_rg.go

@@ -13,10 +13,38 @@ type ListRGRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by vinsId
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
+
+	// Find by VM ID
+	// Required: false
+	VMID uint64 `url:"vmId,omitempty" json:"vmId,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
 }
 
 // ListRG gets list all resource groups under specified account, accessible by the user
-func (a Account) ListRG(ctx context.Context, req ListRGRequest) (ListRG, error) {
+func (a Account) ListRG(ctx context.Context, req ListRGRequest) (*ListRG, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +66,5 @@ func (a Account) ListRG(ctx context.Context, req ListRGRequest) (ListRG, error)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/list_vins.go

@@ -13,10 +13,34 @@ type ListVINSRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by VINS ID
+	// Required: false
+	VINSID uint64 `url:"vins,omitempty" json:"vinsId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by external network ip
+	// Required: false
+	ExtIP string `url:"extIp,omitempty" json:"extIp,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 account, accessible by the user
-func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, error) {
+func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (*ListVINS, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +62,5 @@ func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, e
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/account/models.go

@@ -112,7 +112,7 @@ type DiskUsage struct {
 	DiskSize float64 `json:"disksize"`
 
 	// Disk size max
-	DiskSizeMax uint64 `json:"disksizemax"`
+	DiskSizeMax float64 `json:"disksizemax"`
 }
 
 // Information about resources
@@ -299,7 +299,13 @@ type ItemCompute struct {
 }
 
 // List of computes
-type ListComputes []ItemCompute
+type ListComputes struct {
+	// Data
+	Data []ItemCompute `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about disk
 type ItemDisk struct {
@@ -326,7 +332,13 @@ type ItemDisk struct {
 }
 
 // List of disks
-type ListDisks []ItemDisk
+type ListDisks struct {
+	// Data
+	Data []ItemDisk `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about VINS
 type ItemVINS struct {
@@ -383,7 +395,13 @@ type ItemVINS struct {
 }
 
 // List of VINS
-type ListVINS []ItemVINS
+type ListVINS struct {
+	// Data
+	Data []ItemVINS `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main info about audit
 type ItemAudit struct {
@@ -497,7 +515,13 @@ type ItemRG struct {
 }
 
 // List of Resource groups
-type ListRG []ItemRG
+type ListRG struct {
+	// Data
+	Data []ItemRG `json:"data"`
+
+	// Enrtry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about template
 type ItemTemplate struct {
@@ -602,4 +626,10 @@ type ItemFLIPGroup struct {
 }
 
 // List of FLIPGroups
-type ListFLIPGroups []ItemFLIPGroup
+type ListFLIPGroups struct {
+	// Data
+	Data []ItemFLIPGroup `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/account/serialize.go

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

pkg/cloudapi/account/sorting.go

@@ -6,7 +6,7 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByCreatedTime(inverse bool) ListAccounts {
-	if la.EntryCount < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
@@ -25,7 +25,7 @@ func (la ListAccounts) SortByCreatedTime(inverse bool) ListAccounts {
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByUpdatedTime(inverse bool) ListAccounts {
-	if la.EntryCount < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
@@ -44,7 +44,7 @@ func (la ListAccounts) SortByUpdatedTime(inverse bool) ListAccounts {
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByDeletedTime(inverse bool) ListAccounts {
-	if la.EntryCount < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 

pkg/cloudapi/compute/list_deleted.go

@@ -8,6 +8,42 @@ import (
 
 // Request struct for get deleted computes list
 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 name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,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 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"`

pkg/cloudapi/compute/list_pci_device.go

@@ -13,10 +13,34 @@ type ListPCIDeviceRequest struct {
 	// Identifier compute
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by device id
+	// Required: false
+	DevID uint64 `url:"devId,omitempty" json:"devId,omitempty"`
+
+	// Find by type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,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"`
 }
 
 // ListPCIDevice gets list PCI device
-func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) ([]interface{}, error) {
+func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) (*ListPCIDevices, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,12 +55,12 @@ func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) ([
 		return nil, err
 	}
 
-	list := []interface{}{}
+	list := ListPCIDevices{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/compute/list_vgpu.go

@@ -13,10 +13,34 @@ type ListVGPURequest struct {
 	// Identifier compute
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Find by GPU id
+	// Required: false
+	GPUID uint64 `url:"gpuId,omitempty" json:"gpuId,omitempty"`
+
+	// Find by type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,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"`
+
+	// Include deleted computes. If using field 'status', then includedeleted will be ignored
+	// Required: false
+	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
 }
 
 // ListVGPU gets list vGPU
-func (c Compute) ListVGPU(ctx context.Context, req ListVGPURequest) ([]interface{}, error) {
+func (c Compute) ListVGPU(ctx context.Context, req ListVGPURequest) (*ListVGPUs, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -24,19 +48,19 @@ func (c Compute) ListVGPU(ctx context.Context, req ListVGPURequest) ([]interface
 		}
 	}
 
-	url := "/cloudapi/compute/listVgpu"
+	url := "/cloudapi/compute/listVGpu"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
 
-	list := []interface{}{}
+	list := ListVGPUs{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/compute/models.go

@@ -915,3 +915,21 @@ type ListComputes struct {
 	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
+
+// List VGPUs
+type ListVGPUs struct {
+	// Data
+	Data []interface{} `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
+// List PCI devices
+type ListPCIDevices struct {
+	// Data
+	Data []interface{} `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/disks/list_deleted.go

@@ -8,6 +8,26 @@ import (
 
 // Request struct for get list of deleted disks
 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 name
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize int64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Find by shared, true or false
+	// Required: false
+	Shared bool `url:"shared,omitempty" json:"shared,omitempty"`
+
 	// ID of the account the disks belong to
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`

pkg/cloudapi/disks/list_types.go

@@ -11,10 +11,18 @@ type ListTypesRequest struct {
 	// Show detailed disk types by seps
 	// Required: true
 	Detailed bool `url:"detailed" json:"detailed" validate:"required"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // ListTypes gets list defined disk types
-func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) ([]interface{}, error) {
+func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) (*ListTypes, error) {
 	url := "/cloudapi/disks/listTypes"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -22,12 +30,12 @@ func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) ([]interface
 		return nil, err
 	}
 
-	list := make([]interface{}, 0)
+	list := ListTypes{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/disks/models.go

@@ -442,3 +442,11 @@ type RecordDisk struct {
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 }
+
+type ListTypes struct {
+	// Data
+	Data []interface{} `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/extnet/models.go

@@ -139,11 +139,8 @@ type RecordExtNet struct {
 	// Meta
 	Meta []interface{} `json:"_meta"`
 
-	// CheckIPs
-	CheckIPs []string `json:"checkIPs"`
-
 	// CheckIps
-	CheckIps []string `json:"checkIps"`
+	CheckIPs []string `json:"checkIps"`
 
 	// Default
 	Default bool `json:"default"`

pkg/cloudapi/image/filter.go

@@ -40,21 +40,23 @@ func (li ListImages) FilterByBootType(bootType string) ListImages {
 func (li ListImages) FilterFunc(predicate func(ItemImage) bool) ListImages {
 	var result ListImages
 
-	for _, item := range li {
+	for _, item := range li.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 ItemImage
 // If none was found, returns an empty struct.
 func (li ListImages) FindOne() ItemImage {
-	if len(li) == 0 {
+	if len(li.Data) == 0 {
 		return ItemImage{}
 	}
 
-	return li[0]
+	return li.Data[0]
 }

pkg/cloudapi/image/filter_test.go

@@ -3,66 +3,69 @@ package image
 import "testing"
 
 var images = ListImages{
-	ItemImage{
+	Data: []ItemImage{
-		AccountID:    0,
+		{
-		Architecture: "X86_64",
+			AccountID:    0,
-		BootType:     "bios",
+			Architecture: "X86_64",
-		Bootable:     true,
+			BootType:     "bios",
-		Description:  "",
+			Bootable:     true,
-		Drivers: []string{
+			Description:  "",
-			"KVM_X86",
+			Drivers: []string{
+				"KVM_X86",
+			},
+			HotResize: true,
+			ID:        9882,
+			LinkTo:    0,
+			Name:      "u16",
+			Pool:      "vmstor",
+			Size:      5,
+			Status:    "CREATED",
+			Type:      "linux",
+			Username:  "",
+			Virtual:   false,
 		},
-		HotResize: true,
+		{
-		ID:        9882,
+			AccountID:    0,
-		LinkTo:    0,
+			Architecture: "X86_64",
-		Name:      "u16",
+			BootType:     "bois",
-		Pool:      "vmstor",
+			Bootable:     true,
-		Size:      5,
+			Description:  "",
-		Status:    "CREATED",
+			Drivers: []string{
-		Type:      "linux",
+				"KVM_X86",
-		Username:  "",
+			},
-		Virtual:   false,
+			HotResize: false,
-	},
+			ID:        9884,
-	ItemImage{
+			LinkTo:    0,
-		AccountID:    0,
+			Name:      "alpine-virt-3.17",
-		Architecture: "X86_64",
+			Pool:      "vmstor",
-		BootType:     "bois",
+			Size:      1,
-		Bootable:     true,
+			Status:    "CREATED",
-		Description:  "",
+			Type:      "linux",
-		Drivers: []string{
+			Username:  "",
-			"KVM_X86",
+			Virtual:   true,
 		},
-		HotResize: false,
+		{
-		ID:        9884,
+			AccountID:    1,
-		LinkTo:    0,
+			Architecture: "X86_64",
-		Name:      "alpine-virt-3.17",
+			BootType:     "bios",
-		Pool:      "vmstor",
+			Bootable:     true,
-		Size:      1,
+			Description:  "",
-		Status:    "CREATED",
+			Drivers: []string{
-		Type:      "linux",
+				"KVM_X86",
-		Username:  "",
+			},
-		Virtual:   true,
+			HotResize: true,
-	},
+			ID:        9885,
-	ItemImage{
+			LinkTo:    0,
-		AccountID:    1,
+			Name:      "test",
-		Architecture: "X86_64",
+			Pool:      "vmstor",
-		BootType:     "bios",
+			Size:      4,
-		Bootable:     true,
+			Status:    "DESTROYED",
-		Description:  "",
+			Type:      "linux",
-		Drivers: []string{
+			Username:  "",
-			"KVM_X86",
+			Virtual:   false,
 		},
-		HotResize: true,
-		ID:        9885,
-		LinkTo:    0,
-		Name:      "test",
-		Pool:      "vmstor",
-		Size:      4,
-		Status:    "DESTROYED",
-		Type:      "linux",
-		Username:  "",
-		Virtual:   false,
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -84,11 +87,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := images.FilterByStatus("CREATED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		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 'CREATED', found: ", item.Status)
 		}
@@ -98,11 +101,11 @@ func TestFilterByStatus(t *testing.T) {
 func TestFilterByBootType(t *testing.T) {
 	actual := images.FilterByBootType("bios")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.BootType != "bios" {
 			t.Fatal("expected BootType 'bios', found: ", item.BootType)
 		}
@@ -110,15 +113,15 @@ func TestFilterByBootType(t *testing.T) {
 }
 
 func TestFilterFunc(t *testing.T) {
-    actual := images.FilterFunc(func(ii ItemImage) bool {
+	actual := images.FilterFunc(func(ii ItemImage) bool {
-        return ii.Virtual == true
+		return ii.Virtual == true
-    })
+	})
 
-	if len(actual) != 1 {
+	if len(actual.Data) != 1 {
-		t.Fatal("expected 1 found, actual: ", len(actual))
+		t.Fatal("expected 1 found, actual: ", len(actual.Data))
 	}
 
-	if actual[0].Virtual != true {
+	if actual.Data[0].Virtual != true {
 		t.Fatal("expected Virtual true, found false")
 	}
 }

pkg/cloudapi/image/list.go

@@ -8,9 +8,53 @@ import (
 
 // Request struct for get list available images
 type ListRequest struct {
-	// Optional account ID to include account images
+	// Find by storage endpoint provider ID
 	// Required: false
-	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
+	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
+
+	// Find by id
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by ID
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by architecture
+	// Required: false
+	Architecture string `url:"architecture,omitempty" json:"architecture,omitempty"`
+
+	// Find by type
+	// Required: false
+	TypeImage string `url:"typeImage,omitempty" json:"typeImage,omitempty"`
+
+	// Find by image size
+	// Required: false
+	ImageSize uint64 `url:"imageSize,omitempty" json:"imageSize,omitempty"`
+
+	// Find by SEP name
+	// Required: false
+	SEPName string `url:"sepName,omitempty" json:"sepName,omitempty"`
+
+	// Find by pool
+	// Required: false
+	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
+
+	// Find by public True or False
+	// Required: false
+	Public bool `url:"public,omitempty" json:"public,omitempty"`
+
+	// Find by hot resize True or False
+	// Required: false
+	HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"`
+
+	// Find by bootable True or False
+	// Required: false
+	Bootable bool `url:"bootable,omitempty" json:"bootable,omitempty"`
 
 	// Page number
 	// Required: false
@@ -22,7 +66,7 @@ type ListRequest struct {
 }
 
 // List gets list available images, optionally filtering by account ID
-func (i Image) List(ctx context.Context, req ListRequest) (ListImages, error) {
+func (i Image) List(ctx context.Context, req ListRequest) (*ListImages, error) {
 	url := "/cloudapi/image/list"
 
 	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,5 +81,5 @@ func (i Image) List(ctx context.Context, req ListRequest) (ListImages, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/image/models.go

@@ -58,7 +58,13 @@ type ItemImage struct {
 }
 
 // List of information about images
-type ListImages []ItemImage
+type ListImages struct {
+	// Data
+	Data []ItemImage `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // History
 type History struct {

pkg/cloudapi/image/serialize.go

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

pkg/cloudapi/k8ci/list_deleted.go

@@ -8,6 +8,26 @@ import (
 
 // Request struct for get list information about deleted images
 type ListDeletedRequest struct {
+	// Find by ID
+	// Required: false
+	ByID uint64 `url:"k8cId,omitempty" json:"k8cId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by worker driver
+	// Required: false
+	WorkerDriver string `url:"workerDriver,omitempty" json:"workerDriver,omitempty"`
+
+	// Find by master driver
+	// Required: false
+	MasterDriver string `url:"masterDriver,omitempty" json:"masterDriver,omitempty"`
+
+	// Find by network plugin
+	// Required: false
+	NetworkPlugins string `url:"netPlugins,omitempty" json:"netPlugins,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudapi/k8s/filter.go

@@ -76,21 +76,23 @@ func (lkc ListK8SClusters) FilterByDeletedBy(deletedBy string) ListK8SClusters {
 func (lkc ListK8SClusters) FilterFunc(predicate func(ItemK8SCluster) bool) ListK8SClusters {
 	var result ListK8SClusters
 
-	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 ItemK8SCluster
 // If none was found, returns an empty struct.
 func (lkc ListK8SClusters) FindOne() ItemK8SCluster {
-	if len(lkc) == 0 {
+	if len(lkc.Data) == 0 {
 		return ItemK8SCluster{}
 	}
 
-	return lkc[0]
+	return lkc.Data[0]
 }

pkg/cloudapi/k8s/filter_test.go

@@ -3,86 +3,88 @@ package k8s
 import "testing"
 
 var k8sItems = ListK8SClusters{
-	ItemK8SCluster{
+	Data: []ItemK8SCluster{
-		AccountID:   1,
+		{
-		AccountName: "test_1",
+			AccountID:   1,
-		ACL:         []interface{}{},
+			AccountName: "test_1",
-		BServiceID:  1,
+			ACL:         []interface{}{},
-		CIID:        1,
+			BServiceID:  1,
-		Config:      nil,
+			CIID:        1,
-		CreatedBy:   "test_user",
+			Config:      nil,
-		CreatedTime: 132454563,
+			CreatedBy:   "test_user",
-		DeletedBy:   "",
+			CreatedTime: 132454563,
-		DeletedTime: 0,
+			DeletedBy:   "",
-		Description: "",
+			DeletedTime: 0,
-		ExtNetID:    1,
+			Description: "",
-		GID:         0,
+			ExtNetID:    1,
-		GUID:        1,
+			GID:         0,
-		ID:          1,
+			GUID:        1,
-		LBID:        1,
+			ID:          1,
-		Milestones:  999999,
+			LBID:        1,
-		Name:        "k8s_1",
+			Milestones:  999999,
-		RGID:        1,
+			Name:        "k8s_1",
-		RGName:      "rg_1",
+			RGID:        1,
-		Status:      "ENABLED",
+			RGName:      "rg_1",
-		TechStatus:  "STARTED",
+			Status:      "ENABLED",
-		UpdatedBy:   "",
+			TechStatus:  "STARTED",
-		UpdatedTime: 0,
+			UpdatedBy:   "",
-		VINSID:      0,
+			UpdatedTime: 0,
-	},
+			VINSID:      0,
-	ItemK8SCluster{
+		},
-		AccountID:   2,
+		{
-		AccountName: "test_2",
+			AccountID:   2,
-		ACL:         []interface{}{},
+			AccountName: "test_2",
-		BServiceID:  2,
+			ACL:         []interface{}{},
-		CIID:        2,
+			BServiceID:  2,
-		Config:      nil,
+			CIID:        2,
-		CreatedBy:   "test_user",
+			Config:      nil,
-		CreatedTime: 132454638,
+			CreatedBy:   "test_user",
-		DeletedBy:   "",
+			CreatedTime: 132454638,
-		DeletedTime: 0,
+			DeletedBy:   "",
-		Description: "",
+			DeletedTime: 0,
-		ExtNetID:    2,
+			Description: "",
-		GID:         0,
+			ExtNetID:    2,
-		GUID:        2,
+			GID:         0,
-		ID:          2,
+			GUID:        2,
-		LBID:        2,
+			ID:          2,
-		Milestones:  999999,
+			LBID:        2,
-		Name:        "k8s_2",
+			Milestones:  999999,
-		RGID:        2,
+			Name:        "k8s_2",
-		RGName:      "rg_2",
+			RGID:        2,
-		Status:      "ENABLED",
+			RGName:      "rg_2",
-		TechStatus:  "STARTED",
+			Status:      "ENABLED",
-		UpdatedBy:   "",
+			TechStatus:  "STARTED",
-		UpdatedTime: 0,
+			UpdatedBy:   "",
-		VINSID:      0,
+			UpdatedTime: 0,
-	},
+			VINSID:      0,
-	ItemK8SCluster{
+		},
-		AccountID:   3,
+		{
-		AccountName: "test_3",
+			AccountID:   3,
-		ACL:         []interface{}{},
+			AccountName: "test_3",
-		BServiceID:  3,
+			ACL:         []interface{}{},
-		CIID:        3,
+			BServiceID:  3,
-		Config:      nil,
+			CIID:        3,
-		CreatedBy:   "test_user",
+			Config:      nil,
-		CreatedTime: 132454682,
+			CreatedBy:   "test_user",
-		DeletedBy:   "",
+			CreatedTime: 132454682,
-		DeletedTime: 0,
+			DeletedBy:   "",
-		Description: "",
+			DeletedTime: 0,
-		ExtNetID:    3,
+			Description: "",
-		GID:         0,
+			ExtNetID:    3,
-		GUID:        3,
+			GID:         0,
-		ID:          3,
+			GUID:        3,
-		LBID:        3,
+			ID:          3,
-		Milestones:  999999,
+			LBID:        3,
-		Name:        "k8s_3",
+			Milestones:  999999,
-		RGID:        3,
+			Name:        "k8s_3",
-		RGName:      "rg_3",
+			RGID:        3,
-		Status:      "DISABLED",
+			RGName:      "rg_3",
-		TechStatus:  "STOPPED",
+			Status:      "DISABLED",
-		UpdatedBy:   "",
+			TechStatus:  "STOPPED",
-		UpdatedTime: 0,
+			UpdatedBy:   "",
-		VINSID:      0,
+			UpdatedTime: 0,
+			VINSID:      0,
+		},
 	},
 }
 
@@ -121,11 +123,11 @@ func TestFilterByRGID(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := k8sItems.FilterByStatus("ENABLED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		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)
 		}
@@ -135,11 +137,11 @@ func TestFilterByStatus(t *testing.T) {
 func TestFilterByTechStatus(t *testing.T) {
 	actual := k8sItems.FilterByTechStatus("STARTED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		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)
 		}
@@ -149,11 +151,11 @@ func TestFilterByTechStatus(t *testing.T) {
 func TestFilterByCreatedBy(t *testing.T) {
 	actual := k8sItems.FilterByCreatedBy("test_user")
 
-	if len(actual) != 3 {
+	if len(actual.Data) != 3 {
-		t.Fatal("expected 3 found, actual: ", len(actual))
+		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)
 		}
@@ -163,8 +165,8 @@ func TestFilterByCreatedBy(t *testing.T) {
 func TestFilterByDeletedBy(t *testing.T) {
 	actual := k8sItems.FilterByDeletedBy("test_user")
 
-	if len(actual) != 0 {
+	if len(actual.Data) != 0 {
-		t.Fatal("expected 0 found, actual: ", len(actual))
+		t.Fatal("expected 0 found, actual: ", len(actual.Data))
 	}
 }
 
@@ -182,7 +184,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/cloudapi/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 the user has access to
-func (k8s K8S) List(ctx context.Context, req ListRequest) (ListK8SClusters, error) {
+func (k8s K8S) List(ctx context.Context, req ListRequest) (*ListK8SClusters, error) {
 	url := "/cloudapi/k8s/list"
 
 	res, err := k8s.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,5 +69,5 @@ func (k8s K8S) List(ctx context.Context, req ListRequest) (ListK8SClusters, erro
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/k8s/list_deleted.go

@@ -8,6 +8,38 @@ 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 status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,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 +50,7 @@ type ListDeletedRequest struct {
 }
 
 // ListDeleted gets all deleted kubernetes clusters the user has access to
-func (k8s K8S) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListK8SClusters, error) {
+func (k8s K8S) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListK8SClusters, error) {
 	url := "/cloudapi/k8s/listDeleted"
 
 	res, err := k8s.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +65,5 @@ func (k8s K8S) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListK8S
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/k8s/models.go

@@ -293,4 +293,10 @@ type RecordServiceAccount struct {
 }
 
 // List of kubernetes clusters
-type ListK8SClusters []ItemK8SCluster
+type ListK8SClusters struct {
+	// Data
+	Data []ItemK8SCluster `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudapi/k8s/serialize.go

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

pkg/cloudapi/k8s/sorting.go

@@ -6,16 +6,16 @@ import "sort"
 //
 // If inverse param is set to true, the order is reversed.
 func (lkc ListK8SClusters) SortByCreatedTime(inverse bool) ListK8SClusters {
-	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 ListK8SClusters) SortByCreatedTime(inverse bool) ListK8SClusters {
 //
 // If inverse param is set to true, the order is reversed.
 func (lkc ListK8SClusters) SortByUpdatedTime(inverse bool) ListK8SClusters {
-	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 ListK8SClusters) SortByUpdatedTime(inverse bool) ListK8SClusters {
 //
 // If inverse param is set to true, the order is reversed.
 func (lkc ListK8SClusters) SortByDeletedTime(inverse bool) ListK8SClusters {
-	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/cloudapi/k8s/worker_add.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
@@ -18,8 +19,8 @@ type WorkerAddRequest struct {
 	WorkersGroupID uint64 `url:"workersGroupId" json:"workersGroupId" validate:"required"`
 
 	// How many worker nodes to add
-	// Required: true
+	// Required: false
-	Num uint64 `url:"num" json:"num" validate:"required"`
+	Num uint64 `url:"num,omitempty" json:"num,omitempty"`
 }
 
 // WorkerAdd add worker nodes to a Kubernetes cluster

pkg/cloudapi/k8s/workers_group_get_by_name.go

@@ -20,7 +20,7 @@ type WorkersGroupGetByNameRequest struct {
 }
 
 // WorkersGroupGetByName gets worker group metadata by name
-func (k8s K8S) WorkersGroupGetByName(ctx context.Context, req WorkersGroupGetByNameRequest) (*RecordK8SGroups, error) {
+func (k8s K8S) WorkersGroupGetByName(ctx context.Context, req WorkersGroupGetByNameRequest) (*ItemK8SGroup, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -35,7 +35,7 @@ func (k8s K8S) WorkersGroupGetByName(ctx context.Context, req WorkersGroupGetByN
 		return nil, err
 	}
 
-	info := RecordK8SGroups{}
+	info := ItemK8SGroup{}
 
 	err = json.Unmarshal(res, &info)
 	if err != nil {

pkg/cloudapi/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 == ill.ID
 	}
 
-	return ll.FilterFunc(predicate), nil
+	result := ll.FilterFunc(predicate)
+
+	return &result, nil
 }
 
 // FilterFunc allows filtering ListLB based on a user-specified predicate.
 func (ll ListLB) FilterFunc(predicate func(ItemLoadBalancer) 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(ll.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemLoadBalancer
 // If none was found, returns an empty struct.
 func (ll ListLB) FindOne() ItemLoadBalancer {
-	if len(ll) == 0 {
+	if len(ll.Data) == 0 {
 		return ItemLoadBalancer{}
 	}
 
-	return ll[0]
+	return ll.Data[0]
 }

pkg/cloudapi/lb/filter_test.go

@@ -3,93 +3,96 @@ package lb
 import "testing"
 
 var lbs = ListLB{
-	ItemLoadBalancer{
+	Data: []ItemLoadBalancer{
-		DPAPIPassword: "0000",
+		{
-		RecordLB: RecordLB{
+			DPAPIPassword: "0000",
-			HAMode:      true,
+			RecordLB: RecordLB{
-			ACL:         []interface{}{},
+				HAMode:      true,
-			Backends:    []ItemBackend{},
+				ACL:         []interface{}{},
-			CreatedBy:   "test_user_1",
+				Backends:    []ItemBackend{},
-			CreatedTime: 1636667448,
+				CreatedBy:   "test_user_1",
-			DeletedBy:   "",
+				CreatedTime: 1636667448,
-			DeletedTime: 0,
+				DeletedBy:   "",
-			Description: "",
+				DeletedTime: 0,
-			DPAPIUser:   "api_user",
+				Description: "",
-			ExtNetID:    2522,
+				DPAPIUser:   "api_user",
-			Frontends:   []ItemFrontend{},
+				ExtNetID:    2522,
-			GID:         212,
+				Frontends:   []ItemFrontend{},
-			GUID:        1,
+				GID:         212,
-			ID:          1,
+				GUID:        1,
-			ImageID:     2121,
+				ID:          1,
-			Milestones:  129000,
+				ImageID:     2121,
-			Name:        "k8s-lb-test-1",
+				Milestones:  129000,
-			RGID:        25090,
+				Name:        "k8s-lb-test-1",
-			RGName:      "",
+				RGID:        25090,
-			Status:      "ENABLED",
+				RGName:      "",
-			TechStatus:  "STARTED",
+				Status:      "ENABLED",
-			UpdatedBy:   "",
+				TechStatus:  "STARTED",
-			UpdatedTime: 0,
+				UpdatedBy:   "",
-			VINSID:      101,
+				UpdatedTime: 0,
+				VINSID:      101,
+			},
 		},
-	},
+		{
-	ItemLoadBalancer{
+			DPAPIPassword: "0000",
-		DPAPIPassword: "0000",
+			RecordLB: RecordLB{
-		RecordLB: RecordLB{
+				HAMode:      false,
-			HAMode:      false,
+				ACL:         []interface{}{},
-			ACL:         []interface{}{},
+				Backends:    []ItemBackend{},
-			Backends:    []ItemBackend{},
+				CreatedBy:   "test_user_2",
-			CreatedBy:   "test_user_2",
+				CreatedTime: 1636667506,
-			CreatedTime: 1636667506,
+				DeletedBy:   "",
-			DeletedBy:   "",
+				DeletedTime: 0,
-			DeletedTime: 0,
+				Description: "",
-			Description: "",
+				DPAPIUser:   "api_user_2",
-			DPAPIUser:   "api_user_2",
+				ExtNetID:    2524,
-			ExtNetID:    2524,
+				Frontends:   []ItemFrontend{},
-			Frontends:   []ItemFrontend{},
+				GID:         212,
-			GID:         212,
+				GUID:        2,
-			GUID:        2,
+				ID:          2,
-			ID:          2,
+				ImageID:     2129,
-			ImageID:     2129,
+				Milestones:  129013,
-			Milestones:  129013,
+				Name:        "k8s-lb-test-2",
-			Name:        "k8s-lb-test-2",
+				RGID:        25092,
-			RGID:        25092,
+				RGName:      "",
-			RGName:      "",
+				Status:      "ENABLED",
-			Status:      "ENABLED",
+				TechStatus:  "STOPPED",
-			TechStatus:  "STOPPED",
+				UpdatedBy:   "",
-			UpdatedBy:   "",
+				UpdatedTime: 0,
-			UpdatedTime: 0,
+				VINSID:      102,
-			VINSID:      102,
+			},
 		},
-	},
+		{
-	ItemLoadBalancer{
+			DPAPIPassword: "0000",
-		DPAPIPassword: "0000",
+			RecordLB: RecordLB{
-		RecordLB: RecordLB{
+				HAMode:      true,
-			HAMode:      true,
+				ACL:         []interface{}{},
-			ACL:         []interface{}{},
+				Backends:    []ItemBackend{},
-			Backends:    []ItemBackend{},
+				CreatedBy:   "te2t_user_3",
-			CreatedBy:   "te2t_user_3",
+				CreatedTime: 1636667534,
-			CreatedTime: 1636667534,
+				DeletedBy:   "",
-			DeletedBy:   "",
+				DeletedTime: 0,
-			DeletedTime: 0,
+				Description: "",
-			Description: "",
+				DPAPIUser:   "api_user_3",
-			DPAPIUser:   "api_user_3",
+				ExtNetID:    2536,
-			ExtNetID:    2536,
+				Frontends:   []ItemFrontend{},
-			Frontends:   []ItemFrontend{},
+				GID:         212,
-			GID:         212,
+				GUID:        3,
-			GUID:        3,
+				ID:          3,
-			ID:          3,
+				ImageID:     2139,
-			ImageID:     2139,
+				Milestones:  129025,
-			Milestones:  129025,
+				Name:        "k8s-lb-test-3",
-			Name:        "k8s-lb-test-3",
+				RGID:        25106,
-			RGID:        25106,
+				RGName:      "",
-			RGName:      "",
+				Status:      "DISABLED",
-			Status:      "DISABLED",
+				TechStatus:  "STOPPED",
-			TechStatus:  "STOPPED",
+				UpdatedBy:   "",
-			UpdatedBy:   "",
+				UpdatedTime: 0,
-			UpdatedTime: 0,
+				VINSID:      118,
-			VINSID:      118,
+			},
 		},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -129,7 +132,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)
 		}
@@ -139,7 +142,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/cloudapi/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 (l LB) List(ctx context.Context, req ListRequest) (ListLB, error) {
+func (l LB) List(ctx context.Context, req ListRequest) (*ListLB, error) {
 	url := "/cloudapi/lb/list"
 
 	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,5 +69,5 @@ func (l LB) List(ctx context.Context, req ListRequest) (ListLB, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/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 (l LB) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListLB, error) {
+func (l LB) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListLB, error) {
 	url := "/cloudapi/lb/listDeleted"
 
 	res, err := l.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +61,5 @@ func (l LB) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListLB, er
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/lb/models.go

@@ -90,7 +90,13 @@ type ItemLoadBalancer struct {
 }
 
 // List of load balancers
-type ListLB []ItemLoadBalancer
+type ListLB struct {
+	// Data
+	Data []ItemLoadBalancer `json:"data"`
+
+	// EntryCount
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about backend
 type ItemBackend struct {

pkg/cloudapi/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/cloudapi/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/cloudapi/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/cloudapi/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"`

pkg/cloudapi/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/cloudapi/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) (ListPortForwards, error) {
+func (r RG) ListPFW(ctx context.Context, req ListPFWRequest) (*ListPortForwards, 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) (ListPortForwards,
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudapi/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/cloudapi/rg/models.go

@@ -449,7 +449,13 @@ type ItemCompute struct {
 }
 
 // List of computes
-type ListComputes []ItemCompute
+type ListComputes struct {
+	//Data
+	Data []ItemCompute `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about load balancer
 type RecordLoadBalancer struct {
@@ -563,7 +569,13 @@ type ItemBackend struct {
 type ListBackends []ItemBackend
 
 // List of load balancers
-type ListLB []ItemLoadBalancer
+type ListLB struct {
+	// Data
+	Data []ItemLoadBalancer `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Server settings
 type RecordServerSettings struct {
@@ -704,7 +716,13 @@ type ItemPortForward struct {
 }
 
 // List of port forwards
-type ListPortForwards []ItemPortForward
+type ListPortForwards struct {
+	//Data
+	Data []ItemPortForward `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about VINS
 type ItemVINS struct {
@@ -761,7 +779,13 @@ type ItemVINS struct {
 }
 
 // List of VINSes
-type ListVINS []ItemVINS
+type ListVINS struct {
+	// Data
+	Data []ItemVINS `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about usage of resource
 type RecordResourceUsage struct {

pkg/cloudapi/vins/list_deleted.go

@@ -8,6 +8,26 @@ import (
 
 // Request struct for get list of deleted VINSes
 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 external network IP
+	// Required: false
+	ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudbroker/account/filter.go

@@ -1,34 +1,34 @@
 package account
 
-// FilterByID returns ListDeleted with specified ID.
+// FilterByID returns ListAccounts with specified ID.
-func (ld ListDeleted) FilterByID(id uint64) ListDeleted {
+func (la ListAccounts) FilterByID(id uint64) ListAccounts {
 	predicate := func(ia ItemAccount) bool {
 		return ia.ID == id
 	}
 
-	return ld.FilterFunc(predicate)
+	return la.FilterFunc(predicate)
 }
 
-// FilterByName returns ListDeleted with specified Name.
+// FilterByName returns ListAccounts with specified Name.
-func (ld ListDeleted) FilterByName(name string) ListDeleted {
+func (la ListAccounts) FilterByName(name string) ListAccounts {
 	predicate := func(ia ItemAccount) bool {
 		return ia.Name == name
 	}
 
-	return ld.FilterFunc(predicate)
+	return la.FilterFunc(predicate)
 }
 
-// FilterByStatus returns ListDeleted with specified Status.
+// FilterByStatus returns ListAccounts with specified Status.
-func (ld ListDeleted) FilterByStatus(status string) ListDeleted {
+func (la ListAccounts) FilterByStatus(status string) ListAccounts {
 	predicate := func(ia ItemAccount) bool {
 		return ia.Status == status
 	}
 
-	return ld.FilterFunc(predicate)
+	return la.FilterFunc(predicate)
 }
 
-// FilterByUserGroupID returns ListDeleted with specified UserGroupID.
+// FilterByUserGroupID returns ListAccounts with specified UserGroupID.
-func (ld ListDeleted) FilterByUserGroupID(userGroupID string) ListDeleted {
+func (la ListAccounts) FilterByUserGroupID(userGroupID string) ListAccounts {
 	predicate := func(ia ItemAccount) bool {
 		acl := ia.ACL
 
@@ -41,46 +41,48 @@ func (ld ListDeleted) FilterByUserGroupID(userGroupID string) ListDeleted {
 		return false
 	}
 
-	return ld.FilterFunc(predicate)
+	return la.FilterFunc(predicate)
 }
 
-// FilterByCompany returns ListDeleted with specified Company.
+// FilterByCompany returns ListAccounts with specified Company.
-func (ld ListDeleted) FilterByCompany(company string) ListDeleted {
+func (la ListAccounts) FilterByCompany(company string) ListAccounts {
 	predicate := func(ia ItemAccount) bool {
 		return ia.Company == company
 	}
 
-	return ld.FilterFunc(predicate)
+	return la.FilterFunc(predicate)
 }
 
-// FilterByCreatedBy returns ListDeleted created by specified user.
+// FilterByCreatedBy returns ListAccounts created by specified user.
-func (ld ListDeleted) FilterByCreatedBy(createdBy string) ListDeleted {
+func (la ListAccounts) FilterByCreatedBy(createdBy string) ListAccounts {
 	predicate := func(ia ItemAccount) bool {
 		return ia.CreatedBy == createdBy
 	}
 
-	return ld.FilterFunc(predicate)
+	return la.FilterFunc(predicate)
 }
 
-// FilterFunc allows filtering ListDeleted based on a user-specified predicate.
+// FilterFunc allows filtering ListAccounts based on a user-specified predicate.
-func (ld ListDeleted) FilterFunc(predicate func(ItemAccount) bool) ListDeleted {
+func (la ListAccounts) FilterFunc(predicate func(ItemAccount) bool) ListAccounts {
-	var result ListDeleted
+	var result ListAccounts
 
-	for _, item := range ld {
+	for _, item := range la.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 ItemAccount.
 // If none was found, returns an empty struct.
-func (ld ListDeleted) FindOne() ItemAccount {
+func (la ListAccounts) FindOne() ItemAccount {
-	if len(ld) == 0 {
+	if len(la.Data) == 0 {
 		return ItemAccount{}
 	}
 
-	return ld[0]
+	return la.Data[0]
 }

pkg/cloudbroker/account/filter_test.go

@@ -4,78 +4,81 @@ import (
 	"testing"
 )
 
-var accounts = ListDeleted{
+var accounts = ListAccounts{
-	ItemAccount{
+	Data: []ItemAccount{
-		Meta: []interface{}{},
+		{
-		InfoAccount: InfoAccount{
+			Meta: []interface{}{},
-			ACL: []ACL{
+			InfoAccount: InfoAccount{
-				{
+				ACL: []ACL{
-					Explicit:    true,
+					{
-					GUID:        "",
+						Explicit:    true,
-					Right:       "CXDRAU",
+						GUID:        "",
-					Status:      "CONFIRMED",
+						Right:       "CXDRAU",
-					Type:        "U",
+						Status:      "CONFIRMED",
-					UserGroupID: "not_really_timofey_tkachev_1@decs3o",
+						Type:        "U",
+						UserGroupID: "not_really_timofey_tkachev_1@decs3o",
+					},
 				},
+				CreatedTime: 1676878820,
+				DeletedTime: 0,
+				ID:          132847,
+				Name:        "std_2",
+				Status:      "CONFIRMED",
+				UpdatedTime: 1676645275,
 			},
-			CreatedTime: 1676878820,
-			DeletedTime: 0,
-			ID:          132847,
-			Name:        "std_2",
-			Status:      "CONFIRMED",
-			UpdatedTime: 1676645275,
 		},
-	},
+		{
-	ItemAccount{
+			Meta: []interface{}{},
-		Meta: []interface{}{},
+			InfoAccount: InfoAccount{
-		InfoAccount: InfoAccount{
+				ACL: []ACL{
-			ACL: []ACL{
+					{
-				{
+						Explicit:    true,
-					Explicit:    true,
+						GUID:        "",
-					GUID:        "",
+						Right:       "CXDRAU",
-					Right:       "CXDRAU",
+						Status:      "CONFIRMED",
-					Status:      "CONFIRMED",
+						Type:        "U",
-					Type:        "U",
+						UserGroupID: "timofey_tkachev_1@decs3o",
-					UserGroupID: "timofey_tkachev_1@decs3o",
+					},
 				},
+				CreatedTime: 1676645275,
+				DeletedTime: 1677723401,
+				ID:          132846,
+				Name:        "std",
+				Status:      "DELETED",
+				UpdatedTime: 1676645275,
 			},
-			CreatedTime: 1676645275,
-			DeletedTime: 1677723401,
-			ID:          132846,
-			Name:        "std",
-			Status:      "DELETED",
-			UpdatedTime: 1676645275,
 		},
-	},
+		{
-	ItemAccount{
+			Meta: []interface{}{},
-		Meta: []interface{}{},
+			InfoAccount: InfoAccount{
-		InfoAccount: InfoAccount{
+				ACL: []ACL{
-			ACL: []ACL{
+					{
-				{
+						Explicit:    true,
-					Explicit:    true,
+						GUID:        "",
-					GUID:        "",
+						Right:       "CXDRAU",
-					Right:       "CXDRAU",
+						Status:      "CONFIRMED",
-					Status:      "CONFIRMED",
+						Type:        "U",
-					Type:        "U",
+						UserGroupID: "timofey_tkachev_1@decs3o",
-					UserGroupID: "timofey_tkachev_1@decs3o",
+					},
-				},
+					{
-				{
+						Explicit:    true,
-					Explicit:    true,
+						GUID:        "",
-					GUID:        "",
+						Right:       "CXDRAU",
-					Right:       "CXDRAU",
+						Status:      "CONFIRMED",
-					Status:      "CONFIRMED",
+						Type:        "U",
-					Type:        "U",
+						UserGroupID: "second_account@decs3o",
-					UserGroupID: "second_account@decs3o",
+					},
 				},
+				CreatedTime: 1676883850,
+				DeletedTime: 1676883899,
+				ID:          132848,
+				Name:        "std_broker",
+				Status:      "DELETED",
+				UpdatedTime: 1676878820,
 			},
-			CreatedTime: 1676883850,
-			DeletedTime: 1676883899,
-			ID:          132848,
-			Name:        "std_broker",
-			Status:      "DELETED",
-			UpdatedTime: 1676878820,
 		},
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {
@@ -109,11 +112,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := accounts.FilterByStatus("DELETED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("Expected 2 elements in slice, found: ", len(actual))
+		t.Fatal("Expected 2 elements in slice, found: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "DELETED" {
 			t.Fatal("expected DELETED, found: ", item.Status)
 		}
@@ -125,7 +128,7 @@ func TestFilterFunc(t *testing.T) {
 		return ia.DeletedTime == 0
 	})
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.DeletedTime != 0 {
 			t.Fatal("Expected DeletedTime = 0, found: ", item.DeletedTime)
 		}
@@ -135,21 +138,21 @@ func TestFilterFunc(t *testing.T) {
 func TestSortingByCreatedTime(t *testing.T) {
 	actual := accounts.SortByCreatedTime(false)
 
-	if actual[0].Name != "std" {
+	if actual.Data[0].Name != "std" {
-		t.Fatal("Expected account std as earliest, found: ", actual[0].Name)
+		t.Fatal("Expected account std as earliest, found: ", actual.Data[0].Name)
 	}
 
 	actual = accounts.SortByCreatedTime(true)
 
-	if actual[0].Name != "std_broker" {
+	if actual.Data[0].Name != "std_broker" {
-		t.Fatal("Expected account std_broker as latest, found: ", actual[0].Name)
+		t.Fatal("Expected account std_broker as latest, found: ", actual.Data[0].Name)
 	}
 }
 
 func TestFilterEmpty(t *testing.T) {
 	actual := accounts.FilterByID(0)
 
-	if len(actual) != 0 {
+	if len(actual.Data) != 0 {
-		t.Fatal("Expected 0 found, actual: ", len(actual))
+		t.Fatal("Expected 0 found, actual: ", len(actual.Data))
 	}
 }

pkg/cloudbroker/account/list.go

@@ -10,27 +10,27 @@ import (
 type ListRequest struct {
 	// Find by ID
 	// Required: false
-	ByID uint64 `url:"by_id" json:"by_id"`
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
 
 	// Find by name
 	// Required: false
-	Name string `urL:"name" json:"name"`
+	Name string `url:"name,omitempty" json:"name,omitempty"`
 
 	// Find by access control list
 	// Required: false
-	ACL string `url:"acl" json:"acl"`
+	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
 
 	// Find by status
 	// Required: false
-	Status string `url:"status" json:"status"`
+	Status string `url:"status,omitempty" json:"status,omitempty"`
 
 	// Page number
 	// Required: false
-	Page uint64 `url:"page" json:"page"`
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
 
 	// Page size
 	// Required: false
-	Size uint64 `url:"size" json:"size"`
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // List gets list all accounts the user has access to

pkg/cloudbroker/account/list_computes.go

@@ -13,10 +13,50 @@ type ListComputesRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by compute id
+	// 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 resource group name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,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 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 all compute instances under specified account, accessible by the user
-func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (ListComputes, error) {
+func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (*ListComputes, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +78,5 @@ func (a Account) ListComputes(ctx context.Context, req ListComputesRequest) (Lis
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/account/list_deleted.go

@@ -8,17 +8,29 @@ import (
 
 // Request struct for get list deleted accounts
 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 access control list
+	// Required: false
+	ACL string `url:"acl,omitempty" json:"acl,omitempty"`
+
 	// Page number
 	// Required: false
-	Page uint64 `url:"page" json:"page"`
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
 
 	// Page size
 	// Required: false
-	Size uint64 `url:"size" json:"size"`
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // ListDeleted gets list all deleted accounts the user has access to
-func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListDeleted, error) {
+func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListAccounts, error) {
 	url := "/cloudbroker/account/listDeleted"
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -26,12 +38,12 @@ func (a Account) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListD
 		return nil, err
 	}
 
-	list := ListDeleted{}
+	list := ListAccounts{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/account/list_disks.go

@@ -13,10 +13,34 @@ type ListDisksRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by disk id
+	// Required: false
+	DiskID uint64 `url:"diskId,omitempty" json:"diskId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize uint64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Type of the disks
+	// 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"`
 }
 
 // ListDisks gets list all currently unattached disks under specified account
-func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (ListDisks, error) {
+func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (*ListDisks, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +62,5 @@ func (a Account) ListDisks(ctx context.Context, req ListDisksRequest) (ListDisks
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/account/list_flip_groups.go

@@ -13,10 +13,42 @@ type ListFLIPGroupsRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by vinsId
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
+
+	// Find by VINS name
+	// Required: false
+	VINSName string `url:"vinsName,omitempty" json:"vinsName,omitempty"`
+
+	// Find by external network id
+	// Required: false
+	ExtNetID uint64 `url:"extnetId,omitempty" json:"extnetId,omitempty"`
+
+	// Find by IP
+	// Required: false
+	ByIP string `url:"byIp,omitempty" json:"byIp,omitempty"`
+
+	// Find by flipGroup Id
+	// Required: false
+	FLIPGroupID uint64 `url:"flipGroupId,omitempty" json:"flipGroupId,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"`
 }
 
 // ListFLIPGroups gets list all FLIPGroups under specified account, accessible by the user
-func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (ListFLIPGroups, error) {
+func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest) (*ListFLIPGroups, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +70,5 @@ func (a Account) ListFLIPGroups(ctx context.Context, req ListFLIPGroupsRequest)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/account/list_rg.go

@@ -13,10 +13,38 @@ type ListRGRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by vinsId
+	// Required: false
+	VINSID uint64 `url:"vinsId,omitempty" json:"vinsId,omitempty"`
+
+	// Find by VM ID
+	// Required: false
+	VMID uint64 `url:"vmId,omitempty" json:"vmId,omitempty"`
+
+	// Find by status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
 }
 
 // ListRG gets list all resource groups under specified account, accessible by the user
-func (a Account) ListRG(ctx context.Context, req ListRGRequest) (ListRG, error) {
+func (a Account) ListRG(ctx context.Context, req ListRGRequest) (*ListRG, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +66,5 @@ func (a Account) ListRG(ctx context.Context, req ListRGRequest) (ListRG, error)
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/account/list_vins.go

@@ -13,10 +13,34 @@ type ListVINSRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Find by VINS ID
+	// Required: false
+	VINSID uint64 `url:"vins,omitempty" json:"vinsId,omitempty"`
+
+	// Find by name
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by external network ip
+	// Required: false
+	ExtIP string `url:"extIp,omitempty" json:"extIp,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 account, accessible by the user
-func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, error) {
+func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (*ListVINS, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -28,7 +52,7 @@ func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, e
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return ListVINS{}, err
+		return nil, err
 	}
 
 	list := ListVINS{}
@@ -38,5 +62,5 @@ func (a Account) ListVINS(ctx context.Context, req ListVINSRequest) (ListVINS, e
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/account/models.go

@@ -210,18 +210,23 @@ type ItemAccount struct {
 	InfoAccount
 }
 
-// List of accounts
-type ListDeleted []ItemAccount
-
 // List of accounts
 type ListAccounts struct {
+	// Data
 	Data []ItemAccount `json:"data"`
 
+	// Entry count
 	EntryCount uint64 `json:"entryCount"`
 }
 
 // List of computes
-type ListComputes []ItemCompute
+type ListComputes struct {
+	// Data
+	Data []ItemCompute `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about compute
 type ItemCompute struct {
@@ -287,7 +292,13 @@ type ItemCompute struct {
 }
 
 // List of disks
-type ListDisks []ItemDisk
+type ListDisks struct {
+	// Data
+	Data []ItemDisk `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about disks
 type ItemDisk struct {
@@ -314,7 +325,13 @@ type ItemDisk struct {
 }
 
 // List of FLIPGroups
-type ListFLIPGroups []ItemFLIPGroup
+type ListFLIPGroups struct {
+	// Data
+	Data []ItemFLIPGroup `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about FLIPGroup
 type ItemFLIPGroup struct {
@@ -500,7 +517,13 @@ type ItemRG struct {
 }
 
 // List of resource groups
-type ListRG []ItemRG
+type ListRG struct {
+	// Data
+	Data []ItemRG `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about VINS
 type ItemVINS struct {
@@ -557,4 +580,10 @@ type ItemVINS struct {
 }
 
 // List of VINSes
-type ListVINS []ItemVINS
+type ListVINS struct {
+	//Data
+	Data []ItemVINS `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/account/serialize.go

@@ -6,26 +6,6 @@ import (
 	"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 (ld ListDeleted) Serialize(params ...string) (serialization.Serialized, error) {
-	if len(ld) == 0 {
-		return []byte{}, nil
-	}
-
-	if len(params) > 1 {
-		prefix := params[0]
-		indent := params[1]
-
-		return json.MarshalIndent(ld, prefix, indent)
-	}
-
-	return json.Marshal(ld)
-}
-
 // 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:

pkg/cloudbroker/account/sorting.go

@@ -2,68 +2,11 @@ package account
 
 import "sort"
 
-// SortByCreatedTime sorts ListDeleted by the CreatedTime field in ascending order.
-//
-// If inverse param is set to true, the order is reversed.
-func (ld ListDeleted) SortByCreatedTime(inverse bool) ListDeleted {
-	if len(ld) < 2 {
-		return ld
-	}
-
-	sort.Slice(ld, func(i, j int) bool {
-		if inverse {
-			return ld[i].CreatedTime > ld[j].CreatedTime
-		}
-
-		return ld[i].CreatedTime < ld[j].CreatedTime
-	})
-
-	return ld
-}
-
-// SortByUpdatedTime sorts ListDeleted by the UpdatedTime field in ascending order.
-//
-// If inverse param is set to true, the order is reversed.
-func (ld ListDeleted) SortByUpdatedTime(inverse bool) ListDeleted {
-	if len(ld) < 2 {
-		return ld
-	}
-
-	sort.Slice(ld, func(i, j int) bool {
-		if inverse {
-			return ld[i].UpdatedTime > ld[j].UpdatedTime
-		}
-
-		return ld[i].UpdatedTime < ld[j].UpdatedTime
-	})
-
-	return ld
-}
-
-// SortByDeletedTime sorts ListDeleted by the DeletedTime field in ascending order.
-//
-// If inverse param is set to true, the order is reversed.
-func (ld ListDeleted) SortByDeletedTime(inverse bool) ListDeleted {
-	if len(ld) < 2 {
-		return ld
-	}
-
-	sort.Slice(ld, func(i, j int) bool {
-		if inverse {
-			return ld[i].DeletedTime > ld[j].DeletedTime
-		}
-
-		return ld[i].DeletedTime < ld[j].DeletedTime
-	})
-
-	return ld
-}
-
 // SortByCreatedTime sorts ListAccounts by the CreatedTime field in ascending order.
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByCreatedTime(inverse bool) ListAccounts {
-	if la.EntryCount < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
@@ -82,7 +25,7 @@ func (la ListAccounts) SortByCreatedTime(inverse bool) ListAccounts {
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByUpdatedTime(inverse bool) ListAccounts {
-	if la.EntryCount < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 
@@ -101,7 +44,7 @@ func (la ListAccounts) SortByUpdatedTime(inverse bool) ListAccounts {
 //
 // If inverse param is set to true, the order is reversed.
 func (la ListAccounts) SortByDeletedTime(inverse bool) ListAccounts {
-	if la.EntryCount < 2 {
+	if len(la.Data) < 2 {
 		return la
 	}
 

pkg/cloudbroker/compute/disk_attach.go

@@ -18,6 +18,10 @@ type DiskAttachRequest struct {
 	// Required: true
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 
+	// Type of the disk B;D
+	// Required: false
+	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty"`
+
 	// Reason for action
 	// Required: false
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`

pkg/cloudbroker/compute/disk_qos.go

@@ -21,6 +21,10 @@ type DiskQOSRequest struct {
 	// Limit IO for a certain disk total and read/write options are not allowed to be combined
 	// Required: true
 	Limits string `url:"limits" json:"limits" validate:"required"`
+
+	// Reason for action
+	// Required: false
+	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // DiskQOS change QOS of the disk

pkg/cloudbroker/compute/filter.go

@@ -59,7 +59,7 @@ func (lc ListComputes) FilterByDiskID(diskID uint64) ListComputes {
 }
 
 // FilterByK8SID returns master and worker nodes (ListComputes) inside specified K8S cluster.
-func (lc ListComputes) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (ListComputes, error) {
+func (lc ListComputes) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (*ListComputes, error) {
 	caller := k8s.New(decortClient)
 
 	req := k8s.GetRequest{
@@ -89,7 +89,9 @@ func (lc ListComputes) FilterByK8SID(ctx context.Context, k8sID uint64, decortCl
 		return false
 	}
 
-	return lc.FilterFunc(predicate), nil
+	result := lc.FilterFunc(predicate)
+
+	return &result, nil
 }
 
 // K8SMasters is used to filter master nodes. Best used after FilterByK8SID function.
@@ -121,7 +123,7 @@ func (lc ListComputes) FilterByK8SWorkers() ListComputes {
 }
 
 // FilterByLBID is used to filter ListComputes used by specified Load Balancer.
-func (lc ListComputes) FilterByLBID(ctx context.Context, lbID uint64, decortClient interfaces.Caller) (ListComputes, error) {
+func (lc ListComputes) FilterByLBID(ctx context.Context, lbID uint64, decortClient interfaces.Caller) (*ListComputes, error) {
 	caller := lb.New(decortClient)
 
 	req := lb.GetRequest{
@@ -137,28 +139,32 @@ func (lc ListComputes) FilterByLBID(ctx context.Context, lbID uint64, decortClie
 		return ic.ID == foundLB.PrimaryNode.ComputeID || ic.ID == foundLB.SecondaryNode.ComputeID
 	}
 
-	return lc.FilterFunc(predicate), nil
+	result := lc.FilterFunc(predicate)
+
+	return &result, nil
 }
 
 // FilterFunc allows filtering ListComputes based on a user-specified predicate.
 func (lc ListComputes) FilterFunc(predicate func(ItemCompute) bool) ListComputes {
 	var result ListComputes
 
-	for _, item := range lc {
+	for _, item := range lc.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 ItemCompute
 // If none was found, returns an empty struct.
 func (lc ListComputes) FindOne() ItemCompute {
-	if len(lc) == 0 {
+	if len(lc.Data) == 0 {
 		return ItemCompute{}
 	}
 
-	return lc[0]
+	return lc.Data[0]
 }

pkg/cloudbroker/compute/filter_test.go

@@ -1,247 +1,250 @@
 package compute
 
 import (
-    "testing"
+	"testing"
 )
 
 var computes = ListComputes{
-	ItemCompute{
+	Data: []ItemCompute{
-		Disks: []InfoDisk{
+		{
-			{
+			Disks: []InfoDisk{
-				ID:      65191,
-				PCISlot: 6,
-			},
-		},
-		InfoCompute: InfoCompute{
-			ACL:           []interface{}{},
-			AccountID:     132847,
-			AccountName:   "std_2",
-			AffinityLabel: "",
-			AffinityRules: []ItemRule{
 				{
-					GUID:     "",
+					ID:      65191,
-					Key:      "aff_key",
+					PCISlot: 6,
-					Mode:     "ANY",
-					Policy:   "RECOMMENDED",
-					Topology: "compute",
-					Value:    "aff_val",
 				},
 			},
-			AffinityWeight: 0,
+			InfoCompute: InfoCompute{
-			AntiAffinityRules: []ItemRule{
+				ACL:           []interface{}{},
-				{
+				AccountID:     132847,
-					GUID:     "",
+				AccountName:   "std_2",
-					Key:      "antiaff_key",
+				AffinityLabel: "",
-					Mode:     "ANY",
+				AffinityRules: []ItemRule{
-					Policy:   "RECOMMENDED",
+					{
-					Topology: "compute",
+						GUID:     "",
-					Value:    "antiaff_val",
+						Key:      "aff_key",
+						Mode:     "ANY",
+						Policy:   "RECOMMENDED",
+						Topology: "compute",
+						Value:    "aff_val",
+					},
 				},
+				AffinityWeight: 0,
+				AntiAffinityRules: []ItemRule{
+					{
+						GUID:     "",
+						Key:      "antiaff_key",
+						Mode:     "ANY",
+						Policy:   "RECOMMENDED",
+						Topology: "compute",
+						Value:    "antiaff_val",
+					},
+				},
+				Arch: "X86_64",
+				BootOrder: []string{
+					"hd", "cdrom",
+				},
+				BootDiskSize:     0,
+				CloneReference:   0,
+				Clones:           []uint64{},
+				ComputeCIID:      0,
+				CPUs:             4,
+				CreatedBy:        "timofey_tkachev_1@decs3o",
+				CreatedTime:      1676975175,
+				CustomFields:     map[string]interface{}{},
+				DeletedBy:        "",
+				DeletedTime:      0,
+				Description:      "",
+				Devices:          nil,
+				Driver:           "KVM_X86",
+				GID:              212,
+				GUID:             48500,
+				ID:               48500,
+				ImageID:          9884,
+				Interfaces:       ListInterfaces{},
+				LockStatus:       "UNLOCKED",
+				ManagerID:        0,
+				ManagerType:      "",
+				MigrationJob:     0,
+				Milestones:       363500,
+				Name:             "test",
+				Pinned:           false,
+				RAM:              4096,
+				ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
+				Registered:       true,
+				ResName:          "compute-48500",
+				RGID:             79724,
+				RGName:           "std_broker2",
+				SnapSets:         ListSnapshots{},
+				StatelessSEPID:   0,
+				StatelessSEPType: "",
+				Status:           "ENABLED",
+				Tags:             map[string]interface{}{},
+				TechStatus:       "STOPPED",
+				TotalDiskSize:    2,
+				UpdatedBy:        "",
+				UpdatedTime:      1677058904,
+				UserManaged:      true,
+				VGPUs:            []uint64{},
+				VINSConnected:    0,
+				VirtualImageID:   0,
 			},
-			Arch: "X86_64",
-			BootOrder: []string{
-				"hd", "cdrom",
-			},
-			BootDiskSize:     0,
-			CloneReference:   0,
-			Clones:           []uint64{},
-			ComputeCIID:      0,
-			CPUs:             4,
-			CreatedBy:        "timofey_tkachev_1@decs3o",
-			CreatedTime:      1676975175,
-			CustomFields:     map[string]interface{}{},
-			DeletedBy:        "",
-			DeletedTime:      0,
-			Description:      "",
-			Devices:          nil,
-			Driver:           "KVM_X86",
-			GID:              212,
-			GUID:             48500,
-			ID:               48500,
-			ImageID:          9884,
-			Interfaces:       ListInterfaces{},
-			LockStatus:       "UNLOCKED",
-			ManagerID:        0,
-			ManagerType:      "",
-			MigrationJob:     0,
-			Milestones:       363500,
-			Name:             "test",
-			Pinned:           false,
-			RAM:              4096,
-			ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
-			Registered:       true,
-			ResName:          "compute-48500",
-			RGID:             79724,
-			RGName:           "std_broker2",
-			SnapSets:         ListSnapshots{},
-			StatelessSEPID:   0,
-			StatelessSEPType: "",
-			Status:           "ENABLED",
-			Tags:             map[string]interface{}{},
-			TechStatus:       "STOPPED",
-			TotalDiskSize:    2,
-			UpdatedBy:        "",
-			UpdatedTime:      1677058904,
-			UserManaged:      true,
-			VGPUs:            []uint64{},
-			VINSConnected:    0,
-			VirtualImageID:   0,
 		},
-	},
+		{
-	ItemCompute{
+			Disks: []InfoDisk{
-		Disks: []InfoDisk{
+				{
-			{
+					ID:      65248,
-				ID:      65248,
+					PCISlot: 6,
-				PCISlot: 6,
+				},
 			},
-		},
+			InfoCompute: InfoCompute{
-		InfoCompute: InfoCompute{
+				ACL:               []interface{}{},
-			ACL:               []interface{}{},
+				AccountID:         132848,
-			AccountID:         132848,
+				AccountName:       "std_broker",
-			AccountName:       "std_broker",
+				AffinityLabel:     "",
-			AffinityLabel:     "",
+				AffinityRules:     []ItemRule{},
-			AffinityRules:     []ItemRule{},
+				AffinityWeight:    0,
-			AffinityWeight:    0,
+				AntiAffinityRules: []ItemRule{},
-			AntiAffinityRules: []ItemRule{},
+				Arch:              "X86_64",
-			Arch:      "X86_64",
+				BootOrder: []string{
-			BootOrder: []string{
+					"hd", "cdrom",
-				"hd", "cdrom",
+				},
+				BootDiskSize:     0,
+				CloneReference:   0,
+				Clones:           []uint64{},
+				ComputeCIID:      0,
+				CPUs:             6,
+				CreatedBy:        "timofey_tkachev_1@decs3o",
+				CreatedTime:      1677579436,
+				CustomFields:     map[string]interface{}{},
+				DeletedBy:        "",
+				DeletedTime:      0,
+				Description:      "",
+				Devices:          nil,
+				Driver:           "KVM_X86",
+				GID:              212,
+				GUID:             48556,
+				ID:               48556,
+				ImageID:          9884,
+				Interfaces:       ListInterfaces{},
+				LockStatus:       "UNLOCKED",
+				ManagerID:        0,
+				ManagerType:      "",
+				MigrationJob:     0,
+				Milestones:       363853,
+				Name:             "compute_2",
+				Pinned:           false,
+				RAM:              4096,
+				ReferenceID:      "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
+				Registered:       true,
+				ResName:          "compute-48556",
+				RGID:             79727,
+				RGName:           "sdk_negative_fields_test",
+				SnapSets:         ListSnapshots{},
+				StatelessSEPID:   0,
+				StatelessSEPType: "",
+				Status:           "ENABLED",
+				Tags:             map[string]interface{}{},
+				TechStatus:       "STARTED",
+				TotalDiskSize:    1,
+				UpdatedBy:        "",
+				UpdatedTime:      1677579436,
+				UserManaged:      true,
+				VGPUs:            []uint64{},
+				VINSConnected:    0,
+				VirtualImageID:   0,
 			},
-			BootDiskSize:     0,
-			CloneReference:   0,
-			Clones:           []uint64{},
-			ComputeCIID:      0,
-			CPUs:              6,
-			CreatedBy:        "timofey_tkachev_1@decs3o",
-			CreatedTime:      1677579436,
-			CustomFields:     map[string]interface{}{},
-			DeletedBy:        "",
-			DeletedTime:      0,
-			Description:      "",
-			Devices:          nil,
-			Driver:           "KVM_X86",
-			GID:              212,
-			GUID:             48556,
-			ID:               48556,
-			ImageID:          9884,
-			Interfaces:       ListInterfaces{},
-			LockStatus:       "UNLOCKED",
-			ManagerID:        0,
-			ManagerType:      "",
-			MigrationJob:     0,
-			Milestones:       363853,
-			Name:             "compute_2",
-			Pinned:           false,
-			RAM:              4096,
-			ReferenceID:      "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
-			Registered:       true,
-			ResName:          "compute-48556",
-			RGID:             79727,
-			RGName:           "sdk_negative_fields_test",
-			SnapSets:         ListSnapshots{},
-			StatelessSEPID:   0,
-			StatelessSEPType: "",
-			Status:           "ENABLED",
-			Tags:             map[string]interface{}{},
-			TechStatus:       "STARTED",
-			TotalDiskSize:    1,
-			UpdatedBy:        "",
-			UpdatedTime:      1677579436,
-			UserManaged:      true,
-			VGPUs:            []uint64{},
-			VINSConnected:    0,
-			VirtualImageID:   0,
 		},
 	},
+	EntryCount: 2,
 }
 
 func TestFilterByID(t *testing.T) {
-    actual := computes.FilterByID(48500).FindOne()
+	actual := computes.FilterByID(48500).FindOne()
 
-    if actual.ID != 48500 {
+	if actual.ID != 48500 {
-        t.Fatal("expected ID 48500, found: ", actual.ID)
+		t.Fatal("expected ID 48500, found: ", actual.ID)
-    }
+	}
 
-    actualEmpty := computes.FilterByID(0)
+	actualEmpty := computes.FilterByID(0)
 
-    if len(actualEmpty) != 0 {
+	if len(actualEmpty.Data) != 0 {
-        t.Fatal("expected empty, actual: ", len(actualEmpty))
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
-    }
+	}
 }
 
 func TestFilterByName(t *testing.T) {
-    actual := computes.FilterByName("compute_2").FindOne()
+	actual := computes.FilterByName("compute_2").FindOne()
 
-    if actual.Name != "compute_2" {
+	if actual.Name != "compute_2" {
-        t.Fatal("expected compute with name 'test', found: ", actual.Name)
+		t.Fatal("expected compute with name 'test', found: ", actual.Name)
-    }
+	}
 }
 
 func TestFilterByStatus(t *testing.T) {
-    actual := computes.FilterByStatus("ENABLED")
+	actual := computes.FilterByStatus("ENABLED")
 
-    for _, item := range actual {
+	for _, item := range actual.Data {
-        if item.Status != "ENABLED" {
+		if item.Status != "ENABLED" {
-            t.Fatal("expected ENABLED status, found: ", item.Status)
+			t.Fatal("expected ENABLED status, found: ", item.Status)
-        }
+		}
-    }
+	}
 }
 
 func TestFilterByTechStatus(t *testing.T) {
-    actual := computes.FilterByTechStatus("STARTED").FindOne()
+	actual := computes.FilterByTechStatus("STARTED").FindOne()
 
-    if actual.ID != 48556 {
+	if actual.ID != 48556 {
-        t.Fatal("expected 48556 with STARTED techStatus, found: ", actual.ID)
+		t.Fatal("expected 48556 with STARTED techStatus, found: ", actual.ID)
-    }
+	}
 }
 
 func TestFilterByDiskID(t *testing.T) {
-    actual := computes.FilterByDiskID(65248).FindOne()
+	actual := computes.FilterByDiskID(65248).FindOne()
 
-    if actual.ID != 48556 {
+	if actual.ID != 48556 {
-        t.Fatal("expected 48556 with DiskID 65248, found: ", actual.ID)
+		t.Fatal("expected 48556 with DiskID 65248, found: ", actual.ID)
-    }
+	}
 }
 
 func TestFilterFunc(t *testing.T) {
-    actual := computes.FilterFunc(func(ic ItemCompute) bool {
+	actual := computes.FilterFunc(func(ic ItemCompute) bool {
-        return ic.Registered == true
+		return ic.Registered == true
-    })
+	})
-
+
-    if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-        t.Fatal("expected 2 elements found, actual: ", len(actual))
+		t.Fatal("expected 2 elements found, actual: ", len(actual.Data))
-    }
+	}
-
+
-    for _, item := range actual {
+	for _, item := range actual.Data {
-        if item.Registered != true {
+		if item.Registered != true {
-            t.Fatal("expected Registered to be true, actual: ", item.Registered)
+			t.Fatal("expected Registered to be true, actual: ", item.Registered)
-        }
+		}
-    }
+	}
 }
 
 func TestSortingByCreatedTime(t *testing.T) {
-    actual := computes.SortByCreatedTime(false)
+	actual := computes.SortByCreatedTime(false)
 
-    if actual[0].Name != "test" {
+	if actual.Data[0].Name != "test" {
-        t.Fatal("expected 'test', found: ", actual[0].Name)
+		t.Fatal("expected 'test', found: ", actual.Data[0].Name)
-    }
+	}
 
-    actual = computes.SortByCreatedTime(true)
+	actual = computes.SortByCreatedTime(true)
-    if actual[0].Name != "compute_2" {
+	if actual.Data[0].Name != "compute_2" {
-        t.Fatal("expected 'compute_2', found: ", actual[0].Name)
+		t.Fatal("expected 'compute_2', found: ", actual.Data[0].Name)
-    }
+	}
 }
 
 func TestSortingByCPU(t *testing.T) {
-    actual := computes.SortByCPU(false)
+	actual := computes.SortByCPU(false)
 
-    if actual[0].CPUs != 4{
+	if actual.Data[0].CPUs != 4 {
-        t.Fatal("expected 4 CPU cores, found: ", actual[0].CPUs)
+		t.Fatal("expected 4 CPU cores, found: ", actual.Data[0].CPUs)
-    }
+	}
 
-    actual = computes.SortByCPU(true)
+	actual = computes.SortByCPU(true)
 
-    if actual[0].CPUs != 6 {
+	if actual.Data[0].CPUs != 6 {
-        t.Fatal("expected 6 CPU cores, found: ", actual[0].CPUs)
+		t.Fatal("expected 6 CPU cores, found: ", actual.Data[0].CPUs)
-    }
+	}
 }

pkg/cloudbroker/compute/list.go

@@ -8,6 +8,46 @@ import (
 
 // Request struct for get list available computes
 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 name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,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 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"`
+
 	// Include deleted computes
 	// Required: false
 	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
@@ -23,7 +63,7 @@ type ListRequest struct {
 
 // List gets list of the available computes.
 // Filtering based on status is possible
-func (c Compute) List(ctx context.Context, req ListRequest) (ListComputes, error) {
+func (c Compute) List(ctx context.Context, req ListRequest) (*ListComputes, error) {
 	url := "/cloudbroker/compute/list"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -38,5 +78,5 @@ func (c Compute) List(ctx context.Context, req ListRequest) (ListComputes, error
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/compute/list_deleted.go

@@ -8,6 +8,42 @@ import (
 
 // Request struct for get deleted computes list
 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 name
+	// Required: false
+	RGName string `url:"rgName,omitempty" json:"rgName,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 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"`
@@ -18,7 +54,7 @@ type ListDeletedRequest struct {
 }
 
 // ListDeleted gets list all deleted computes
-func (c Compute) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListComputes, error) {
+func (c Compute) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListComputes, error) {
 	url := "/cloudbroker/compute/listDeleted"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +69,5 @@ func (c Compute) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListC
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/compute/list_pci_device.go

@@ -13,10 +13,34 @@ type ListPCIDeviceRequest struct {
 	// Identifier compute
 	// Required: true
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Find by resource group ID
+	// Required: false
+	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
+
+	// Find by device id
+	// Required: false
+	DevID uint64 `url:"devId,omitempty" json:"devId,omitempty"`
+
+	// Find by type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,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"`
 }
 
 // ListPCIDevice gets list PCI device
-func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) (ListPCIDevices, error) {
+func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) (*ListPCIDevices, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -38,5 +62,5 @@ func (c Compute) ListPCIDevice(ctx context.Context, req ListPCIDeviceRequest) (L
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/compute/list_vgpu.go

@@ -0,0 +1,66 @@
+package compute
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// Request struct for get list GPU for compute
+type ListVGPURequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Find by GPU id
+	// Required: false
+	GPUID uint64 `url:"gpuId,omitempty" json:"gpuId,omitempty"`
+
+	// Find by type
+	// Required: false
+	Type string `url:"type,omitempty" json:"type,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"`
+
+	// Include deleted computes. If using field 'status', then includedeleted will be ignored
+	// Required: false
+	IncludeDeleted bool `url:"includedeleted,omitempty" json:"includedeleted,omitempty"`
+}
+
+// ListVGPU gets list GPU for compute
+func (c Compute) ListVGPU(ctx context.Context, req ListVGPURequest) (*ListVGPUs, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
+	}
+
+	url := "/cloudbroker/compute/listVGpu"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListVGPUs{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}

pkg/cloudbroker/compute/models.go

@@ -119,6 +119,9 @@ type RecordNetAttach struct {
 	// Default GW
 	DefGW string `json:"defGw"`
 
+	// Enabled
+	Enabled bool `json:"enabled"`
+
 	// FLIPGroup ID
 	FLIPGroupID uint64 `json:"flipgroupId"`
 
@@ -742,7 +745,13 @@ type InfoDisk struct {
 }
 
 // List computes
-type ListComputes []ItemCompute
+type ListComputes struct {
+	// Data
+	Data []ItemCompute `json:"data"`
+
+	// Entru Count
+	EntryCount uint64 `json:"entrycount"`
+}
 
 // Short information about audir
 type ItemAudit struct {
@@ -796,4 +805,19 @@ type ItemPCIDevice struct {
 }
 
 // List PCI devices
-type ListPCIDevices []ItemPCIDevice
+type ListPCIDevices struct {
+	// Data
+	Data []ItemPCIDevice `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
+// List VGPUs
+type ListVGPUs struct {
+	// Data
+	Data []interface{} `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/compute/resize.go

@@ -17,16 +17,16 @@ type ResizeRequest struct {
 	// New CPU count.
 	// Pass 0 if no change to CPU count is required
 	// Required: false
-	Force bool `url:"force,omitempty" json:"force,omitempty"`
+	CPU uint64 `url:"cpu,omitempty" json:"cpu,omitempty"`
 
 	// New RAM volume in MB.
 	// Pass 0 if no change to RAM volume is required
 	// Required: false
-	CPU uint64 `url:"cpu,omitempty" json:"cpu,omitempty"`
+	RAM uint64 `url:"ram,omitempty" json:"ram,omitempty"`
 
 	// Force compute resize
 	// Required: false
-	RAM uint64 `url:"ram,omitempty" json:"ram,omitempty"`
+	Force bool `url:"force,omitempty" json:"force,omitempty"`
 
 	// Reason for action
 	// Required: false

pkg/cloudbroker/compute/serialize.go

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

pkg/cloudbroker/compute/sorting.go

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

pkg/cloudbroker/disks/filter.go

@@ -70,7 +70,7 @@ func (ld ListDisks) FilterByComputeID(computeID uint64) ListDisks {
 }
 
 // FilterByK8SID is used to filter ListDisks by specified K8S cluster.
-func (ld ListDisks) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (ListDisks, error) {
+func (ld ListDisks) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (*ListDisks, error) {
 	caller := k8s.New(decortClient)
 
 	req := k8s.GetRequest{
@@ -85,20 +85,20 @@ func (ld ListDisks) FilterByK8SID(ctx context.Context, k8sID uint64, decortClien
 	var result ListDisks
 
 	for _, masterCompute := range cluster.K8SGroups.Masters.DetailedInfo {
-		result = append(result, ld.FilterByComputeID(masterCompute.ID)...)
+		result.Data = append(result.Data, ld.FilterByComputeID(masterCompute.ID).Data...)
 	}
 
 	for _, workerGroup := range cluster.K8SGroups.Workers {
 		for _, workerCompute := range workerGroup.DetailedInfo {
-			result = append(result, ld.FilterByComputeID(workerCompute.ID)...)
+			result.Data = append(result.Data, ld.FilterByComputeID(workerCompute.ID).Data...)
 		}
 	}
 
-	return result, nil
+	return &result, nil
 }
 
 // FilterByLBID is used to filter ListDisks used by computes inside specified Load Balancer.
-func (ld ListDisks) FilterByLBID(ctx context.Context, lbID uint64, decortClient interfaces.Caller) (ListDisks, error) {
+func (ld ListDisks) FilterByLBID(ctx context.Context, lbID uint64, decortClient interfaces.Caller) (*ListDisks, error) {
 	caller := lb.New(decortClient)
 
 	req := lb.GetRequest{
@@ -111,31 +111,33 @@ func (ld ListDisks) FilterByLBID(ctx context.Context, lbID uint64, decortClient
 	}
 
 	var result ListDisks
-	result = append(result, ld.FilterByComputeID(foundLB.PrimaryNode.ComputeID)...)
+	result.Data = append(result.Data, ld.FilterByComputeID(foundLB.PrimaryNode.ComputeID).Data...)
-	result = append(result, ld.FilterByComputeID(foundLB.SecondaryNode.ComputeID)...)
+	result.Data = append(result.Data, ld.FilterByComputeID(foundLB.SecondaryNode.ComputeID).Data...)
 
-	return result, nil
+	return &result, nil
 }
 
 // FilterFunc allows filtering ListDisks based on a user-specified predicate.
 func (ld ListDisks) FilterFunc(predicate func(ItemDisk) bool) ListDisks {
 	var result ListDisks
 
-	for _, item := range ld {
+	for _, item := range ld.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(ld.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemDisk
 // If none was found, returns an empty struct.
 func (ld ListDisks) FindOne() ItemDisk {
-	if len(ld) == 0 {
+	if len(ld.Data) == 0 {
 		return ItemDisk{}
 	}
 
-	return ld[0]
+	return ld.Data[0]
 }

pkg/cloudbroker/disks/filter_test.go

@@ -3,131 +3,134 @@ package disks
 import "testing"
 
 var disks = ListDisks{
-	ItemDisk{
+	Data: []ItemDisk{
-		MachineID:   0,
+		{
-		MachineName: "",
+			MachineID:   0,
-		RecordDisk: RecordDisk{
+			MachineName: "",
-			DeviceName: "vda",
+			RecordDisk: RecordDisk{
-			SEPType:    "",
+				DeviceName: "vda",
-			InfoDisk: InfoDisk{
+				SEPType:    "",
-				AccountID:     132847,
+				InfoDisk: InfoDisk{
-				AccountName:   "std_2",
+					AccountID:     132847,
-				ACL:           map[string]interface{}{},
+					AccountName:   "std_2",
-				BootPartition: 0,
+					ACL:           map[string]interface{}{},
-				Computes: map[string]string{
+					BootPartition: 0,
-					"48500": "test",
+					Computes: map[string]string{
+						"48500": "test",
+					},
+					CreatedTime:     1676975177,
+					DeletedTime:     0,
+					Description:     "",
+					DestructionTime: 0,
+					DiskPath:        "",
+					GID:             212,
+					GUID:            65191,
+					ID:              65191,
+					ImageID:         9884,
+					Images:          []uint64{},
+					IOTune: IOTune{
+						TotalIOPSSec: 2000,
+					},
+					IQN:        "",
+					Login:      "",
+					Milestones: 363501,
+					Name:       "bootdisk",
+					Order:      0,
+					Params:     "",
+					ParentID:   0,
+					Password:   "",
+					PCISlot:    6,
+					Pool:       "vmstor",
+					PresentTo: []uint64{
+						27,
+					},
+					PurgeAttempts:       0,
+					PurgeTime:           0,
+					RealityDeviceNumber: 0,
+					ReferenceID:         "sample",
+					ResID:               "sample",
+					ResName:             "sample",
+					Role:                "",
+					SEPID:               2504,
+					Shareable:           false,
+					SizeMax:             2,
+					SizeUsed:            2,
+					Snapshots:           []ItemSnapshot{},
+					Status:              "ASSIGNED",
+					TechStatus:          "ALLOCATED",
+					Type:                "B",
+					VMID:                48500,
 				},
-				CreatedTime:     1676975177,
-				DeletedTime:     0,
-				Description:     "",
-				DestructionTime: 0,
-				DiskPath:        "",
-				GID:             212,
-				GUID:            65191,
-				ID:              65191,
-				ImageID:         9884,
-				Images:          []uint64{},
-				IOTune: IOTune{
-					TotalIOPSSec: 2000,
-				},
-				IQN:        "",
-				Login:      "",
-				Milestones: 363501,
-				Name:       "bootdisk",
-				Order:      0,
-				Params:     "",
-				ParentID:   0,
-				Password:   "",
-				PCISlot:    6,
-				Pool:       "vmstor",
-				PresentTo: []uint64{
-					27,
-				},
-				PurgeAttempts:       0,
-				PurgeTime:           0,
-				RealityDeviceNumber: 0,
-				ReferenceID:         "sample",
-				ResID:               "sample",
-				ResName:             "sample",
-				Role:                "",
-				SEPID:               2504,
-				Shareable:           false,
-				SizeMax:             2,
-				SizeUsed:            2,
-				Snapshots:           []ItemSnapshot{},
-				Status:              "ASSIGNED",
-				TechStatus:          "ALLOCATED",
-				Type:                "B",
-				VMID:                48500,
 			},
 		},
-	},
+		{
-	ItemDisk{
+			MachineID:   0,
-		MachineID:   0,
+			MachineName: "",
-		MachineName: "",
+			RecordDisk: RecordDisk{
-		RecordDisk: RecordDisk{
+				DeviceName: "vda",
-			DeviceName: "vda",
+				SEPType:    "",
-			SEPType:    "",
+				InfoDisk: InfoDisk{
-			InfoDisk: InfoDisk{
+					AccountID:     132852,
-				AccountID:     132852,
+					AccountName:   "std",
-				AccountName:   "std",
+					ACL:           map[string]interface{}{},
-				ACL:           map[string]interface{}{},
+					BootPartition: 0,
-				BootPartition: 0,
+					Computes: map[string]string{
-				Computes: map[string]string{
+						"48502": "stdvm2",
-					"48502": "stdvm2",
+					},
-				},
+					CreatedTime:     1676982606,
-				CreatedTime:     1676982606,
+					DeletedTime:     0,
-				DeletedTime:     0,
+					Description:     "",
-				Description:     "",
+					DestructionTime: 0,
-				DestructionTime: 0,
+					DiskPath:        "",
-				DiskPath:        "",
+					GID:             212,
-				GID:             212,
+					GUID:            65193,
-				GUID:            65193,
+					ID:              65193,
-				ID:              65193,
+					ImageID:         9885,
-				ImageID:         9885,
+					Images:          []uint64{},
-				Images:          []uint64{},
+					IOTune: IOTune{
-				IOTune: IOTune{
+						TotalIOPSSec: 2000,
-					TotalIOPSSec: 2000,
+					},
-				},
+					IQN:        "",
-				IQN:        "",
+					Login:      "",
-				Login:      "",
+					Milestones: 363516,
-				Milestones: 363516,
+					Name:       "bootdisk",
-				Name:       "bootdisk",
+					Order:      0,
-				Order:      0,
+					Params:     "",
-				Params:     "",
+					ParentID:   0,
-				ParentID:   0,
+					Password:   "",
-				Password:   "",
+					PCISlot:    6,
-				PCISlot:    6,
+					Pool:       "vmstor",
-				Pool:       "vmstor",
+					PresentTo: []uint64{
-				PresentTo: []uint64{
+						27,
-					27,
+						27,
-					27,
+					},
+					PurgeAttempts:       0,
+					PurgeTime:           0,
+					RealityDeviceNumber: 0,
+					ReferenceID:         "sample",
+					ResID:               "sample",
+					ResName:             "sample",
+					Role:                "",
+					SEPID:               2504,
+					Shareable:           false,
+					SizeMax:             4,
+					SizeUsed:            4,
+					Snapshots:           []ItemSnapshot{},
+					Status:              "ASSIGNED",
+					TechStatus:          "ALLOCATED",
+					Type:                "B",
+					VMID:                48502,
 				},
-				PurgeAttempts:       0,
-				PurgeTime:           0,
-				RealityDeviceNumber: 0,
-				ReferenceID:         "sample",
-				ResID:               "sample",
-				ResName:             "sample",
-				Role:                "",
-				SEPID:               2504,
-				Shareable:           false,
-				SizeMax:             4,
-				SizeUsed:            4,
-				Snapshots:           []ItemSnapshot{},
-				Status:              "ASSIGNED",
-				TechStatus:          "ALLOCATED",
-				Type:                "B",
-				VMID:                48502,
 			},
 		},
 	},
+	EntryCount: 2,
 }
 
 func TestFilterByID(t *testing.T) {
 	actual := disks.FilterByID(65193)
 
-	if len(actual) == 0 {
+	if len(actual.Data) == 0 {
 		t.Fatal("No elements were found")
 	}
 
@@ -141,11 +144,11 @@ func TestFilterByID(t *testing.T) {
 func TestFilterByName(t *testing.T) {
 	actual := disks.FilterByName("bootdisk")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 elements, found: ", len(actual))
+		t.Fatal("expected 2 elements, found: ", len(actual.Data))
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Name != "bootdisk" {
 			t.Fatal("expected 'bootdisk' name, found: ", item.Name)
 		}
@@ -155,11 +158,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := disks.FilterByStatus("ASSIGNED")
 
-	if len(actual) == 0 {
+	if len(actual.Data) == 0 {
 		t.Fatal("No elements were found")
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.Status != "ASSIGNED" {
 			t.Fatal("expected 'ASSIGNED' status, found: ", item.Status)
 		}
@@ -169,11 +172,11 @@ func TestFilterByStatus(t *testing.T) {
 func TestFilterByTechStatus(t *testing.T) {
 	actual := disks.FilterByTechStatus("ALLOCATED")
 
-	if len(actual) == 0 {
+	if len(actual.Data) == 0 {
 		t.Fatal("No elements were found")
 	}
 
-	for _, item := range actual {
+	for _, item := range actual.Data {
 		if item.TechStatus != "ALLOCATED" {
 			t.Fatal("expected 'ALLOCATED' techStatus, found: ", item.TechStatus)
 		}
@@ -183,12 +186,12 @@ func TestFilterByTechStatus(t *testing.T) {
 func TestFilterByImageID(t *testing.T) {
 	actual := disks.FilterByImageID(9885)
 
-	if len(actual) == 0 {
+	if len(actual.Data) == 0 {
 		t.Fatal("No elements were found")
 	}
 
-	if actual[0].ImageID != 9885 {
+	if actual.Data[0].ImageID != 9885 {
-		t.Fatal("expected 9885 ImageID, found: ", actual[0].ImageID)
+		t.Fatal("expected 9885 ImageID, found: ", actual.Data[0].ImageID)
 	}
 }
 
@@ -197,25 +200,25 @@ func TestFilterFunc(t *testing.T) {
 		return len(id.PresentTo) == 2
 	})
 
-	if len(actual) == 0 {
+	if len(actual.Data) == 0 {
 		t.Fatal("No elements were found")
 	}
 
-	if len(actual[0].PresentTo) != 2 {
+	if len(actual.Data[0].PresentTo) != 2 {
-		t.Fatal("expected 2 elements in PresentTo, found: ", len(actual[0].PresentTo))
+		t.Fatal("expected 2 elements in PresentTo, found: ", len(actual.Data[0].PresentTo))
 	}
 }
 
 func TestSortByCreatedTime(t *testing.T) {
 	actual := disks.SortByCreatedTime(false)
 
-	if actual[0].ID != 65191 {
+	if actual.Data[0].ID != 65191 {
-		t.Fatal("expected ID 65191, found: ", actual[0].ID)
+		t.Fatal("expected ID 65191, found: ", actual.Data[0].ID)
 	}
 
 	actual = disks.SortByCreatedTime(true)
 
-	if actual[0].ID != 65193 {
+	if actual.Data[0].ID != 65193 {
-		t.Fatal("expected ID 65193, found: ", actual[0].ID)
+		t.Fatal("expected ID 65193, found: ", actual.Data[0].ID)
 	}
 }

pkg/cloudbroker/disks/list.go

@@ -8,6 +8,30 @@ import (
 
 // Request struct for get list/list_deleted of disks
 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 name
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize int64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Find by status
+	// 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"`
+
 	// ID of the account the disks belong to
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
@@ -26,7 +50,7 @@ type ListRequest struct {
 }
 
 // List gets list the created disks belonging to an account
-func (d Disks) List(ctx context.Context, req ListRequest) (ListDisks, error) {
+func (d Disks) List(ctx context.Context, req ListRequest) (*ListDisks, error) {
 	url := "/cloudbroker/disks/list"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -41,5 +65,5 @@ func (d Disks) List(ctx context.Context, req ListRequest) (ListDisks, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/disks/list_deleted.go

@@ -8,6 +8,26 @@ import (
 
 // Request struct for get list deleted disks
 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 name
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize int64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Find by shared, true or false
+	// Required: false
+	Shared bool `url:"shared,omitempty" json:"shared,omitempty"`
+
 	// ID of the account the disks belong to
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
@@ -26,7 +46,7 @@ type ListDeletedRequest struct {
 }
 
 // ListDeleted gets list the deleted disks based on filter
-func (d Disks) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListDeletedDisks, error) {
+func (d Disks) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListDisks, error) {
 	url := "/cloudbroker/disks/listDeleted"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -34,12 +54,12 @@ func (d Disks) ListDeleted(ctx context.Context, req ListDeletedRequest) (ListDel
 		return nil, err
 	}
 
-	list := ListDeletedDisks{}
+	list := ListDisks{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/disks/list_types.go

@@ -11,12 +11,20 @@ import (
 // Request struct for get list types of disks
 type ListTypesRequest struct {
 	// Show detailed disk types by seps
-	// Required: true
+	// Required: false
-	Detailed bool `url:"detailed" json:"detailed" validate:"required"`
+	Detailed bool `url:"detailed" json:"detailed"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 }
 
 // ListTypes gets list defined disk types
-func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) ([]interface{}, error) {
+func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) (*ListTypes, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
 		for _, validationError := range validators.GetErrors(err) {
@@ -31,13 +39,13 @@ func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) ([]interface
 		return nil, err
 	}
 
-	list := make([]interface{}, 0)
+	list := ListTypes{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 
 }

pkg/cloudbroker/disks/list_unattached.go

@@ -8,6 +8,30 @@ import (
 
 // Request struct for get list unattached disk
 type ListUnattachedRequest struct {
+	// Find by id
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by account name
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Find by max size disk
+	// Required: false
+	DiskMaxSize int64 `url:"diskMaxSize,omitempty" json:"diskMaxSize,omitempty"`
+
+	// Find by status
+	// 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"`
+
 	// ID of the account
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
@@ -22,7 +46,7 @@ type ListUnattachedRequest struct {
 }
 
 // ListUnattached gets list of unattached disks
-func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (ListUnattachedDisks, error) {
+func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (*ListUnattachedDisks, error) {
 	url := "/cloudbroker/disks/listUnattached"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,5 +61,5 @@ func (d Disks) ListUnattached(ctx context.Context, req ListUnattachedRequest) (L
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/disks/models.go

@@ -199,28 +199,16 @@ type ItemDisk struct {
 }
 
 // List disks
-type ListDisks []ItemDisk
+type ListDisks struct {
+	// Data
+	Data []ItemDisk `json:"data"`
 
-// Main information about deleted disk
+	// Entry count
-type ItemDeletedDisk struct {
+	EntryCount uint64 `json:"entryCount"`
-	// Machine ID
-	MachineID uint64 `json:"machineId"`
-
-	// Machine name
-	MachineName string `json:"machineName"`
-
-	// Detailed information about disk
-	RecordDisk
-
-	// Updated by
-	UpdatedBy uint64 `json:"updatedBy"`
-
-	// Updated time
-	UpdatedTime uint64 `json:"updatedTime"`
 }
 
-// List deleted disks
+// ListSearchDisks
-type ListDeletedDisks []ItemDeletedDisk
+type SearchListDisks []ItemDisk
 
 // Main information about unattached disk
 type ItemUnattachedDisk struct {
@@ -241,7 +229,13 @@ type ItemUnattachedDisk struct {
 }
 
 // List unattached disks
-type ListUnattachedDisks []ItemUnattachedDisk
+type ListUnattachedDisks struct {
+	// Data
+	Data []ItemUnattachedDisk `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Main information about snapshot
 type ItemSnapshot struct {
@@ -269,3 +263,11 @@ type ItemSnapshot struct {
 
 // List snapshots
 type ListSnapshots []ItemSnapshot
+
+type ListTypes struct {
+	// Data
+	Data []interface{} `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/disks/search.go

@@ -29,7 +29,7 @@ type SearchRequest struct {
 }
 
 // Search search disks
-func (d Disks) Search(ctx context.Context, req SearchRequest) (ListDisks, error) {
+func (d Disks) Search(ctx context.Context, req SearchRequest) (SearchListDisks, error) {
 	url := "/cloudbroker/disks/search"
 
 	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,7 +37,7 @@ func (d Disks) Search(ctx context.Context, req SearchRequest) (ListDisks, error)
 		return nil, err
 	}
 
-	list := ListDisks{}
+	list := SearchListDisks{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudbroker/disks/serialize.go

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

pkg/cloudbroker/disks/sorting.go

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

pkg/cloudbroker/extnet/create.go

@@ -23,14 +23,14 @@ type CreateRequest struct {
 	// Required: true
 	IPCIDR string `url:"ipcidr" json:"ipcidr" validate:"required"`
 
-	// External network gateway IP address
-	// Required: true
-	Gateway string `url:"gateway" json:"gateway" validate:"required"`
-
 	// VLAN ID
 	// Required: true
 	VLANID uint64 `url:"vlanId" json:"vlanId" validate:"required"`
 
+	// External network gateway IP address
+	// Required: false
+	Gateway string `url:"gateway,omitempty" json:"gateway,omitempty"`
+
 	// List of DNS addresses
 	// Required: false
 	DNS []string `url:"dns,omitempty" json:"dns,omitempty"`

pkg/cloudbroker/extnet/filter.go

@@ -31,21 +31,23 @@ func (lenet ListExtNet) FilterByStatus(status string) ListExtNet {
 func (lenet ListExtNet) FilterFunc(predicate func(ItemExtNet) bool) ListExtNet {
 	var result ListExtNet
 
-	for _, item := range lenet {
+	for _, item := range lenet.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
+	result.EntryCount = uint64(len(lenet.Data))
+
 	return result
 }
 
 // FindOne returns first found ItemExtNet
 // If none was found, returns an empty struct.
 func (lenet ListExtNet) FindOne() ItemExtNet {
-	if len(lenet) == 0 {
+	if len(lenet.Data) == 0 {
 		return ItemExtNet{}
 	}
 
-	return lenet[0]
+	return lenet.Data[0]
 }

pkg/cloudbroker/extnet/filter_test.go

@@ -3,74 +3,76 @@ package extnet
 import "testing"
 
 var extnets = ListExtNet{
-	ItemExtNet{
+	Data: []ItemExtNet{
-		CKey:               "",
+		{
-		Meta:               []interface{}{},
+			CKey:               "",
-		CheckIPs:           []string{},
+			Meta:               []interface{}{},
-		Default:            false,
+			CheckIPs:           []string{},
-		DefaultQOS:         QOS{},
+			Default:            false,
-		Description:        "",
+			DefaultQOS:         QOS{},
-		FreeIPs:            0,
+			Description:        "",
-		GID:                212,
+			FreeIPs:            0,
-		GUID:               3,
+			GID:                212,
-		ID:                 3,
+			GUID:               3,
-		IPCIDR:             "176.118.164.0/24",
+			ID:                 3,
-		Milestones:         1355466,
+			IPCIDR:             "176.118.164.0/24",
-		Name:               "176.118.164.0/24",
+			Milestones:         1355466,
-		NetworkID:          0,
+			Name:               "176.118.164.0/24",
-		OVSBridge:          "",
+			NetworkID:          0,
-		PreReservationsNum: 0,
+			OVSBridge:          "",
-		PriVNFDevID:        0,
+			PreReservationsNum: 0,
-		SharedWith:         []interface{}{},
+			PriVNFDevID:        0,
-		Status:             "ENABLED",
+			SharedWith:         []interface{}{},
-		VLANID:             0,
+			Status:             "ENABLED",
-		VNFs:               VNFs{},
+			VLANID:             0,
-	},
+			VNFs:               VNFs{},
-	ItemExtNet{
+		},
-		CKey:               "",
+		{
-		Meta:               []interface{}{},
+			CKey:               "",
-		CheckIPs:           []string{},
+			Meta:               []interface{}{},
-		Default:            false,
+			CheckIPs:           []string{},
-		DefaultQOS:         QOS{},
+			Default:            false,
-		Description:        "",
+			DefaultQOS:         QOS{},
-		FreeIPs:            0,
+			Description:        "",
-		GID:                212,
+			FreeIPs:            0,
-		GUID:               10,
+			GID:                212,
-		ID:                 10,
+			GUID:               10,
-		IPCIDR:             "45.134.255.0/24",
+			ID:                 10,
-		Milestones:         2135543,
+			IPCIDR:             "45.134.255.0/24",
-		Name:               "45.134.255.0/24",
+			Milestones:         2135543,
-		NetworkID:          0,
+			Name:               "45.134.255.0/24",
-		OVSBridge:          "",
+			NetworkID:          0,
-		PreReservationsNum: 0,
+			OVSBridge:          "",
-		PriVNFDevID:        0,
+			PreReservationsNum: 0,
-		SharedWith:         []interface{}{},
+			PriVNFDevID:        0,
-		Status:             "ENABLED",
+			SharedWith:         []interface{}{},
-		VLANID:             0,
+			Status:             "ENABLED",
-		VNFs:               VNFs{},
+			VLANID:             0,
-	},
+			VNFs:               VNFs{},
-	ItemExtNet{
+		},
-		CKey:               "",
+		{
-		Meta:               []interface{}{},
+			CKey:               "",
-		CheckIPs:           []string{},
+			Meta:               []interface{}{},
-		Default:            false,
+			CheckIPs:           []string{},
-		DefaultQOS:         QOS{},
+			Default:            false,
-		Description:        "",
+			DefaultQOS:         QOS{},
-		FreeIPs:            0,
+			Description:        "",
-		GID:                212,
+			FreeIPs:            0,
-		GUID:               13,
+			GID:                212,
-		ID:                 13,
+			GUID:               13,
-		IPCIDR:             "88.218.249.0/24",
+			ID:                 13,
-		Milestones:         1232134,
+			IPCIDR:             "88.218.249.0/24",
-		Name:               "88.218.249.0/24",
+			Milestones:         1232134,
-		NetworkID:          0,
+			Name:               "88.218.249.0/24",
-		OVSBridge:          "",
+			NetworkID:          0,
-		PreReservationsNum: 0,
+			OVSBridge:          "",
-		PriVNFDevID:        0,
+			PreReservationsNum: 0,
-		SharedWith:         []interface{}{},
+			PriVNFDevID:        0,
-		Status:             "DISABLED",
+			SharedWith:         []interface{}{},
-		VLANID:             0,
+			Status:             "DISABLED",
-		VNFs:               VNFs{},
+			VLANID:             0,
+			VNFs:               VNFs{},
+		},
 	},
 }
 
@@ -94,11 +96,11 @@ func TestFilterByName(t *testing.T) {
 func TestFilterByStatus(t *testing.T) {
 	actual := extnets.FilterByStatus("ENABLED")
 
-	if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-		t.Fatal("expected 2 found, actual: ", len(actual))
+		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)
 		}
@@ -110,7 +112,7 @@ func TestFilterFunc(t *testing.T) {
 		return ien.IPCIDR == ien.Name
 	})
 
-	if len(actual) != 3 {
+	if len(actual.Data) != 3 {
-		t.Fatal("expected 3 elements, found: ", len(actual))
+		t.Fatal("expected 3 elements, found: ", len(actual.Data))
 	}
 }

pkg/cloudbroker/extnet/list.go

@@ -8,10 +8,34 @@ import (
 
 // Request struct for get list external network
 type ListRequest struct {
-	// Filter by account ID
+	// Find by account ID
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
+	// 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 network ip address
+	// Required: false
+	Network string `url:"network,omitempty" json:"network,omitempty"`
+
+	// Find by vlan ID
+	// Required: false
+	VLANID uint64 `url:"vlanId,omitempty" json:"vlanId,omitempty"`
+
+	// Find by vnfDevices ID
+	// Required: false
+	VNFDevID uint64 `url:"vnfDevId,omitempty" json:"vnfDevId,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"`
@@ -22,7 +46,7 @@ type ListRequest struct {
 }
 
 // List gets list all available external networks
-func (e ExtNet) List(ctx context.Context, req ListRequest) (ListExtNet, error) {
+func (e ExtNet) List(ctx context.Context, req ListRequest) (*ListExtNet, error) {
 	url := "/cloudbroker/extnet/list"
 
 	res, err := e.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -37,5 +61,5 @@ func (e ExtNet) List(ctx context.Context, req ListRequest) (ListExtNet, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/extnet/models.go

@@ -117,18 +117,21 @@ type ItemExtNet struct {
 }
 
 // List external networks
-type ListExtNet []ItemExtNet
+type ListExtNet struct {
+	// Data
+	Data []ItemExtNet `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
 
 // Detailed information about external network
 type RecordExtNet struct {
 	// Main information about external network
 	ItemExtNet
 
-	// CheckIPs
-	CheckIPs []string `json:"checkIPs"`
-
 	// CheckIps
-	CheckIps []string `json:"checkIps"`
+	CheckIPs []string `json:"checkIps"`
 
 	// List DNS
 	DNS []string `json:"dns"`

pkg/cloudbroker/extnet/serialize.go

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

pkg/cloudbroker/grid/filter.go

@@ -31,21 +31,23 @@ func (lg ListGrids) FilterByLocationCode(locationCode string) ListGrids {
 func (lg ListGrids) FilterFunc(predicate func(RecordGrid) bool) ListGrids {
 	var result ListGrids
 
-	for _, item := range lg {
+	for _, item := range lg.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 RecordGrid.
 // If none was found, returns an empty struct.
 func (lg ListGrids) FindOne() RecordGrid {
-	if len(lg) == 0 {
+	if len(lg.Data) == 0 {
 		return RecordGrid{}
 	}
 
-	return lg[0]
+	return lg.Data[0]
 }

pkg/cloudbroker/grid/filter_test.go

@@ -3,96 +3,99 @@ package grid
 import "testing"
 
 var grids = ListGrids{
-	{
+	Data: []RecordGrid{
-		Resources: Resources{
+		{
-			Current: RecordResource{
+			Resources: Resources{
-				CPU:         84,
+				Current: RecordResource{
-				DiskSize:    976,
+					CPU:         84,
-				DiskSizeMax: 1200,
+					DiskSize:    976,
-				ExtIPs:      132,
+					DiskSizeMax: 1200,
-				ExtTraffic:  0,
+					ExtIPs:      132,
-				GPU:         79500,
+					ExtTraffic:  0,
-				RAM:         0,
+					GPU:         79500,
-				SEPs:        map[string]map[string]DiskUsage{},
+					RAM:         0,
-			},
+					SEPs:        map[string]map[string]DiskUsage{},
-			Reserved: RecordResource{
+				},
-				CPU:         123,
+				Reserved: RecordResource{
-				DiskSize:    976,
+					CPU:         123,
-				DiskSizeMax: 1200,
+					DiskSize:    976,
-				ExtIPs:      132,
+					DiskSizeMax: 1200,
-				ExtTraffic:  0,
+					ExtIPs:      132,
-				GPU:         0,
+					ExtTraffic:  0,
-				RAM:         152600,
+					GPU:         0,
-				SEPs:        map[string]map[string]DiskUsage{},
+					RAM:         152600,
+					SEPs:        map[string]map[string]DiskUsage{},
+				},
 			},
+			Flag:         "",
+			GID:          212,
+			GUID:         1,
+			ID:           1,
+			LocationCode: "alfa",
+			Name:         "alfa",
 		},
-		Flag:         "",
+		{
-		GID:          212,
+			Resources: Resources{
-		GUID:         1,
+				Current: RecordResource{
-		ID:           1,
+					CPU:         84,
-		LocationCode: "alfa",
+					DiskSize:    976,
-		Name:         "alfa",
+					DiskSizeMax: 1200,
-	},
+					ExtIPs:      132,
-	{
+					ExtTraffic:  0,
-		Resources: Resources{
+					GPU:         79500,
-			Current: RecordResource{
+					RAM:         0,
-				CPU:         84,
+					SEPs:        map[string]map[string]DiskUsage{},
-				DiskSize:    976,
+				},
-				DiskSizeMax: 1200,
+				Reserved: RecordResource{
-				ExtIPs:      132,
+					CPU:         123,
-				ExtTraffic:  0,
+					DiskSize:    976,
-				GPU:         79500,
+					DiskSizeMax: 1200,
-				RAM:         0,
+					ExtIPs:      132,
-				SEPs:        map[string]map[string]DiskUsage{},
+					ExtTraffic:  0,
-			},
+					GPU:         0,
-			Reserved: RecordResource{
+					RAM:         152600,
-				CPU:         123,
+					SEPs:        map[string]map[string]DiskUsage{},
-				DiskSize:    976,
+				},
-				DiskSizeMax: 1200,
-				ExtIPs:      132,
-				ExtTraffic:  0,
-				GPU:         0,
-				RAM:         152600,
-				SEPs:        map[string]map[string]DiskUsage{},
 			},
+			Flag:         "",
+			GID:          666,
+			GUID:         2,
+			ID:           2,
+			LocationCode: "beta",
+			Name:         "beta",
 		},
-		Flag:         "",
+		{
-		GID:          666,
+			Resources: Resources{
-		GUID:         2,
+				Current: RecordResource{
-		ID:           2,
+					CPU:         84,
-		LocationCode: "beta",
+					DiskSize:    976,
-		Name:         "beta",
+					DiskSizeMax: 1200,
-	},
+					ExtIPs:      132,
-	{
+					ExtTraffic:  0,
-		Resources: Resources{
+					GPU:         79500,
-			Current: RecordResource{
+					RAM:         0,
-				CPU:         84,
+					SEPs:        map[string]map[string]DiskUsage{},
-				DiskSize:    976,
+				},
-				DiskSizeMax: 1200,
+				Reserved: RecordResource{
-				ExtIPs:      132,
+					CPU:         123,
-				ExtTraffic:  0,
+					DiskSize:    976,
-				GPU:         79500,
+					DiskSizeMax: 1200,
-				RAM:         0,
+					ExtIPs:      132,
-				SEPs:        map[string]map[string]DiskUsage{},
+					ExtTraffic:  0,
-			},
+					GPU:         0,
-			Reserved: RecordResource{
+					RAM:         152600,
-				CPU:         123,
+					SEPs:        map[string]map[string]DiskUsage{},
-				DiskSize:    976,
+				},
-				DiskSizeMax: 1200,
-				ExtIPs:      132,
-				ExtTraffic:  0,
-				GPU:         0,
-				RAM:         152600,
-				SEPs:        map[string]map[string]DiskUsage{},
 			},
+			Flag:         "",
+			GID:          777,
+			GUID:         3,
+			ID:           3,
+			LocationCode: "gamma",
+			Name:         "gamma",
 		},
-		Flag:         "",
-		GID:          777,
-		GUID:         3,
-		ID:           3,
-		LocationCode: "gamma",
-		Name:         "gamma",
 	},
+	EntryCount: 3,
 }
 
 func TestFilterByID(t *testing.T) {

pkg/cloudbroker/grid/get_resource_consumption.go

@@ -0,0 +1,40 @@
+package grid
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type GetResourceConsumptionRequest struct {
+	// ID of the grid
+	// Required: true
+	GridID uint64 `url:"gridId" json:"gridId" validate:"required"`
+}
+
+func (g Grid) GetResourceConsumption(ctx context.Context, req GetResourceConsumptionRequest) (*RecordResourcesConsumption, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		for _, validationError := range validators.GetErrors(err) {
+			return nil, validators.ValidationError(validationError)
+		}
+	}
+
+	url := "/cloudbroker/grid/getResourceConsumption"
+
+	res, err := g.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	result := RecordResourcesConsumption{}
+
+	err = json.Unmarshal(res, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}

pkg/cloudbroker/grid/list.go

@@ -8,6 +8,14 @@ import (
 
 // Request struct for get list locations
 type ListRequest struct {
+	// Find by id grid
+	// Required: false
+	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`
+
+	// Find by name grid
+	// Required: false
+	Name string `url:"name,omitempty" json:"name,omitempty"`
+
 	// Page number
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
@@ -18,7 +26,7 @@ type ListRequest struct {
 }
 
 // List gets list all locations
-func (g Grid) List(ctx context.Context, req ListRequest) (ListGrids, error) {
+func (g Grid) List(ctx context.Context, req ListRequest) (*ListGrids, error) {
 	url := "/cloudbroker/grid/list"
 
 	res, err := g.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -33,5 +41,5 @@ func (g Grid) List(ctx context.Context, req ListRequest) (ListGrids, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/grid/list_emails.go

@@ -6,21 +6,33 @@ import (
 	"net/http"
 )
 
+// Request struct for getting list of email addresses of users
+type ListEmailsRequest struct {
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+}
+
 // ListEmails returns list of email addresses of users
-func (g Grid) ListEmails(ctx context.Context) ([]string, error) {
+func (g Grid) ListEmails(ctx context.Context, req ListEmailsRequest) (*ListEmails, error) {
+
 	url := "/cloudbroker/grid/listEmails"
 
-	res, err := g.client.DecortApiCall(ctx, http.MethodPost, url, nil)
+	res, err := g.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
 		return nil, err
 	}
 
-	list := make([]string, 0)
+	list := ListEmails{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }

pkg/cloudbroker/grid/list_resource_consumption.go

@@ -0,0 +1,25 @@
+package grid
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+)
+
+func (g Grid) ListResourceConsumption(ctx context.Context) (*ListResourceConsumption, error) {
+	url := "/cloudbroker/grid/listResourceConsumption"
+
+	res, err := g.client.DecortApiCall(ctx, http.MethodPost, url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	result := ListResourceConsumption{}
+
+	err = json.Unmarshal(res, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}

pkg/cloudbroker/grid/models.go

@@ -9,6 +9,26 @@ type Resources struct {
 	Reserved RecordResource `json:"Reserved"`
 }
 
+// Resource consumption information
+type RecordResourcesConsumption struct {
+	// Current resources
+	Consumed RecordResource `json:"Consumed"`
+
+	// Reserved resources
+	Reserved RecordResource `json:"Reserved"`
+
+	// GID
+	GID uint64 `json:"gid"`
+}
+
+type ListResourceConsumption struct {
+	// Data
+	Data []RecordResourcesConsumption `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
 // Resource details
 type RecordResource struct {
 	// Number of CPU
@@ -70,4 +90,19 @@ type RecordGrid struct {
 }
 
 // List Grids
-type ListGrids []RecordGrid
+type ListGrids struct {
+	//Data
+	Data []RecordGrid `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}
+
+// List emails
+type ListEmails struct {
+	//Data
+	Data []string `json:"data"`
+
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+}

pkg/cloudbroker/grid/serialize.go

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

pkg/cloudbroker/image/delete.go

@@ -16,7 +16,7 @@ type DeleteRequest struct {
 
 	// Reason for action
 	// Required: true
-	Reason string `url:"reason" json:"reason" validate:"required"`
+	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 
 	// Whether to completely delete the image
 	// Required: false

pkg/cloudbroker/image/filter.go

@@ -49,9 +49,9 @@ func (li ListImages) FilterByBootType(bootType string) ListImages {
 func (li ListImages) FilterFunc(predicate func(RecordImage) bool) ListImages {
 	var result ListImages
 
-	for _, item := range li {
+	for _, item := range li.Data {
 		if predicate(item) {
-			result = append(result, item)
+			result.Data = append(result.Data, item)
 		}
 	}
 
@@ -61,9 +61,9 @@ func (li ListImages) FilterFunc(predicate func(RecordImage) bool) ListImages {
 // FindOne returns first found RecordImage
 // If none was found, returns an empty struct.
 func (li ListImages) FindOne() RecordImage {
-	if len(li) == 0 {
+	if len(li.Data) == 0 {
 		return RecordImage{}
 	}
 
-	return li[0]
+	return li.Data[0]
 }

pkg/cloudbroker/image/filter_test.go

@@ -3,155 +3,157 @@ package image
 import "testing"
 
 var images = ListImages{
-	RecordImage{
+	Data: []RecordImage{
-		UNCPath: "",
+		{
-		CKey:    "",
+			UNCPath: "",
-		Meta: []interface{}{
+			CKey:    "",
-			"osismodel",
+			Meta: []interface{}{
-			"cloudbroker",
+				"osismodel",
-			"image",
+				"cloudbroker",
-			1,
+				"image",
+				1,
+			},
+			AccountID:    0,
+			ACL:          []ACL{},
+			Architecture: "X86_64",
+			BootType:     "bios",
+			Bootable:     true,
+			ComputeCIID:  0,
+			DeletedTime:  0,
+			Description:  "",
+			Drivers: []string{
+				"KVM_X86",
+			},
+			Enabled:       true,
+			GID:           212,
+			GUID:          9882,
+			History:       []History{},
+			HotResize:     true,
+			ID:            9882,
+			LastModified:  0,
+			LinkTo:        0,
+			Milestones:    363491,
+			Name:          "u16",
+			Password:      "",
+			Pool:          "vmstor",
+			PresentTo:     []uint64{},
+			ProviderName:  "",
+			PurgeAttempts: 0,
+			ReferenceID:   "sample_reference_id_u16",
+			ResID:         "b321318-3214as-324-213-fdas",
+			ResName:       "templates/image_9882",
+			RescueCD:      false,
+			SEPID:         2504,
+			SharedWith:    []uint64{},
+			Size:          5,
+			Status:        "CREATED",
+			TechStatus:    "ALLOCATED",
+			Type:          "linux",
+			URL:           "http://sample_url:8000/u16",
+			Username:      "",
+			Version:       "",
+			Virtual:       false,
 		},
-		AccountID:    0,
+		{
-		ACL:          []ACL{},
+			UNCPath: "",
-		Architecture: "X86_64",
+			CKey:    "",
-		BootType:     "bios",
+			Meta: []interface{}{
-		Bootable:     true,
+				"osismodel",
-		ComputeCIID:  0,
+				"cloudbroker",
-		DeletedTime:  0,
+				"image",
-		Description:  "",
+				1,
-		Drivers: []string{
+			},
-			"KVM_X86",
+			AccountID:    0,
+			ACL:          []ACL{},
+			Architecture: "X86_64",
+			BootType:     "bois",
+			Bootable:     true,
+			ComputeCIID:  0,
+			DeletedTime:  0,
+			Description:  "",
+			Drivers: []string{
+				"KVM_X86",
+			},
+			Enabled:       false,
+			GID:           212,
+			GUID:          9884,
+			History:       []History{},
+			HotResize:     false,
+			ID:            9884,
+			LastModified:  0,
+			LinkTo:        0,
+			Milestones:    363499,
+			Name:          "alpine-virt-3.17",
+			Password:      "",
+			Pool:          "vmstor",
+			PresentTo:     []uint64{},
+			ProviderName:  "",
+			PurgeAttempts: 0,
+			ReferenceID:   "sample_reference_id_alpine",
+			ResID:         "31d1d410-74f1-4e09-866b-046a5a8433c3",
+			ResName:       "templates/image_9884",
+			RescueCD:      false,
+			SEPID:         2504,
+			SharedWith:    []uint64{},
+			Size:          1,
+			Status:        "CREATED",
+			TechStatus:    "ALLOCATED",
+			Type:          "linux",
+			URL:           "http://sample_url:8000/alpine-virt-3",
+			Username:      "",
+			Version:       "",
+			Virtual:       true,
 		},
-		Enabled:       true,
+		{
-		GID:           212,
+			UNCPath: "",
-		GUID:          9882,
+			CKey:    "",
-		History:       []History{},
+			Meta: []interface{}{
-		HotResize:     true,
+				"osismodel",
-		ID:            9882,
+				"cloudbroker",
-		LastModified:  0,
+				"image",
-		LinkTo:        0,
+				1,
-		Milestones:    363491,
+			},
-		Name:          "u16",
+			AccountID:    1,
-		Password:      "",
+			ACL:          []ACL{},
-		Pool:          "vmstor",
+			Architecture: "X86_64",
-		PresentTo:     []uint64{},
+			BootType:     "bios",
-		ProviderName:  "",
+			Bootable:     true,
-		PurgeAttempts: 0,
+			ComputeCIID:  0,
-		ReferenceID:   "sample_reference_id_u16",
+			DeletedTime:  0,
-		ResID:         "b321318-3214as-324-213-fdas",
+			Description:  "",
-		ResName:       "templates/image_9882",
+			Drivers: []string{
-		RescueCD:      false,
+				"KVM_X86",
-		SEPID:         2504,
+			},
-		SharedWith:    []uint64{},
+			Enabled:       true,
-		Size:          5,
+			GID:           212,
-		Status:        "CREATED",
+			GUID:          9885,
-		TechStatus:    "ALLOCATED",
+			History:       []History{},
-		Type:          "linux",
+			HotResize:     true,
-		URL:           "http://sample_url:8000/u16",
+			ID:            9885,
-		Username:      "",
+			LastModified:  0,
-		Version:       "",
+			LinkTo:        0,
-		Virtual:       false,
+			Milestones:    363513,
-	},
+			Name:          "test",
-	RecordImage{
+			Password:      "",
-		UNCPath: "",
+			Pool:          "vmstor",
-		CKey:    "",
+			PresentTo:     []uint64{},
-		Meta: []interface{}{
+			ProviderName:  "",
-			"osismodel",
+			PurgeAttempts: 0,
-			"cloudbroker",
+			ReferenceID:   "sample_reference_id_test",
-			"image",
+			ResID:         "1f53b815-1ac9-4a4b-af98-a0a3b69a34bb",
-			1,
+			ResName:       "templates/image_9885",
-		},
+			RescueCD:      false,
-		AccountID:    0,
+			SEPID:         2505,
-		ACL:          []ACL{},
+			SharedWith:    []uint64{},
-		Architecture: "X86_64",
+			Size:          4,
-		BootType:     "bois",
+			Status:        "DESTROYED",
-		Bootable:     true,
+			TechStatus:    "ALLOCATED",
-		ComputeCIID:  0,
+			Type:          "linux",
-		DeletedTime:  0,
+			URL:           "http://sample_url:8000/test",
-		Description:  "",
+			Username:      "",
-		Drivers: []string{
+			Version:       "",
-			"KVM_X86",
+			Virtual:       false,
-		},
-		Enabled:       false,
-		GID:           212,
-		GUID:          9884,
-		History:       []History{},
-		HotResize:     false,
-		ID:            9884,
-		LastModified:  0,
-		LinkTo:        0,
-		Milestones:    363499,
-		Name:          "alpine-virt-3.17",
-		Password:      "",
-		Pool:          "vmstor",
-		PresentTo:     []uint64{},
-		ProviderName:  "",
-		PurgeAttempts: 0,
-		ReferenceID:   "sample_reference_id_alpine",
-		ResID:         "31d1d410-74f1-4e09-866b-046a5a8433c3",
-		ResName:       "templates/image_9884",
-		RescueCD:      false,
-		SEPID:         2504,
-		SharedWith:    []uint64{},
-		Size:          1,
-		Status:        "CREATED",
-		TechStatus:    "ALLOCATED",
-		Type:          "linux",
-		URL:           "http://sample_url:8000/alpine-virt-3",
-		Username:      "",
-		Version:       "",
-		Virtual:       true,
-	},
-	RecordImage{
-		UNCPath: "",
-		CKey:    "",
-		Meta: []interface{}{
-			"osismodel",
-			"cloudbroker",
-			"image",
-			1,
-		},
-		AccountID:    1,
-		ACL:          []ACL{},
-		Architecture: "X86_64",
-		BootType:     "bios",
-		Bootable:     true,
-		ComputeCIID:  0,
-		DeletedTime:  0,
-		Description:  "",
-		Drivers: []string{
-			"KVM_X86",
 		},
-		Enabled:       true,
-		GID:           212,
-		GUID:          9885,
-		History:       []History{},
-		HotResize:     true,
-		ID:            9885,
-		LastModified:  0,
-		LinkTo:        0,
-		Milestones:    363513,
-		Name:          "test",
-		Password:      "",
-		Pool:          "vmstor",
-		PresentTo:     []uint64{},
-		ProviderName:  "",
-		PurgeAttempts: 0,
-		ReferenceID:   "sample_reference_id_test",
-		ResID:         "1f53b815-1ac9-4a4b-af98-a0a3b69a34bb",
-		ResName:       "templates/image_9885",
-		RescueCD:      false,
-		SEPID:         2505,
-		SharedWith:    []uint64{},
-		Size:          4,
-		Status:        "DESTROYED",
-		TechStatus:    "ALLOCATED",
-		Type:          "linux",
-		URL:           "http://sample_url:8000/test",
-		Username:      "",
-		Version:       "",
-		Virtual:       false,
 	},
 }
 
@@ -159,56 +161,56 @@ func TestFilterByID(t *testing.T) {
 	actual := images.FilterByID(9885).FindOne()
 
 	if actual.ID != 9885 {
-        t.Fatal("expected ID 9885, found: ", actual.ID)
+		t.Fatal("expected ID 9885, found: ", actual.ID)
 	}
 }
 
 func TestFilterByName(t *testing.T) {
-    actual := images.FilterByName("u16").FindOne()
+	actual := images.FilterByName("u16").FindOne()
 
-    if actual.Name != "u16" {
+	if actual.Name != "u16" {
-        t.Fatal("expected Name 'u16', found: ", actual.Name)
+		t.Fatal("expected Name 'u16', found: ", actual.Name)
-    }
+	}
 }
 
 func TestFilterByStatus(t *testing.T) {
-    actual := images.FilterByStatus("CREATED")
+	actual := images.FilterByStatus("CREATED")
 
-    if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-        t.Fatal("expected 2 found, actual: ", len(actual))
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
-    }
+	}
 
-    for _, item := range actual {
+	for _, item := range actual.Data {
-        if item.Status != "CREATED" {
+		if item.Status != "CREATED" {
-            t.Fatal("expected Status 'CREATED', found: ", item.Status)
+			t.Fatal("expected Status 'CREATED', found: ", item.Status)
-        }
+		}
-    }
+	}
 }
 
 func TestFilterByBootType(t *testing.T) {
-    actual := images.FilterByBootType("bios")
+	actual := images.FilterByBootType("bios")
 
-    if len(actual) != 2 {
+	if len(actual.Data) != 2 {
-        t.Fatal("expected 2 found, actual: ", len(actual))
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
-    }
+	}
 
-    for _, item := range actual {
+	for _, item := range actual.Data {
-        if item.BootType != "bios" {
+		if item.BootType != "bios" {
-            t.Fatal("expected BootType 'bios', found: ", item.BootType)
+			t.Fatal("expected BootType 'bios', found: ", item.BootType)
-        }
+		}
-    }
+	}
 }
 
 func TestFilterFunc(t *testing.T) {
-    actual := images.FilterFunc(func(ri RecordImage) bool {
+	actual := images.FilterFunc(func(ri RecordImage) bool {
-        return ri.Virtual == true
+		return ri.Virtual == true
-    })
+	})
 
-    if len(actual) != 1 {
+	if len(actual.Data) != 1 {
-        t.Fatal("expected 1 found, actual: ", len(actual))
+		t.Fatal("expected 1 found, actual: ", len(actual.Data))
-    }
+	}
 
-    if actual[0].Virtual != true {
+	if actual.Data[0].Virtual != true {
-        t.Fatal("expected Virtual true, found false")
+		t.Fatal("expected Virtual true, found false")
-    }
+	}
 }

pkg/cloudbroker/image/list.go

@@ -12,9 +12,49 @@ type ListRequest struct {
 	// Required: false
 	SepID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
 
-	// Filter images by account ID availability
+	// Find by ID
 	// Required: false
-	SharedWith uint64 `url:"sharedWith,omitempty" json:"sharedWith,omitempty"`
+	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 status
+	// Required: false
+	Status string `url:"status,omitempty" json:"status,omitempty"`
+
+	// Find by architecture
+	// Required: false
+	Architecture string `url:"architecture,omitempty" json:"architecture,omitempty"`
+
+	// Find by type
+	// Required: false
+	TypeImage string `url:"typeImage,omitempty" json:"typeImage,omitempty"`
+
+	// Find by image size
+	// Required: false
+	ImageSize uint64 `url:"imageSize,omitempty" json:"imageSize,omitempty"`
+
+	// Find by SEP name
+	// Required: false
+	SEPName string `url:"sepName,omitempty" json:"sepName,omitempty"`
+
+	// Find by pool
+	// Required: false
+	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
+
+	// Find by public True or False
+	// Required: false
+	Public bool `url:"public,omitempty" json:"public,omitempty"`
+
+	// Find by hot resize True or False
+	// Required: false
+	HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"`
+
+	// Find by bootable True or False
+	// Required: false
+	Bootable bool `url:"bootable,omitempty" json:"bootable,omitempty"`
 
 	// Page number
 	// Required: false
@@ -26,7 +66,7 @@ type ListRequest struct {
 }
 
 // List gets list of information about images
-func (i Image) List(ctx context.Context, req ListRequest) (ListImages, error) {
+func (i Image) List(ctx context.Context, req ListRequest) (*ListImages, error) {
 	url := "/cloudbroker/image/list"
 
 	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
@@ -41,5 +81,5 @@ func (i Image) List(ctx context.Context, req ListRequest) (ListImages, error) {
 		return nil, err
 	}
 
-	return list, nil
+	return &list, nil
 }