v12.0.0

internal/validators/custom.go

@@ -6,20 +6,14 @@ import (
 	"net/url"
 	"reflect"
 	"regexp"
+	"strconv"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/interfaces"
-	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v11/internal/multierror"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/interfaces"
+	"repository.basistech.ru/BASIS/dynamix-golang-sdk/v12/internal/multierror"
 )
 
-// computeDriverValidator is used to validate Driver field in kvmx86 create.
-func computeDriverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, computeDriverValues)
-}
-
 // protoValidator is used to validate Proto fields.
 func protoValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -57,13 +51,6 @@ func resTypesValidator(fe validator.FieldLevel) bool {
 	return true
 }
 
-// driverValidator is used to validate Driver fields.
-func driverValidator(fe validator.FieldLevel) bool {
-	fieldValue := fe.Field().String()
-
-	return IsInSlice(fieldValue, driverValues)
-}
-
 // accountCUTypeValidator is used to validate CUType field.
 func accountCUTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -120,6 +107,27 @@ func computex86NetTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, computex86NetTypeValues)
 }
 
+// securityGroupDirectionValidator is used to validate Direction field
+func securityGroupDirectionValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupDirectionValues)
+}
+
+// securityGroupEthertypeValidator is used to validate Ethertype field
+func securityGroupEthertypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupEthertypeValues)
+}
+
+// securityGroupProtocolValidator is used to validate Protocol field
+func securityGroupProtocolValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, securityGroupProtocolValues)
+}
+
 // computeOrderValidator is used to validate Order field.
 func computeOrderValidator(fe validator.FieldLevel) bool {
 	fieldSlice, ok := fe.Field().Interface().([]string)
@@ -206,22 +214,6 @@ func imageTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, imageTypeValues)
 }
 
-// imageDriversValidator is used to validate Drivers field.
-func imageDriversValidator(fe validator.FieldLevel) bool {
-	fieldSlice, ok := fe.Field().Interface().([]string)
-	if !ok {
-		return false
-	}
-
-	for _, item := range fieldSlice {
-		if !IsInSlice(item, imageDriversValues) {
-			return false
-		}
-	}
-
-	return true
-}
-
 // imageArchitectureValidator is used to validate Architecture field.
 func imageArchitectureValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -414,6 +406,12 @@ func languageValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, languageValues)
 }
 
+func userProviderValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, userProviders)
+}
+
 // sepTypeValidator is used to validate sepType fields
 func sepTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
@@ -421,6 +419,13 @@ func sepTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, sepTypeValues)
 }
 
+// deviceValidator is used to validate extnet device fields
+func deviceValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, deviceValues)
+}
+
 // ValidateRAM checks if request contains RAM value that is positive integer divisible by divisibility passed.
 // It is recommended to pass constants.RAM_DIVISIBILITY as divisility arguement
 func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
@@ -442,3 +447,13 @@ func ValidateRAM(r interfaces.RequestWithRAM, divisibility uint64) error {
 	}
 	return multierror.Join(errs...)
 }
+
+// trunkTagsValidator checks if trunk_tags is in range from 1 to 4095
+func trunkTagsValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+	numFieldValue, err := strconv.ParseInt(fieldValue, 10, 64)
+	if err != nil {
+		return false
+	}
+	return uint64(numFieldValue) >= uint64(trunkTagsMin) && uint64(numFieldValue) <= uint64(trunkTagsMax)
+}

internal/validators/helper.go

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

internal/validators/messages.go

