v1.11.2

CHANGELOG.md

@@ -1,40 +1,21 @@
-## Version 1.10.1
+## Version 1.11.2
 
 ### Добавлено
 
+#### bservice
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-366 | Метод `Get` структура запроса `GetRequest` и структура ответа `RecordBasicService` в cloudbroker/bservice |
+| BGOS-366 | Метод `List` структура запроса `ListRequest` и структура ответа `ListBasicServices` в cloudbroker/bservice |
+
+#### prometheus
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-406 | Добавлена группа ручек `prometheus` в cloudapi |
+
+### Исправлено
+
 #### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-268 | Вычисляемое поле `PreferredCPU` в моделях `RecordCompute, ItemCompute, InfoCompute` в cloudapi/compute и cloudbroker/compute |
+| BGOS-433 | Исправлена ошибка валидации поля LoaderType для всех структур в cloudapi/compute и в cloudbroker/compute |
-| BGOS-268 | Опциональное поле `PreferredCPU` в структурах `ResizeRequest, UpdateRequest` в cloudapi/compute и cloudbroker/compute |
-
-#### kvmx86
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-268 | Опциональное поле `PreferredCPU` в структурах `CreateRequest, CreateBlankRequest` в cloudapi/kvmx86 и cloudbroker/kvmx86 |
-
-#### node
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-270 | Вычисляемые поля `DPDK, UEFIFirmwareFile` в модели `ItemNode` в cloudbroker/node |
-| BGOS-271 | Вычисляемые поля `DPDK, NetworkMode, ToActive, ToInstalling, ToMaintenance, ToRestricted` в моделях `RecordNode` в cloudbroker/node |
-
-#### sep
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-273 | Вычисляемое поле `MultipathNum` в модели `RecordSEP` cloudbroker/sep |
-
-#### vins
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-265 | Вычисляемое поле `AccoundID` в модели `ItemReservation` в cloudbroker/vins |
-
-### Удалено
-
-#### sep
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-272 | Вычисляемые поля `_ckey,_meta` в модели `RecordSEP` в cloudbroker/sep |
-
-
-

README.md

@@ -15,6 +15,7 @@ Decort SDK - это библиотека, написанная на языке G
     - Версия 1.8.х Decort-SDK соответствует 4.0.0 версии платформы
     - Версия 1.9.х Decort-SDK соответствует 4.1.0 версии платформы
     - Версия 1.10.х Decort-SDK соответствует 4.2.0 версии платформы
+    - Версия 1.11.х Decort-SDK соответствует 4.3.0 версии платформы
 
 ## Оглавление
 
@@ -113,7 +114,9 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `KVMx86` - создание виртуальной машины x86;
 - `LB` - управление балансировщиками нагрузки;
 - `Locations` - получение информации о grid площадки;
+- `Prometheus` - получение статистики prometheus;
 - `RG` - управление ресурсными группами аккаунта;
+- `SEP` - управление storage endpoint (sep);
 - `Stack` - получение информации о вычислительных узлах;
 - `Tasks` - получение информации о ходе выполнения асинхронных задач (например, создание кластера);
 - `VFPool` - управление пулом виртуальных сетевых функций;
@@ -142,6 +145,8 @@ go get -u repository.basistech.ru/BASIS/decort-golang-sdk
 - `LB` - управление балансировщиками нагрузки;
 - `Node` - управление нодами платформы;
 - `PCIDevice` - управление устройствами;
+- `Prometheus` - получение статистики prometheus;
+- `Resmon` - получение статистики resource monitoring;
 - `RG` - управление ресурсными группами аккаунта;
 - `SEP` - управление storage endpoint (sep);
 - `Stack` - получение информации о вычислительных узлах;
@@ -295,7 +300,9 @@ func main() {
     - `pkg/cloudapi/kvmx86` - для `KVMX86`
     - `pkg/cloudapi/lb` - для `LB`
     - `pkg/cloudapi/locations` - для `Locations`
+    - `pkg/cloudapi/prometheus` - для `Prometheus`
     - `pkg/cloudapi/rg` - для `RG`
+    - `pkg/cloudapi/sep` - для `SEP`
     - `pkg/cloudapi/stack` - для `Stack`
     - `pkg/cloudapi/tasks` - для `Tasks`
     - `pkg/cloudapi/vfpool` - для `VFPool`
@@ -319,6 +326,8 @@ func main() {
     - `pkg/cloudbroker/lb` - для `LB`
     - `pkg/cloudbroker/node` - для `Node`
     - `pkg/cloudbroker/pcidevice` - для `PCIDevice`
+    - `pkg/cloudbroker/prometheus` - для `Prometheus`
+    - `pkg/cloudbroker/resmon` - для `Resmon`
     - `pkg/cloudbroker/rg` - для `RG`
     - `pkg/cloudbroker/sep` - для `SEP`
     - `pkg/cloudbroker/stack` - для `Stack`
@@ -479,7 +488,9 @@ func main() {
     - `.KVMx86()` - для работы с `KVMX86`
     - `.LB()` - для работы с `LB`
     - `.Locations()` - для работы с `Locations`
+    - `.Prometheus()` - для работы с `Prometheus`
     - `.RG()` - для работы с `RG`
+    - `.SEP()` - для работы с `SEP`
     - `.Stack()` - для работы с `Stack`
     - `.Tasks()` - для работы с `Tasks`
     - `.VFPool()` - для работы с `VFPool`
@@ -505,6 +516,8 @@ func main() {
     - `.LB()` - для работы с `LB`
     - `.Node()` - для работы с `Node`
     - `.PCIDevice()` - для работы с `PCIDevice`
+    - `.Prometheus()` - для работы с `Prometheus`
+    - `.Resmon()` - для работы с `Resmon`
     - `.RG()` - для работы с `RG`
     - `.SEP()` - для работы с `SEP`
     - `.Stack()` - для работы с `Stack`

internal/validators/custom.go

@@ -27,6 +27,13 @@ func protoValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, protoValues)
 }
 
+// apiGroupValidator is used to validate APIGroup fields
+func apiGroupValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, apiGroupValues)
+}
+
 // accessTypeValidator is used to validate AccessType fields.
 func accessTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -393,6 +400,27 @@ func preferredCPUValidator(fe validator.FieldLevel) bool {
 	return true
 }
 
+// loaderTypeValidator is used to validate loaderType fields
+func loaderTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, loaderTypeValues)
+}
+
+// languageValidator is used to validate language fields
+func languageValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, languageValues)
+}
+
+// sepTypeValidator is used to validate sepType fields
+func sepTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, sepTypeValues)
+}
+
 // ValidateRAM checks if request contains RAM value that is positive integer divisible by divisibility passed.
 // It is recommended to pass constants.RAM_DIVISIBILITY as divisility arguement
 func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {

internal/validators/messages.go

@@ -52,6 +52,13 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(protoValues))
 
+	// apiGroup Validators
+	case "apiGroup":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(apiGroupValues))
+
 	// Account Validators
 	case "accountCUType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -308,6 +315,24 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(chipsetValues))
