v1.14.1

CHANGELOG.md

@@ -1,53 +1,70 @@
-## Version 1.13.4
+## Version 1.14.1
 
 Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами  
-Метод `ListNodes` в cloudbroker/image стал deprecated и в следующих версиях будет удалён  
 Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены  
-Методы `ComputeCISet`, `ComputeCIUnset`, `GetAudits` в cloudbroker/computeGetAudits и `GetAudits` в cloudbroker/compute стали deprecated и будут удалены в следующих версиях
+Методы `ComputeCISet`, `ComputeCIUnset`, `GetAudits` в cloudbroker/compute и `GetAudits` в cloudapi/compute стали deprecated и будут удалены в следующих версиях  
+Методы `ComputeCISet`, `ComputeCIUnset` в cloudbroker/image стали deprecated и будут удалены в следующих версиях 
 
 Все методы группы `.SDN()` находятся в альфа-версии.
 
 ### Добавлено
 
+#### account
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-780 | Вычисляемое поле `DeletedBy` в структуру ответа `ItemAccount` в cloudapi/account |
+
 #### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-732 | Опциональное поле `NetMask` в структуру запроса `NetAttachRequest` в cloudapi/compute |
+| BGOS-777 | Структура ответа `RecordCloneAbort` в cloudbroker/compute |
-| BGOS-727 | Опциональное поле `Cache` в структуру запроса `DiskAddRequest` в cloudapi/compute и в cloudbroker/compute |
+| BGOS-774 | Опциональное поле `Weight` в структуру запроса `UpdateRequest` в cloudbroker/compute |
-| BGOS-727 | Поле `Cache` в структуры ответа `ItemComputeDisk` в cloudapi/compute и в `ItemDisk` в cloudbroker/compute |
+| BGOS-774 | Вычисляемое поле `Weight` в структуры ответа `InfoCompute` и `RecordCompute` в cloudbroker/compute и в структуры ответа `RecordCompute` и `ItemCompute` в cloudapi/compute |
-
-#### disks
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-725 | Структура запроса `UpdateRequest`, метод `Update` в cloudbroker/disks |
-| BGOS-725 | Опциональное поле `Cache` в структуру запроса `CreateRequest` в cloudapi/disks и в cloudbroker/disks |
-| BGOS-725 | Поле `Cache` в структуру ответа `InfoDisk` в cloudbroker/disks |
-| BGOS-725 | Поле `Cache` в структуры ответа `RecordDisk`,`ItemDisk` в cloudapi/disks |
 
 #### kvmx86
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-727 | Опциональное поле `BootDiskCache` в структуры запроса `CreateRequest`, `CreateBlankRequest` в cloudapi/kvmx86 и в cloudbroker/kvmx86 |
+| BGOS-775 | Опциональное поле `Weight` в структуры запроса `CreateRequest`, `CreateBlankRequest` и `MassCreateRequest` в cloudbroker/kvmx86 |
-| BGOS-727 | Опциональное поле `BootDiskCache` в структуру запроса `MassCreateRequest` в cloudbroker/kvmx86 |
+
+#### rg
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-776 | Вычисляемое поле `Email` в структуры ответа `ItemACL` в cloudapi/rg и в `ACL` в cloudbroker/rg |
+| BGOS-779 | Опциональные поля `RGID` и `ComputeID` в структуру запроса `ListRequest` в cloudapi/rg и в cloudbroker/rg |
+
+#### stpolicy
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-784 | Вычисляемое поле `Usage` в структуру ответа `InfoStoragePolicyWithID` в cloudbroker/stpolicy |
+
 
 ### Изменено
 
-#### bservice
+#### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-728 | Тип полей `Chipset` и `Mode` с обязательного на опциональный в структуре запроса `GroupResizeRequest` в cloudapi/bservice и в cloudbroker/bservice |
+| BGOS-777 | Тип возвращаемого значения метода `CloneAbort` с `bool` на `[]RecordCloneAbort` в cloudbroker/compute |
 
-#### lb
+### Удалено
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-733 | Тип поля `Start` с обязательного на опциональный в структуре запроса `CreateRequest`в cloudapi/lb и в cloudbroker/lb |
 
-#### trunk
+#### compute
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-730 | Тип полей `Name` и `TrunkTags` с обязательного на опциональный в структуре запроса `UpdateRequest` в cloudbroker/trunk |
+| BGOS-781 | Опциональное поле `DiskType` из структур `DiskAddRequest` и `DiskAttachRequest` в cloudapi/compute и в cloudbroker/compute |
+| BGOS-785 | Вычисляемое поле `Type` из структур `ItemDisk`,  `RecordDisk` и `ItemDiskUnattached` в cloudapi/compute и из структуры `InfoDisk` в cloudbroker/compute |
 
-#### user
+#### disks
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-729 | Тип поля `Limit` с обязательного на опциональный в структуре запроса `GetMatchingUsernamesRequest` в cloudbroker/user |
+| BGOS-781 | Структура запросов `ListTypesRequest`, структура ответов `ListTypes`, метод `ListTypes` в cloudapi/disks и в cloudbroker/disks |
+| BGOS-781 | Опциональное поле `Type` из структур `ListRequest`, `ListDeletedRequest` и `ListUnattachedRequest` в cloudapi/disks и в cloudbroker/disks |
+
+#### kvmx86
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-773 | Опциональные поля `IS` и `IPAType` из структур запроса `CreateRequest` в cloudapi/kvmx86 и в cloudbroker/kvmx86 |
+
+#### stpolicy
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-784 | Вычисляемое поле `StoragePolicyID` из структуры ответа `InfoStoragePolicyWithID` в cloudbroker/stpolicy |