@@ -28,12 +28,6 @@ func errorMessage(fe validator.FieldError) string {
 	case "isBool":
 		return fmt.Sprintf("%s %s: must be bool type", prefix, fe.Field())
 
-	case "driver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(driverValues))
-
 	case "accessType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -128,12 +122,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeDataDisksValues))
 
-	case "computeDriver":
-		return fmt.Sprintf("%s %s must be one of the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(computeDriverValues))
-
 	// Disk Validators
 	case "diskType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
@@ -201,12 +189,6 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(imageTypeValues))
 
-	case "imageDrivers":
-		return fmt.Sprintf("%s %s must contain only the following: %s",
-			prefix,
-			fe.Field(),
-			joinValues(imageDriversValues))
-
 	case "imageArchitecture":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
@@ -333,6 +315,44 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(sepTypeValues))
+
+	// user validators
+	case "userProvider":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(userProviders))
+
+	// security group validators
+	case "securityGroupDirection":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupDirectionValues))
+
+	case "securityGroupEthertype":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupEthertypeValues))
+
+	case "securityGroupProtocol":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(securityGroupProtocolValues))
+
+	// trunk tags validator
+	case "trunkTags":
+		return fmt.Sprintf("%s %s must be in range from 1 to 4095",
+			prefix,
+			fe.Field())
+
+	case "device":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(deviceValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -31,11 +31,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("computeDriver", computeDriverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("apiGroup", apiGroupValidator)
 	if err != nil {
 		return err
@@ -51,11 +46,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("driver", driverValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("imageBootType", imageBootTypeValidator)
 	if err != nil {
 		return err
@@ -66,11 +56,6 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("imageDrivers", imageDriversValidator)
-	if err != nil {
-		return err
-	}
-
 	err = validate.RegisterValidation("imageArchitecture", imageArchitectureValidator)
 	if err != nil {
 		return err
@@ -281,10 +266,40 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("userProvider", userProviderValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("sepType", sepTypeValidator)
 	if err != nil {
 		return err
 	}
 
+	err = validate.RegisterValidation("device", deviceValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("trunkTags", trunkTagsValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupDirection", securityGroupDirectionValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupEthertype", securityGroupEthertypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("securityGroupProtocol", securityGroupProtocolValidator)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

internal/validators/values.go

@@ -3,7 +3,6 @@ package validators
 var (
 	apiGroupValues = []string{"cloudapi", "cloudbroker", "system"}
 
-	driverValues     = []string{"KVM_X86"}
 	accessTypeValues = []string{"R", "RCX", "ARCXDU"}
 	resTypesValues   = []string{"compute", "vins", "k8s", "openshift", "lb", "flipgroup"}
 	protoValues      = []string{"tcp", "udp"}
@@ -17,17 +16,16 @@ var (
 	computeModeValues       = []string{"EQ", "EN", "ANY"}
 	computeDiskTypeValues   = []string{"D", "B"}
 	computeNetTypeValues    = []string{"EXTNET", "VINS"}
-	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK"}
+	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC", "DPDK", "SDN", "EMPTY", "TRUNK"}
 	computeOrderValues      = []string{"cdrom", "network", "hd"}
 	computeDataDisksValues  = []string{"KEEP", "DETACH", "DESTROY"}
-	computeDriverValues     = []string{"KVM_X86", "SVA_KVM_X86"}
 
 	diskTypeValues = []string{"B", "T", "D"}
 
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
 	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
-	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC", "DPDK"}
+	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "EMPTY", "VFNIC", "DPDK", "SDN", "TRUNK"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
@@ -38,7 +36,6 @@ var (
 
 	imageBootTypeValues     = []string{"uefi", "bios"}
 	imageTypeValues         = []string{"windows", "linux", "unknown"}
-	imageDriversValues      = []string{"KVM_X86"}
 	imageArchitectureValues = []string{"X86_64"}
 
 	sepFieldTypeValues = []string{"int", "str", "bool", "list", "dict"}
@@ -49,11 +46,11 @@ var (
 
 	interfaceStateValues = []string{"on", "off"}
 
-	actionValues = []string{"power_on", "shutdown", "force_shutdown", "reboot"}
+	actionValues = []string{"is_powered", "power_on", "shutdown", "force_shutdown", "reboot"}
 
 	vmActionValues = []string{"stop", "move"}
 
-	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac"}
+	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic", "dpdk", "changemac", "trunk"}
 
 	networkInterfaceNamingValues = []string{"eth", "ens"}
 
@@ -72,10 +69,20 @@ var (
 	sepTypeValues = []string{"hitachi", "dorado", "tatlin", "shared", "local", "des"}
 
 	languageValues = []string{"ru", "en"}
+
+	userProviders = []string{"bvs", "decs3o"}
+
+	deviceValues = []string{"primary", "secondary"}
+
+	securityGroupDirectionValues = []string{"inbound", "outbound"}
+	securityGroupEthertypeValues = []string{"IPv4", "IPv6"}
+	securityGroupProtocolValues  = []string{"icmp", "tcp", "udp"}
 )
 
 const (
 	mtuMin = 1
-
 	mtuMax = 9216
+
+	trunkTagsMin = 1
+	trunkTagsMax = 4095
 )