v1.3.0

pkg/cloudbroker/compute/affinity_rule_remove.go

@@ -2,7 +2,6 @@ package compute
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"strconv"
 
@@ -13,18 +12,18 @@ import (
 type AffinityRuleRemoveRequest struct {
 	// IDs of the compute instances
 	// Required: true
-	ComputeIDs []uint64 `url:"computeIds" json:"computeIds"`
+	ComputeIDs []uint64 `url:"computeIds" json:"computeIds" validate:"min=1"`
 
 	// Compute or node, for whom rule applies
 	// Required: true
-	Topology string `url:"topology" json:"topology"`
+	Topology string `url:"topology" json:"topology" validate:"computeTopology"`
 
 	// The degree of 'strictness' of this rule
 	// Should be one of:
 	//	- RECOMMENDED
 	//	- REQUIRED
 	// Required: true
-	Policy string `url:"policy" json:"policy"`
+	Policy string `url:"policy" json:"policy" validate:"computePolicy"`
 
 	// The comparison mode is 'value', recorded by the specified 'key'
 	// Should be one of:
@@ -32,57 +31,24 @@ type AffinityRuleRemoveRequest struct {
 	//	- EN
 	//	- ANY
 	// Required: true
-	Mode string `url:"mode" json:"mode"`
+	Mode string `url:"mode" json:"mode" validate:"computeMode"`
 
 	// Key that are taken into account when analyzing this rule will be identified
 	// Required: true
-	Key string `url:"key" json:"key"`
+	Key string `url:"key" json:"key" validate:"required"`
 
 	// Value that must match the key to be taken into account when analyzing this rule
 	// Required: true
-	Value string `url:"value" json:"value"`
-}
-
-func (crq AffinityRuleRemoveRequest) validate() error {
-	if len(crq.ComputeIDs) == 0 {
-		return errors.New("validation-error: field ComputeIDs must be set")
-	}
-	if crq.Topology == "" {
-		return errors.New("validation-error: field Topology must be set")
-	}
-	validator := validators.StringInSlice(crq.Topology, []string{"compute", "node"})
-	if !validator {
-		return errors.New("validation-error: field Topology can be only compute or node")
-	}
-	if crq.Policy == "" {
-		return errors.New("validation-error: field Policy must be set")
-	}
-	validator = validators.StringInSlice(crq.Policy, []string{"RECOMMENDED", "REQUIRED"})
-	if !validator {
-		return errors.New("validation-error: field Policy can be only RECOMMENDED or REQUIRED")
-	}
-	if crq.Mode == "" {
-		return errors.New("validation-error: field Mode must be set")
-	}
-	validator = validators.StringInSlice(crq.Mode, []string{"EQ", "NE", "ANY"})
-	if !validator {
-		return errors.New("validation-error: field Mode can be only EQ, NE or ANY")
-	}
-	if crq.Key == "" {
-		return errors.New("validation-error: field Key must be set")
-	}
-	if crq.Value == "" {
-		return errors.New("validation-error: field Value must be set")
-	}
-
-	return nil
+	Value string `url:"value" json:"value" validate:"required"`
 }
 
 // AffinityRuleRemove remove affinity rule
 func (c Compute) AffinityRuleRemove(ctx context.Context, req AffinityRuleRemoveRequest) (bool, error) {
-	err := req.validate()
+	err := validators.ValidateRequest(req)
 	if err != nil {
-		return false, err
+		for _, validationError := range validators.GetErrors(err) {
+			return false, validators.ValidationError(validationError)
+		}
 	}
 
 	url := "/cloudbroker/compute/affinityRuleRemove"