v1.12.9

internal/validators/custom.go

@@ -165,11 +165,11 @@ func flipgroupClientTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, flipgroupClientTypeValues)
 }
 
-// kvmNetTypeValidator is used to validate NetType field.
-func kvmNetTypeValidator(fe validator.FieldLevel) bool {
+// massCreateTypeValidator is used to validate net type field when mass creating kvm
+func massCreateTypeValidator(fe validator.FieldLevel) bool {
 	fieldValue := fe.Field().String()
 
-	return IsInSlice(fieldValue, kvmNetTypeValues)
+	return IsInSlice(fieldValue, massCreateNetTypeValues)
 }
 
 // lbAlgorithmValidator is used to validate Algorithm field.
@@ -426,6 +426,13 @@ func deviceValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, deviceValues)
 }
 
+// ipTypesValidator is used to validate ip types version fields
+func ipTypesValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, ipTypeValues)
+}
+
 // 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 {
@@ -457,3 +464,10 @@ func trunkTagsValidator(fe validator.FieldLevel) bool {
 	}
 	return uint64(numFieldValue) >= uint64(trunkTagsMin) && uint64(numFieldValue) <= uint64(trunkTagsMax)
 }
+
+// addressPoolNetTypeValidator is used to validate NetAddressType fields
+func addressPoolNetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, addressPoolNetTypeValues)
+}

internal/validators/messages.go

@@ -142,12 +142,12 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
-	// KVM_X86 Validators
-	case "kvmNetType":
+	// KVM_X86 Mass create validators
+	case "massCreateNetType":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
-			joinValues(kvmNetTypeValues))
+			joinValues(massCreateNetTypeValues))
 
 	// LB Validators
 	case "lbAlgorithm":
@@ -348,11 +348,24 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field())
 
+		// addressPoolNetTypeValidator validator
+	case "addressPoolNetTypeValidator":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(addressPoolNetTypeValues))
+
 	case "device":
 		return fmt.Sprintf("%s %s must be one of the following: %s",
 			prefix,
 			fe.Field(),
 			joinValues(deviceValues))
+
+	case "ipTypes":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(ipTypeValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -121,7 +121,7 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
-	err = validate.RegisterValidation("kvmNetType", kvmNetTypeValidator)
+	err = validate.RegisterValidation("massCreateNetType", massCreateTypeValidator)
 	if err != nil {
 		return err
 	}
@@ -301,5 +301,15 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("addressPoolNetTypeValidator", addressPoolNetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("ipTypes", ipTypesValidator)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

internal/validators/values.go

@@ -24,8 +24,8 @@ var (
 
 	flipgroupClientTypeValues = []string{"compute", "vins"}
 
-	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
-	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "EMPTY", "VFNIC", "DPDK", "SDN", "TRUNK"}
+	massCreateNetTypeValues = []string{"EXTNET", "VINS", "TRUNK"}
+	kvmx86NetTypeValues     = []string{"EXTNET", "VINS", "EMPTY", "VFNIC", "DPDK", "SDN", "TRUNK"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
@@ -77,6 +77,10 @@ var (
 	securityGroupDirectionValues = []string{"inbound", "outbound"}
 	securityGroupEthertypeValues = []string{"IPv4", "IPv6"}
 	securityGroupProtocolValues  = []string{"icmp", "tcp", "udp"}
+
+	addressPoolNetTypeValues = []string{"IPv4", "IPv6", "MAC"}
+
+	ipTypeValues = []string{"v4, v6"}
 )
 
 const (