v1.14.2

CHANGELOG.md

@@ -1,4 +1,4 @@
-## Version 1.14.0
+## Version 1.14.2
 
 Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами  
 Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены  
@@ -12,38 +12,44 @@
 #### account
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-772 | Вычисляемое поле `UpdatedBy` в структуры ответа `RecordAccount` в cloudapi/account и `InfoAccount` в cloudbroker/account |
+| BGOS-796 | Опциональное поле `CpuAllocationParameter` в структуру запроса `UpdateRequest` в cloudbroker/account |
+| BGOS-790 | Вычисляемое поле `UpdatedBy` в структуру ответа `ItemAccount` в cloudapi/account |
 
 #### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-767 | Метод `CheckComputePlacement`, структура запроса `CheckComputePlacementRequest` и структуры ответа `CheckComputePlacementResult`, `CheckComputePlacementItem`,`CheckComputePlacementError` в cloudbroker/compute |
-| BGOS-771 | Вычисляемое поле `BlockSize` в структуры ответа `ItemDisk` в cloudbroker/compute и в `ItemComputeDisk` в  cloudapi/compute |
+| BGOS-793 | Вычисляемые поля `Aborted` и `BlockcopyAbortJobID` в структуру ответа `RecordCloneAbort` в cloudbroker/compute |
+| BGOS-792 | Структуры ответа `RecordCloneAbort` и `ListCloneAbort` в cloudapi/compute |
+| BGOS-791 | Вычисляемое поле `Independent` в структуру ответа `ItemComputeDisk` в cloudapi/compute и в структуру ответа `ItemDisk` в cloudbroker/compute |
 
 #### disks
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-770 | Опциональное поле `BlockSize` в структуру запроса `UpdateRequest` в cloudbroker/disks |
-| BGOS-770 | Вычисляемое поле `BlockSize` в структуры ответа `ItemDisk`, `ItemDiskUnattached` и `RecordDisk` в cloudapi/disks и в структуры ответа `InfoDisk` и `RecordDisk` в cloudbroker/disks |
+| BGOS-791 | Вычисляемое поле `Independent` в структуры ответа `ItemDisk` и `RecordDisk` в cloudapi/disks и в структуру ответа `RecordDisk` в cloudbroker/disks |
+| BGOS-797 | Вычисляемые поля `ToClean` и `StoragePolicyID` в структуру ответа `ItemDiskUnattached` в cloudapi/disks |
+
+#### image
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-791 | Вычисляемое поле `Independent` в структуру ответа `RecordImage` в cloudapi/image и в структуры ответа `RecordImage` и `ItemImage` в cloudbroker/image |
+
+
+### Изменено
+
+#### compute
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-799 | Минимальное значение поля `MTU` в структуре запроса `NetAttachRequest` в cloudapi/compute и cloudbroker/compute с 1 на 1500 |
+| BGOS-792 | Тип возвращаемого значения метода `CloneAbort` с `bool` на `ListCloneAbort` в cloudapi/compute |
 
 #### node
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-769 | Опциональное поле `ZoneID` в структуру запроса `ListRequest` в cloudbroker/node |
-
-#### SDN external networks
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-694 | Опциональные поля `OperationStatus` и `HypervisorStatus` в структуру запроса `ListRequest` в sdn/external_networks |
-
-#### SDN network object groups
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-749 | Методы `AttachL2ConnectionPorts`, `DetachL2ConnectionPorts` и структуры запросов `AttachL2ConnectionPortsRequest`, `L2PortBindings`, `DetachL2PortBindings`, `DetachL2ConnectionPortsRequest` в sdn/netobjgroups |
+| BGOS-789 | Дефолтное значение поля `Force` в структуре запроса `EnableRequest` в cloudbroker/node с `true` на `false` |
 
 ### Удалено
 
-#### kvmx86
+#### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-773 | Опциональные поля `IS` и `IPAType` из структур запроса `CreateRequest` в cloudapi/kvmx86 и в cloudbroker/kvmx86 |
+| BGOS-793 | Вычисляемое поле `Status` из структуры ответа `RecordCloneAbort` в cloudbroker/compute |

README.md

