v1.13.5

CHANGELOG.md

@@ -1,70 +1,50 @@
-## Version 1.14.1
+## Version 1.13.5
 
 Методы `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/compute и `GetAudits` в cloudapi/compute стали deprecated и будут удалены в следующих версиях  
+Методы `ComputeCISet`, `ComputeCIUnset`, `GetAudits` в cloudbroker/computeGetAudits и `GetAudits` в cloudbroker/compute стали deprecated и будут удалены в следующих версиях  
 Методы `ComputeCISet`, `ComputeCIUnset` в cloudbroker/image стали deprecated и будут удалены в следующих версиях 
 
 Все методы группы `.SDN()` находятся в альфа-версии.
 
 ### Добавлено
 
-#### account
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-780 | Вычисляемое поле `DeletedBy` в структуру ответа `ItemAccount` в cloudapi/account |
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-777 | Структура ответа `RecordCloneAbort` в cloudbroker/compute |
-| BGOS-774 | Опциональное поле `Weight` в структуру запроса `UpdateRequest` в cloudbroker/compute |
-| BGOS-774 | Вычисляемое поле `Weight` в структуры ответа `InfoCompute` и `RecordCompute` в cloudbroker/compute и в структуры ответа `RecordCompute` и `ItemCompute` в cloudapi/compute |
-
-#### kvmx86
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-775 | Опциональное поле `Weight` в структуры запроса `CreateRequest`, `CreateBlankRequest` и `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 |
-
-
-### Изменено
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-777 | Тип возвращаемого значения метода `CloneAbort` с `bool` на `[]RecordCloneAbort` в cloudbroker/compute |
-
-### Удалено
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-781 | Опциональное поле `DiskType` из структур `DiskAddRequest` и `DiskAttachRequest` в cloudapi/compute и в cloudbroker/compute |
-| BGOS-785 | Вычисляемое поле `Type` из структур `ItemDisk`,  `RecordDisk` и `ItemDiskUnattached` в cloudapi/compute и из структуры `InfoDisk` в cloudbroker/compute |
-
 #### disks
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-781 | Структура запросов `ListTypesRequest`, структура ответов `ListTypes`, метод `ListTypes` в cloudapi/disks и в cloudbroker/disks |
+| BGOS-735 | Вычисляемое поле `Cache` в структуры ответа `ItemDiskUnattached` в cloudapi/disks и в cloudbroker/disks |
-| BGOS-781 | Опциональное поле `Type` из структур `ListRequest`, `ListDeletedRequest` и `ListUnattachedRequest` в cloudapi/disks и в cloudbroker/disks |
 
-#### kvmx86
+#### node
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-773 | Опциональные поля `IS` и `IPAType` из структур запроса `CreateRequest` в cloudapi/kvmx86 и в cloudbroker/kvmx86 |
+| BGOS-738 | Структура запроса `AutoStartRequest`, метод `AutoStart` в cloudbroker/node |
+| BGOS-738 | Опциональное поле `AutoStart` в структуру запроса `MaintenanceRequest` в cloudbroker/node |
+| BGOS-738 | Вычисляемые поля `AutoStart`, `AutoStartCount` в структуры ответов `ItemNode` и `RecordNode` в cloudbroker/node |
+| BGOS-743 | Структура запроса `NodeAutoStartRequest`, метод `NodeAutoStart` в cloudbroker/zone |
 
-#### stpolicy
+#### zone
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-784 | Вычисляемое поле `StoragePolicyID` из структуры ответа `InfoStoragePolicyWithID` в cloudbroker/stpolicy |
+| BGOS-737 | Опциональное поле `AutoStart` в структуру запроса `UpdateRequest` в cloudbroker/zone |
+| BGOS-737 | Вычисляемое поле `AutoStart` в структуры ответа `RecordZone` в cloudapi/zone и в cloudbroker/zone |
+
+### Изменено
+
+#### sep
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-740 | Тип поля `Force` с обязательного на опциональный в структуре запроса `DelConsumerNodesRequest` в cloudbroker/sep |
+
+### Удалено
+
+#### bservice
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-739 | Обязательное поле `Driver` в структурах запроса `GroupAddRequest` в cloudapi/bservice и в cloudbroker/bservice |
+
+#### flipgroup
+| Идентификатор<br>задачи | Описание |
+| --- | --- |
+| BGOS-742 | Опциональное поле `RGID` из структуры запроса `ListRequest` в cloudapi/flipgroup и в cloudbroker/flipgroup |
+| BGOS-742 | Вычисляемые поля `RGName` и `RGID` из структуры ответа `RecordFLIPGroup` в cloudapi/flipgroup и в cloudbroker/flipgroup |

README.md

@@ -18,7 +18,6 @@ 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 версии платформы
 
 ## Оглавление
 
@@ -467,6 +466,16 @@ 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,7 +28,6 @@ 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,6 +86,13 @@ 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()
@@ -144,6 +151,13 @@ 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,6 +86,12 @@ 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)
 
