v1.14.3

pkg/cloudapi/compute/abort_shared_snapshot_merge.go

@@ -3,7 +3,6 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
@@ -20,23 +19,18 @@ type AbortSharedSnapshotMergeRequest struct {
 }
 
 // AbortSharedSnapshotMerge shared snapshots merge abort
-func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (bool, error) {
+func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudapi/compute/abort_shared_snapshot_merge"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
+	return string(res), nil
 }

pkg/cloudapi/compute/models.go

@@ -882,6 +882,9 @@ type ItemComputeDisk struct {
 	// Present to
 	PresentTo map[string]uint64 `json:"presentTo"`
 
+	// Provision
+	Provision string `json:"provision"`
+
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
 

pkg/cloudapi/disks/models.go

@@ -89,6 +89,9 @@ type ItemDisk struct {
 	// Present to
 	PresentTo map[string]uint64 `json:"presentTo"`
 
+	// Provision
+	Provision string `json:"provision"`
+
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
 
@@ -241,6 +244,9 @@ type ItemDiskUnattached struct {
 	// Present to
 	PresentTo map[string]uint64 `json:"presentTo"`
 
+	// Provision
+	Provision string `json:"provision"`
+
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
 
@@ -471,6 +477,9 @@ type RecordDisk struct {
 	// Present to
 	PresentTo map[string]uint64 `json:"presentTo"`
 
+	// Provision
+	Provision string `json:"provision"`
+
 	// Purge time
 	PurgeTime uint64 `json:"purgeTime"`
 

pkg/cloudapi/kvmx86/create.go

@@ -30,8 +30,8 @@ type Interface struct {
 	// Required: false
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
 
-	// Maximum transmission unit, must be 1-9216
-	// Used only to DPDK net type
+	// Used for EXTNET, TRUNK and DPDK
+	// Must be 1500-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
 

pkg/cloudapi/zone/models.go

@@ -47,7 +47,7 @@ type RecordZone struct {
 	K8SIDs []uint64 `json:"k8sIds"`
 
 	// List of associated LB IDs
-	LBIDs []uint64 `json:"lbIds"`
+	LBIDs []uint64 `json:"lbsIds"`
 
 	// Status
 	Status string `json:"status"`

pkg/cloudbroker/compute/abort_shared_snapshot_merge.go

@@ -3,7 +3,6 @@ package compute
 import (
 	"context"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
@@ -20,23 +19,18 @@ type AbortSharedSnapshotMergeRequest struct {
 }
 
 // AbortSharedSnapshotMerge shared snapshots merge abort
-func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (bool, error) {
+func (c Compute) AbortSharedSnapshotMerge(ctx context.Context, req AbortSharedSnapshotMergeRequest) (string, error) {
 	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, validators.ValidationErrors(validators.GetErrors(err))
+		return "", validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/compute/abort_shared_snapshot_merge"
 
 	res, err := c.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return false, err
+		return "", err
 	}
 
-	result, err := strconv.ParseBool(string(res))
-	if err != nil {
-		return false, err
-	}
-
-	return result, nil
+	return string(res), nil
 }

pkg/cloudbroker/compute/models.go

@@ -481,6 +481,9 @@ type ItemDisk struct {
 	// Present to
 	PresentTo map[string]uint64 `json:"presentTo"`
 
+	// Provision
+	Provision string `json:"provision"`
+
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
 

pkg/cloudbroker/disks/models.go

@@ -131,6 +131,9 @@ type InfoDisk struct {
 	// Present to
 	PresentTo map[string]uint64 `json:"presentTo"`
 
+	// Provision
+	Provision string `json:"provision"`
+
 	// Purge attempts
 	PurgeAttempts uint64 `json:"purgeAttempts"`
 

pkg/cloudbroker/kvmx86/create.go

@@ -28,8 +28,8 @@ type Interface struct {
 	// Required: false
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
 
-	// Maximum transmission unit, must be 1-9216
-	// Used only to DPDK net type
+	// Used for EXTNET, TRUNK and DPDK
+	// Must be 1500-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
 

pkg/cloudbroker/kvmx86/mass_create.go

@@ -27,8 +27,8 @@ type InterfaceMassCreate struct {
 	// Required: false
 	IPAddr string `url:"ipAddr,omitempty" json:"ipAddr,omitempty"`
 
-	// Maximum transmission unit, must be 1-9216
-	// Used only to DPDK net type
+	// Used for EXTNET, TRUNK and DPDK
+	// Must be 1500-9216
 	// Required: false
 	MTU uint64 `url:"mtu,omitempty" json:"mtu,omitempty" validate:"omitempty,mtu"`
 

pkg/cloudbroker/node/get_logical_cores_count.go

@@ -13,6 +13,10 @@ type GetLogicalCoresCountRequest struct {
 	// Node ID
 	// Required: true
 	NodeId uint64 `url:"node_id" json:"node_id" validate:"required"`
+
+	// Target
+	// Required: false
+	Target string `url:"target,omitempty" json:"target,omitempty" validate:"omitempty,oneof=core node"`
 }
 
 // GetLogicalCoresCount get logical cores count by node
@@ -24,7 +28,7 @@ func (i Node) GetLogicalCoresCount(ctx context.Context, req GetLogicalCoresCount
 
 	url := "/cloudbroker/node/get_logical_cores_count"
 
-	res, err := i.client.DecortApiCall(ctx, http.MethodPost, url, req)
+	res, err := i.client.DecortApiCall(ctx, http.MethodGet, url, req)
 	if err != nil {
 		return 0, err
 	}

pkg/cloudbroker/rg/update.go

@@ -51,6 +51,10 @@ type UpdateRequest struct {
 	// Storage policies
 	// Required: false
 	StoragePolicies []StoragePolicy `url:"-" json:"storage_policies,omitempty"`
+
+	// CPU allocation parameter
+	// Required: false
+	CPUAllocationParameter string `url:"cpu_allocation_parameter,omitempty" json:"cpu_allocation_parameter,omitempty"`
 }
 
 // Update updates resource group

pkg/sdn/logicalports/create.go

@@ -9,6 +9,12 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
+// Label struct
+type CreateLabels struct {
+	VMID   string `url:"vm_id,omitempty" json:"vm_id,omitempty"`
+	VMName string `url:"vm_name,omitempty" json:"vm_name,omitempty"`
+}
+
 // CreateRequest struct to create logical port
 type CreateRequest struct {
 	// ID of the access group
@@ -27,10 +33,6 @@ type CreateRequest struct {
 	// Required: true
 	Enabled interface{} `url:"enabled" json:"enabled" validate:"required,isBool"`
 
-	// Is excluded from firewall. True or False
-	// Required: true
-	IsExcludedFromFirewall interface{} `url:"is_excluded_from_firewall" json:"is_excluded_from_firewall" validate:"required,isBool"`
-
 	// Hypervisor
 	// Required: true
 	Hypervisor string `url:"hypervisor" json:"hypervisor" validate:"required"`
@@ -54,6 +56,10 @@ type CreateRequest struct {
 	// Logical port addresses
 	// Required: false
 	LogicalPortAddresses []LogicalPortAddress `url:"logical_port_addresses,omitempty" json:"logical_port_addresses,omitempty" validate:"dive"`
+
+	// Labels
+	// Required: false
+	Labels CreateLabels `url:"labels,omitempty" json:"labels,omitempty"`
 }
 
 // LogicalPortAddressRequest struct representing logical port address

pkg/sdn/logicalports/create_batch.go

@@ -0,0 +1,134 @@
+package logicalports
+
+import (
+	"context"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type CreateBatchLogicalPortAddress struct {
+	// IP
+	// Required: true
+	IP string `url:"ip" json:"ip" validate:"required"`
+
+	// IP Type
+	// Required: true
+	IPType string `url:"ip_type" json:"ip_type" validate:"required"`
+
+	// Is Discovered
+	// Required: true
+	IsDiscovered bool `url:"is_discovered" json:"is_discovered" validate:"required"`
+
+	// Is Primary
+	// Required: true
+	IsPrimary bool `url:"is_primary" json:"is_primary" validate:"required"`
+
+	// MAC
+	// Required: false
+	MAC string `url:"mac,omitempty" json:"mac,omitempty"`
+}
+
+type CreateBatchBindings struct {
+	// Address Detection
+	// Required: true
+	AddressDetection bool `url:"address_detection" json:"address_detection" validate:"required"`
+
+	// Logical Port Address
+	// Required: true
+	LogicalPortAddresses []CreateBatchLogicalPortAddress `url:"logical_port_addresses" json:"logical_port_addresses" validate:"required,dive"`
+
+	// Port Security
+	// Required: true
+	PortSecurity bool `url:"port_security" json:"port_security" validate:"required"`
+
+	// Segment ID
+	// Required: true
+	SegmentID string `url:"segment_id" json:"segment_id" validate:"required"`
+}
+
+type CreateBatchLabels struct {
+	// VM ID
+	// Required: false
+	VMID string `url:"vm_id,omitempty" json:"vm_id,omitempty"`
+
+	// VM Name
+	// Required: false
+	VMName string `url:"vm_name,omitempty" json:"vm_name,omitempty"`
+}
+
+type NetObjectGroups struct {
+	// ID
+	// Required: true
+	ID string `url:"id" json:"id" validate:"required"`
+
+	// Version ID
+	// Required: true
+	VersionID uint64 `url:"version_id" json:"version_id" validate:"required"`
+}
+
+type Ports struct {
+	// Adapter MAC
+	// Required: false
+	AdapterMAC string `url:"adapter_mac,omitempty" json:"adapter_mac,omitempty"`
+
+	// Bindings
+	// Required: true
+	Bindings CreateBatchBindings `url:"bindings" json:"bindings" validate:"required"`
+
+	// Description
+	// Required: true
+	Description string `url:"description" json:"description" validate:"required"`
+
+	// Display Name
+	// Required: true
+	DisplayName string `url:"display_name" json:"display_name" validate:"required"`
+
+	// Enabled
+	// Required: true
+	Enabled bool `url:"enabled" json:"enabled" validate:"required"`
+
+	// Hypervisor
+	// Required: true
+	Hypervisor string `url:"hypervisor" json:"hypervisor" validate:"required"`
+
+	// Net Object Groups
+	// Required: false
+	NetObjectGroups []NetObjectGroups `json:"net_object_groups" validate:"required,dive"`
+
+	// Labels
+	// Required: false
+	Labels []CreateBatchLabels `url:"labels,omitempty" json:"labels,omitempty" validate:"required,dive"`
+
+	// Unique Identifier
+	// Required: false
+	UniqueIdentifier string `url:"unique_identifier,omitempty" json:"unique_identifier,omitempty"`
+}
+
+// CreateBatchRequest struct to create a batch of logical ports
+type CreateBatchRequest struct {
+	// Access Group ID
+	// Required: true
+	AccessGroupID string `url:"access_group_id" json:"access_group_id" validate:"required"`
+
+	// Ports
+	// Required: true
+	Ports []Ports `json:"ports" validate:"required,dive"`
+}
+
+// CreateBatch creates a batch of logical ports
+func (lp LogicalPorts) CreateBatch(ctx context.Context, req CreateBatchRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+	url := "/sdn/logical_port/create_batch"
+
+	_, err = lp.client.DecortApiCallCtype(ctx, http.MethodPost, url, constants.MIMEJSON, req)
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}

pkg/sdn/logicalports/delete_batch.go

@@ -0,0 +1,50 @@
+package logicalports
+
+import (
+	"context"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type PortsInfo struct {
+	// Force
+	// Required: true
+	Force bool `url:"force" json:"force" validate:"required"`
+
+	// ID
+	// Required: true
+	ID string `url:"id" json:"id" validate:"required"`
+
+	// Version ID
+	// Required: true
+	VersionID uint64 `url:"version_id" json:"version_id" validate:"required"`
+}
+
+// DeleteBatchRequest struct to delete a batch of logical ports
+type DeleteBatchRequest struct {
+	// Access Group ID
+	// Required: true
+	AccessGroupID string `url:"access_group_id" json:"access_group_id" validate:"required"`
+
+	// Ports Info
+	// Required: true
+	PortsInfo []PortsInfo `json:"ports_info" validate:"required,dive"`
+}
+
+// DeleteBatch deletes a batch of logical ports
+func (lp LogicalPorts) DeleteBatch(ctx context.Context, req DeleteBatchRequest) (bool, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return false, validators.ValidationErrors(validators.GetErrors(err))
+	}
+	url := "/sdn/logical_port/delete_batch"
+
+	_, err = lp.client.DecortApiCallCtype(ctx, http.MethodDelete, url, constants.MIMEJSON, req)
+	if err != nil {
+		return false, err
+	}
+
+	return true, nil
+}

pkg/sdn/logicalports/exclude_firewall.go

@@ -0,0 +1,63 @@
+package logicalports
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type LogicalPortsForExcludeFromFirewall struct {
+	// Exclude IP Addresses
+	// Required: true
+	ExcludeIPAddresses bool `url:"exclude_ip_addresses" json:"exclude_ip_addresses" validate:"required"`
+
+	// ID
+	// Required: true
+	ID string `url:"id" json:"id" validate:"required"`
+
+	// Version ID
+	// Required: true
+	VersionID uint64 `url:"version_id" json:"version_id" validate:"required"`
+}
+
+// ExcludeFirewallRequest struct to exclude firewall for logical port
+type ExcludeFirewallRequest struct {
+	// Access Group ID
+	// Required: true
+	AccessGroupID string `url:"access_group_id" json:"access_group_id" validate:"required"`
+
+	// Logical Ports For Exclude From Firewall
+	// Required: true
+	LogicalPortsForExcludeFromFirewall []LogicalPortsForExcludeFromFirewall `json:"logical_ports_for_exclude_from_firewall" validate:"required,dive"`
+
+	// Exclusion Reason
+	// Required: false
+	ExclusionReason string `url:"exclusion_reason,omitempty" json:"exclusion_reason,omitempty"`
+}
+
+// ExcludeFirewall excludes firewall from a logical port
+func (lp LogicalPorts) ExcludeFirewall(ctx context.Context, req ExcludeFirewallRequest) (*RecordVersion, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/sdn/logical_port/exclude_firewall"
+
+	res, err := lp.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/logicalports/list.go

@@ -70,6 +70,14 @@ type ListRequest struct {
 	// 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"`
@@ -87,7 +95,7 @@ type ListRequest struct {
 	SortOrder string `url:"sort_order,omitempty" json:"sort_order,omitempty"`
 }
 
-// List of logical portts
+// List of logical ports
 func (i LogicalPorts) List(ctx context.Context, req ListRequest) (*LogicalPortsList, error) {
 	res, err := i.ListRaw(ctx, req)
 	if err != nil {

pkg/sdn/logicalports/models.go

@@ -43,6 +43,9 @@ type LogicalPort struct {
 	// Hypervisor display name
 	HypervisorDisplayName string `json:"hypervisor_display_name"`
 
+	// Labels
+	Labels Labels `json:"labels"`
+
 	// Live migration target hypervisor
 	LiveMigrationTargetHV string `json:"live_migration_target_hv"`
 
@@ -64,17 +67,21 @@ type LogicalPort struct {
 
 // Status information
 type Status struct {
-	// Common status
-	Common string `json:"common"`
+
+	// Operation status
+	OperationStatus string `json:"operation_status"`
 
 	// Hypervisors status
 	Hypervisors []HypervisorStatus `json:"hypervisors"`
+
+	// Hypervisor status
+	HypervisorStatus string `json:"hypervisor_status"`
 }
 
 // HypervisorStatus information
 type HypervisorStatus struct {
-	// Status
-	Status string `json:"status"`
+	// Operation status
+	OperationStatus string `json:"operation_status"`
 
 	// Name
 	Name string `json:"name"`
@@ -106,9 +113,6 @@ type Bindings struct {
 	// Address detection
 	AddressDetection bool `json:"address_detection"`
 
-	// Is excluded from firewall
-	IsExcludedFromFirewall bool `json:"is_excluded_from_firewall"`
-
 	// Version ID
 	VersionID uint64 `json:"version_id"`
 
@@ -149,6 +153,7 @@ type LogicalPortAddress struct {
 	AssignedAt string `json:"assigned_at"`
 }
 
+// Migration status information
 type MigrationStatus struct {
 	// ID
 	ID string `json:"id"`
@@ -156,3 +161,18 @@ type MigrationStatus struct {
 	// Version ID
 	VersionID uint64 `json:"version_id"`
 }
+
+// Labels information
+type Labels struct {
+	// VM ID
+	VMID string `json:"vm_id"`
+
+	// VM name
+	VMName string `json:"vm_name"`
+}
+
+// Information about a version
+type RecordVersion struct {
+	// Version ID
+	VersionID uint64 `json:"version_id"`
+}

pkg/sdn/logicalports/unexclude_firewall.go

@@ -0,0 +1,55 @@
+package logicalports
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/constants"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
+)
+
+type LogicalPortsForUnexcludeFromFirewall struct {
+	// Exclude IP Addresses
+	// Required: true
+	ID string `url:"id" json:"id" validate:"required"`
+
+	// Version ID
+	// Required: true
+	VersionID uint64 `url:"version_id" json:"version_id" validate:"required"`
+}
+
+// UnexcludeFirewallRequest struct to unexclude firewall for logical port
+type UnexcludeFirewallRequest struct {
+	// Access Group ID
+	// Required: true
+	AccessGroupID string `url:"access_group_id" json:"access_group_id" validate:"required"`
+
+	// Logical Ports For Unexclude From Firewall
+	// Required: true
+	LogicalPortsForUnexcludeFromFirewall []LogicalPortsForUnexcludeFromFirewall `json:"logical_ports_for_unexclude_from_firewall" validate:"required,dive"`
+}
+
+// UnexcludeFirewallRequest struct to unexclude firewall for logical port
+func (lp LogicalPorts) UnexcludeFirewall(ctx context.Context, req UnexcludeFirewallRequest) (*RecordVersion, error) {
+	err := validators.ValidateRequest(req)
+	if err != nil {
+		return nil, validators.ValidationErrors(validators.GetErrors(err))
+	}
+
+	url := "/sdn/logical_port/unexclude_firewall"
+
+	res, err := lp.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/logicalports/update.go

@@ -9,6 +9,12 @@ import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/internal/validators"
 )
 
+// Label struct
+type UpdateLabels struct {
+	VMID   string `url:"vm_id,omitempty" json:"vm_id,omitempty"`
+	VMName string `url:"vm_name,omitempty" json:"vm_name,omitempty"`
+}
+
 // UpdateRequest struct to update logical port
 type UpdateRequest struct {
 	// ID of the logical port
@@ -47,10 +53,6 @@ type UpdateRequest struct {
 	// Required: true
 	PortSecurity interface{} `url:"port_security" json:"port_security" validate:"required,isBool"`
 
-	// Is excluded from firewall. True or False
-	// Required: true
-	IsExcludedFromFirewall interface{} `url:"is_excluded_from_firewall" json:"is_excluded_from_firewall" validate:"required,isBool"`
-
 	// Segment ID
 	// Required: true
 	SegmentID string `url:"segment_id" json:"segment_id" validate:"required"`
@@ -62,6 +64,10 @@ type UpdateRequest struct {
 	// Add addresses
 	// Required: false
 	AddAddresses []AddAddress `url:"add_addresses,omitempty" json:"add_addresses,omitempty" validate:"dive"`
+
+	// Labels
+	// Required: false
+	Labels UpdateLabels `url:"labels,omitempty" json:"labels,omitempty"`
 }
 
 // UpdateAddress struct representing update address