v1.14.0

pkg/cloudapi/account/models.go

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

pkg/cloudapi/disks/models.go

@@ -14,6 +14,9 @@ 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"`
 
@@ -163,6 +166,9 @@ type ItemDiskUnattached struct {
 	// BLK Discard
 	BLKDiscard bool `json:"blkdiscard"`
 
+	// Block size of disk
+	BlockSize string `json:"block_size"`
+
 	// Boot Partition
 	BootPartition uint64 `json:"bootPartition"`
 
@@ -387,6 +393,9 @@ 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,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"`

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

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

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

pkg/cloudbroker/disks/update.go

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

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/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
+}