@@ -116,6 +122,13 @@ 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,6 +86,11 @@ 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
@@ -106,6 +111,11 @@ 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,11 +14,14 @@ 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,9 +95,6 @@ type ItemAccount struct {
 	// Deleted time
 	DeletedTime uint64 `json:"deletedTime"`
 
-	// Deleted by
-	DeletedBy string `json:"deletedBy"`
-
 	// Description
 	Description string `json:"desc"`
 
@@ -302,9 +299,6 @@ type RecordAccount struct {
 	// UniqPools
 	UniqPools []interface{} `json:"uniqPools"`
 
-	// Updated By
-	UpdatedBy string `json:"updatedBy"`
-
 	// Updated time
 	UpdatedTime uint64 `json:"updatedTime"`
 

pkg/cloudapi/compute/disk_add.go

@@ -26,6 +26,13 @@ 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
@@ -51,6 +58,10 @@ 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,6 +18,10 @@ type DiskAttachRequest struct {
 	// Required: true
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 
+	// Type of the disk B;D
+	// Required: false
+	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty" 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,9 +545,6 @@ type RecordCompute struct {
 	// VNC password
 	VNCPassword string `json:"vncPasswd"`
 
-	// Weight
-	Weight uint64 `json:"weight"`
-
 	// Zone ID
 	// Required: false
 	ZoneID uint64 `json:"zoneId"`
@@ -792,12 +789,6 @@ 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"`
 
@@ -1238,9 +1229,6 @@ 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
-	// `SDN` for connect to SDN
+	// `SDT` for connect to SDN
 	// `TRUNK` for connect to TRUNK
 	// Required: true
 	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
@@ -50,22 +50,6 @@ 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,6 +37,10 @@ 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,6 +48,7 @@ var disks = ListDisks{
 			Snapshots:  []ItemSnapshot{},
 			Status:     "ASSIGNED",
 			TechStatus: techStatusAllocated,
+			Type:       "B",
 			VMID:       48500,
 		},
 		{
@@ -91,6 +92,7 @@ var disks = ListDisks{
 			Snapshots:  []ItemSnapshot{},
 			Status:     "ASSIGNED",
 			TechStatus: techStatusAllocated,
+			Type:       "B",
 			VMID:       48502,
 		},
 	},
@@ -222,6 +224,7 @@ var searchDisks = ListSearchDisks{
 		Snapshots:  []ItemSnapshot{},
 		Status:     "ASSIGNED",
 		TechStatus: techStatusAllocated,
+		Type:       "B",
 		VMID:       48500,
 	},
 	ItemDisk{
@@ -265,6 +268,7 @@ var searchDisks = ListSearchDisks{
 		Snapshots:  []ItemSnapshot{},
 		Status:     "ASSIGNED",
 		TechStatus: techStatusAllocated,
+		Type:       "B",
 		VMID:       48502,
 	},
 }
@@ -356,6 +360,7 @@ func TestListSearchDisks_SortByCreatedTime(t *testing.T) {
 var unattachedDisks = ListDisksUnattached{
 	Data: []ItemDiskUnattached{
 		{
+			CKey: "",
 			Meta: []interface{}{
 				"cloudbroker",
 				"disk",
@@ -407,6 +412,7 @@ var unattachedDisks = ListDisksUnattached{
 			VMID:                0,
 		},
 		{
+			CKey: "",
 			Meta: []interface{}{
 				"cloudbroker",
 				"disk",

pkg/cloudapi/disks/list.go

@@ -38,6 +38,10 @@ 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"`
@@ -61,14 +65,6 @@ 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,6 +34,10 @@ 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

@@ -0,0 +1,52 @@
+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,6 +26,10 @@ 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,12 +11,6 @@ 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"`
 
@@ -134,6 +128,9 @@ 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"`
 
@@ -148,6 +145,9 @@ type ItemDisk struct {
 }
 
 type ItemDiskUnattached struct {
+	// CKey
+	CKey string `json:"_ckey"`
+
 	// Meta
 	Meta []interface{} `json:"_meta"`
 
@@ -160,12 +160,6 @@ 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"`
 
@@ -280,6 +274,9 @@ type ItemDiskUnattached struct {
 	// Tech status
 	TechStatus string `json:"techStatus"`
 
+	// Type
+	Type string `json:"type"`
+
 	// Virtual machine ID
 	VMID uint64 `json:"vmid"`
 }
@@ -384,12 +381,6 @@ 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"`
 
@@ -507,6 +498,9 @@ 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"`
 
@@ -539,3 +533,11 @@ 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

@@ -92,6 +92,9 @@ 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,22 +44,6 @@ 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"`
@@ -183,6 +167,14 @@ 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"`
@@ -217,6 +209,10 @@ 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,6 +115,10 @@ 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,9 +267,6 @@ 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/models.go

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

pkg/cloudbroker/compute/check_compute_placement.go

@@ -1,47 +0,0 @@
-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,24 +17,22 @@ type CloneAbortRequest struct {
 }
 
 // CloneAbort aborts a compute clone
-func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) ([]RecordCloneAbort, error) {
+func (c Compute) CloneAbort(ctx context.Context, req CloneAbortRequest) (bool, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return nil, validators.ValidationErrors(validators.GetErrors(err))
+		return false, 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 nil, err
+		return false, err
 	}
 
-	result := make([]RecordCloneAbort, 0)
+	result, err := strconv.ParseBool(string(res))
-
-	err = json.Unmarshal(res, &result)
 	if err != nil {
-		return nil, err
+		return false, err
 	}
 
 	return result, nil

pkg/cloudbroker/compute/disk_add.go

@@ -31,6 +31,13 @@ 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
@@ -55,10 +62,6 @@ 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,6 +18,10 @@ type DiskAttachRequest struct {
 	// Required: true
 	DiskID uint64 `url:"diskId" json:"diskId" validate:"required"`
 
+	// Type of the disk B;D
+	// Required: false
+	DiskType string `url:"diskType,omitempty" json:"diskType,omitempty"`
+
 	// 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,12 +391,6 @@ 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"`
 
@@ -891,9 +885,6 @@ type InfoCompute struct {
 	// VINS connected
 	VINSConnected uint64 `json:"vinsConnected"`
 
-	// Weight
-	Weight uint64 `json:"weight"`
-
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 }
@@ -1181,9 +1172,6 @@ type RecordCompute struct {
 	// VNC password
 	VNCPassword string `json:"vncPasswd"`
 
-	// Weight
-	Weight uint64 `json:"weight"`
-
 	// Zone ID
 	ZoneID uint64 `json:"zoneId"`
 
@@ -1475,14 +1463,6 @@ 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"`
@@ -1510,20 +1490,3 @@ 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
-	// `SDN` for connect to SDN
+	// `SDT` for connect to SDN
 	// `TRUNK` for connect to TRUNK
 	// Required: true
 	NetType string `url:"netType" json:"netType" validate:"computex86NetType"`
@@ -50,22 +50,6 @@ 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,10 +69,6 @@ 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,10 +41,6 @@ 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,6 +59,7 @@ var disks = ListDisks{
 					Snapshots:           []ItemSnapshot{},
 					Status:              "ASSIGNED",
 					TechStatus:          "ALLOCATED",
+					Type:                "B",
 					VMID:                48500,
 				},
 			},
@@ -119,6 +120,7 @@ var disks = ListDisks{
 					Snapshots:           []ItemSnapshot{},
 					Status:              "ASSIGNED",
 					TechStatus:          "ALLOCATED",
+					Type:                "B",
 					VMID:                48502,
 				},
 			},

pkg/cloudbroker/disks/list.go

@@ -38,6 +38,10 @@ 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"`
@@ -61,14 +65,6 @@ 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,6 +34,10 @@ 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

@@ -0,0 +1,53 @@
+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,6 +26,10 @@ 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,12 +53,6 @@ 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"`
 
@@ -185,6 +179,9 @@ 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"`
 
@@ -218,9 +215,6 @@ 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"`
 
@@ -270,6 +264,9 @@ type SearchListDisks []ItemDisk
 
 // Main information about unattached disk
 type ItemUnattachedDisk struct {
+	// CKey
+	CKey string `json:"_ckey"`
+
 	// Meta
 	Meta []interface{} `json:"_meta"`
 
@@ -319,6 +316,14 @@ 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,14 +17,6 @@ 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/kvmx86/create.go

@@ -57,22 +57,6 @@ 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
@@ -106,14 +90,6 @@ 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
@@ -193,6 +169,14 @@ 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"`
@@ -231,15 +215,6 @@ 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,15 +119,6 @@ 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,13 +14,9 @@ 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
@@ -51,22 +47,6 @@ 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
@@ -156,15 +136,6 @@ 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/list.go

@@ -49,10 +49,6 @@ 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/models.go

@@ -26,9 +26,6 @@ type RecordNode struct {
 	// Isolated Cpus
 	IsolatedCpus []interface{} `json:"isolatedCpus"`
 
-	// MemAllocationRatio
-	MemAllocationRatio float64 `json:"mem_allocation_ratio"`
-
 	// Name
 	Name string `json:"name"`
 

pkg/cloudbroker/rg/models.go

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

pkg/cloudbroker/zone/create.go

@@ -17,10 +17,6 @@ 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/sdn/extnet/list.go

@@ -62,18 +62,10 @@ type ListRequest struct {
 	// Required: false
 	CreatedFrom string `url:"created_from,omitempty" json:"created_from,omitempty"`
 
-	// Filter by create date to
+	// Filter lby 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

@@ -1,62 +0,0 @@
-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

@@ -1,62 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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,6 +237,7 @@ 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{},
@@ -569,7 +570,6 @@ 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,6 +672,7 @@ 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{},
@@ -1164,8 +1165,6 @@ 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{},