README.md

@@ -18,6 +18,7 @@ Decort SDK - это библиотека, написанная на языке G
     - Версия 1.11.х Decort-SDK соответствует 4.3.0 версии платформы
     - Версия 1.12.х Decort-SDK соответствует 4.4.0 версии платформы
     - Версия 1.13.х Decort-SDK соответствует 4.5.0 версии платформы
+    - Версия 1.14.х Decort-SDK соответствует 4.6.0 версии платформы
 
 ## Оглавление
 
@@ -466,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/constants/constants.go

@@ -28,6 +28,7 @@ var FileName = map[string]string{
 var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}
 
 var VersionMap = map[string]string{
+	"4.6.0": "-",
 	"4.5.0": "-",
 	"4.4.0": "-",
 	"4.3.0": "-",

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"}

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"`
 
@@ -299,6 +302,9 @@ type RecordAccount struct {
 	// UniqPools
 	UniqPools []interface{} `json:"uniqPools"`
 
+	// Updated By
+	UpdatedBy string `json:"updatedBy"`
+
 	// Updated time
 	UpdatedTime uint64 `json:"updatedTime"`
 

pkg/cloudapi/bservice/group_add.go

@@ -38,10 +38,6 @@ type GroupAddRequest struct {
 	// Required: true
 	ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
 
-	// Compute driver like a KVM_X86, etc.
-	// Required: true
-	Driver string `url:"driver" json:"driver" validate:"required"`
-
 	// Storage endpoint provider ID
 	// Required: false
 	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`

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
@@ -58,10 +51,6 @@ type DiskAddRequest struct {
 	// Desired bus number (hex string, e.g. "0x03")
 	// Required: false
 	BusNumber string `url:"bus_number,omitempty" json:"bus_number,omitempty"`
-
-	// Disk cache mode
-	// Required: false
-	Cache string `url:"cache,omitempty" json:"cache,omitempty"`
 }
 
 // DiskAdd creates new disk and attach to compute

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"`
@@ -789,6 +792,12 @@ type ItemComputeDisk struct {
 	// Account ID
 	AccountID uint64 `json:"accountId"`
 
+	// BLK Discard
+	BLKDiscard bool `json:"blkdiscard"`
+
+	// Block Size
+	BlockSize string `json:"block_size"`
+
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -1229,6 +1238,9 @@ type ItemCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 }

pkg/cloudapi/compute/net_attach.go

@@ -20,7 +20,7 @@ type NetAttachRequest struct {
 	// 'VFNIC' for connect to vfpool
 	// 'DPDK' for connect to DPDK
 	// `EMPTY` for connect empty network
-	// `SDT` for connect to SDN
+	// `SDN` for connect to SDN
 	// `TRUNK` for connect to TRUNK
 	// Required: true
 	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
@@ -50,6 +50,22 @@ type NetAttachRequest struct {
 	// Required: false
 	NetMask uint64 `url:"netMask,omitempty" json:"netMask,omitempty"`
 
+	// SDN Segment ID
+	// Required: false
+	SDNSegmentID string `url:"sdn_segment_id,omitempty" json:"sdn_segment_id,omitempty"`
+
+	// SDN Object Group ID
+	// Required: false
+	SDNObjectGroupID string `url:"sdn_object_group_id,omitempty" json:"sdn_object_group_id,omitempty"`
+
+	// SDN Logical Port Display Name
+	// Required: false
+	SDNLogicalPortDisplayName string `url:"sdn_logical_port_display_name,omitempty" json:"sdn_logical_port_display_name,omitempty"`
+
+	// SDN Logical Port Description
+	// Required: false
+	SDNLogicalPortDescription string `url:"sdn_logical_port_description,omitempty" json:"sdn_logical_port_description,omitempty"`
+
 	// Unique identifier of logical port on SDN side
 	// Required: false
 	SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"`

pkg/cloudapi/disks/create.go

@@ -37,10 +37,6 @@ type CreateRequest struct {
 	// Pool name to create disk
 	// Required: false
 	Pool string `url:"pool,omitempty" json:"pool,omitempty"`
-
-	// Cache mode of disk
-	// Required: false
-	Cache string `url:"cache,omitempty" json:"cache,omitempty"`
 }
 
 // Create creates a disk

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,
 	},
 }
@@ -360,7 +356,6 @@ func TestListSearchDisks_SortByCreatedTime(t *testing.T) {
 var unattachedDisks = ListDisksUnattached{
 	Data: []ItemDiskUnattached{
 		{
-			CKey: "",
 			Meta: []interface{}{
 				"cloudbroker",
 				"disk",
@@ -412,7 +407,6 @@ var unattachedDisks = ListDisksUnattached{
 			VMID:                0,
 		},
 		{
-			CKey: "",
 			Meta: []interface{}{
 				"cloudbroker",
 				"disk",

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

@@ -11,6 +11,12 @@ type ItemDisk struct {
 	// Account name
 	AccountName string `json:"accountName"`
 
+	// BLK Discard
+	BLKDiscard bool `json:"blkdiscard"`
+
+	// Block size of disk
+	BlockSize string `json:"block_size"`
+
 	// Computes
 	Computes map[string]string `json:"computes"`
 
@@ -128,9 +134,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"`
 
@@ -145,9 +148,6 @@ type ItemDisk struct {
 }
 
 type ItemDiskUnattached struct {
-	// CKey
-	CKey string `json:"_ckey"`
-
 	// Meta
 	Meta []interface{} `json:"_meta"`
 
@@ -160,9 +160,18 @@ type ItemDiskUnattached struct {
 	// Access Control List
 	ACL map[string]interface{} `json:"acl"`
 
+	// BLK Discard
+	BLKDiscard bool `json:"blkdiscard"`
+
+	// Block size of disk
+	BlockSize string `json:"block_size"`
+
 	// Boot Partition
 	BootPartition uint64 `json:"bootPartition"`
 
+	// Cache
+	Cache string `json:"cache"`
+
 	// Created time
 	CreatedTime uint64 `json:"createdTime"`
 
@@ -271,9 +280,6 @@ type ItemDiskUnattached struct {
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
-	// Type
-	Type string `json:"type"`
-
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 }
@@ -378,6 +384,12 @@ type RecordDisk struct {
 	// Account name
 	AccountName string `json:"accountName"`
 
+	// BLK Discard
+	BLKDiscard bool `json:"blkdiscard"`
+
+	// Block size of disk
+	BlockSize string `json:"block_size"`
+
 	// Computes
 	Computes map[string]string `json:"computes"`
 
@@ -495,9 +507,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"`
 
@@ -530,11 +539,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/flipgroup/list.go

@@ -34,10 +34,6 @@ type ListRequest struct {
 	// Required: false
 	AccountId uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
-	// Find by resource group ID
-	// Required: false
-	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
-
 	// Find by id
 	// Required: false
 	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`

pkg/cloudapi/flipgroup/models.go

@@ -85,12 +85,6 @@ type RecordFLIPGroup struct {
 	// Network
 	Network string `json:"network"`
 
-	// Resource group ID
-	RGID uint64 `json:"rgId"`
-
-	// Resource group name
-	RGName string `json:"rgName"`
-
 	// Status
 	Status string `json:"status"`
 

pkg/cloudapi/image/models.go

@@ -92,9 +92,6 @@ type RecordImage struct {
 	// UNCPathj
 	UNCPath string `json:"UNCPath"`
 
-	// CKey
-	CKey string `json:"_ckey"`
-
 	// Account ID
 	AccountID uint64 `json:"accountId"`
 

pkg/cloudapi/kvmx86/create.go

@@ -44,6 +44,22 @@ type Interface struct {
 	// Required: false
 	MAC string `url:"mac,omitempty" json:"mac,omitempty" validate:"omitempty"`
 
+	// SDN Segment ID
+	// Required: false
+	SDNSegmentID string `url:"sdn_segment_id,omitempty" json:"sdn_segment_id,omitempty"`
+
+	// SDN Object Group ID
+	// Required: false
+	SDNObjectGroupID string `url:"sdn_object_group_id,omitempty" json:"sdn_object_group_id,omitempty"`
+
+	// SDN Logical Port Display Name
+	// Required: false
+	SDNLogicalPortDisplayName string `url:"sdn_logical_port_display_name,omitempty" json:"sdn_logical_port_display_name,omitempty"`
+
+	// SDN Logical Port Description
+	// Required: false
+	SDNLogicalPortDescription string `url:"sdn_logical_port_description,omitempty" json:"sdn_logical_port_description,omitempty"`
+
 	// SDN interface id
 	// Required: false
 	SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty"`
@@ -167,14 +183,6 @@ type CreateRequest struct {
 	// Required: false
 	Start bool `url:"start" json:"start"`
 
-	// System name
-	// Required: false
-	IS string `url:"IS,omitempty" json:"IS,omitempty"`
-
-	// Compute purpose
-	// Required: false
-	IPAType string `url:"ipaType,omitempty" json:"ipaType,omitempty"`
-
 	// Custom fields for compute. Must be a dict
 	// Required: false
 	CustomFields string `url:"customFields,omitempty" json:"customFields,omitempty"`
@@ -209,10 +217,6 @@ type CreateRequest struct {
 	// Zone ID
 	// Required: false
 	ZoneID uint64 `url:"zoneId,omitempty" json:"zoneId,omitempty"`
-
-	// Cache mode for boot disk
-	// Required: false
-	BootDiskCache string `url:"boot_disk_cache,omitempty" json:"boot_disk_cache,omitempty"`
 }
 
 // GetRAM returns RAM field values

pkg/cloudapi/kvmx86/create_blank.go

@@ -115,10 +115,6 @@ type CreateBlankRequest struct {
 	// The OS version that will be installed on the virtual machine
 	// Required: false
 	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
-
-	// Cache mode for boot disk
-	// Required: false
-	BootDiskCache string `url:"boot_disk_cache,omitempty" json:"boot_disk_cache,omitempty"`
 }
 
 // GetRAM returns RAM field values

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

@@ -10,6 +10,9 @@ type ListZones struct {
 
 // Detailed information about the zone record
 type RecordZone struct {
+	// If true, all nodes belonging to the given zone will be marked for autostart
+	AutoStart bool `json:"autostart"`
+
 	// ID
 	ID uint64 `json:"id"`
 

pkg/cloudbroker/account/models.go

@@ -215,6 +215,9 @@ type InfoAccount struct {
 	// UniqPools
 	UniqPools []string `json:"uniqPools"`
 
+	// Updated By
+	UpdatedBy string `json:"updatedBy"`
+
 	// UpdatedTime
 	UpdatedTime uint64 `json:"updatedTime"`
 

pkg/cloudbroker/bservice/group_add.go

@@ -38,10 +38,6 @@ type GroupAddRequest struct {
 	// Required: true
 	ImageID uint64 `url:"imageId" json:"imageId" validate:"required"`
 
-	// Compute driver like a KVM_X86, etc.
-	// Required: true
-	Driver string `url:"driver" json:"driver" validate:"required"`
-
 	// Storage endpoint provider ID
 	// Required: false
 	SEPID uint64 `url:"sepId,omitempty" json:"sepId,omitempty"`

pkg/cloudbroker/compute/check_compute_placement.go

@@ -0,0 +1,47 @@
+package compute
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// CheckComputePlacementRequest struct for check compute placement
+type CheckComputePlacementRequest struct {
+	// IDs of compute instances to check
+	// Required: true
+	ComputeIDs []uint64 `url:"compute_ids" json:"compute_ids" validate:"required"`
+
+	// Filter by CPU and RAM when checking placement
+	// Required: false
+	// Default: true
+	FilterByCPURAM interface{} `url:"filter_by_cpu_ram,omitempty" json:"filter_by_cpu_ram,omitempty" validate:"omitempty,isBool"`
+}
+
+// CheckComputePlacement checks compute placement and returns structured result
+func (c Compute) CheckComputePlacement(ctx context.Context, req CheckComputePlacementRequest) (CheckComputePlacementResult, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/compute/check_compute_placement"
+
+	if req.FilterByCPURAM == nil {
+		req.FilterByCPURAM = true
+	}
+
+	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	if err != nil {
+		return nil, err
+	}
+
+	result := make(CheckComputePlacementResult)
+	if err := json.Unmarshal(res, &result); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}

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
@@ -62,6 +55,10 @@ type DiskAddRequest struct {
 	// Disk cache mode
 	// Required: false
 	Cache string `url:"cache,omitempty" json:"cache,omitempty"`
+
+	// BLK Discard
+	// Required: false
+	BLKDiscard interface{} `url:"blkdiscard,omitempty" json:"blkdiscard,omitempty" validate:"omitempty,isBool"`
 }
 
 // DiskAdd creates new disk and attach to compute

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

@@ -391,6 +391,12 @@ type ItemDisk struct {
 	// Access Control List
 	ACL ItemACL `json:"acl"`
 
+	// BLK Discard
+	BLKDiscard bool `json:"blkdiscard"`
+
+	// Block Size
+	BlockSize string `json:"block_size"`
+
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -885,6 +891,9 @@ type InfoCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 }
@@ -1172,6 +1181,9 @@ type RecordCompute struct {
 	// VNC password
 	VNCPassword string `json:"vncPasswd"`
 
+	// Weight
+	Weight uint64 `json:"weight"`
+
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 
@@ -1463,6 +1475,14 @@ type MigrateStorageItem struct {
 	TargetNodeID uint64 `json:"targetNodeId"`
 }
 
+type RecordCloneAbort struct {
+	// Disk ID
+	DiskID uint64 `json:"disk_id"`
+
+	// Abort status
+	Status bool `json:"status"`
+}
+
 type RecordCloneStatus struct {
 	// Disk ID
 	DiskID int `json:"disk_id"`
@@ -1490,3 +1510,20 @@ type CloneStatus struct {
 	// Progress percent
 	ProgressPercent int `json:"progress_percent"`
 }
+
+type CheckComputePlacementError struct {
+	// Code
+	Code int64 `json:"code"`
+
+	// Message
+	Message string `json:"message"`
+}
+
+type CheckComputePlacementItem struct {
+	// Nide IDs
+	NodeIDs []uint64 `json:"node_ids"`
+	// error
+	Error CheckComputePlacementError `json:"error,omitempty"`
+}
+
+type CheckComputePlacementResult map[string]CheckComputePlacementItem

pkg/cloudbroker/compute/net_attach.go

@@ -20,7 +20,7 @@ type NetAttachRequest struct {
 	// 'VFNIC' for connect to vfpool
 	// 'DPDK' for connect to DPDK
 	// `EMPTY` for connect empty network
-	// `SDT` for connect to SDN
+	// `SDN` for connect to SDN
 	// `TRUNK` for connect to TRUNK
 	// Required: true
 	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
@@ -50,6 +50,22 @@ type NetAttachRequest struct {
 	// Required: false
 	NetMask uint64 `url:"netMask,omitempty" json:"netMask,omitempty"`
 
+	// SDN Segment ID
+	// Required: false
+	SDNSegmentID string `url:"sdn_segment_id,omitempty" json:"sdn_segment_id,omitempty"`
+
+	// SDN Object Group ID
+	// Required: false
+	SDNObjectGroupID string `url:"sdn_object_group_id,omitempty" json:"sdn_object_group_id,omitempty"`
+
+	// SDN Logical Port Display Name
+	// Required: false
+	SDNLogicalPortDisplayName string `url:"sdn_logical_port_display_name,omitempty" json:"sdn_logical_port_display_name,omitempty"`
+
+	// SDN Logical Port Description
+	// Required: false
+	SDNLogicalPortDescription string `url:"sdn_logical_port_description,omitempty" json:"sdn_logical_port_description,omitempty"`
+
 	// Unique identifier of logical port on SDN side
 	// Required: false
 	SDNInterfaceID string `url:"sdn_interface_id,omitempty" json:"sdn_interface_id,omitempty" validate:"omitempty"`

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/create.go

@@ -41,6 +41,10 @@ type CreateRequest struct {
 	// Cache mode of disk
 	// Required: false
 	Cache string `url:"cache,omitempty" json:"cache,omitempty"`
+
+	// BLK Discard
+	// Required: false
+	BLKDiscard interface{} `url:"blkdiscard,omitempty" json:"blkdiscard,omitempty" validate:"omitempty,isBool"`
 }
 
 // Create creates a disk

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

@@ -53,6 +53,12 @@ type InfoDisk struct {
 	// Access Control Control
 	ACL map[string]interface{} `json:"acl"`
 
+	// BLK Discard
+	BLKDiscard bool `json:"blkdiscard"`
+
+	// Block size of disk
+	BlockSize string `json:"block_size"`
+
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -179,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"`
 
@@ -215,6 +218,9 @@ type ItemReplication struct {
 // Detailed indormation about disk
 type RecordDisk struct {
 
+	// Block size of disk
+	BlockSize string `json:"block_size"`
+
 	//Created by
 	CreatedBy string `json:"createdBy"`
 
@@ -264,9 +270,6 @@ type SearchListDisks []ItemDisk
 
 // Main information about unattached disk
 type ItemUnattachedDisk struct {
-	// CKey
-	CKey string `json:"_ckey"`
-
 	// Meta
 	Meta []interface{} `json:"_meta"`
 
@@ -316,14 +319,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/disks/update.go

@@ -17,6 +17,14 @@ type UpdateRequest struct {
 	// Cache mode of disk
 	// Required: false
 	Cache string `url:"cache,omitempty" json:"cache,omitempty"`
+
+	// BLK Discard
+	// Required: false
+	BLKDiscard interface{} `url:"blkdiscard,omitempty" json:"blkdiscard,omitempty" validate:"omitempty,isBool"`
+
+	// Block size of disk
+	// Required: false
+	BlockSize string `url:"block_size,omitempty" json:"block_size,omitempty"`
 }
 
 // Update updates disk

pkg/cloudbroker/flipgroup/list.go

@@ -34,10 +34,6 @@ type ListRequest struct {
 	// Required: false
 	AccountId uint64 `url:"accountId,omitempty" json:"accountId,omitempty"`
 
-	// Find by resource group ID
-	// Required: false
-	RGID uint64 `url:"rgId,omitempty" json:"rgId,omitempty"`
-
 	// Find by id
 	// Required: false
 	ByID uint64 `url:"by_id,omitempty" json:"by_id,omitempty"`

pkg/cloudbroker/flipgroup/models.go

@@ -85,12 +85,6 @@ type RecordFLIPGroup struct {
 	// Network
 	Network string `json:"network"`
 
-	// Resource group ID
-	RGID uint64 `json:"rgId"`
-
-	// Resource group name
-	RGName string `json:"rgName"`
-
 	// Status
 	Status string `json:"status"`
 

pkg/cloudbroker/kvmx86/create.go

@@ -57,6 +57,22 @@ type Interface struct {
 	// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
 	// Required: false
 	Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
+
+	// SDN Segment ID
+	// Required: false
+	SDNSegmentID string `url:"sdn_segment_id,omitempty" json:"sdn_segment_id,omitempty"`
+
+	// SDN Object Group ID
+	// Required: false
+	SDNObjectGroupID string `url:"sdn_object_group_id,omitempty" json:"sdn_object_group_id,omitempty"`
+
+	// SDN Logical Port Display Name
+	// Required: false
+	SDNLogicalPortDisplayName string `url:"sdn_logical_port_display_name,omitempty" json:"sdn_logical_port_display_name,omitempty"`
+
+	// SDN Logical Port Description
+	// Required: false
+	SDNLogicalPortDescription string `url:"sdn_logical_port_description,omitempty" json:"sdn_logical_port_description,omitempty"`
 }
 
 // DataDisk detailed struct for DataDisks field in CreateRequest, CreateBlankRequest and MassCreateRequest
@@ -90,6 +106,14 @@ type DataDisk struct {
 	// Specify image id for create disk from template
 	// Required: false
 	ImageID uint64 `url:"imageId,omitempty" json:"imageId,omitempty"`
+
+	// Cache mode for disk
+	// Required: false
+	Cache string `url:"cache,omitempty" json:"cache,omitempty"`
+
+	// BLK Discard
+	// Required: false
+	BLKDiscard interface{} `url:"blkdiscard,omitempty" json:"blkdiscard,omitempty" validate:"omitempty,isBool"`
 }
 
 // CreateRequest struct to create KVM x86 VM
@@ -169,14 +193,6 @@ type CreateRequest struct {
 	// Required: false
 	NodeID uint64 `url:"node_id,omitempty" json:"node_id,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"`
-
 	// Custom fields for Compute. Must be dict
 	// Required: false
 	CustomField string `url:"customFields,omitempty" json:"customFields,omitempty"`
@@ -215,6 +231,15 @@ type CreateRequest struct {
 	// Cache mode for boot disk
 	// Required: false
 	BootDiskCache string `url:"boot_disk_cache,omitempty" json:"boot_disk_cache,omitempty"`
+
+	// 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

@@ -119,6 +119,15 @@ type CreateBlankRequest struct {
 	// Cache mode for boot disk
 	// Required: false
 	BootDiskCache string `url:"boot_disk_cache,omitempty" json:"boot_disk_cache,omitempty"`
+
+	// 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

@@ -14,9 +14,13 @@ type InterfaceMassCreate struct {
 	//	- VINS
 	//	- EXTNET
 	//  - TRUNK
+	//  - SDN
+	// For SDN, one of the fields sdn_interface_id or sdn_segment_id is specified, but not both at the same time
+	// Required: false
 	NetType string `url:"netType" json:"netType" validate:"required,massCreateNetType"`
 
 	// Network ID for connect
+	// Required: false
 	NetID uint64 `url:"netId" json:"netId" validate:"required"`
 
 	// IP address to assign to this VM when connecting to the specified network
@@ -47,6 +51,22 @@ type InterfaceMassCreate struct {
 	// Flag indicating whether this interface is enabled (only for VINS, EXTNET, DPDK, SDN, TRUNK)
 	// Required: false
 	Enabled interface{} `url:"enabled,omitempty" json:"enabled,omitempty" validate:"omitempty,isBool"`
+
+	// SDN Segment ID
+	// Required: false
+	SDNSegmentID string `url:"sdn_segment_id,omitempty" json:"sdn_segment_id,omitempty"`
+
+	// SDN Object Group ID
+	// Required: false
+	SDNObjectGroupID string `url:"sdn_object_group_id,omitempty" json:"sdn_object_group_id,omitempty"`
+
+	// SDN Logical Port Display Name
+	// Required: false
+	SDNLogicalPortDisplayName string `url:"sdn_logical_port_display_name,omitempty" json:"sdn_logical_port_display_name,omitempty"`
+
+	// SDN Logical Port Description
+	// Required: false
+	SDNLogicalPortDescription string `url:"sdn_logical_port_description,omitempty" json:"sdn_logical_port_description,omitempty"`
 }
 
 // MassCreateRequest struct to mass create KVM x86
@@ -136,6 +156,15 @@ type MassCreateRequest struct {
 	// Cache mode for boot disk
 	// Required: false
 	BootDiskCache string `url:"boot_disk_cache,omitempty" json:"boot_disk_cache,omitempty"`
+
+	// 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/autostart.go

@@ -0,0 +1,42 @@
+package node
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// AutoStartRequest struct to set node autostart
+type AutoStartRequest struct {
+	// Node ID
+	// Required: true
+	NodeID uint64 `url:"node_id" json:"node_id" validate:"required"`
+
+	// Auto start
+	// Required: true
+	AutoStart bool `url:"autostart" json:"autostart" validate:"required"`
+}
+
+// AutoStart sets node autostart
+func (n Node) AutoStart(ctx context.Context, req AutoStartRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/node/autostart"
+
+	res, err := n.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/node/list.go

@@ -49,6 +49,10 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by zone ID
+	// Required: false
+	ZoneID uint64 `url:"zone_id,omitempty" json:"zone_id,omitempty"`
 }
 
 // List gets list of all nodes as a ListNodes struct

pkg/cloudbroker/node/maintenance.go

@@ -26,6 +26,11 @@ type MaintenanceRequest struct {
 	// Reason
 	// Required: false
 	Reason string `url:"reason,omitempty" json:"reason,omitempty"`
+
+	// Allow node auto-enable
+	// Default: false
+	// Required: false
+	AutoStart bool `url:"autostart" json:"autostart"`
 }
 
 // Maintenance places node in maintenance state

pkg/cloudbroker/node/models.go

@@ -26,6 +26,9 @@ type RecordNode struct {
 	// Isolated Cpus
 	IsolatedCpus []interface{} `json:"isolatedCpus"`
 
+	// MemAllocationRatio
+	MemAllocationRatio float64 `json:"mem_allocation_ratio"`
+
 	// Name
 	Name string `json:"name"`
 
@@ -85,6 +88,12 @@ type RecordNode struct {
 
 	// CPU used by the node
 	UsableCPUs []string `json:"usable_cpus"`
+
+	// AutoStart
+	AutoStart bool `json:"autostart"`
+
+	// AutoStart Count
+	AutoStartCount uint64 `json:"autostart_count"`
 }
 
 // Resource consumption of the node
@@ -301,6 +310,12 @@ type ItemNode struct {
 
 	// CPU used by the node
 	UsableCPUs []string `json:"usable_cpus"`
+
+	// AutoStart
+	AutoStart bool `json:"autostart"`
+
+	// AutoStart Count
+	AutoStartCount uint64 `json:"autostart_count"`
 }
 
 type PackageInfo struct {

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/sep/del_consumer_nodes.go

@@ -20,8 +20,8 @@ type DelConsumerNodesRequest struct {
 
 	// The force flag must be set to true only if the node will never come back online
 	// Default: false
-	// Required: true
+	// Required: false
-	Force bool `url:"force" json:"force" validate:"required"`
+	Force bool `url:"force" json:"force"`
 }
 
 // DelConsumerNodes excludes consumer nodes from SEP parameters

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
+	// Which accounts and resource groups use the storage policy
-	StoragePolicyID uint64 `json:"storage_policy_id"`
+	Usage Usage `json:"usage"`
 }
 
 type ListStoragePolicies struct {

pkg/cloudbroker/zone/create.go

@@ -17,6 +17,10 @@ type CreateRequest struct {
 	// Description
 	// Required: false
 	Description string `url:"description,omitempty" json:"description,omitempty"`
+
+	// If true, all nodes belonging to the given zone will be marked for autostart
+	// Required: false
+	AutoStart interface{} `url:"autostart,omitempty" json:"autostart,omitempty" validate:"omitempty,isBool"`
 }
 
 // Create creates zone object

pkg/cloudbroker/zone/models.go

@@ -10,6 +10,9 @@ type ListZones struct {
 
 // Detailed information about the zone record
 type RecordZone struct {
+	// If true, all nodes belonging to the given zone will be marked for autostart
+	AutoStart bool `json:"autostart"`
+
 	// ID
 	ID uint64 `json:"id"`
 

pkg/cloudbroker/zone/node_autostart.go

@@ -0,0 +1,43 @@
+package zone
+
+import (
+	"context"
+	"net/http"
+	"strconv"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// NodeAutoStartRequest struct to set node autostart in zone
+type NodeAutoStartRequest struct {
+	// ID of zone
+	// Required: true
+	ZoneID uint64 `url:"zone_id" json:"zone_id" validate:"required"`
+
+	// AutoStart nodes in zone
+	// Required: true
+	AutoStart bool `url:"autostart" json:"autostart" validate:"required"`
+}
+
+// NodeAutoStart sets node autostart in zone
+func (e Zone) NodeAutoStart(ctx context.Context, req NodeAutoStartRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/cloudbroker/zone/node_autostart"
+
+	res, err := e.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/zone/update.go

@@ -21,6 +21,10 @@ type UpdateRequest struct {
 	// Description
 	// Required: false
 	Description string `url:"description,omitempty" json:"description,omitempty"`
+
+	// If true, all nodes belonging to the given zone will be marked for autostart
+	// Required: false
+	AutoStart interface{} `url:"autostart,omitempty" json:"autostart,omitempty" validate:"omitempty,isBool"`
 }
 
 // Update updates zone object

pkg/sdn/extnet/list.go

@@ -62,10 +62,18 @@ type ListRequest struct {
 	// Required: false
 	CreatedFrom string `url:"created_from,omitempty" json:"created_from,omitempty"`
 
-	// Filter lby create date to
+	// Filter by create date to
 	// Required: false
 	CreatedTo string `url:"created_to,omitempty" json:"created_to,omitempty"`
 
+	// Filter by operation status
+	// Required: false
+	OperationStatus string `url:"operation_status,omitempty" json:"operation_status,omitempty"`
+
+	// Filter by hypervisor status
+	// Required: false
+	HypervisorStatus string `url:"hypervisor_status,omitempty" json:"hypervisor_status,omitempty"`
+
 	// Page number for pagination
 	// Required: false
 	Page uint64 `url:"page,omitempty" json:"page,omitempty"`

pkg/sdn/netobjgroups/attach_l2_connection_ports.go

@@ -0,0 +1,62 @@
+package netobjgroups
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// AttachL2ConnectionPortsRequest struct to attach l2 ports to a network object group
+type AttachL2ConnectionPortsRequest struct {
+	// ID of a network object group
+	// Required: true
+	ObjectGroupID string `url:"object_group_id" json:"object_group_id" validate:"required"`
+
+	// ID of an access group
+	// Required: true
+	AccessGroupID string `url:"access_group_id" json:"access_group_id" validate:"required"`
+
+	// Version ID
+	// Required: true
+	VersionID uint64 `url:"version_id" json:"version_id" validate:"required"`
+
+	// Port Bindings
+	// Required: true
+	PortBindings []L2PortBindings `url:"port_bindings" json:"port_bindings" validate:"required,dive"`
+}
+type L2PortBindings struct {
+	// ID of a logical port
+	// Required: true
+	PortID string `url:"port_id" json:"port_id" validate:"required"`
+
+	// Version of a logical port
+	// Required: true
+	PortVersion int64 `url:"port_version" json:"port_version" validate:"required"`
+}
+
+// AttachLogicalPorts attaches l2 ports to a network object group
+func (nog NetworkObjectGroups) AttachL2ConnectionPorts(ctx context.Context, req AttachL2ConnectionPortsRequest) (*RecordVersion, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/sdn/network_object_group/attach_l2_connection_ports"
+
+	res, err := nog.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := RecordVersion{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}

pkg/sdn/netobjgroups/detach_l2_connection_ports.go

@@ -0,0 +1,62 @@
+package netobjgroups
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+// DetachL2ConnectionPortsRequest struct to detach an l2 port from a network object group
+type DetachL2ConnectionPortsRequest struct {
+	// ID of a network object group
+	// Required: true
+	ObjectGroupID string `url:"object_group_id" json:"object_group_id" validate:"required"`
+
+	// ID of an access group
+	// Required: true
+	AccessGroupID string `url:"access_group_id" json:"access_group_id" validate:"required"`
+
+	// Version ID
+	// Required: true
+	VersionID uint64 `url:"version_id" json:"version_id" validate:"required"`
+
+	// Port Bindings
+	// Required: true
+	PortBindings []DetachL2PortBindings `url:"port_bindings" json:"port_bindings" validate:"required,dive"`
+}
+type DetachL2PortBindings struct {
+	// ID of a logical port
+	// Required: true
+	PortID string `url:"port_id" json:"port_id" validate:"required"`
+
+	// Version of a logical port
+	// Required: true
+	PortVersion int64 `url:"port_version" json:"port_version" validate:"required"`
+}
+
+// DetachL2ConnectionPorts detaches logical ports from a network object group
+func (nog NetworkObjectGroups) DetachL2ConnectionPorts(ctx context.Context, req DetachL2ConnectionPortsRequest) (*RecordVersion, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/sdn/network_object_group/detach_l2_connection_ports"
+
+	res, err := nog.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	if err != nil {
+		return nil, err
+	}
+
+	info := RecordVersion{}
+
+	err = json.Unmarshal(res, &info)
+	if err != nil {
+		return nil, err
+	}
+
+	return &info, nil
+}

tests/platform_upgrade/platform_tests_start.sh

@@ -0,0 +1,7 @@
+go test -v -run TestGetListCloudAPI > TestGetListCloudAPI.txt
+go test -v -run TestGetListCloudbroker > TestGetListCloudbroker.txt
+go test -v -run TestGetListSDNAPI > TestGetListSDNAPI.txt
+go test -v -run TestRequestsCloudAPI > TestRequestsCloudAPI.txt
+go test -v -run TestRequestsCloudbroker > TestRequestsCloudbroker.txt
+go test -v -run TestRequestsSDN > TestRequestsSDN.txt
+go test -v -run TestGetAllPaths > TestGetAllPaths.txt

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{},
@@ -570,6 +569,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/compute/cdInsert":                     compute_cb.CDInsertRequest{},
 		"/restmachine/cloudbroker/compute/changeLinkState":              compute_cb.ChangeLinkStateRequest{},
 		"/restmachine/cloudbroker/compute/change_mtu":                   compute_cb.ChangeMTURequest{},
+		"/restmachine/cloudbroker/compute/check_compute_placement":      compute_cb.CheckComputePlacementRequest{},
 		"/restmachine/cloudbroker/compute/change_security_groups":       compute_cb.ChangeSecGroupsRequest{},
 		"/restmachine/cloudbroker/compute/clone":                        compute_cb.CloneRequest{},
 		"/restmachine/cloudbroker/compute/clone_abort":                  compute_cb.CloneAbortRequest{},
@@ -672,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{},
@@ -894,6 +893,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/node/get_logical_cores_count":  node_cb.GetLogicalCoresCountRequest{},
 		"/restmachine/cloudbroker/node/set_cpu_allocation_ratio": node_cb.SetCpuAllocationRatioRequest{},
 		"/restmachine/cloudbroker/node/set_mem_allocation_ratio": node_cb.SetMemAllocationRatioRequest{},
+		"/restmachine/cloudbroker/node/autostart":                node_cb.AutoStartRequest{},
 
 		// pcidevice
 		"/restmachine/cloudbroker/pcidevice/create":  pcidevice_cb.CreateRequest{},
@@ -1092,13 +1092,14 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/vins/migrateToZone":           vins_cb.MigrateToZoneRequest{},
 
 		// zone
-		"/restmachine/cloudbroker/zone/get":     zone_cb.GetRequest{},
+		"/restmachine/cloudbroker/zone/get":            zone_cb.GetRequest{},
-		"/restmachine/cloudbroker/zone/list":    zone_cb.ListRequest{},
+		"/restmachine/cloudbroker/zone/list":           zone_cb.ListRequest{},
-		"/restmachine/cloudbroker/zone/create":  zone_cb.CreateRequest{},
+		"/restmachine/cloudbroker/zone/create":         zone_cb.CreateRequest{},
-		"/restmachine/cloudbroker/zone/delete":  zone_cb.DeleteRequest{},
+		"/restmachine/cloudbroker/zone/delete":         zone_cb.DeleteRequest{},
-		"/restmachine/cloudbroker/zone/update":  zone_cb.UpdateRequest{},
+		"/restmachine/cloudbroker/zone/update":         zone_cb.UpdateRequest{},
-		"/restmachine/cloudbroker/zone/addNode": zone_cb.AddNodeRequest{},
+		"/restmachine/cloudbroker/zone/addNode":        zone_cb.AddNodeRequest{},
-		"/restmachine/cloudbroker/zone/delNode": zone_cb.DelNodeRequest{},
+		"/restmachine/cloudbroker/zone/delNode":        zone_cb.DelNodeRequest{},
+		"/restmachine/cloudbroker/zone/node_autostart": zone_cb.NodeAutoStartRequest{},
 
 		// security policy
 		"/sdn/security_policy/create":    secpolicies.CreateRequest{},
@@ -1163,6 +1164,8 @@ func getRequestsMapSDN() map[string]interface{} {
 		"/restmachine/sdn/network_object_group/get":                           netobjgroups.GetRequest{},
 		"/restmachine/sdn/network_object_group/list":                          netobjgroups.ListRequest{},
 		"/restmachine/sdn/network_object_group/update":                        netobjgroups.UpdateRequest{},
+		"/restmachine/sdn/network_object_group/attach_l2_connection_ports":    netobjgroups.AttachL2ConnectionPortsRequest{},
+		"/restmachine/sdn/network_object_group/detach_l2_connection_ports":    netobjgroups.DetachL2ConnectionPortsRequest{},
 
 		// segments
 		"/restmachine/sdn/segment/create":     segments.CreateRequest{},