v1.8.1

internal/constants/constants.go

@@ -10,3 +10,5 @@ const (
 var FileName = map[string]string{
 	"OidcCertificate": "ca.crt",
 }
+
+var K8sValues = []string{"labels", "taints", "annotations, additionalSANs"}

internal/validators/custom.go

@@ -3,6 +3,7 @@ package validators
 import (
 	"errors"
 	"fmt"
+	"reflect"
 	"regexp"
 	"strings"
 
@@ -104,6 +105,13 @@ func computeNetTypeValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, computeNetTypeValues)
 }
 
+// computex86NetTypeValidator is used to validate NetType field.
+func computex86NetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, computex86NetTypeValues)
+}
+
 // computeOrderValidator is used to validate Order field.
 func computeOrderValidator(fe validator.FieldLevel) bool {
 	fieldSlice, ok := fe.Field().Interface().([]string)
@@ -312,6 +320,23 @@ func networkInterfaceNamingValidator(fe validator.FieldLevel) bool {
 	return IsInSlice(fieldValue, networkInterfaceNamingValues)
 }
 
+func numaAffinityValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, numaAffinityValues)
+}
+
+// kvmx86NetTypeValidator is used to validate NetType field for x86 compute.
+func kvmx86NetTypeValidator(fe validator.FieldLevel) bool {
+	fieldValue := fe.Field().String()
+
+	return IsInSlice(fieldValue, kvmx86NetTypeValues)
+}
+
+func isBoolTypeValidator(fe validator.FieldLevel) bool {
+	return fe.Field().CanConvert(reflect.TypeOf(true))
+}
+
 // 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 {

internal/validators/messages.go

@@ -95,6 +95,12 @@ func errorMessage(fe validator.FieldError) string {
 			fe.Field(),
 			joinValues(computeNetTypeValues))
 
+	case "computex86NetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(computex86NetTypeValues))
+
 	case "computeOrder":
 		return fmt.Sprintf("%s %s can contain only the following values: %s",
 			prefix,
@@ -258,6 +264,18 @@ func errorMessage(fe validator.FieldError) string {
 			prefix,
 			fe.Field(),
 			joinValues(networkInterfaceNamingValues))
+
+	case "numaAffinity":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(numaAffinityValues))
+
+	case "kvmx86NetType":
+		return fmt.Sprintf("%s %s must be one of the following: %s",
+			prefix,
+			fe.Field(),
+			joinValues(kvmx86NetTypeValues))
 	}
 
 	return fe.Error()

internal/validators/validator.go

@@ -106,6 +106,11 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("computex86NetType", computex86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
 	err = validate.RegisterValidation("computeOrder", computeOrderValidator)
 	if err != nil {
 		return err
@@ -211,5 +216,20 @@ func registerAllValidators(validate *validator.Validate) error {
 		return err
 	}
 
+	err = validate.RegisterValidation("numaAffinity", numaAffinityValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("kvmx86NetType", kvmx86NetTypeValidator)
+	if err != nil {
+		return err
+	}
+
+	err = validate.RegisterValidation("isBool", isBoolTypeValidator)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

internal/validators/values.go

@@ -10,20 +10,22 @@ var (
 
 	bserviceModeValues = []string{"ABSOLUTE", "RELATIVE"}
 
-	computeTopologyValues  = []string{"compute", "node"}
-	computePolicyValues    = []string{"RECOMMENDED", "REQUIRED"}
-	computeModeValues      = []string{"EQ", "EN", "ANY"}
-	computeDiskTypeValues  = []string{"D", "B"}
-	computeNetTypeValues   = []string{"EXTNET", "VINS"}
-	computeOrderValues     = []string{"cdrom", "network", "hd"}
-	computeDataDisksValues = []string{"KEEP", "DETACH", "DESTROY"}
-	computeDriverValues    = []string{"KVM_X86", "SVA_KVM_X86"}
+	computeTopologyValues   = []string{"compute", "node"}
+	computePolicyValues     = []string{"RECOMMENDED", "REQUIRED"}
+	computeModeValues       = []string{"EQ", "EN", "ANY"}
+	computeDiskTypeValues   = []string{"D", "B"}
+	computeNetTypeValues    = []string{"EXTNET", "VINS"}
+	computex86NetTypeValues = []string{"EXTNET", "VINS", "VFNIC"}
+	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"}
+	kvmNetTypeValues    = []string{"EXTNET", "VINS", "NONE"}
+	kvmx86NetTypeValues = []string{"EXTNET", "VINS", "NONE", "VFNIC"}
 
 	lbAlgorithmValues = []string{"roundrobin", "static-rr", "leastconn"}
 
@@ -52,4 +54,6 @@ var (
 	computeFeaturesValues = []string{"hugepages", "numa", "cpupin", "vfnic"}
 
 	networkInterfaceNamingValues = []string{"eth", "ens"}
+
+	numaAffinityValues = []string{"none", "strict", "loose"}
 )