v1.13.9

v1.13.9

CHANGELOG.md

@@ -1,49 +1,16 @@
-## Version 1.14.0
+## Version 1.13.9
 
 Методы `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` в cloudbroker/image стали deprecated и будут удалены в следующих версиях 
 
 Все методы группы `.SDN()` находятся в альфа-версии.
 
-### Добавлено
+### Исправлено
 
-#### account
+#### rg
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BGOS-772 | Вычисляемое поле `UpdatedBy` в структуры ответа `RecordAccount` в cloudapi/account и `InfoAccount` в cloudbroker/account |
+| BGOS-815 | JSON-тэг у поля `RGID` в структуре ответа `ItemResourceConsumption` с `rgid` на `id` в cloudbroker/rg |
-
-#### compute
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-767 | Метод `CheckComputePlacement`, структура запроса `CheckComputePlacementRequest` и структуры ответа `CheckComputePlacementResult`, `CheckComputePlacementItem`,`CheckComputePlacementError` в cloudbroker/compute |
-| BGOS-771 | Вычисляемое поле `BlockSize` в структуры ответа `ItemDisk` в cloudbroker/compute и в `ItemComputeDisk` в  cloudapi/compute |
-
-#### disks
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-770 | Опциональное поле `BlockSize` в структуру запроса `UpdateRequest` в cloudbroker/disks |
-| BGOS-770 | Вычисляемое поле `BlockSize` в структуры ответа `ItemDisk`, `ItemDiskUnattached` и `RecordDisk` в cloudapi/disks и в структуры ответа `InfoDisk` и `RecordDisk` в cloudbroker/disks |
-
-#### node
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-769 | Опциональное поле `ZoneID` в структуру запроса `ListRequest` в cloudbroker/node |
-
-#### SDN external networks
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-694 | Опциональные поля `OperationStatus` и `HypervisorStatus` в структуру запроса `ListRequest` в sdn/external_networks |
-
-#### SDN network object groups
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-749 | Методы `AttachL2ConnectionPorts`, `DetachL2ConnectionPorts` и структуры запросов `AttachL2ConnectionPortsRequest`, `L2PortBindings`, `DetachL2PortBindings`, `DetachL2ConnectionPortsRequest` в sdn/netobjgroups |
-
-### Удалено
-
-#### kvmx86
-| Идентификатор<br>задачи | Описание |
-| --- | --- |
-| BGOS-773 | Опциональные поля `IS` и `IPAType` из структур запроса `CreateRequest` в cloudapi/kvmx86 и в cloudbroker/kvmx86 |

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 версии платформы
 
 ## Оглавление
 

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": "-",

pkg/cloudapi/account/models.go

@@ -299,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/models.go

@@ -792,9 +792,6 @@ type ItemComputeDisk struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
-	// Block Size
-	BlockSize string `json:"block_size"`
-
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 

pkg/cloudapi/disks/filter_test.go

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

pkg/cloudapi/disks/models.go

@@ -14,9 +14,6 @@ type ItemDisk struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
-	// Block size of disk
-	BlockSize string `json:"block_size"`
-
 	// Computes
 	Computes map[string]string `json:"computes"`
 
@@ -166,9 +163,6 @@ type ItemDiskUnattached struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
-	// Block size of disk
-	BlockSize string `json:"block_size"`
-
 	// Boot Partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -393,9 +387,6 @@ type RecordDisk struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
-	// Block size of disk
-	BlockSize string `json:"block_size"`
-
 	// Computes
 	Computes map[string]string `json:"computes"`
 

pkg/cloudapi/kvmx86/create.go

@@ -183,6 +183,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"`

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

@@ -394,9 +394,6 @@ type ItemDisk struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
-	// Block Size
-	BlockSize string `json:"block_size"`
-
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -1496,20 +1493,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/disks/models.go

@@ -56,9 +56,6 @@ type InfoDisk struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
-	// Block size of disk
-	BlockSize string `json:"block_size"`
-
 	// Boot partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -221,9 +218,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"`
 

pkg/cloudbroker/disks/update.go

@@ -21,10 +21,6 @@ type UpdateRequest struct {
 	// 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

@@ -193,6 +193,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"`

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

@@ -66,7 +66,7 @@ type ItemResourceConsumption struct {
 	ResourceLimits ResourceLimits `json:"resourceLimits"`
 
 	// Resource group ID
-	RGID uint64 `json:"rgid"`
+	RGID uint64 `json:"id"`
 }
 
 type ListResourceConsumption struct {

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

@@ -570,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{},
@@ -1166,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{},