@@ -467,16 +467,6 @@ type CreateRequest struct {
 	// Node ID
 	// Required: false
 	NodeID uint64 `url:"nodeId,omitempty" json:"nodeId,omitempty"`
-
-	// System name
-	// Required: false
-	IS string `url:"IS,omitempty" json:"IS,omitempty"`
-
-	// Compute purpose
-	// Required: false
-	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
-
-	
 }
 ```
 

internal/validators/custom.go

@@ -86,13 +86,6 @@ func computeModeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, computeModeValues)
 }
 
-// computeDiskTypeValidator is used to validate DiskType field.
-func computeDiskTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, computeDiskTypeValues)
-}
-
 // computeNetTypeValidator is used to validate NetType field.
 func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -151,13 +144,6 @@ func computeDataDisksValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, computeDataDisksValues)
 }
 
-// diskTypeValidator is used to validate Type field.
-func diskTypeValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, diskTypeValues)
-}
-
 // flipgroupClientTypeValidator is used to validate ClientType field.
 func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()

internal/validators/messages.go

@@ -86,12 +86,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeModeValues))
 
-	case "computeDiskType":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(computeDiskTypeValues))
-
 	case "mtu":
 		return fmt.Sprint(prefix, fe.Field(), "must be ", mtuMin, "-", mtuMax)
 
@@ -122,13 +116,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDataDisksValues))
 
-	// Disk Validators
-	case "diskType":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(diskTypeValues))
-
 	// Flipgroup Validators
 	case "flipgroupClientType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",

internal/validators/validator.go

@@ -86,11 +86,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("computeDiskType", computeDiskTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("computeNetType", computeNetTypeValidator)
 	if err != nil {
 		return err
@@ -111,11 +106,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("diskType", diskTypeValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("flipgroupClientType", flipgroupClientTypeValidator)
 	if err != nil {
 		return err

internal/validators/values.go

@@ -14,14 +14,11 @@ var (
 	computeTopologyValues   = []string{"compute", "node"}
 	computePolicyValues     = []string{"RECOMMENDED", "REQUIRED"}
 	computeModeValues       = []string{"EQ", "EN", "ANY"}
-	computeDiskTypeValues   = []string{"D", "B"}
 	computeNetTypeValues    = []string{"EXTNET", "VINS"}
 	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
 	computeOrderValues      = []string{"cdrom", "network", "hd"}
 	computeDataDisksValues  = []string{"KEEP", "DETACH", "DESTROY"}
 
-	diskTypeValues = []string{"B", "T", "D"}
-
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
 	massCreateNetTypeValues = []string{"EXTNET", "VINS", "TRUNK"}
@@ -86,7 +83,7 @@ var (
 )
 
 const (
-	mtuMin = 1
+	mtuMin = 1500
 	mtuMax = 9216
 
 	trunkTagsMin = 1

pkg/cloudapi/account/models.go

@@ -95,6 +95,9 @@ type ItemAccount struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
+	// Deleted by
+	DeletedBy string `json:"deletedBy"`
+
 	// Description
 	Description string `json:"desc"`
 
@@ -107,6 +110,9 @@ type ItemAccount struct {
 	// Status
 	Status string `json:"status"`
 
+	// Updated by
+	UpdatedBy string `json:"updatedBy"`
+
 	// Updated time
 	UpdatedTime uint64 `json:"updatedTime"`
 

pkg/cloudapi/compute/clone_abort.go

@@ -2,8 +2,8 @@ package compute
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -17,22 +17,24 @@ type CloneAbortRequest struct {
 }
 
 // CloneAbort aborts a compute clone
-func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (bool, error) {
+func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (ListCloneAbort, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/clone_abort"
 
 	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
-		return false, err
+		return nil, err
 	}
 
-	result, err := strconv.ParseBool(string(res))
+	var result ListCloneAbort
+
+	err = json.Unmarshal(res, &result)
 	if err != nil {
-		return false, err
+		return nil, err
 	}
 
 	return result, nil

pkg/cloudapi/compute/disk_add.go

@@ -26,13 +26,6 @@ type DiskAddRequest struct {
 	// Required: true
 	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
 
-	// Type of the disk
-	// Should be one of:
-	//	- D
-	//	- B
-	// Required: false
-	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" validate:"omitempty,computeDiskType"`
-
 	// Storage endpoint provider ID
 	// By default the same with boot disk
 	// Required: false

