v14.13.0

CHANGELOG.md

@@ -1,4 +1,4 @@
-## Version 14.10.0
+## Version 1.14.13
 
 Методы `Audits` в cloudapi/compute, cloudbroker/compute, cloudapi/account, cloudbroker/account, cloudapi/vins, cloudbroker/vins, cloudapi/rg и cloudbroker/rg  стали deprecated и в следующих версиях будут удалены, вместо них необходимо использовать метод `List` в cloudapi/audit и cloudbroker/audit с соответствующими фильтрами  
 Методы `AccessGrant`, `AccessGrantToPool`, `AccessRevoke`, `AccessRevokeToPool` в cloudbroker/sep стали deprecated и в следующих версиях будут удалены  
@@ -7,9 +7,25 @@
 
 Все методы группы `.SDN()` находятся в альфа-версии.
 
-### Удалено
 
-#### resource_optimizer
-| Идентификатор<br>задачи | Описание |
+
+### Добавлено
+
+#### sdn logicalports
+| Идентификатор задачи | Описание |
 | --- | --- |
-| BGOS-855 | Группа методов `resource_optimizer` |
+| BGOS-967 | Вычисляемое поле `ExcludeFirewall` в структуру ответа `LogicalPort` в sdn/logicalports |
+
+
+### Изменено
+
+#### sdn logicalports
+| Идентификатор задачи | Описание |
+| --- | --- |
+| BGOS-967 | Тип опционального поля `LogicalPortAddresses` в структуре запроса `CreateRequest` с `[]LogicalPortAddress` на `[]LogicalPortAddressRequest` в sdn/logicalports |
+| BGOS-967 | Тип обязательного поля `IP` в структуре запроса `LogicalPortAddressRequest` с `string` на `interface{}` в sdn/logicalports |
+| BGOS-967 | Тип поля `IsDiscovered` c опционального на обязательное в структурах запросов `UpdateAddress` и `AddAddress` в sdn/logicalports |
+| BGOS-967 | Тип обязательного поля `IsDiscovered` в структуре запроса `UpdateAddress` и `AddAddress` с `bool` на `interface{}` в sdn/logicalports |
+| BGOS-967 | Тип опционального поля `Labels` в структуре запроса `CreateRequest` с `CreateLabels` на `*CreateLabels` в sdn/logicalports |
+| BGOS-967 | Тип опционального поля `Labels` в структуре запроса `UpdateRequest` с `UpdateLabels` на `*UpdateLabels` в sdn/logicalports |
+

internal/validators/custom.go

@@ -350,6 +350,10 @@ func isBoolTypeValidator(fe validator.FieldLevel) bool {
 	return fe.Field().CanConvert(reflect.TypeOf(true))
 }
 