+
+	case "loaderType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(loaderTypeValues))
+
+	case "language":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(languageValues))
+
+	case "sepType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(sepTypeValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -36,6 +36,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("accessType", accessTypeValidator)
 	if err != nil {
 		return err
@@ -266,5 +271,20 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("loaderType", loaderTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("language", languageValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("sepType", sepTypeValidator)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

internal/validators/values.go

@@ -1,6 +1,8 @@
 package validators
 
 var (
+	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
+
 	driverValues     = []string{"KVM_X86"}
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
@@ -35,7 +37,7 @@ var (
 	vinsTypeValues = []string{"DHCP", "VIP", "EXCLUDED"}
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
-	imageTypeValues         = []string{"windows", "linux", "other"}
+	imageTypeValues         = []string{"windows", "linux", "unknown"}
 	imageDriversValues      = []string{"KVM_X86"}
 	imageArchitectureValues = []string{"X86_64"}
 
@@ -51,7 +53,7 @@ var (
 
 	vmActionValues = []string{"stop", "move"}
 
-	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic"}
+	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac"}
 
 	networkInterfaceNamingValues = []string{"eth", "ens"}
 
@@ -64,6 +66,12 @@ var (
 	eventIDxValues = []string{"on", "off", "selected by hypervisor"}
 
 	chipsetValues = []string{"i440fx", "Q35"}
+
+	loaderTypeValues = []string{"linux", "windows", "unknown"}
+
+	sepTypeValues = []string{"hitachi", "dorado", "tatlin", "shared", "local", "des"}
+
+	languageValues = []string{"ru", "en"}
 )
 
 const (

pkg/cloudapi/account/disable_enable.go

@@ -13,6 +13,10 @@ type DisableEnableRequest struct {
 	// ID of account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Reason of disabling
+	// Required: false
+	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Disable disables an account

pkg/cloudapi/account/models.go

@@ -62,6 +62,9 @@ type ItemAccount struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -197,6 +200,9 @@ type RecordAccount struct {
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Deactivation time
 	DeactivationTime float64 `json:"deactivationTime"`
 
@@ -512,6 +518,9 @@ type ItemRG struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Resource group ID
 	RGID uint64 `json:"id"`
 

pkg/cloudapi/account/update.go

@@ -14,6 +14,10 @@ type UpdateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
+	// Description
+	// Required: false
+	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
 	// Name of the account
 	// Required: false
 	Name string `url:"name,omitempty" json:"name,omitempty"`

pkg/cloudapi/audit/get.go

@@ -12,7 +12,7 @@ import (
 type GetRequest struct {
 	// Audit GUID
 	// Required: true
-	AuditGuid string `url:"auditGuid" json:"auditGuid" validate:"required"`
+	AuditGuid string `url:"audit_guid" json:"audit_guid" validate:"required"`
 }
 
 // Get gets information about audit as a RecordAudit struct

pkg/cloudapi/bservice/group_add.go

@@ -71,6 +71,10 @@ type GroupAddRequest struct {
 	// Meta data for working group computes, format YAML "user_data": 1111
 	// Required: false
 	UserData string `url:"userData,omitempty" json:"userData,omitempty"`
+
+	//Chipset "i440fx" or "Q35
+	//Required: false
+	Chipset string `url:"chipset,omitempty" json:"chipset,omitempty" validate:"chipset"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/bservice/group_resize.go

@@ -22,6 +22,12 @@ type GroupResizeRequest struct {
 	// Required: true
 	Count int64 `url:"count" json:"count" validate:"required"`
 
+	//Chipset for new computes, either i440fx or Q35 (i440fx by default)
+	//Available values : i440fx, Q35
+	//Default value : i440fx
+	//Required: true
+	Chipset string `url:"chipset" json:"chipset" validate:"required,chipset"`
+
 	// Either delta or absolute value of computes
 	// Should be one of:
 	//	- ABSOLUTE

pkg/cloudapi/bservice/models.go

@@ -295,6 +295,9 @@ type ItemGroupCompute struct {
 
 	// List of information about OS Users
 	OSUsers ListOSUsers `json:"osUsers"`
+
+	//Chipset
+	Chipset string `json:"chipset"`
 }
 
 // List of Group Computes

pkg/cloudapi/compute/change_ip.go

@@ -12,23 +12,23 @@ import (
 type ChangeIPRequest struct {
 	// ID of compute instance
 	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
 
 	// Network type
 	// 'EXTNET' for connect to external network directly
 	// 'VINS' for connect to ViNS
 	// Required: true
-	NetType string `url:"netType" json:"netType" validate:"computeNetType"`
+	NetType string `url:"net_type" json:"net_type" validate:"computeNetType"`
 
 	// Network ID for connect to
 	// For EXTNET - external network ID
 	// For VINS - VINS ID
 	// Required: true
-	NetID uint64 `url:"netId" json:"netId" validate:"required"`
+	NetID uint64 `url:"net_id" json:"net_id" validate:"required"`
 
 	// IP address to which we will change the existing one, it must be from the same subnet
 	// Required: true
-	IPAddr string `url:"ipAddr" json:"ipAddr" validate:"required"`
+	IPAddr string `url:"ip_addr" json:"ip_addr" validate:"required"`
 }
 
 // ChangeIP change reserved IP for compute instance

pkg/cloudapi/compute/change_mac.go

@@ -0,0 +1,46 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ChangeMACRequest struct to change MAC for network
+type ChangeMACRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+
+	// Current mac address
+	// Required: true
+	СurrentMAC string `url:"current_mac_address" json:"current_mac_address" validate:"required"`
+
+	// the MAC address to which we will change the existing one
+	// Required: true
+	NewMAC string `url:"new_mac_address" json:"new_mac_address" validate:"required"`
+}
+
+// ChangeMAC change MAC for compute instance
+func (c Compute) ChangeMAC(ctx context.Context, req ChangeMACRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/compute/changeMac"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+}

pkg/cloudapi/compute/filter_test.go

@@ -48,8 +48,7 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID:      65191,
+					ID: 65191,
-					PCISlot: 6,
 				},
 			},
 			Driver:           "KVM_X86",
@@ -64,7 +63,7 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363500,
 			Name:             "test",
-			Pinned:           false,
+			PinnedToStack:    true,
 			RAM:              4096,
 			ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
 			Registered:       true,
@@ -111,8 +110,7 @@ var computes = ListComputes{
 			Devices:        nil,
 			Disks: []InfoDisk{
 				{
-					ID:      65248,
+					ID: 65248,
-					PCISlot: 6,
 				},
 			},
 			Driver:           "KVM_X86",
@@ -127,10 +125,10 @@ var computes = ListComputes{
 			MigrationJob:     0,
 			Milestones:       363853,
 			Name:             "compute_2",
-			Pinned:           false,
 			RAM:              4096,
 			ReferenceID:      "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
 			Registered:       true,
+			PinnedToStack:    true,
 			ResName:          "compute-48556",
 			RGID:             79727,
 			RGName:           "sdk_negative_fields_test",

pkg/cloudapi/compute/models.go

@@ -308,6 +308,9 @@ type RecordCompute struct {
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
+	// Boot type
+	BootType string `json:"bootType"`
+
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
@@ -368,6 +371,9 @@ type RecordCompute struct {
 	// HPBacked
 	HPBacked bool `json:"hpBacked"`
 
+	// Hot resize
+	HotResize bool `json:"hotResize"`
+
 	// ID
 	ID uint64 `json:"id"`
 
@@ -380,6 +386,9 @@ type RecordCompute struct {
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
+	// Loader type
+	LoaderType string `json:"loaderType"`
+
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -401,6 +410,9 @@ type RecordCompute struct {
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
+	// Network interface naming
+	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
+
 	// Numa Affinity
 	NumaAffinity string `json:"numaAffinity"`
 
@@ -425,8 +437,8 @@ type RecordCompute struct {
 	// List OS Users
 	OSUsers ListOSUser `json:"osUsers"`
 
-	// Pinned or not
+	// Pinned to stack
-	Pinned bool `json:"pinned"`
+	PinnedToStack bool `json:"pinnedToStack"`
 
 	// PreferredCPU
 	PreferredCPU []int64 `json:"preferredCpu"`
@@ -712,13 +724,13 @@ type ItemComputeDisk struct {
 	Passwd string `json:"passwd"`
 
 	// PCI slot
-	PCISlot int64 `json:"pciSlot"`
+	PCISlot int64 `json:"pci_slot"`
 
 	// Pool
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -741,6 +753,9 @@ type ItemComputeDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
+	// Size available
+	SizeAvailable float64 `json:"sizeAvailable"`
+
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -759,6 +774,9 @@ type ItemComputeDisk struct {
 	// Type
 	Type string `json:"type"`
 
+	// Updated by
+	UpdatedBy uint64 `json:"updatedBy"`
+
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 }
@@ -884,6 +902,9 @@ type ItemCompute struct {
 	// Boot order
 	BootOrder []string `json:"bootOrder"`
 
+	// Boot type
+	BootType string `json:"bootType"`
+
 	// Boot disk size
 	BootDiskSize uint64 `json:"bootdiskSize"`
 
@@ -941,6 +962,9 @@ type ItemCompute struct {
 	// GUID
 	GUID uint64 `json:"guid"`
 
+	// Hot resize
+	HotResize bool `json:"hotResize"`
+
 	// HPBacked
 	HPBacked bool `json:"hpBacked"`
 
@@ -953,6 +977,9 @@ type ItemCompute struct {
 	// List interfaces
 	Interfaces ListInterfaces `json:"interfaces"`
 
+	// Loader type
+	LoaderType string `json:"loaderType"`
+
 	// Lock status
 	LockStatus string `json:"lockStatus"`
 
@@ -974,14 +1001,17 @@ type ItemCompute struct {
 	// NeedReboot
 	NeedReboot bool `json:"needReboot"`
 
+	// network interface naming
+	NetworkInterfaceNaming string `json:"networkInterfaceNaming"`
+
 	// Numa Affinity
 	NumaAffinity string `json:"numaAffinity"`
 
 	//NumaNodeId
 	NumaNodeId int64 `json:"numaNodeId"`
 
-	// Pinned or not
+	// Pinned to stack
-	Pinned bool `json:"pinned"`
+	PinnedToStack bool `json:"pinnedToStack"`
 
 	// PreferredCPU
 	PreferredCPU []int64 `json:"preferredCpu"`
@@ -1054,12 +1084,6 @@ type ListInfoDisks []InfoDisk
 type InfoDisk struct {
 	// ID
 	ID uint64 `json:"id"`
-
-	// PCISlot
-	PCISlot int64 `json:"pciSlot"`
-
-	// Bus number
-	BusNumber uint64 `json:"bus_number"`
 }
 
 // List information about computes

pkg/cloudapi/compute/net_attach.go

@@ -32,6 +32,10 @@ type NetAttachRequest struct {
 	// Required: false
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
 
+	// MAC address
+	// Required: false
+	MACAddr string `url:"mac_addr,omitempty" json:"mac_addr,omitempty"`
+
 	// Used only for DPDK type, must be 1-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`

pkg/cloudapi/compute/update.go

@@ -52,6 +52,22 @@ type UpdateRequest struct {
 	// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
 	// Required: false
 	PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`
+
+	// VM type linux, windows or unknown
+	// Required: false
+	LoaderType string `url:"loaderType,omitempty" json:"loaderType,omitempty" validate:"omitempty,loaderType"`
+
+	// Boot type of image bios or uefi
+	// Required: false
+	BootType string `url:"bootType,omitempty" json:"bootType,omitempty" validate:"omitempty,imageBootType"`
+
+	// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming.
+	// Required: false
+	NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"`
+
+	// Does this machine supports hot resize
+	// Required: false
+	HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"`
 }
 
 // Update updates some properties of the compute

pkg/cloudapi/disks/create.go

@@ -3,8 +3,9 @@ package disks
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
 // CreateRequest struct to create disk
@@ -13,10 +14,6 @@ type CreateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
-	// ID of the grid (platform)
-	// Required: true
-	GID uint64 `url:"gid" json:"gid" validate:"required"`
-
 	// Name of disk
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
@@ -29,17 +26,6 @@ type CreateRequest struct {
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
 
-	// Type of disk
-	//	- B=Boot
-	//	- D=Data
-	//	- T=Temp
-	// Required: true
-	Type string `url:"type" json:"type" validate:"diskType"`
-
-	// Size in GB default is 0
-	// Required: false
-	SSDSize uint64 `url:"ssdSize,omitempty" json:"ssdSize,omitempty"`
-
 	// Max IOPS disk can perform defaults to 2000
 	// Required: false
 	IOPS uint64 `url:"iops,omitempty" json:"iops,omitempty"`

pkg/cloudapi/disks/filter_test.go

@@ -35,9 +35,9 @@ var disks = ListDisks{
 			ParentID: 0,
 			PCISlot:  6,
 			Pool:     "vmstor",
-			PresentTo: []uint64{
+			//PresentTo: []uint64{
-				27,
+			//	27,
-			},
+			//},
 			PurgeTime:  0,
 			ResID:      "sample",
 			ResName:    "sample",
@@ -78,10 +78,10 @@ var disks = ListDisks{
 			ParentID: 0,
 			PCISlot:  6,
 			Pool:     "vmstor",
-			PresentTo: []uint64{
+			//PresentTo: []uint64{
-				27,
+			//	27,
-				27,
+			//	27,
-			},
+			//},
 			PurgeTime:  0,
 			ResID:      "sample",
 			ResName:    "sample",
@@ -211,9 +211,9 @@ var searchDisks = ListSearchDisks{
 		ParentID: 0,
 		PCISlot:  6,
 		Pool:     "vmstor",
-		PresentTo: []uint64{
+		//PresentTo: []uint64{
-			27,
+		//	27,
-		},
+		//},
 		PurgeTime:  0,
 		ResID:      "sample",
 		ResName:    "sample",
@@ -254,10 +254,10 @@ var searchDisks = ListSearchDisks{
 		ParentID: 0,
 		PCISlot:  6,
 		Pool:     "vmstor",
-		PresentTo: []uint64{
+		//PresentTo: []uint64{
-			27,
+		//	27,
-			27,
+		//	27,
-		},
+		//},
 		PurgeTime:  0,
 		ResID:      "sample",
 		ResName:    "sample",
@@ -393,7 +393,7 @@ var unattachedDisks = ListDisksUnattached{
 			Password:            "",
 			PCISlot:             -1,
 			Pool:                "data05",
-			PresentTo:           []uint64{},
+			PresentTo:           map[string]uint64{},
 			PurgeAttempts:       0,
 			PurgeTime:           0,
 			RealityDeviceNumber: 0,
@@ -445,10 +445,10 @@ var unattachedDisks = ListDisksUnattached{
 			Password:   "",
 			PCISlot:    -1,
 			Pool:       "data05",
-			PresentTo: []uint64{
+			//PresentTo: []uint64{
-				27,
+			//	27,
-				27,
+			//	27,
-			},
+			//},
 			PurgeAttempts:       0,
 			PurgeTime:           0,
 			RealityDeviceNumber: 0,

pkg/cloudapi/disks/models.go

@@ -14,9 +14,15 @@ type ItemDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
+	//Created by
+	CreatedBy string `json:"createdBy"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -50,6 +56,9 @@ type ItemDisk struct {
 	// Machine name
 	MachineName string `json:"machineName"`
 
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
 	// Name
 	Name string `json:"name"`
 
@@ -69,7 +78,7 @@ type ItemDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -95,6 +104,9 @@ type ItemDisk struct {
 	// SepID
 	SepID uint64 `json:"sepId"`
 
+	// Size available
+	SizeAvailable float64 `json:"sizeAvailable"`
+
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -115,6 +127,12 @@ type ItemDisk struct {
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
+
+	// Update time
+	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemDiskUnattached struct {
@@ -200,7 +218,7 @@ type ItemDiskUnattached struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
@@ -354,9 +372,15 @@ type RecordDisk struct {
 	// Computes
 	Computes map[string]string `json:"computes"`
 
+	// Created by
+	CreatedBy string `json:"createdBy"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
@@ -384,6 +408,15 @@ type RecordDisk struct {
 	// IOTune
 	IOTune IOTune `json:"iotune"`
 
+	// Machine ID
+	MachineID uint64 `json:"machineId"`
+
+	// Machine name
+	MachineName string `json:"machineName"`
+
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
 	// Name
 	Name string `json:"name"`
 
@@ -403,7 +436,7 @@ type RecordDisk struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
@@ -429,6 +462,9 @@ type RecordDisk struct {
 	// Shareable
 	Shareable bool `json:"shareable"`
 
+	// Size available
+	SizeAvailable float64 `json:"sizeAvailable"`
+
 	// Size max
 	SizeMax uint64 `json:"sizeMax"`
 
@@ -449,6 +485,12 @@ type RecordDisk struct {
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
+
+	// Update time
+	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
 }
 
 type ItemReplication struct {

pkg/cloudapi/extnet/list.go

@@ -49,6 +49,10 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	//openVswitch bridge name
+	//Required: false
+	OVSBridge string `url:"ovsBridge,omitempty" json:"ovsBridge,omitempty"`
 }
 
 // List gets list of all available external networks as a ListExtNets struct

pkg/cloudapi/extnet/models.go

@@ -202,6 +202,9 @@ type RecordExtNet struct {
 	// Network ID
 	NetworkID uint64 `json:"networkId"`
 
+	// NTP
+	NTP []string `json:"ntp"`
+
 	// OVS Bridge
 	OVSBridge string `json:"ovsBridge"`
 

pkg/cloudapi/image/models.go

@@ -162,7 +162,7 @@ type RecordImage struct {
 	Pool string `json:"pool"`
 
 	// Present to
-	PresentTo []uint64 `json:"presentTo"`
+	PresentTo map[string]uint64 `json:"presentTo"`
 
 	// ProviderName
 	ProviderName string `json:"provider_name"`
@@ -185,6 +185,9 @@ type RecordImage struct {
 	// Size
 	Size uint64 `json:"size"`
 
+	// snapshot ID
+	SnapshotID string `json:"snapshotId"`
+
 	// Status
 	Status string `json:"status"`
 

pkg/cloudapi/k8s/models.go

@@ -89,6 +89,9 @@ type RecordK8S struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// Only external network
 	ExtnetOnly bool `json:"extnetOnly"`
 

pkg/cloudapi/kvmx86/create.go

@@ -31,6 +31,10 @@ type Interface struct {
 	// Used only to DPDK net type
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
+
+	// MAC address to assign to this VM when connecting to the specified network
+	// Required: false
+	MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"`
 }
 
 // DataDisk detailed struct for DataDisks field in CreateRequest and CreateBlankRequest

pkg/cloudapi/kvmx86/create_blank.go

@@ -72,6 +72,22 @@ type CreateBlankRequest struct {
 	// Recommended isolated CPUs. Field is ignored if compute.cpupin=False or compute.pinned=False
 	// Required: false
 	PreferredCPU []int64 `url:"preferredCpu,omitempty" json:"preferredCpu,omitempty" validate:"omitempty,preferredCPU"`
+
+	// VM type linux, windows or unknown
+	// Required: false
+	LoaderType string `url:"loaderType,omitempty" json:"loaderType,omitempty" validate:"omitempty,loaderType"`
+
+	// Boot type of image bios or uefi
+	// Required: false
+	BootType string `url:"bootType,omitempty" json:"bootType,omitempty" validate:"omitempty,imageBootType"`
+
+	// Select a network interface naming pattern for your Linux machine. eth - onboard, ens - pci slot naming.
+	// Required: false
+	NetworkInterfaceNaming string `url:"networkInterfaceNaming,omitempty" json:"networkInterfaceNaming,omitempty" validate:"omitempty,networkInterfaceNaming"`
+
+	// Does this machine supports hot resize
+	// Required: false
+	HotResize bool `url:"hotResize,omitempty" json:"hotResize,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/prometheus.go

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

pkg/cloudapi/prometheus/compute_cpu_load.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeCPULoadRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Per-second CPU time consumed by Compute in percent, average over the time step specified
+func (p Prometheus) ComputeCPULoad(ctx context.Context, req ComputeCPULoadRequest) (*PrometheusData, error) {
+	res, err := p.ComputeCPULoadRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeCPULoadRaw(ctx context.Context, req ComputeCPULoadRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeCPUload"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_memory_available.go

@@ -0,0 +1,53 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeMemoryAvailableRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+}
+
+// Available Memory
+func (p Prometheus) ComputeMemoryAvailable(ctx context.Context, req ComputeMemoryAvailableRequest) (*PrometheusData, error) {
+	res, err := p.ComputeMemoryAvailableRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeMemoryAvailableRaw(ctx context.Context, req ComputeMemoryAvailableRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeMemoryAvailable"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_memory_unused.go

@@ -0,0 +1,53 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeMemoryUnusedRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+}
+
+// Unused Memory
+func (p Prometheus) ComputeMemoryUnused(ctx context.Context, req ComputeMemoryUnusedRequest) (*PrometheusData, error) {
+	res, err := p.ComputeMemoryUnusedRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeMemoryUnusedRaw(ctx context.Context, req ComputeMemoryUnusedRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeMemoryUnused"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_memory_usable.go

@@ -0,0 +1,53 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeMemoryUsableRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+}
+
+// Usable Memory
+func (p Prometheus) ComputeMemoryUsable(ctx context.Context, req ComputeMemoryUsableRequest) (*PrometheusData, error) {
+	res, err := p.ComputeMemoryUsableRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeMemoryUsableRaw(ctx context.Context, req ComputeMemoryUsableRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeMemoryUsable"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_memory_usage.go

@@ -0,0 +1,53 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeMemoryUsageRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+}
+
+// Memory Usage
+func (p Prometheus) ComputeMemoryUsage(ctx context.Context, req ComputeMemoryUsageRequest) (*PrometheusData, error) {
+	res, err := p.ComputeMemoryUsageRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeMemoryUsageRaw(ctx context.Context, req ComputeMemoryUsageRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeMemoryUsage"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_memory_used.go

@@ -0,0 +1,53 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeMemoryUsedRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+}
+
+// Used Memory
+func (p Prometheus) ComputeMemoryUsed(ctx context.Context, req ComputeMemoryUsedRequest) (*PrometheusData, error) {
+	res, err := p.ComputeMemoryUsedRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeMemoryUsedRaw(ctx context.Context, req ComputeMemoryUsedRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeMemoryUsed"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_read_bytes.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeReadBytesRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Read Bytes
+func (p Prometheus) ComputeReadBytes(ctx context.Context, req ComputeReadBytesRequest) (*PrometheusData, error) {
+	res, err := p.ComputeReadBytesRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeReadBytesRaw(ctx context.Context, req ComputeReadBytesRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeReadBytes"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_read_requests.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeReadRequestsRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Read Requests
+func (p Prometheus) ComputeReadRequests(ctx context.Context, req ComputeReadRequestsRequest) (*PrometheusData, error) {
+	res, err := p.ComputeReadRequestsRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeReadRequestsRaw(ctx context.Context, req ComputeReadRequestsRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeReadRequests"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_receive_bytes.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeReceiveBytesRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Receive Bytes
+func (p Prometheus) ComputeReceiveBytes(ctx context.Context, req ComputeReceiveBytesRequest) (*PrometheusData, error) {
+	res, err := p.ComputeReceiveBytesRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeReceiveBytesRaw(ctx context.Context, req ComputeReceiveBytesRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeReceiveBytes"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_receive_packets.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeReceivePacketsRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Receive Packets
+func (p Prometheus) ComputeReceivePackets(ctx context.Context, req ComputeReceivePacketsRequest) (*PrometheusData, error) {
+	res, err := p.ComputeReceivePacketsRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeReceivePacketsRaw(ctx context.Context, req ComputeReceivePacketsRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeReceivePackets"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_transmit_bytes.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeTransmitBytesRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Transmit Bytes
+func (p Prometheus) ComputeTransmitBytes(ctx context.Context, req ComputeTransmitBytesRequest) (*PrometheusData, error) {
+	res, err := p.ComputeTransmitBytesRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeTransmitBytesRaw(ctx context.Context, req ComputeTransmitBytesRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeTransmitBytes"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_transmit_packets.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeTransmitPacketsRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Transmit Packets
+func (p Prometheus) ComputeTransmitPackets(ctx context.Context, req ComputeTransmitPacketsRequest) (*PrometheusData, error) {
+	res, err := p.ComputeTransmitPacketsRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeTransmitPacketsRaw(ctx context.Context, req ComputeTransmitPacketsRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeTransmitPackets"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_write_bytes.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeWriteBytesRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Write Bytes
+func (p Prometheus) ComputeWriteBytes(ctx context.Context, req ComputeWriteBytesRequest) (*PrometheusData, error) {
+	res, err := p.ComputeWriteBytesRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeWriteBytesRaw(ctx context.Context, req ComputeWriteBytesRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeWriteBytes"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/compute_write_requests.go

@@ -0,0 +1,57 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type ComputeWriteRequestsRequest struct {
+	// Compute ID
+	// Required: true
+	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Write Requests
+func (p Prometheus) ComputeWriteRequests(ctx context.Context, req ComputeWriteRequestsRequest) (*PrometheusData, error) {
+	res, err := p.ComputeWriteRequestsRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := PrometheusData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputeWriteRequestsRaw(ctx context.Context, req ComputeWriteRequestsRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computeWriteRequests"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/computes.go

@@ -0,0 +1,77 @@
+package prometheus
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+const (
+	ComputeCPULoad         = "computeCPUload"
+	ComputeMemoryUsage     = "computeMemoryUsage"
+	ComputeMemoryUsable    = "computeMemoryUsable"
+	ComputeMemoryUnused    = "computeMemoryUnused"
+	ComputeMemoryUsed      = "computeMemoryUsed"
+	ComputeMemoryAvailable = "computeMemoryAvailable"
+	ComputeReadBytes       = "computeReadBytes"
+	ComputeReadRequests    = "computeReadRequests"
+	ComputeReceiveBytes    = "computeReceiveBytes"
+	ComputeTransmitBytes   = "computeTransmitBytes"
+	ComputeTransmitPackets = "computeTransmitPackets"
+	ComputeWriteBytes      = "computeWriteBytes"
+	ComputeWriteRequests   = "computeWriteRequests"
+)
+
+type ComputesRequest struct {
+	// List of compute IDs to fetch metrics for
+	// Required: true
+	ComputeIDs []uint64 `url:"computeIds" json:"computeIds" validate:"required"`
+
+	// List of compute IDs to fetch metrics for
+	// Required: true
+	MetricIDs []string `url:"metricIds" json:"metricIds" validate:"required"`
+
+	// Time to loads of statistic in seconds
+	// Required: false
+	ForLast uint64 `url:"forLast,omitempty" json:"forLast,omitempty"`
+
+	// The reading interval in seconds
+	// Required: false
+	Step uint64 `url:"step,omitempty" json:"step,omitempty"`
+
+	// Number of zeros after the decimal point
+	// Required: false
+	DecimalPlaces uint64 `url:"decimalPlaces,omitempty" json:"decimalPlaces,omitempty"`
+}
+
+// Get multiple metrics for multiple compute instances
+func (p Prometheus) Computes(ctx context.Context, req ComputesRequest) (*ComputesData, error) {
+	res, err := p.ComputesRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := ComputesData{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets information about compute as an array of bytes
+func (p Prometheus) ComputesRaw(ctx context.Context, req ComputesRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/prometheus/computes"
+
+	res, err := p.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/prometheus/models.go

@@ -0,0 +1,40 @@
+package prometheus
+
+// PrometheusData represents an array of data points
+type PrometheusData []PrometheusPoint
+
+// PrometheusPoint represents a single data point
+type PrometheusPoint struct {
+	// Value of the metric at a specific point in time
+	Value float64 `json:"value"`
+
+	// Timestamp the Unix timestamp.
+	Timestamp uint64 `json:"timestamp"`
+}
+
+// ComputesData represents an array of data points for computes
+type ComputesData []ItemCompute
+
+// ItemCompute represents a single data of compute
+type ItemCompute struct {
+	// Compute ID
+	ComputeID uint64 `json:"computeId"`
+
+	// Array of metrics
+	Metrics []ItemMetric `json:"metrics"`
+
+	// Error
+	Error string `json:"error"`
+}
+
+// ItemMetric represents a single data point of metric
+type ItemMetric struct {
+	// Metric ID
+	MetricID string `json:"metricId"`
+
+	// Data represents an array of data points
+	Data PrometheusData `json:"data"`
+
+	// Error
+	Error string `json:"error"`
+}

pkg/cloudapi/prometheus/prometheus.go

@@ -0,0 +1,15 @@
+package prometheus
+
+import (
+	"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+)
+
+type Prometheus struct {
+	client interfaces.Caller
+}
+
+func New(client interfaces.Caller) *Prometheus {
+	return &Prometheus{
+		client: client,
+	}
+}

pkg/cloudapi/rg/create.go

@@ -71,10 +71,6 @@ type CreateRequest struct {
 	// External IP address
 	// Required: false
 	ExtIP string `url:"extIp,omitempty" json:"extIp,omitempty"`
-
-	// Register computes in registration system
-	// Required: false
-	RegisterComputes bool `url:"registerComputes,omitempty" json:"registerComputes,omitempty"`
 }
 
 // Create creates resource group

pkg/cloudapi/rg/update.go

@@ -42,10 +42,6 @@ type UpdateRequest struct {
 	// Required: false
 	MaxNumPublicIP int64 `url:"maxNumPublicIP,omitempty" json:"maxNumPublicIP,omitempty"`
 
-	// Register computes in registration system
-	// Required: false
-	RegisterComputes bool `url:"registerComputes,omitempty" json:"registerComputes,omitempty"`
-
 	// List of strings with pools i.e.: ["sep1_poolName1", "sep2_poolName2", etc]
 	// Required: false
 	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`

pkg/cloudapi/sep.go

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

pkg/cloudapi/sep/filter.go

@@ -0,0 +1,83 @@
+package sep
+
+// FilterBySEPID returns ListAvailableSEP with the specified SEPID.
+func (sl ListAvailableSEP) FilterBySEPID(sepID uint64) ListAvailableSEP {
+	predicate := func(sd SEPData) bool {
+		return sd.SEPID == sepID
+	}
+
+	return sl.FilterFunc(predicate)
+}
+
+// FilterBySEPName returns ListAvailableSEP with the specified SEPName.
+func (sl ListAvailableSEP) FilterBySEPName(SEPName string) ListAvailableSEP {
+	predicate := func(sd SEPData) bool {
+		return sd.SEPName == SEPName
+	}
+
+	return sl.FilterFunc(predicate)
+}
+
+// FilterBySEPType returns ListAvailableSEP with the specified SEPType.
+func (sl ListAvailableSEP) FilterBySEPType(SEPType string) ListAvailableSEP {
+	predicate := func(sd SEPData) bool {
+		return sd.SEPType == SEPType
+	}
+
+	return sl.FilterFunc(predicate)
+}
+
+// FilterByPoolType returns ListAvailableSEP where at least one pool has the specified type.
+func (sl ListAvailableSEP) FilterByPoolType(poolType string) ListAvailableSEP {
+	predicate := func(sd SEPData) bool {
+		for _, pool := range sd.Pools {
+			for _, pt := range pool.Types {
+				if pt == poolType {
+					return true
+				}
+			}
+		}
+		return false
+	}
+
+	return sl.FilterFunc(predicate)
+}
+
+// FilterBySystemPool returns ListAvailableSEP where at least one pool is a system pool.
+func (sl ListAvailableSEP) FilterBySystemPool(isSystem bool) ListAvailableSEP {
+	predicate := func(sd SEPData) bool {
+		for _, pool := range sd.Pools {
+			if pool.System == isSystem {
+				return true
+			}
+		}
+		return false
+	}
+
+	return sl.FilterFunc(predicate)
+}
+
+// FilterFunc allows filtering ListAvailableSEP based on a user-defined predicate.
+func (sl ListAvailableSEP) FilterFunc(predicate func(SEPData) bool) ListAvailableSEP {
+	var result ListAvailableSEP
+
+	for _, item := range sl.Data {
+		if predicate(item) {
+			result.Data = append(result.Data, item)
+		}
+	}
+
+	result.EntryCount = uint64(len(result.Data))
+
+	return result
+}
+
+// FindOne returns the first found SEPData.
+// If nothing is found, returns an empty struct.
+func (sl ListAvailableSEP) FindOne() SEPData {
+	if len(sl.Data) == 0 {
+		return SEPData{}
+	}
+
+	return sl.Data[0]
+}

pkg/cloudapi/sep/filter_test.go

@@ -0,0 +1,134 @@
+package sep
+
+import (
+	"testing"
+)
+
+var seps = ListAvailableSEP{
+	EntryCount: 3,
+	Data: []SEPData{
+		{
+			SEPID:   1,
+			SEPName: "sep_1",
+			SEPType: "TATLIN",
+			Pools: []Pool{
+				{
+					Name:   "pool_1",
+					Types:  []string{"DES"},
+					System: false,
+				},
+			},
+		},
+		{
+			SEPID:   2,
+			SEPName: "sep_2",
+			SEPType: "SHARED",
+			Pools: []Pool{
+				{
+					Name:   "pool_2",
+					Types:  []string{"DES"},
+					System: true,
+				},
+			},
+		},
+		{
+			SEPID:   3,
+			SEPName: "sep_3",
+			SEPType: "DES",
+			Pools: []Pool{
+				{
+					Name:   "pool_3",
+					Types:  []string{"DES"},
+					System: false,
+				},
+			},
+		},
+	},
+}
+
+func TestFilterBySEPID(t *testing.T) {
+	actual := seps.FilterBySEPID(1).FindOne()
+
+	if actual.SEPID != 1 {
+		t.Fatal("expected SEPID 1, found: ", actual.SEPID)
+	}
+}
+
+func TestFilterBySEPName(t *testing.T) {
+	actual := seps.FilterBySEPName("sep_2").FindOne()
+
+	if actual.SEPName != "sep_2" {
+		t.Fatal("expected SEPName 'sep_2', found: ", actual.SEPName)
+	}
+}
+
+func TestFilterBySEPType(t *testing.T) {
+	actual := seps.FilterBySEPType("TATLIN").FindOne()
+
+	if actual.SEPType != "TATLIN" {
+		t.Fatal("expected SEPType 'TATLIN', found: ", actual.SEPType)
+	}
+}
+
+func TestFilterByPoolType(t *testing.T) {
+	actual := seps.FilterByPoolType("DES")
+
+	if len(actual.Data) != 3 {
+		t.Fatal("expected 3 found, actual: ", len(actual.Data))
+	}
+
+	for _, item := range actual.Data {
+		found := false
+		for _, pool := range item.Pools {
+			for _, poolType := range pool.Types {
+				if poolType == "DES" {
+					found = true
+					break
+				}
+			}
+			if found {
+				break
+			}
+		}
+		if !found {
+			t.Fatal("expected Pool type 'DES', not found in SEP: ", item.SEPID)
+		}
+	}
+}
+
+func TestFilterBySystemPool(t *testing.T) {
+	actual := seps.FilterBySystemPool(true)
+
+	if len(actual.Data) != 1 {
+		t.Fatal("expected 1 found, actual: ", len(actual.Data))
+	}
+
+	for _, item := range actual.Data {
+		found := false
+		for _, pool := range item.Pools {
+			if pool.System {
+				found = true
+				break
+			}
+		}
+		if !found {
+			t.Fatal("expected System pool, not found in SEP: ", item.SEPID)
+		}
+	}
+}
+
+func TestFilterFunc(t *testing.T) {
+	actual := seps.FilterFunc(func(sd SEPData) bool {
+		return len(sd.Pools) > 0
+	})
+
+	if len(actual.Data) != 3 {
+		t.Fatal("expected 3 found, actual: ", len(actual.Data))
+	}
+
+	for _, item := range actual.Data {
+		if len(item.Pools) == 0 {
+			t.Fatal("expected Pools to contain at least 1 element, found: ", len(item.Pools))
+		}
+	}
+}

pkg/cloudapi/sep/ids.go

@@ -0,0 +1,10 @@
+package sep
+
+// IDs gets array of SEPIDs from ListSEP struct
+func (ls ListAvailableSEP) IDs() []uint64 {
+	res := make([]uint64, 0, len(ls.Data))
+	for _, s := range ls.Data {
+		res = append(res, s.SEPID)
+	}
+	return res
+}

pkg/cloudapi/sep/list_available_sep_and_pools.go

@@ -0,0 +1,52 @@
+package sep
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ListAvailableSEPAndPoolsRequest struct to get dict with entry count and list of dict with SEPs and pools details accessible by the Account and RG
+type ListAvailableSEPAndPoolsRequest struct {
+	// Account ID
+	// Required: true
+	AccountID uint64 `url:"account_id" json:"account_id" validate:"required"`
+
+	// RG ID
+	// Required: false
+	RGID uint64 `url:"rg_id,omitempty" json:"rg_id,omitempty"`
+}
+
+// ListAvailableSEPAndPools get dict with entry count and list of dict with SEPs and pools details accessible by the Account and RG
+func (s SEP) ListAvailableSEPAndPools(ctx context.Context, req ListAvailableSEPAndPoolsRequest) (*ListAvailableSEP, error) {
+
+	res, err := s.ListAvailableSEPAndPoolsRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListAvailableSEP{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}
+
+// ListRaw gets list as an array of bytes
+func (s SEP) ListAvailableSEPAndPoolsRaw(ctx context.Context, req ListAvailableSEPAndPoolsRequest) ([]byte, error) {
+
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudapi/sep/listAvailableSepAndPools"
+
+	res, err := s.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudapi/sep/models.go

@@ -0,0 +1,34 @@
+package sep
+
+type Pool struct {
+	// Pool name
+	Name string `json:"name"`
+
+	// Pool types
+	Types []string `json:"types"`
+
+	// System
+	System bool `json:"system"`
+}
+
+type SEPData struct {
+	// SEP ID
+	SEPID uint64 `json:"sepId"`
+
+	// SEP name
+	SEPName string `json:"sepName"`
+
+	// Sep type
+	SEPType string `json:"sepType"`
+
+	// Pools
+	Pools []Pool `json:"pools"`
+}
+
+type ListAvailableSEP struct {
+	// Entry count
+	EntryCount uint64 `json:"entryCount"`
+
+	// Data
+	Data []SEPData `json:"data"`
+}

pkg/cloudapi/sep/sep.go

@@ -0,0 +1,18 @@
+// Operator actions for handling interventions on a storage endpoint provider
+package sep
+
+import (
+	"repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+)
+
+// Structure for creating request to storage endpoint provider
+type SEP struct {
+	client interfaces.Caller
+}
+
+// Builder for SEP endpoints
+func New(client interfaces.Caller) *SEP {
+	return &SEP{
+		client: client,
+	}
+}

pkg/cloudapi/sep/serialize.go

@@ -0,0 +1,43 @@
+package sep
+
+import (
+	"encoding/json"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/serialization"
+)
+
+// Serialize returns JSON-serialized []byte. Used as a wrapper over json.Marshal and json.MarshalIndent functions.
+//
+// In order to serialize with indent make sure to follow these guidelines:
+//   - First argument -> prefix
+//   - Second argument -> indent
+func (lsep ListAvailableSEP) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(lsep.Data) == 0 {
+		return []byte{}, nil
+	}
+
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(lsep, prefix, indent)
+	}
+
+	return json.Marshal(lsep)
+}
+
+// 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 (rsep SEPData) Serialize(params ...string) (serialization.Serialized, error) {
+	if len(params) > 1 {
+		prefix := params[0]
+		indent := params[1]
+
+		return json.MarshalIndent(rsep, prefix, indent)
+	}
+
+	return json.Marshal(rsep)
+}

pkg/cloudapi/user/get_audit.go

@@ -28,6 +28,10 @@ type GetAuditRequest struct {
 	// Required: false
 	MinStatusCode uint64 `url:"minStatusCode,omitempty" json:"minStatusCode,omitempty"`
 
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
 	// Page number.
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/cloudapi/vins/list.go

@@ -18,6 +18,10 @@ type ListRequest struct {
 	// 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 account ID
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`

pkg/cloudbroker/account/create.go

@@ -14,6 +14,10 @@ type CreateRequest struct {
 	// Required: true
 	Name string `url:"name" json:"name" validate:"required"`
 
+	// Description
+	// Required: false
+	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
 	// Name of the account
 	// Required: true
 	Username string `url:"username" json:"username" validate:"required"`
@@ -56,7 +60,7 @@ type CreateRequest struct {
 	UniqPools []string `url:"uniqPools,omitempty" json:"uniqPools,omitempty"`
 
 	// Advanced compute features,
-	// one of: hugepages, numa, cpupin, vfnic
+	// one of: hugepages, numa, cpupin, vfnic, dpdk, changemac
 	// Required: false
 	ComputeFeatures []string `url:"computeFeatures,omitempty" json:"computeFeatures,omitempty" validate:"omitempty,computeFeatures"`
 }

pkg/cloudbroker/account/disable.go

@@ -13,6 +13,10 @@ type DisableRequest struct {
 	// ID of account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Reason of disabling
+	// Required: false
+	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Disable disables an account

pkg/cloudbroker/account/disable_accounts.go

@@ -12,6 +12,10 @@ type DisableAccountsRequest struct {
 	// IDs of accounts
 	// Required: true
 	AccountIDs []uint64 `url:"accountIds" json:"accountIds" validate:"min=1"`
+
+	// Reason of disabling
+	// Required: false
+	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // DisableAccounts disables accounts

pkg/cloudbroker/account/models.go

@@ -170,6 +170,9 @@ type InfoAccount struct {
 	// Display name
 	DisplayName string `json:"displayname"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// GUID
 	GUID uint64 `json:"guid"`
 
@@ -476,6 +479,9 @@ type ItemRG struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Description
+	Description string `json:"desc"`
+
 	// ID
 	ID uint64 `json:"id"`
 

pkg/cloudbroker/account/restore.go

@@ -12,6 +12,10 @@ type RestoreRequest struct {
 	// ID an account
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
+
+	// Reason of disabling
+	// Required: false
+	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
 }
 
 // Restore restores a deleted account

pkg/cloudbroker/account/update.go

@@ -14,6 +14,10 @@ type UpdateRequest struct {
 	// Required: true
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
+	// Description
+	// Required: false
+	Description string `url:"desc,omitempty" json:"desc,omitempty"`
+
 	// Name of the account
 	// Required: false
 	Name string `url:"name" json:"name"`

pkg/cloudbroker/account/update_compute_features.go

@@ -15,7 +15,7 @@ type UpdateComputeFeaturesRequest struct {
 	AccountID uint64 `url:"accountId" json:"accountId" validate:"required"`
 
 	// Advanced compute features,
-	// one of: hugepages, numa, cpupin, vfnic
+	// one of: hugepages, numa, cpupin, vfnic, dpdk, changemac
 	// Required: false
 	ComputeFeatures []string `url:"computeFeatures,omitempty" json:"computeFeatures,omitempty" validate:"omitempty,computeFeatures"`
 }

pkg/cloudbroker/apiaccess/api_find.go

@@ -10,10 +10,20 @@ import (
 
 // APIFindRequest struct for finding apiaccess groups.
 type APIFindRequest struct {
-	// API function to find
+	//API group to find (cloudbroker, cloudapi, etc)
-	// Example: cloudbroker/k8s/create
+	//Available values : cloudapi, cloudbroker, system
-	// Required: true
+	//Required: true
-	APIName string `url:"apiName" json:"apiName" validate:"required"`
+	APIGroup string `url:"api_group" json:"api_group" validate:"required,apiGroup"`
+
+	//API object to find (compute, vins, etc )
+	//Required: true
+	APIObject string `url:"api_object" json:"api_object" validate:"required"`
+
+	//API endpoint to find (delete, create, etc)
+	//Required: true
+	APIMethod string `url:"api_method" json:"api_method" valudate:"required"`
+
+
 }
 
 // APIFind outputs a list of apiaccess groups that mention the specified API function.

pkg/cloudbroker/apiaccess/apis_exclude.go

@@ -15,7 +15,7 @@ type APIString string
 type APIsExcludeRequest struct {
 	// APIAccess group ID
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// APIs to remove from APIAccess group
 	// Required: true

pkg/cloudbroker/apiaccess/apis_include.go

@@ -12,7 +12,7 @@ import (
 type APIsIncludeRequest struct {
 	// APIAccess group ID.
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// APIs to add to APIAccess group.
 	// Required: true

pkg/cloudbroker/apiaccess/copy.go

@@ -12,7 +12,7 @@ import (
 type CopyRequest struct {
 	// ID of the API access group to make copy from
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// Name of the target API access group, which will be created on successful copy
 	// Required: true

pkg/cloudbroker/apiaccess/delete.go

@@ -12,7 +12,7 @@ import (
 type DeleteRequest struct {
 	// APIAccess group ID.
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// Set True to delete apiaccess group with attached users.
 	// Required: false

pkg/cloudbroker/apiaccess/desc_update.go

@@ -12,7 +12,7 @@ import (
 type DescUpdateRequest struct {
 	// APIAccess group ID.
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// New description to set for the apiaccess group.
 	// Required: true

pkg/cloudbroker/apiaccess/get.go

@@ -12,7 +12,7 @@ import (
 type GetRequest struct {
 	// APIAccess group ID.
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 }
 
 // Get gets apiaccess group as an ItemAPIAccess struct

pkg/cloudbroker/apiaccess/get_default.go

@@ -6,11 +6,11 @@ import (
 	"net/http"
 )
 
-// GetPreGroups gets list of pre default groups from spec
+// GetDefault gets default apiaccess group
-func (a APIAccess) GetPreGroups(ctx context.Context) (map[string]APIsEndpoints, error) {
+func (a APIAccess) GetDefault(ctx context.Context) (*ItemAPIAccessDefault, error) {
-	url := "/cloudbroker/apiaccess/getPreGroups"
+	url := "/cloudbroker/apiaccess/getDefault"
 
-	info := make(map[string]APIsEndpoints)
+	info := ItemAPIAccessDefault{}
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, nil)
 	if err != nil {
@@ -22,5 +22,5 @@ func (a APIAccess) GetPreGroups(ctx context.Context) (map[string]APIsEndpoints,
 		return nil, err
 	}
 
-	return info, nil
+	return &info, nil
 }

pkg/cloudbroker/apiaccess/list.go

@@ -22,21 +22,18 @@ type ListRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
-	// Find by created actor
-	// Required: false
-	CreatedBy string `url:"createdBy,omitempty" json:"createdBy,omitempty"`
 
 	// Find by created after time (unix timestamp)
 	// Required: false
-	CreatedAfter uint64 `url:"createdAfter,omitempty" json:"createdAfter,omitempty"`
+	CreatedAfter uint64 `url:"created_after,omitempty" json:"created_after,omitempty"`
 
 	// Find by created before time (unix timestamp)
 	// Required: false
-	CreatedBefore uint64 `url:"createdBefore,omitempty" json:"createdBefore,omitempty"`
+	CreatedBefore uint64 `url:"created_before,omitempty" json:"created_before,omitempty"`
 
 	// Sort by one of supported fields, format +|-(field)
 	// Required: false
-	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+	SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty" validate:"omitempty,sortBy"`
 
 	// Page number
 	// Required: false

pkg/cloudbroker/apiaccess/list_deleted.go

@@ -1,48 +0,0 @@
-package apiaccess
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ListDeletedRequest struct for getting list of all deleted apiaccess instances.
-type ListDeletedRequest struct {
-	// Sort by one of supported fields, format +|-(field)
-	// Required: false
-	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
-
-	// Page number.
-	// Required: false
-	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
-
-	// Page size.
-	// Required: false
-	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
-}
-
-// ListDeleted gets list of all deleted apiaccess instances.
-func (a APIAccess) ListDeleted(ctx context.Context, req ListDeletedRequest) (*ListAPIAccess, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudbroker/apiaccess/listDeleted"
-
-	info := ListAPIAccess{}
-
-	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(res, &info)
-	if err != nil {
-		return nil, err
-	}
-
-	return &info, nil
-}

pkg/cloudbroker/apiaccess/models.go

@@ -4,20 +4,51 @@ type ItemAPIAccess struct {
 	// APIs
 	APIs APIsEndpoints `json:"apis"`
 
-	// Created by
+	CreatedTime uint64 `json:"created_at"`
-	CreatedBy string `json:"createdBy"`
-
-	// Created time
-	CreatedTime uint64 `json:"createdTime"`
 
 	// Is default
 	Default bool `json:"default"`
 
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Deleted time
-	DeletedTime uint64 `json:"deletedTime"`
+	DeletedTime uint64 `json:"deleted_at"`
+
+	// Description
+	Description string `json:"desc"`
+
+	// GID
+	GID uint64 `json:"gid"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Is protected
+	Protected bool `json:"protected"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Updated time
+	UpdatedTime uint64 `json:"updated_at"`
+}
+
+type ItemAPIAccessDefault struct {
+	// APIs
+	APIs APIsEndpoints `json:"apis"`
+
+	// Created at
+	CreatedAt uint64 `json:"created_at"`
+
+	// Is default
+	Default bool `json:"default"`
+
+	// Deleted at
+	DeletedAt uint64 `json:"deleted_at"`
 
 	// Description
 	Description string `json:"decs"`
@@ -31,23 +62,17 @@ type ItemAPIAccess struct {
 	// ID
 	ID uint64 `json:"id"`
 
-	// Milestones
-	Milestones uint64 `json:"milestones"`
-
 	// Name
 	Name string `json:"name"`
 
-	// Is protected
+	// Protected
 	Protected bool `json:"protected"`
 
 	// Status
 	Status string `json:"status"`
 
-	//Updated by
+	//Updated at
-	UpdatedBy string `json:"updatedBy"`
+	UpdatedAt uint64 `json:"updated_at"`
-
-	// Updated time
-	UpdatedTime uint64 `json:"updatedTime"`
 }
 
 type ListAPIAccess struct {
@@ -77,6 +102,7 @@ type CloudAPIEndpoints struct {
 	Compute        []string `json:"compute,omitempty"`
 	ComputeCI      []string `json:"computeci,omitempty"`
 	Disks          []string `json:"disks,omitempty"`
+	DPDK           []string `json:"dpdk,omitempty"`
 	ExtNet         []string `json:"extnet,omitempty"`
 	FLIPGroup      []string `json:"flipgroup,omitempty"`
 	GPU            []string `json:"gpu,omitempty"`
@@ -115,6 +141,7 @@ type CloudBrokerEndpoints struct {
 	Desnode        []string    `json:"desnode,omitempty"`
 	Diagnostics    []string    `json:"diagnostics,omitempty"`
 	Disks          []string    `json:"disks,omitempty"`
+	DPDK           []string    `json:"dpdk,omitempty"`
 	Eco            []string    `json:"eco,omitempty"`
 	ExtNet         []string    `json:"extnet,omitempty"`
 	FlIPgroup      []string    `json:"flipgroup,omitempty"`

pkg/cloudbroker/apiaccess/set_default.go

@@ -12,7 +12,7 @@ import (
 type SetDefaultRequest struct {
 	// APIAccess group ID
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 }
 
 // SetDefault sets current apiaccess group default.

pkg/cloudbroker/apiaccess/subtract.go

@@ -12,10 +12,10 @@ import (
 // SubtractRequest struct for subtracting.
 type SubtractRequest struct {
 	// ID of the API access group to subtract from. This group will contain the difference.
-	MinuendID uint64 `url:"minuendId" json:"minuendId" validate:"required"`
+	MinuendID uint64 `url:"minuend_group_id" json:"minuend_group_id" validate:"required"`
 
 	// ID of the API access group which is subtracted. This group is unchanged.
-	SubtrahendID uint64 `url:"subtrahendId" json:"subtrahendId" validate:"required"`
+	SubtrahendID uint64 `url:"subtrahend_group_id" json:"subtrahend_group_id" validate:"required"`
 }
 
 // Subtract removes such APIs from MinuendID that match APIs from SubtrahendID.

pkg/cloudbroker/apiaccess/union.go

@@ -12,11 +12,11 @@ import (
 type UnionRequest struct {
 	// Recipient apiaccess group ID
 	// Required: true
-	RecipientID uint64 `url:"recipientId" json:"recipientId" validate:"required"`
+	RecipientID uint64 `url:"recipient_group_id" json:"recipient_group_id" validate:"required"`
 
 	// Donor apiaccess group ID
 	// Required: true
-	DonorID uint64 `url:"donorId" json:"donorId" validate:"required"`
+	DonorID uint64 `url:"donor_group_id" json:"donor_group_id" validate:"required"`
 }
 
 // Union combines the API list of group #1 ("recipient") and group #2 ("donor"),

pkg/cloudbroker/apiaccess/update.go

@@ -13,7 +13,7 @@ import (
 type UpdateRequest struct {
 	// APIAccess group ID
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// APIs to remove from APIAccess group
 	// Required: false

pkg/cloudbroker/apiaccess/user_list.go

@@ -12,7 +12,7 @@ import (
 type UserListRequest struct {
 	// APIAccess group ID
 	// Required: true
-	APIAccessID uint64 `url:"apiaccessId" json:"apiaccessId" validate:"required"`
+	APIAccessID uint64 `url:"apiaccess_id" json:"apiaccess_id" validate:"required"`
 
 	// Page number
 	// Required: false

pkg/cloudbroker/audit/get.go

@@ -12,7 +12,7 @@ import (
 type GetRequest struct {
 	// Audit GUID
 	// Required: true
-	AuditGuid string `url:"auditGuid" json:"auditGuid" validate:"required"`
+	AuditGuid string `url:"audit_guid" json:"audit_guid" validate:"required"`
 }
 
 // Get gets information about audit as a RecordAudit struct

pkg/cloudbroker/audit/linked_jobs.go

@@ -12,7 +12,7 @@ import (
 type LinkedJobsRequest struct {
 	// Audit GUID
 	// Required: true
-	AuditGuid string `url:"auditGuid" json:"auditGuid" validate:"required"`
+	AuditGuid string `url:"audit_guid" json:"audit_guid" validate:"required"`
 }
 
 // LinkedJobs gets information about Linked Jobs as a ListLinkedJobs struct
@@ -43,4 +43,4 @@ func (a Audit) GetRawLinkedJobs(ctx context.Context, req LinkedJobsRequest) ([]b
 
 	res, err := a.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	return res, err
-}
+}

pkg/cloudbroker/audit/list.go

@@ -13,11 +13,11 @@ type ListRequest struct {
 
 	// Find all audits after point in time (unixtime)
 	// Required: false
-	TimestampAt uint64 `url:"timestampAt,omitempty" json:"timestampAt,omitempty"`
+	TimestampAt uint64 `url:"timestamp_at,omitempty" json:"timestamp_at,omitempty"`
 
 	// Find all audits before point in time (unixtime)
 	// Required: false
-	TimestampTo uint64 `url:"timestampTo,omitempty" json:"timestampTo,omitempty"`
+	TimestampTo uint64 `url:"timestamp_to,omitempty" json:"timestamp_to,omitempty"`
 
 	// Find by user (Mongo RegExp supported)
 	// Required: false
@@ -27,17 +27,21 @@ type ListRequest struct {
 	// Required: false
 	Call string `url:"call,omitempty" json:"call,omitempty"`
 
+	// Find by request id
+	// Required: false
+	RequestID string `url:"request_id,omitempty" json:"request_id,omitempty"`
+
 	// Find by HTTP min status code
 	// Required: false
-	MinStatusCode uint64 `url:"minStatusCode,omitempty" json:"minStatusCode,omitempty"`
+	MinStatusCode uint64 `url:"min_status_code,omitempty" json:"min_status_code,omitempty"`
 
 	// Find by HTTP max status code
 	// Required: false
-	MaxStatusCode uint64 `url:"maxStatusCode,omitempty" json:"maxStatusCode,omitempty"`
+	MaxStatusCode uint64 `url:"max_status_code,omitempty" json:"max_status_code,omitempty"`
 
 	// Sort by one of supported fields, format +|-(field)
 	// Required: false
-	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+	SortBy string `url:"sort_by,omitempty" json:"sort_by,omitempty" validate:"omitempty,sortBy"`
 
 	// Page number
 	// Required: false

pkg/cloudbroker/audit/models.go

@@ -2,23 +2,44 @@ package audit
 
 // Main info about audit
 type ItemAudit struct {
+	// Args
+	Args string `json:"args"`
+
 	// Call
 	Call string `json:"call"`
 
 	// GUID
 	GUID string `json:"guid"`
 
+	// Kwargs
+	Kwargs string `json:"kwargs"`
+
+	// RemoteAddr
+	RemoteAddr string `json:"remote_addr"`
+
 	// Response time
 	ResponseTime float64 `json:"responsetime"`
 
+	// Result
+	Result string `json:"result"`
+
 	// Status code
 	StatusCode uint64 `json:"statuscode"`
 
 	// Timestamp
 	Timestamp float64 `json:"timestamp"`
 
+	// Timestamp End
+	TimestampEnd float64 `json:"timestampEnd"`
+
 	// User
 	User string `json:"user"`
+
+	// TTL
+	TTL string `json:"_ttl"`
+
+	// Tags
+	Tags string `json:"tags"`
 }
 
 // List of audits
@@ -68,6 +89,9 @@ type RecordAudit struct {
 
 	// User
 	User string `json:"user"`
+
+	// TTL
+	TTL string `json:"_ttl"`
 }
 
 // List of Linked Jobs
@@ -85,6 +109,9 @@ type ItemLinkedJobs struct {
 	// NID
 	NID uint64 `json:"nid"`
 
+	// Physical Node or not
+	PhysicalNode bool `json:"physicalNode"`
+
 	// state
 	State string `json:"state"`
 

pkg/cloudbroker/bservice.go

@@ -0,0 +1,8 @@
+package cloudbroker
+
+import "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/bservice"
+
+// Accessing the BService method group
+func (ca *CloudBroker) BService() *bservice.BService {
+	return bservice.New(ca.client)
+}

pkg/cloudbroker/bservice/bservice.go

@@ -0,0 +1,15 @@
+package bservice
+
+import "repository.basistech.ru/BASIS/decort-golang-sdk/interfaces"
+
+// Structure for creating request to bservice
+type BService struct {
+	client interfaces.Caller
+}
+
+// Builder for bservice endpoints
+func New(client interfaces.Caller) *BService {
+	return &BService{
+		client,
+	}
+}

pkg/cloudbroker/bservice/filter.go

@@ -0,0 +1,71 @@
+package bservice
+
+// FilterByID returns ListBasicServices with specified ID.
+func (lbs ListBasicServices) FilterByID(id uint64) ListBasicServices {
+	predicate := func(ibs ItemBasicService) bool {
+		return ibs.ID == id
+	}
+
+	return lbs.FilterFunc(predicate)
+}
+
+// FilterByName returns ListBasicServices with specified Name.
+func (lbs ListBasicServices) FilterByName(name string) ListBasicServices {
+	predicate := func(ibs ItemBasicService) bool {
+		return ibs.Name == name
+	}
+
+	return lbs.FilterFunc(predicate)
+}
+
+// FilterByRGID returns ListBasicServices with specified RGID.
+func (lbs ListBasicServices) FilterByRGID(rgID uint64) ListBasicServices {
+	predicate := func(ibs ItemBasicService) bool {
+		return ibs.RGID == rgID
+	}
+
+	return lbs.FilterFunc(predicate)
+}
+
+// FilterByStatus returns ListBasicServices with specified Status.
+func (lbs ListBasicServices) FilterByStatus(status string) ListBasicServices {
+	predicate := func(ibs ItemBasicService) bool {
+		return ibs.Status == status
+	}
+
+	return lbs.FilterFunc(predicate)
+}
+
+// FilterByTechStatus returns ListBasicServices with specified TechStatus.
+func (lbs ListBasicServices) FilterByTechStatus(techStatus string) ListBasicServices {
+	predicate := func(ibs ItemBasicService) bool {
+		return ibs.TechStatus == techStatus
+	}
+
+	return lbs.FilterFunc(predicate)
+}
+
+// FilterFunc allows filtering ListResourceGroups based on a user-specified predicate.
+func (lbs ListBasicServices) FilterFunc(predicate func(ItemBasicService) bool) ListBasicServices {
+	var result ListBasicServices
+
+	for _, item := range lbs.Data {
+		if predicate(item) {
+			result.Data = append(result.Data, item)
+		}
+	}
+
+	result.EntryCount = uint64(len(lbs.Data))
+
+	return result
+}
+
+// FindOne returns first found ItemBasicService
+// If none was found, returns an empty struct.
+func (lbs ListBasicServices) FindOne() ItemBasicService {
+	if lbs.EntryCount == 0 {
+		return ItemBasicService{}
+	}
+
+	return lbs.Data[0]
+}

pkg/cloudbroker/bservice/filter_test.go

@@ -0,0 +1,155 @@
+package bservice
+
+import "testing"
+
+var bservices = ListBasicServices{
+	Data: []ItemBasicService{
+		{
+			AccountID:     1,
+			AccountName:   "std_1",
+			BaseDomain:    "",
+			CreatedBy:     "sample_user_1@decs3o",
+			CreatedTime:   1677743675,
+			DeletedBy:     "",
+			DeletedTime:   0,
+			GID:           212,
+			Groups:        []uint64{},
+			GUID:          1,
+			ID:            1,
+			Name:          "bservice_1",
+			ParentSrvID:   0,
+			ParentSrvType: "",
+			RGID:          7971,
+			RGName:        "rg_1",
+			SSHUser:       "",
+			Status:        "CREATED",
+			TechStatus:    "STOPPED",
+			UpdatedBy:     "",
+			UpdatedTime:   0,
+			UserManaged:   true,
+		},
+		{
+			AccountID:     2,
+			AccountName:   "std_2",
+			BaseDomain:    "",
+			CreatedBy:     "sample_user_1@decs3o",
+			CreatedTime:   1677743736,
+			DeletedBy:     "",
+			DeletedTime:   0,
+			GID:           212,
+			Groups:        []uint64{},
+			GUID:          2,
+			ID:            2,
+			Name:          "bservice_2",
+			ParentSrvID:   0,
+			ParentSrvType: "",
+			RGID:          7972,
+			RGName:        "rg_2",
+			SSHUser:       "",
+			Status:        "CREATED",
+			TechStatus:    "STOPPED",
+			UpdatedBy:     "",
+			UpdatedTime:   0,
+			UserManaged:   true,
+		},
+		{
+			AccountID:     3,
+			AccountName:   "std_3",
+			BaseDomain:    "",
+			CreatedBy:     "sample_user_2@decs3o",
+			CreatedTime:   1677743830,
+			DeletedBy:     "",
+			DeletedTime:   0,
+			GID:           212,
+			Groups:        []uint64{},
+			GUID:          3,
+			ID:            3,
+			Name:          "bservice_3",
+			ParentSrvID:   0,
+			ParentSrvType: "",
+			RGID:          7973,
+			RGName:        "rg_3",
+			SSHUser:       "",
+			Status:        "ENABLED",
+			TechStatus:    "STARTED",
+			UpdatedBy:     "",
+			UpdatedTime:   0,
+			UserManaged:   true,
+		},
+	},
+	EntryCount: 3,
+}
+
+func TestFilterByID(t *testing.T) {
+	actual := bservices.FilterByID(1).FindOne()
+
+	if actual.ID != 1 {
+		t.Fatal("expected ID 1, found: ", actual.ID)
+	}
+}
+
+func TestFilterByName(t *testing.T) {
+	actual := bservices.FilterByName("bservice_3").FindOne()
+
+	if actual.Name != "bservice_3" {
+		t.Fatal("expected Name 'bservice_3', found: ", actual.Name)
+	}
+}
+
+func TestFilterByRGID(t *testing.T) {
+	actual := bservices.FilterByRGID(7971).FindOne()
+
+	if actual.RGID != 7971 {
+		t.Fatal("expected RGID 7971, found: ", actual.RGID)
+	}
+}
+
+func TestFilterByStatus(t *testing.T) {
+	actual := bservices.FilterByStatus("CREATED")
+
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
+	}
+
+	for _, item := range actual.Data {
+		if item.Status != "CREATED" {
+			t.Fatal("expected Status 'CREATED', found: ", item.Status)
+		}
+	}
+}
+
+func TestFilterByTechStatus(t *testing.T) {
+	actual := bservices.FilterByTechStatus("STOPPED")
+
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 found, actual: ", len(actual.Data))
+	}
+
+	for _, item := range actual.Data {
+		if item.TechStatus != "STOPPED" {
+			t.Fatal("expected TechStatus 'STOPPED', found: ", item.TechStatus)
+		}
+	}
+}
+
+func TestFilterFunc(t *testing.T) {
+	actual := bservices.FilterFunc(func(ibs ItemBasicService) bool {
+		return ibs.CreatedBy == "sample_user_2@decs3o"
+	})
+
+	if len(actual.Data) > 1 {
+		t.Fatal("expected 1 found, actual: ", len(actual.Data))
+	}
+
+	if actual.FindOne().CreatedBy != "sample_user_2@decs3o" {
+		t.Fatal("expected 'sample_user_2@decs3o', found: ", actual.FindOne().CreatedBy)
+	}
+}
+
+func TestSortByCreatedTime(t *testing.T) {
+	actual := bservices.SortByCreatedTime(true)
+
+	if actual.Data[0].CreatedTime != 1677743830 || actual.Data[2].CreatedTime != 1677743675 {
+		t.Fatal("expected descending order, found ascending")
+	}
+}

pkg/cloudbroker/bservice/get.go

@@ -0,0 +1,46 @@
+package bservice
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// GetRequest struct to get detailed information about service
+type GetRequest struct {
+	// ID of the service to query information
+	// Required: true
+	ServiceID uint64 `url:"serviceId" json:"serviceId" validate:"required"`
+}
+
+// Get gets detailed specifications for the BasicService as a RecordBasicService struct
+func (b BService) Get(ctx context.Context, req GetRequest) (*RecordBasicService, error) {
+	res, err := b.GetRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := RecordBasicService{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}
+
+// GetRaw gets detailed specifications for the BasicService as an array of bytes
+func (b BService) GetRaw(ctx context.Context, req GetRequest) ([]byte, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/bservice/get"
+
+	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudbroker/bservice/list.go

@@ -0,0 +1,87 @@
+package bservice
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ListRequest struct to get list of BasicService instances
+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"`
+
+	// ID of the account to query for BasicService instances
+	// 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"`
+
+	// ID of the resource group to query for BasicService instances
+	// 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 account name
+	// Required: false
+	AccountName string `url:"accountName,omitempty" json:"accountName,omitempty"`
+
+	// Sort by one of supported fields, format +|-(field)
+	// Required: false
+	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`
+
+	// Page number
+	// Required: false
+	Page uint64 `url:"page,omitempty" json:"page,omitempty"`
+
+	// Page size
+	// Required: false
+	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+}
+
+// List gets list of BasicService instances associated with the specified Resource Group as a ListBasicServices struct
+func (b BService) List(ctx context.Context, req ListRequest) (*ListBasicServices, error) {
+
+	res, err := b.ListRaw(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	list := ListBasicServices{}
+
+	err = json.Unmarshal(res, &list)
+	if err != nil {
+		return nil, err
+	}
+
+	return &list, nil
+}
+
+// ListRaw gets list of BasicService instances associated with the specified Resource Group as an array of bytes
+func (b BService) ListRaw(ctx context.Context, req ListRequest) ([]byte, error) {
+
+	if err := validators.ValidateRequest(req); err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/bservice/list"
+
+	res, err := b.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	return res, err
+}

pkg/cloudbroker/bservice/models.go

@@ -0,0 +1,257 @@
+package bservice
+
+// Detailed info about BasicService
+type RecordBasicService struct {
+	// Account ID
+	AccountID uint64 `json:"accountId"`
+
+	// Account name
+	AccountName string `json:"accountName"`
+
+	// Base domain
+	BaseDomain string `json:"baseDomain"`
+
+	// List Computes
+	Computes ListComputes `json:"computes"`
+
+	// Number of cores
+	CPUTotal uint64 `json:"cpuTotal"`
+
+	// Created by
+	CreatedBy string `json:"createdBy"`
+
+	// Created time
+	CreatedTime uint64 `json:"createdTime"`
+
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
+	// Deleted time
+	DeletedTime uint64 `json:"deletedTime"`
+
+	// Amount of disk space used, GB
+	DiskTotal uint64 `json:"diskTotal"`
+
+	// Grid ID
+	GID uint64 `json:"gid"`
+
+	// List of Service Compute Groups
+	Groups ListGroups `json:"groups"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Parent service ID
+	ParentSrvID uint64 `json:"parentSrvId"`
+
+	// Parent service type
+	ParentSrvType string `json:"parentSrvType"`
+
+	// Total amount of RAM, MB
+	RAMTotal uint64 `json:"ramTotal"`
+
+	// Resource group ID
+	RGID uint64 `json:"rgId"`
+
+	// Resource group name
+	RGName string `json:"rgName"`
+
+	// List of snapshots
+	Snapshots ListSnapshots `json:"snapshots"`
+
+	// SSH key for connection
+	SSHKey string `json:"sshKey"`
+
+	// Username for SSH connection
+	SSHUser string `json:"sshUser"`
+
+	// status
+	Status string `json:"status"`
+
+	// TechStatus
+	TechStatus string `json:"techStatus"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
+
+	// Updated time
+	UpdatedTime uint64 `json:"updatedTime"`
+
+	// Whether user controlled
+	UserManaged bool `json:"userManaged"`
+}
+
+// List of Groups
+type ListGroups []ItemGroup
+
+// Main information about Group
+type ItemGroup struct {
+	// Amount of computes
+	Computes uint64 `json:"computes"`
+
+	// Consistency
+	Consistency bool `json:"consistency"`
+
+	// Group ID
+	ID uint64 `json:"id"`
+
+	// Group name
+	Name string `json:"name"`
+
+	// Status
+	Status string `json:"status"`
+
+	// TechStatus
+	TechStatus string `json:"techStatus"`
+}
+
+// List of Computes
+type ListComputes []ItemCompute
+
+// Main information about Compute
+type ItemCompute struct {
+	// Account ID
+	AccountID uint64 `json:"accountId"`
+
+	// Architecture
+	Architecture string `json:"arch"`
+
+	// Compute group ID
+	CompGroupID uint64 `json:"compgroupId"`
+
+	// Compute group name
+	CompGroupName string `json:"compgroupName"`
+
+	// compute group role
+	CompGroupRole string `json:"compgroupRole"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Resource group ID
+	RGID uint64 `json:"rgId"`
+
+	// StackID
+	StackID uint64 `json:"stackId"`
+
+	// Status
+	Status string `json:"status"`
+
+	// Tech status
+	TechStatus string `json:"techStatus"`
+}
+
+// List of Snapshot
+type ListSnapshots []ItemSnapshot
+
+// Main information about Snapshot
+type ItemSnapshot struct {
+	// GUID
+	GUID string `json:"guid"`
+
+	// Label
+	Label string `json:"label"`
+
+	// Timestamp
+	Timestamp uint64 `json:"timestamp"`
+
+	// Valid or not
+	Valid bool `json:"valid"`
+}
+
+// List of BasicServices
+type ListBasicServices struct {
+	Data []ItemBasicService `json:"data"`
+
+	EntryCount uint64 `json:"entryCount"`
+}
+
+// Main information about BasicService
+type ItemBasicService struct {
+	// Account ID
+	AccountID uint64 `json:"accountId"`
+
+	// Account name
+	AccountName string `json:"accountName"`
+
+	// Base domain
+	BaseDomain string `json:"baseDomain"`
+
+	// Created by
+	CreatedBy string `json:"createdBy"`
+
+	// Created time
+	CreatedTime uint64 `json:"createdTime"`
+
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
+	// Deleted time
+	DeletedTime uint64 `json:"deletedTime"`
+
+	// Grid ID
+	GID uint64 `json:"gid"`
+
+	// List of group IDs
+	Groups []uint64 `json:"groups"`
+
+	// GUID
+	GUID uint64 `json:"guid"`
+
+	// ID
+	ID uint64 `json:"id"`
+
+	// Name
+	Name string `json:"name"`
+
+	// Milestones
+	Milestones uint64 `json:"milestones"`
+
+	// Parent service ID
+	ParentSrvID uint64 `json:"parentSrvId"`
+
+	// Parent service type
+	ParentSrvType string `json:"parentSrvType"`
+
+	// Resource group ID
+	RGID uint64 `json:"rgId"`
+
+	// Resource group name
+	RGName string `json:"rgName"`
+
+	// List of snapshots
+	Snapshots ListSnapshots `json:"snapshots"`
+
+	// SSH key for connection
+	SSHKey string `json:"sshKey"`
+
+	// SSH user
+	SSHUser string `json:"sshUser"`
+
+	// Status
+	Status string `json:"status"`
+
+	// TechStatus
+	TechStatus string `json:"techStatus"`
+
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
+
+	// Updated time
+	UpdatedTime uint64 `json:"updatedTime"`
+
+	// User Managed or not
+	UserManaged bool `json:"userManaged"`
+}

pkg/cloudbroker/bservice/sorting.go

@@ -0,0 +1,60 @@
+package bservice
+
+import "sort"
+
+// SortByCreatedTime sorts ListBasicServices by the CreatedTime field in ascending order.
+//
+// If inverse param is set to true, the order is reversed.
+func (lbs ListBasicServices) SortByCreatedTime(inverse bool) ListBasicServices {
+	if lbs.EntryCount < 2 {
+		return lbs
+	}
+
+	sort.Slice(lbs.Data, func(i, j int) bool {
+		if inverse {
+			return lbs.Data[i].CreatedTime > lbs.Data[j].CreatedTime
+		}
+
+		return lbs.Data[i].CreatedTime < lbs.Data[j].CreatedTime
+	})
+
+	return lbs
+}
+
+// SortByUpdatedTime sorts ListBasicServices by the UpdatedTime field in ascending order.
+//
+// If inverse param is set to true, the order is reversed.
+func (lbs ListBasicServices) SortByUpdatedTime(inverse bool) ListBasicServices {
+	if lbs.EntryCount < 2 {
+		return lbs
+	}
+
+	sort.Slice(lbs.Data, func(i, j int) bool {
+		if inverse {
+			return lbs.Data[i].UpdatedTime > lbs.Data[j].UpdatedTime
+		}
+
+		return lbs.Data[i].UpdatedTime < lbs.Data[j].UpdatedTime
+	})
+
+	return lbs
+}
+
+// SortByDeletedTime sorts ListBasicServices by the DeletedTime field in ascending order.
+//
+// If inverse param is set to true, the order is reversed.
+func (lbs ListBasicServices) SortByDeletedTime(inverse bool) ListBasicServices {
+	if lbs.EntryCount < 2 {
+		return lbs
+	}
+
+	sort.Slice(lbs.Data, func(i, j int) bool {
+		if inverse {
+			return lbs.Data[i].DeletedTime > lbs.Data[j].DeletedTime
+		}
+
+		return lbs.Data[i].DeletedTime < lbs.Data[j].DeletedTime
+	})
+
+	return lbs
+}

pkg/cloudbroker/compute/change_ip.go

@@ -12,23 +12,23 @@ import (
 type ChangeIPRequest struct {
 	// ID of compute instance
 	// Required: true
-	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
 
 	// Network type
 	// 'EXTNET' for connect to external network directly
 	// 'VINS' for connect to ViNS
 	// Required: true
-	NetType string `url:"netType" json:"netType" validate:"computeNetType"`
+	NetType string `url:"net_type" json:"net_type" validate:"computeNetType"`
 
 	// Network ID for connect to
 	// For EXTNET - external network ID
 	// For VINS - VINS ID
 	// Required: true
-	NetID uint64 `url:"netId" json:"netId" validate:"required"`
+	NetID uint64 `url:"net_id" json:"net_id" validate:"required"`
 
 	// IP address to which we will change the existing one, it must be from the same subnet
 	// Required: true
-	IPAddr string `url:"ipAddr" json:"ipAddr" validate:"required"`
+	IPAddr string `url:"ip_addr" json:"ip_addr" validate:"required"`
 }
 
 // ChangeIP change reserved IP for compute instance

pkg/cloudbroker/compute/change_mac.go

@@ -0,0 +1,46 @@
+package compute
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// ChangeMACRequest struct to change MAC for network
+type ChangeMACRequest struct {
+	// ID of compute instance
+	// Required: true
+	ComputeID uint64 `url:"compute_id" json:"compute_id" validate:"required"`
+
+	// Current mac address
+	// Required: true
+	СurrentMAC string `url:"current_mac_address" json:"current_mac_address" validate:"required"`
+
+	// the MAC address to which we will change the existing one
+	// Required: true
+	NewMAC string `url:"new_mac_address" json:"new_mac_address" validate:"required"`
+}
+
+// ChangeMAC change MAC for compute instance
+func (c Compute) ChangeMAC(ctx context.Context, req ChangeMACRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/compute/changeMac"
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return false, err
+	}
+
+	result, err := strconv.ParseBool(string(res))
+	if err != nil {
+		return false, err
+	}
+
+	return result, nil
+}

pkg/cloudbroker/compute/filter.go

@@ -168,3 +168,164 @@ func (lc ListComputes) FindOne() ItemCompute {
 
 	return lc.Data[0]
 }
+
+// FilterByID returns ListDeletedComputes with specified ID.
+func (lc ListDeletedComputes) FilterByID(id uint64) ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		return ic.ID == id
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// FilterByName returns ListDeletedComputes with specified Name.
+func (lc ListDeletedComputes) FilterByName(name string) ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		return ic.Name == name
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// FilterByStatus returns ListDeletedComputes with specified Status.
+func (lc ListDeletedComputes) FilterByStatus(status string) ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		return ic.Status == status
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// FilterByTechStatus returns ListDeletedComputes with specified TechStatus.
+func (lc ListDeletedComputes) FilterByTechStatus(techStatus string) ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		return ic.TechStatus == techStatus
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// FilterByDiskID return ListDeletedComputes with specified DiskID.
+func (lc ListDeletedComputes) FilterByDiskID(diskID uint64) ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		for _, disk := range ic.Disks {
+			if disk.ID == diskID {
+				return true
+			}
+		}
+		return false
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// FilterByK8SID returns master and worker nodes (ListDeletedComputes) inside specified K8S cluster.
+func (lc ListDeletedComputes) FilterByK8SID(ctx context.Context, k8sID uint64, decortClient interfaces.Caller) (*ListDeletedComputes, error) {
+	caller := k8s.New(decortClient)
+
+	req := k8s.GetRequest{
+		K8SID: k8sID,
+	}
+
+	cluster, err := caller.Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	predicate := func(ic ItemDeletedCompute) bool {
+		for _, info := range cluster.K8SGroups.Masters.DetailedInfo {
+			if info.ID == ic.ID {
+				return true
+			}
+		}
+
+		for _, worker := range cluster.K8SGroups.Workers {
+			for _, info := range worker.DetailedInfo {
+				if info.ID == ic.ID {
+					return true
+				}
+			}
+		}
+
+		return false
+	}
+
+	result := lc.FilterFunc(predicate)
+
+	return &result, nil
+}
+
+// K8SMasters is used to filter master nodes. Best used after FilterByK8SID function.
+func (lc ListDeletedComputes) FilterByK8SMasters() ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		for _, rule := range ic.AntiAffinityRules {
+			if rule.Value == "master" {
+				return true
+			}
+		}
+		return false
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// K8SMasters is used to filter worker nodes. Best used after FilterByK8SID function.
+func (lc ListDeletedComputes) FilterByK8SWorkers() ListDeletedComputes {
+	predicate := func(ic ItemDeletedCompute) bool {
+		for _, rule := range ic.AntiAffinityRules {
+			if rule.Value == "worker" {
+				return true
+			}
+		}
+		return false
+	}
+
+	return lc.FilterFunc(predicate)
+}
+
+// FilterByLBID is used to filter ListDeletedComputes used by specified Load Balancer.
+func (lc ListDeletedComputes) FilterByLBID(ctx context.Context, lbID uint64, decortClient interfaces.Caller) (*ListDeletedComputes, error) {
+	caller := lb.New(decortClient)
+
+	req := lb.GetRequest{
+		LBID: lbID,
+	}
+
+	foundLB, err := caller.Get(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	predicate := func(ic ItemDeletedCompute) bool {
+		return ic.ID == foundLB.PrimaryNode.ComputeID || ic.ID == foundLB.SecondaryNode.ComputeID
+	}
+
+	result := lc.FilterFunc(predicate)
+
+	return &result, nil
+}
+
+// FilterFunc allows filtering ListDeletedComputes based on a user-specified predicate.
+func (lc ListDeletedComputes) FilterFunc(predicate func(ItemDeletedCompute) bool) ListDeletedComputes {
+	var result ListDeletedComputes
+
+	for _, item := range lc.Data {
+		if predicate(item) {
+			result.Data = append(result.Data, item)
+		}
+	}
+
+	result.EntryCount = uint64(len(result.Data))
+
+	return result
+}
+
+// FindOne returns first found ItemDeletedCompute
+// If none was found, returns an empty struct.
+func (lc ListDeletedComputes) FindOne() ItemDeletedCompute {
+	if len(lc.Data) == 0 {
+		return ItemDeletedCompute{}
+	}
+
+	return lc.Data[0]
+}

pkg/cloudbroker/compute/filter_test.go

@@ -9,8 +9,7 @@ var computes = ListComputes{
 		{
 			Disks: []InfoDisk{
 				{
-					ID:      65191,
+					ID: 65191,
-					PCISlot: 6,
 				},
 			},
 			InfoCompute: InfoCompute{
@@ -67,7 +66,7 @@ var computes = ListComputes{
 				MigrationJob:     0,
 				Milestones:       363500,
 				Name:             "test",
-				Pinned:           false,
+				PinnedToStack:    1,
 				RAM:              4096,
 				ReferenceID:      "c7cb19ac-af4a-4067-852f-c5572949207e",
 				Registered:       true,
@@ -92,8 +91,7 @@ var computes = ListComputes{
 		{
 			Disks: []InfoDisk{
 				{
-					ID:      65248,
+					ID: 65248,
-					PCISlot: 6,
 				},
 			},
 			InfoCompute: InfoCompute{
@@ -132,7 +130,7 @@ var computes = ListComputes{
 				MigrationJob:     0,
 				Milestones:       363853,
 				Name:             "compute_2",
-				Pinned:           false,
+				PinnedToStack:    1,
 				RAM:              4096,
 				ReferenceID:      "a542c449-5b1c-4f90-88c5-7bb5f8ae68ff",
 				Registered:       true,
@@ -248,3 +246,244 @@ func TestSortingByCPU(t *testing.T) {
 		t.Fatal("expected 6 CPU cores, found: ", actual.Data[0].CPUs)
 	}
 }
+
+var deleteComputes = ListDeletedComputes{
+	Data: []ItemDeletedCompute{
+		{
+			Disks: []InfoDisk{
+				{
+					ID: 65191,
+				},
+			},
+			InfoCompute: InfoCompute{
+				ACL:           []interface{}{},
+				AccountID:     132847,
+				AccountName:   "std_2",
+				AffinityLabel: "",
+				AffinityRules: []ItemRule{
+					{
+						GUID:     "",
+						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",
+				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,
+			},
+		},
+		{
+			Disks: []InfoDisk{
+				{
+					ID: 65248,
+				},
+			},
+			InfoCompute: InfoCompute{
+				ACL:               []interface{}{},
+				AccountID:         132848,
+				AccountName:       "std_broker",
+				AffinityLabel:     "",
+				AffinityRules:     []ItemRule{},
+				AffinityWeight:    0,
+				AntiAffinityRules: []ItemRule{},
+				Arch:              "X86_64",
+				BootOrder: []string{
+					"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",
+				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 TestFilterDeleteByID(t *testing.T) {
+	actual := deleteComputes.FilterByID(48500).FindOne()
+
+	if actual.ID != 48500 {
+		t.Fatal("expected ID 48500, found: ", actual.ID)
+	}
+
+	actualEmpty := deleteComputes.FilterByID(0)
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterDeleteByName(t *testing.T) {
+	actual := deleteComputes.FilterByName("compute_2").FindOne()
+
+	if actual.Name != "compute_2" {
+		t.Fatal("expected compute with name 'test', found: ", actual.Name)
+	}
+}
+
+func TestFilterDeleteByStatus(t *testing.T) {
+	actual := deleteComputes.FilterByStatus("ENABLED")
+
+	for _, item := range actual.Data {
+		if item.Status != "ENABLED" {
+			t.Fatal("expected ENABLED status, found: ", item.Status)
+		}
+	}
+}
+
+func TestFilterDeleteByTechStatus(t *testing.T) {
+	actual := deleteComputes.FilterByTechStatus("STARTED").FindOne()
+
+	if actual.ID != 48556 {
+		t.Fatal("expected 48556 with STARTED techStatus, found: ", actual.ID)
+	}
+}
+
+func TestFilterDeleteByDiskID(t *testing.T) {
+	actual := deleteComputes.FilterByDiskID(65248).FindOne()
+
+	if actual.ID != 48556 {
+		t.Fatal("expected 48556 with DiskID 65248, found: ", actual.ID)
+	}
+}
+
+func TestFilterDeleteFunc(t *testing.T) {
+	actual := deleteComputes.FilterFunc(func(ic ItemDeletedCompute) bool {
+		return ic.Registered == true
+	})
+
+	if len(actual.Data) != 2 {
+		t.Fatal("expected 2 elements found, actual: ", len(actual.Data))
+	}
+
+	for _, item := range actual.Data {
+		if item.Registered != true {
+			t.Fatal("expected Registered to be true, actual: ", item.Registered)
+		}
+	}
+}
+
+func TestDeleteSortingByCreatedTime(t *testing.T) {
+	actual := deleteComputes.SortByCreatedTime(false)
+
+	if actual.Data[0].Name != "test" {
+		t.Fatal("expected 'test', found: ", actual.Data[0].Name)
+	}
+
+	actual = deleteComputes.SortByCreatedTime(true)
+	if actual.Data[0].Name != "compute_2" {
+		t.Fatal("expected 'compute_2', found: ", actual.Data[0].Name)
+	}
+}
+
+func TestDeleteSortingByCPU(t *testing.T) {
+	actual := deleteComputes.SortByCPU(false)
+
+	if actual.Data[0].CPUs != 4 {
+		t.Fatal("expected 4 CPU cores, found: ", actual.Data[0].CPUs)
+	}
+
+	actual = deleteComputes.SortByCPU(true)
+
+	if actual.Data[0].CPUs != 6 {
+		t.Fatal("expected 6 CPU cores, found: ", actual.Data[0].CPUs)
+	}
+}

pkg/cloudbroker/compute/list.go

@@ -54,6 +54,10 @@ type ListRequest struct {
 	// Required: false
 	CDImageID uint64 `url:"cdImageId,omitempty" json:"cdImageId,omitempty"`
 
+	// Find by stack name
+	// Required: false
+	StackName string `url:"stackName,omitempty" json:"stackName,omitempty"`
+
 	// Find by external network name
 	// Required: false
 	ExtNetName string `url:"extNetName,omitempty" json:"extNetName,omitempty"`

pkg/cloudbroker/compute/list_deleted.go

@@ -60,7 +60,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) (*ListDeletedComputes, error) {
 
 	if err := validators.ValidateRequest(req); err != nil {
 		return nil, validators.ValidationErrors(validators.GetErrors(err))
@@ -73,7 +73,7 @@ func (c Compute) ListDeleted(ctx context.Context, req ListDeletedRequest) (*List
 		return nil, err
 	}
 
-	list := ListComputes{}
+	list := ListDeletedComputes{}
 
 	err = json.Unmarshal(res, &list)
 	if err != nil {

pkg/cloudbroker/compute/mass_repair_boot_fs.go

@@ -1,38 +0,0 @@
-package compute
-
-import (
-	"context"
-	"net/http"
-	"strconv"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// MassRepairBootFSRequest struct to repair boot disk filesystem on several computes
-type MassRepairBootFSRequest struct {
-	// IDs of compute instances which boot file systems will be repaired
-	// Required: true
-	ComputeIDs []uint64 `url:"computeIds" json:"computeIds" validate:"min=1"`
-}
-
-// MassRepairBootFS repairs boot disk filesystem on several computes
-func (c Compute) MassRepairBootFS(ctx context.Context, req MassRepairBootFSRequest) (bool, error) {
-	err := validators.ValidateRequest(req)
-	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudbroker/compute/massRepairBootFs"
-
-	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return false, err
-	}
-
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
-}