pkg/cloudapi/compute/disk_attach.go

@@ -18,10 +18,6 @@ type DiskAttachRequest struct {
 	// Required: true
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 
-	// Type of the disk B;D
-	// Required: false
-	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" validate:"omitempty,computeDiskType"`
-
 	// Desired PCI slot (hex string, e.g. "0x1A")
 	// Required: false
 	PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`

pkg/cloudapi/compute/models.go

@@ -545,6 +545,9 @@ type RecordCompute struct {
 	// VNC password
 	VNCPassword string `json:"vncPasswd"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	// Required: false
 	ZoneID uint64 `json:"zoneId"`
@@ -840,6 +843,9 @@ type ItemComputeDisk struct {
 	// Image ID
 	ImageID uint64 `json:"imageId"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// List image IDs
 	Images []uint64 `json:"images"`
 
@@ -1235,6 +1241,9 @@ type ItemCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 }
@@ -1376,6 +1385,21 @@ type RecordCloneStatus struct {
 	Status CloneStatus `json:"status"`
 }
 
+// Information about aborted clone disk
+type RecordCloneAbort struct {
+	// Disk ID
+	DiskID uint64 `json:"disk_id"`
+
+	// Aborted
+	Aborted bool `json:"aborted"`
+
+	// Blockcopy abort job ID
+	BlockcopyAbortJobID string `json:"blockcopy_abort_job_id"`
+}
+
+// List of aborted clone disks
+type ListCloneAbort []RecordCloneAbort
+
 type CloneStatus struct {
 	// Type
 	Type int `json:"type"`

pkg/cloudapi/compute/net_attach.go

@@ -39,9 +39,8 @@ type NetAttachRequest struct {
 	// Required: false
 	MACAddr string `url:"mac_addr,omitempty" json:"mac_addr,omitempty"`
 
-	// Used only for EXTNET and DPDK
-	// For DPDK must be 1-9216
-	// For EXTNET must be 1500-9216
+	// Used for EXTNET, TRUNK and DPDK
+	// Must be 1500-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
 

pkg/cloudapi/disks/filter_test.go

@@ -48,7 +48,6 @@ var disks = ListDisks{
 			Snapshots:  []ItemSnapshot{},
 			Status:     "ASSIGNED",
 			TechStatus: techStatusAllocated,
-			Type:       "B",
 			VMID:       48500,
 		},
 		{
@@ -92,7 +91,6 @@ var disks = ListDisks{
 			Snapshots:  []ItemSnapshot{},
 			Status:     "ASSIGNED",
 			TechStatus: techStatusAllocated,
-			Type:       "B",
 			VMID:       48502,
 		},
 	},
@@ -224,7 +222,6 @@ var searchDisks = ListSearchDisks{
 		Snapshots:  []ItemSnapshot{},
 		Status:     "ASSIGNED",
 		TechStatus: techStatusAllocated,
-		Type:       "B",
 		VMID:       48500,
 	},
 	ItemDisk{
@@ -268,7 +265,6 @@ var searchDisks = ListSearchDisks{
 		Snapshots:  []ItemSnapshot{},
 		Status:     "ASSIGNED",
 		TechStatus: techStatusAllocated,
-		Type:       "B",
 		VMID:       48502,
 	},
 }
@@ -407,7 +403,6 @@ var unattachedDisks = ListDisksUnattached{
 			Snapshots:           nil,
 			Status:              "CREATED",
 			TechStatus:          techStatusAllocated,
-			Type:                "D",
 			VMID:                0,
 		},
 		{
@@ -461,7 +456,6 @@ var unattachedDisks = ListDisksUnattached{
 			Snapshots:           nil,
 			Status:              "CREATED",
 			TechStatus:          techStatusAllocated,
-			Type:                "B",
 			VMID:                0,
 		},
 	},

pkg/cloudapi/disks/list.go

@@ -38,10 +38,6 @@ type ListRequest struct {
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
-	// Type of the disks
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
 	// Find by sep ID
 	// Required: false
 	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
@@ -65,6 +61,14 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// ID of the resource group
+	// Required: false
+	RGID uint64 `url:"rg_id,omitempty" json:"rg_id,omitempty"`
+
+	// ID of the compute
+	// Required: false
+	ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
 }
 
 // List gets list of the created disks belonging to an account as a ListDisks struct

pkg/cloudapi/disks/list_deleted.go

@@ -34,10 +34,6 @@ type ListDeletedRequest struct {
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
-	// Type of the disks
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
 	// Sort by one of supported fields, format +|-(field)
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`

pkg/cloudapi/disks/list_types.go

@@ -1,52 +0,0 @@
-package disks
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ListTypesRequest struct to get list types of disks
-type ListTypesRequest struct {
-	// Show detailed disk types by seps
-	// Required: true
-	Detailed bool `url:"detailed" json:"detailed"`
-
-	// 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"`
-}
-
-// ListTypes gets list defined disk types
-func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) (*ListTypes, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudapi/disks/listTypes"
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListTypes{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-}

pkg/cloudapi/disks/list_unattached.go

@@ -26,10 +26,6 @@ type ListUnattachedRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
-	// Type of the disks
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
 	// ID of the account
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`

pkg/cloudapi/disks/models.go

@@ -50,6 +50,9 @@ type ItemDisk struct {
 	// Image ID
 	ImageID uint64 `json:"imageId"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// List of image IDs
 	Images []uint64 `json:"images"`
 
@@ -134,9 +137,6 @@ type ItemDisk struct {
 	// Need to clean before destroy
 	ToClean bool `json:"to_clean"`
 
-	// Type
-	Type string `json:"type"`
-
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 
@@ -283,8 +283,11 @@ type ItemDiskUnattached struct {
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
-	// Type
-	Type string `json:"type"`
+	// Need to clean before destroy
+	ToClean bool `json:"to_clean"`
+
+	// ID of the Storage Policy
+	StoragePolicyID uint64 `json:"storage_policy_id"`
 
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
@@ -429,6 +432,9 @@ type RecordDisk struct {
 	// Image ID
 	ImageID uint64 `json:"imageId"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// List of image IDs
 	Images []uint64 `json:"images"`
 
@@ -513,9 +519,6 @@ type RecordDisk struct {
 	// Need to clean before destroy
 	ToClean bool `json:"to_clean"`
 
-	// Type
-	Type string `json:"type"`
-
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 
@@ -548,11 +551,3 @@ type ItemReplication struct {
 	// VolumeID
 	VolumeID string `json:"volumeId"`
 }
-
-type ListTypes struct {
-	// Data
-	Data []interface{} `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}

pkg/cloudapi/image/models.go

@@ -140,6 +140,9 @@ type RecordImage struct {
 	// ID
 	ID uint64 `json:"id"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// Last modified
 	LastModified uint64 `json:"lastModified"`
 

pkg/cloudapi/rg/models.go

@@ -267,6 +267,9 @@ type ListResourceGroups struct {
 
 // Main information about Access Control List
 type ItemACL struct {
+	// Email
+	Email string `json:"email"`
+
 	// Explicit
 	Explicit bool `json:"explicit"`
 

pkg/cloudbroker/account/update.go

@@ -64,6 +64,10 @@ type UpdateRequest struct {
 	// Default zone ID
 	// Required: false
 	DefaultZoneID uint64 `url:"defaultZoneId,omitempty" json:"defaultZoneId,omitempty"`
+
+	// CPU allocation parameter
+	// Required: false
+	CpuAllocationParameter string `url:"cpu_allocation_parameter,omitempty" json:"cpu_allocation_parameter,omitempty"`
 }
 
 // Update updates an account name and resource types and limits

pkg/cloudbroker/compute/clone_abort.go

@@ -2,8 +2,8 @@ package compute
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
@@ -17,22 +17,24 @@ type CloneAbortRequest struct {
 }
 
 // CloneAbort aborts a compute clone
-func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (bool, error) {
+func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) ([]RecordCloneAbort, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/compute/clone_abort"
 
 	res, err := c.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
 	if err != nil {
-		return false, err
+		return nil, err
 	}
 
-	result, err := strconv.ParseBool(string(res))
+	result := make([]RecordCloneAbort, 0)
+
+	err = json.Unmarshal(res, &result)
 	if err != nil {
-		return false, err
+		return nil, err
 	}
 
 	return result, nil

pkg/cloudbroker/compute/disk_add.go

@@ -31,13 +31,6 @@ type DiskAddRequest struct {
 	// Required: true
 	StoragePolicyID uint64 `url:"storage_policy_id" json:"storage_policy_id" validate:"required"`
 
-	// Type of the disk
-	// Should be one of:
-	//	- D
-	//	- B
-	// Required: false
-	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" validate:"omitempty,computeDiskType"`
-
 	// Pool name
 	// By default will be chosen automatically
 	// Required: false

pkg/cloudbroker/compute/disk_attach.go

@@ -18,10 +18,6 @@ type DiskAttachRequest struct {
 	// Required: true
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 
-	// Type of the disk B;D
-	// Required: false
-	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty"`
-
 	// Desired PCI slot (hex string, e.g. "0x1A")
 	// Required: false
 	PCISlot string `url:"pci_slot,omitempty" json:"pci_slot,omitempty"`

pkg/cloudbroker/compute/models.go

@@ -442,6 +442,9 @@ type ItemDisk struct {
 	// Image ID
 	ImageID uint64 `json:"imageId"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// List image IDs
 	Images []uint64 `json:"images"`
 
@@ -891,6 +894,9 @@ type InfoCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 }
@@ -1178,6 +1184,9 @@ type RecordCompute struct {
 	// VNC password
 	VNCPassword string `json:"vncPasswd"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 
@@ -1469,6 +1478,17 @@ type MigrateStorageItem struct {
 	TargetNodeID uint64 `json:"targetNodeId"`
 }
 
+type RecordCloneAbort struct {
+	// Disk ID
+	DiskID uint64 `json:"disk_id"`
+
+	// Aborted
+	Aborted bool `json:"aborted"`
+
+	// Blockcopy abort job ID
+	BlockcopyAbortJobID string `json:"blockcopy_abort_job_id"`
+}
+
 type RecordCloneStatus struct {
 	// Disk ID
 	DiskID int `json:"disk_id"`

pkg/cloudbroker/compute/net_attach.go

@@ -39,9 +39,8 @@ type NetAttachRequest struct {
 	// Required: false
 	MACAddr string `url:"mac_addr,omitempty" json:"mac_addr,omitempty"`
 
-	// Used only for EXTNET and DPDK
-	// For DPDK must be 1-9216
-	// For EXTNET must be 1500-9216
+	// Used for EXTNET, TRUNK and DPDK
+	// Must be 1500-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
 

pkg/cloudbroker/compute/update.go

@@ -69,6 +69,10 @@ type UpdateRequest struct {
 	// The OS version that will be installed on the virtual machine
 	// Required: false
 	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
+
+	// Priority weight of the compute: higher value means higher priority and later migration
+	// Required: false
+	Weight uint64 `url:"weight,omitempty" json:"weight,omitempty"`
 }
 
 // Update updates some properties of the compute

pkg/cloudbroker/disks/filter_test.go

@@ -59,7 +59,6 @@ var disks = ListDisks{
 					Snapshots:           []ItemSnapshot{},
 					Status:              "ASSIGNED",
 					TechStatus:          "ALLOCATED",
-					Type:                "B",
 					VMID:                48500,
 				},
 			},
@@ -120,7 +119,6 @@ var disks = ListDisks{
 					Snapshots:           []ItemSnapshot{},
 					Status:              "ASSIGNED",
 					TechStatus:          "ALLOCATED",
-					Type:                "B",
 					VMID:                48502,
 				},
 			},

pkg/cloudbroker/disks/list.go

@@ -38,10 +38,6 @@ type ListRequest struct {
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
-	// Type of the disks
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
 	// Find by sep ID
 	// Required: false
 	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`
@@ -65,6 +61,14 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// ID of the resource group
+	// Required: false
+	RGID uint64 `url:"rg_id,omitempty" json:"rg_id,omitempty"`
+
+	// ID of the compute
+	// Required: false
+	ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
 }
 
 // List gets list of the created disks belonging to an account as a ListDisks struct

pkg/cloudbroker/disks/list_deleted.go

@@ -34,10 +34,6 @@ type ListDeletedRequest struct {
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
-	// Type of the disks
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
 	// Sort by one of supported fields, format +|-(field)
 	// Required: false
 	SortBy string `url:"sortBy,omitempty" json:"sortBy,omitempty" validate:"omitempty,sortBy"`

pkg/cloudbroker/disks/list_types.go

@@ -1,53 +0,0 @@
-package disks
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
-)
-
-// ListTypesRequest struct to get list of types of disks
-type ListTypesRequest struct {
-	// Show detailed disk types by seps
-	// Required: false
-	Detailed bool `url:"detailed" json:"detailed"`
-
-	// 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"`
-}
-
-// ListTypes gets list of defined disk types
-func (d Disks) ListTypes(ctx context.Context, req ListTypesRequest) (*ListTypes, error) {
-
-	if err := validators.ValidateRequest(req); err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
-	}
-
-	url := "/cloudbroker/disks/listTypes"
-
-	res, err := d.client.DecortApiCall(ctx, http.MethodPost, url, req)
-	if err != nil {
-		return nil, err
-	}
-
-	list := ListTypes{}
-
-	err = json.Unmarshal(res, &list)
-	if err != nil {
-		return nil, err
-	}
-
-	return &list, nil
-
-}

pkg/cloudbroker/disks/list_unattached.go

@@ -26,10 +26,6 @@ type ListUnattachedRequest struct {
 	// Required: false
 	Status string `url:"status,omitempty" json:"status,omitempty"`
 
-	// Type of the disks
-	// Required: false
-	Type string `url:"type,omitempty" json:"type,omitempty"`
-
 	// ID of the account
 	// Required: false
 	AccountID uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`

pkg/cloudbroker/disks/models.go

@@ -185,9 +185,6 @@ type InfoDisk struct {
 	// Need to clean before destroy
 	ToClean bool `json:"to_clean"`
 
-	// Type
-	Type string `json:"type"`
-
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 
@@ -245,6 +242,9 @@ type RecordDisk struct {
 	// Main information about disk
 	InfoDisk
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	//Updated by
 	UpdatedBy string `json:"updatedBy"`
 
@@ -322,14 +322,6 @@ type ItemSnapshot struct {
 // List snapshots
 type ListSnapshots []ItemSnapshot
 
-type ListTypes struct {
-	// Data
-	Data []interface{} `json:"data"`
-
-	// Entry count
-	EntryCount uint64 `json:"entryCount"`
-}
-
 type MigrateStatus struct {
 	// Type
 	Type int `json:"type"`

pkg/cloudbroker/image/models.go

@@ -53,6 +53,9 @@ type RecordImage struct {
 	// ID
 	ID uint64 `json:"id"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// Last modified
 	LastModified uint64 `json:"lastModified"`
 
@@ -185,6 +188,9 @@ type ItemImage struct {
 	// ID
 	ID uint64 `json:"id"`
 
+	// Independent
+	Independent bool `json:"independent"`
+
 	// Last modified
 	LastModified uint64 `json:"lastModified"`
 

pkg/cloudbroker/kvmx86/create.go

@@ -235,6 +235,11 @@ type CreateRequest struct {
 	// Boot Disk BLK Discard
 	// Required: false
 	BootDiskBLKDiscard interface{} `url:"boot_disk_blkdiscard,omitempty" json:"boot_disk_blkdiscard,omitempty" validate:"omitempty,isBool"`
+
+	// Priority weight of the VM: higher value means higher priority and later migration
+	// Required: false
+	// Default: 1
+	Weight uint64 `url:"weight,omitempty" json:"weight,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudbroker/kvmx86/create_blank.go

@@ -123,6 +123,11 @@ type CreateBlankRequest struct {
 	// Boot Disk BLK Discard
 	// Required: false
 	BootDiskBLKDiscard interface{} `url:"boot_disk_blkdiscard" json:"boot_disk_blkdiscard" validate:"omitempty,isBool"`
+
+	// Priority weight of the VM: higher value means higher priority and later migration
+	// Required: false
+	// Default: 1
+	Weight uint64 `url:"weight,omitempty" json:"weight,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudbroker/kvmx86/mass_create.go

@@ -160,6 +160,11 @@ type MassCreateRequest struct {
 	// Boot Disk BLK Discard
 	// Required: false
 	BootDiskBLKDiscard interface{} `url:"boot_disk_blkdiscard" json:"boot_disk_blkdiscard" validate:"omitempty,isBool"`
+
+	// Priority weight of the VM: higher value means higher priority and later migration
+	// Required: false
+	// Default: 1
+	Weight uint64 `url:"weight,omitempty" json:"weight,omitempty"`
 }
 
 type asyncWrapperMassCreateRequest struct {

pkg/cloudbroker/node/enable.go

@@ -18,9 +18,9 @@ type EnableRequest struct {
 	Message string `url:"message,omitempty" json:"message,omitempty"`
 
 	// Do not check locks, iscsi-sessions or disk-present
-	// Default: true
+	// Default: false
 	// Required: false
-	Force interface{} `url:"force" json:"force" validate:"isBool" `
+	Force interface{} `url:"force" json:"force" validate:"isBool"`
 
 	// Reason
 	// Required: false
@@ -41,7 +41,7 @@ func (n Node) Enable(ctx context.Context, req EnableRequest) (string, error) {
 	}
 
 	if req.Force == nil {
-		req.Force = true
+		req.Force = false
 	}
 
 	reqWrapped := wrapperEnableRequest{
@@ -67,7 +67,7 @@ func (n Node) EnableAsync(ctx context.Context, req EnableRequest) (string, error
 	}
 
 	if req.Force == nil {
-		req.Force = true
+		req.Force = false
 	}
 
 	reqWrapped := wrapperEnableRequest{

pkg/cloudbroker/rg/models.go

@@ -79,6 +79,9 @@ type ListResourceConsumption struct {
 
 // Access Control List
 type ACL struct {
+	// Email
+	Email string `json:"email"`
+
 	// Explicit
 	Explicit bool `json:"explicit"`
 

pkg/cloudbroker/stpolicy/models.go

@@ -22,8 +22,8 @@ type InfoStoragePolicyWithID struct {
 	// Max IOPS for the sotrage policy
 	LimitIOPS uint64 `json:"limit_iops"`
 
-	// ID of the storage policy
-	StoragePolicyID uint64 `json:"storage_policy_id"`
+	// Which accounts and resource groups use the storage policy
+	Usage Usage `json:"usage"`
 }
 
 type ListStoragePolicies struct {

tests/platform_upgrade/request_map.go

@@ -237,7 +237,6 @@ func getRequestsMapCloudAPI() map[string]interface{} {
 		"/restmachine/cloudapi/disks/limitIO":                    disks.LimitIORequest{},
 		"/restmachine/cloudapi/disks/list":                       disks.ListRequest{},
 		"/restmachine/cloudapi/disks/listDeleted":                disks.ListDeletedRequest{},
-		"/restmachine/cloudapi/disks/listTypes":                  disks.ListTypesRequest{},
 		"/restmachine/cloudapi/disks/listUnattached":             disks.ListUnattachedRequest{},
 		"/restmachine/cloudapi/disks/rename":                     disks.RenameRequest{},
 		"/restmachine/cloudapi/disks/replicate":                  disks.ReplicateRequest{},
@@ -673,7 +672,6 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/disks/limitIO":                    disks_cb.LimitIORequest{},
 		"/restmachine/cloudbroker/disks/list":                       disks_cb.ListRequest{},
 		"/restmachine/cloudbroker/disks/listDeleted":                disks_cb.ListDeletedRequest{},
-		"/restmachine/cloudbroker/disks/listTypes":                  disks_cb.ListTypesRequest{},
 		"/restmachine/cloudbroker/disks/listUnattached":             disks_cb.ListUnattachedRequest{},
 		"/restmachine/cloudbroker/disks/rename":                     disks_cb.RenameRequest{},
 		"/restmachine/cloudbroker/disks/present":                    disks_cb.PresentRequest{},