+func isStringTypeValidator(fe validator.FieldLevel) bool {
+	return fe.Field().Kind() == reflect.String
+}
+
 func urlValidartor(fl validator.FieldLevel) bool {
 	fieldValues := fl.Field().String()
 

internal/validators/helper.go

@@ -2,6 +2,7 @@ package validators
 
 import (
 	"errors"
+
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/multierror"
 
 	"github.com/go-playground/validator/v10"

internal/validators/messages.go

@@ -27,6 +27,8 @@ func errorMessage(fe validator.FieldError) string {
 		return fmt.Sprintf("%s %s: unexpected E-Mail format", prefix, fe.Field())
 	case "isBool":
 		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
+	case "isString":
+		return fmt.Sprintf("%s %s: must be string type", prefix, fe.Field())
 
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",

internal/validators/validator.go

@@ -231,6 +231,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("isString", isStringTypeValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("url", urlValidartor)
 	if err != nil {
 		return err

pkg/cloudapi/compute/boot_order_get.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 

pkg/cloudapi/compute/boot_order_set.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 

pkg/cloudapi/compute/change_link_state.go

@@ -3,8 +3,9 @@ package compute
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // ChangeLinkStateRequest struct to change link state

pkg/cloudapi/compute/redeploy.go

@@ -15,7 +15,7 @@ type RedeployRequest struct {
 	ComputeID uint64 `url:"computeId" json:"computeId" validate:"required"`
 
 	// Storage policy id of compute. The rules of the specified storage policy will be used.
-	// Required: true
+	// Required: false
 	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
 
 	// ID of the new OS image, if image change is required

pkg/cloudapi/pcidevice/serialize.go

@@ -2,6 +2,7 @@ package pcidevice
 
 import (
 	"encoding/json"
+
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/serialization"
 )
 

pkg/cloudbroker/account/set_cpu_allocation_parameter.go

@@ -3,8 +3,9 @@ package account
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // SetCPUAllocationParameterRequest struct for setting CPU allocation parameter

pkg/cloudbroker/compute/change_link_state.go

@@ -3,8 +3,9 @@ package compute
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // ChangeLinkStateRequest struct for changing link state

pkg/cloudbroker/compute/redeploy.go

@@ -23,7 +23,7 @@ type RedeployRequest struct {
 	OSVersion string `url:"os_version,omitempty" json:"os_version,omitempty"`
 
 	// Storage policy id of compute. The rules of the specified storage policy will be used.
-	// Required: true
+	// Required: false
 	StoragePolicyID uint64 `url:"storage_policy_id,omitempty" json:"storage_policy_id,omitempty"`
 
 	// New size for the boot disk in GB, if boot disk size change is required

pkg/cloudbroker/disks/depresent.go

@@ -3,8 +3,9 @@ package disks
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // DepresentRequest struct to depresent disk from node

pkg/cloudbroker/disks/present.go

@@ -3,8 +3,9 @@ package disks
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // PresentRequest struct to present disk to node

pkg/cloudbroker/grid/set_cpu_allocation_parameter.go

@@ -3,8 +3,9 @@ package grid
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // SetCPUAllocationParameterRequest for setting CPU allocation parameter

pkg/cloudbroker/grid/set_cpu_allocation_ratio_for_vm.go

@@ -3,8 +3,9 @@ package grid
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // SetCPUAllocationRatioForVMRequest for setting CPU allocation ratio for computes

pkg/cloudbroker/pcidevice/delete.go

@@ -3,8 +3,9 @@ package pcidevice
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // DeleteRequest struct to deleting PCI device

pkg/cloudbroker/pcidevice/disable.go

@@ -3,8 +3,9 @@ package pcidevice
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // DisableRequest struct for disabling PCI device

pkg/cloudbroker/pcidevice/enable.go

@@ -3,8 +3,9 @@ package pcidevice
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // EnableRequest struct for enabling PCI device

pkg/cloudbroker/pcidevice/serialize.go

@@ -2,6 +2,7 @@ package pcidevice
 
 import (
 	"encoding/json"
+
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/serialization"
 )
 

pkg/cloudbroker/rg/set_cpu_allocation_parameter.go

@@ -3,8 +3,9 @@ package rg
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // SetCPUAllocationParameterRequest struct for setting CPU allocation parameter

pkg/cloudbroker/rg/set_cpu_allocation_ratio.go

@@ -3,8 +3,9 @@ package rg
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // SetCPUAllocationRatioRequest struct for setting CPU allocation ratio

pkg/cloudbroker/sep/add_consumer_nodes.go

@@ -2,8 +2,8 @@ package sep
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
-	"strconv"
 
 	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
@@ -20,23 +20,24 @@ type AddConsumerNodesRequest struct {
 }
 
 // AddConsumerNodes adds consumer nodes to SEP parameters
-func (s SEP) AddConsumerNodes(ctx context.Context, req AddConsumerNodesRequest) (uint64, error) {
+func (s SEP) AddConsumerNodes(ctx context.Context, req AddConsumerNodesRequest) ([]uint64, error) {
 	err := validators.ValidateRequest(req)
+	list := []uint64{}
 	if err != nil {
-		return 0, validators.ValidationErrors(validators.GetErrors(err))
+		return list, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
 	url := "/cloudbroker/sep/addConsumerNodes"
 
 	res, err := s.client.DecortApiCall(ctx, http.MethodPost, url, req)
 	if err != nil {
-		return 0, err
+		return list, err
 	}
 
-	result, err := strconv.ParseUint(string(res), 10, 64)
+	err = json.Unmarshal(res, &list)
 	if err != nil {
-		return 0, err
+		return nil, err
 	}
 
-	return result, nil
+	return list, nil
 }

pkg/cloudbroker/vfpool/update.go

@@ -38,7 +38,7 @@ type UpdateRequest struct {
 
 type wrapperUpdateRequest struct {
 	UpdateRequest
-	Config []string `url:"config,omitempty"`
+	Config string `url:"config,omitempty"`
 }
 
 // Update updates vfpool device
@@ -48,21 +48,15 @@ func (v VFPool) Update(ctx context.Context, req UpdateRequest) (bool, error) {
 		return false, validators.ValidationErrors(validators.GetErrors(err))
 	}
 
-	var config []string
+	var config string
 
 	if len(req.Config) != 0 {
-		config = make([]string, 0, len(req.Config))
-
-		for c := range req.Config {
-			b, err := json.Marshal(req.Config[c])
+		b, err := json.Marshal(req.Config)
 		if err != nil {
 			return false, err
 		}
 
-			config = append(config, string(b))
-		}
-	} else {
-		config = []string{}
+		config = string(b)
 	}
 
 	reqWrapped := wrapperUpdateRequest{

pkg/cloudbroker/vgpu/allocate.go

@@ -3,8 +3,9 @@ package vgpu
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // AllocateRequest struct for allocating VGPU

pkg/cloudbroker/vgpu/create.go

@@ -3,8 +3,9 @@ package vgpu
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // CreateRequest struct for creating VGPU

pkg/cloudbroker/vgpu/deallocate.go

@@ -3,8 +3,9 @@ package vgpu
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // DeallocateRequest struct for deallocating VGPU

pkg/cloudbroker/vgpu/destroy.go

@@ -3,8 +3,9 @@ package vgpu
 import (
 	"context"
 	"net/http"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 	"strconv"
+
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v14/internal/validators"
 )
 
 // DestroyRequest struct for destroying VGPU

pkg/sdn/logicalports/create.go

@@ -55,34 +55,35 @@ type CreateRequest struct {
 
 	// Logical port addresses
 	// Required: false
-	LogicalPortAddresses []LogicalPortAddress `url:"logical_port_addresses,omitempty" json:"logical_port_addresses,omitempty" validate:"dive"`
+	LogicalPortAddresses []LogicalPortAddressRequest `url:"logical_port_addresses,omitempty" json:"logical_port_addresses,omitempty" validate:"dive"`
 
 	// Labels
 	// Required: false
-	Labels CreateLabels `url:"labels,omitempty" json:"labels,omitempty"`
+	Labels *CreateLabels `url:"labels,omitempty" json:"labels"`
 }
 
 // LogicalPortAddressRequest struct representing logical port address
 type LogicalPortAddressRequest struct {
-	// IP address
+	// IP address. IPv4 or IPv6 address of the logical port
+	// If nil (allowed only when IsPrimary is true), the system will automatically generate a valid address
 	// Required: true
-	IP string `url:"ip" json:"ip" validate:"required"`
+	IP interface{} `url:"ip" json:"ip" validate:"omitempty,isString"`
 
 	// IP type
 	// Required: true
 	IPType string `url:"ip_type" json:"ip_type" validate:"required,oneof=IPv4 IPv6"`
 
-	// Is primary. True or False
+	// Is primary
 	// Required: true
 	IsPrimary interface{} `url:"is_primary" json:"is_primary" validate:"required,isBool"`
 
+	// Is discovered
+	// Required: true
+	IsDiscovered interface{} `url:"is_discovered" json:"is_discovered" validate:"required,isBool"`
+
 	// MAC address
 	// Required: false
 	MAC string `url:"mac,omitempty" json:"mac,omitempty"`
-
-	// Is discovered. True or False
-	// Required: false
-	IsDiscovered interface{} `url:"is_discovered,omitempty" json:"is_discovered,omitempty" validate:"omitempty,isBool"`
 }
 
 // Create creates a logical port

pkg/sdn/logicalports/models.go

@@ -34,6 +34,9 @@ type LogicalPort struct {
 	// Enabled
 	Enabled bool `json:"enabled"`
 
+	// Exclude firewall information
+	ExcludeFirewall ExcludeFirewall `json:"exclude_firewall"`
+
 	// External network ID
 	ExternalNetworkID string `json:"external_network_id"`
 
@@ -162,6 +165,18 @@ type MigrationStatus struct {
 	VersionID uint64 `json:"version_id"`
 }
 
+// ExcludeFirewall information
+type ExcludeFirewall struct {
+	// Exclusion reason
+	ExclusionReason string `json:"exclusion_reason"`
+
+	// Whether logical port addresses are excluded from firewall
+	LogicalPortAddressesExcluded bool `json:"logical_port_addresses_excluded"`
+
+	// Whether logical port is excluded from firewall
+	LogicalPortExcluded bool `json:"logical_port_excluded"`
+}
+
 // Labels information
 type Labels struct {
 	// VM ID

pkg/sdn/logicalports/update.go

@@ -67,11 +67,15 @@ type UpdateRequest struct {
 
 	// Labels
 	// Required: false
-	Labels UpdateLabels `url:"labels,omitempty" json:"labels,omitempty"`
+	Labels *UpdateLabels `url:"labels,omitempty" json:"labels"`
 }
 
 // UpdateAddress struct representing update address
 type UpdateAddress struct {
+	// ID of the address
+	// Required: true
+	ID string `url:"id" json:"id" validate:"required"`
+
 	// IP address
 	// Required: true
 	IP string `url:"ip" json:"ip" validate:"required"`
@@ -81,8 +85,8 @@ type UpdateAddress struct {
 	IPType string `url:"ip_type" json:"ip_type" validate:"required,oneof=IPv4 IPv6"`
 
 	// Is discovered. True or False
-	// Required: false
-	IsDiscovered interface{} `url:"is_discovered,omitempty" json:"is_discovered,omitempty" validate:"omitempty,isBool"`
+	// Required: true
+	IsDiscovered interface{} `url:"is_discovered" json:"is_discovered" validate:"required,isBool"`
 
 	// Is primary. True or False
 	// Required: true
@@ -103,11 +107,11 @@ type AddAddress struct {
 	// Required: true
 	IPType string `url:"ip_type" json:"ip_type" validate:"required,oneof=IPv4 IPv6"`
 
-	// Is discovered. True or False
-	// Required: false
-	IsDiscovered interface{} `url:"is_discovered,omitempty" json:"is_discovered,omitempty" validate:"omitempty,isBool"`
+	// Is discovered
+	// Required: true
+	IsDiscovered interface{} `url:"is_discovered" json:"is_discovered" validate:"required,isBool"`
 
-	// Is primary. True or False
+	// Is primary
 	// Required: true
 	IsPrimary interface{} `url:"is_primary" json:"is_primary" validate:"required,isBool"`