fix os vendor checks

metal-stack · Oct 17, 2024 · 30a347d · 30a347d
1 parent e00903b
commit 30a347d
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/cmd/metal-api/internal/service/switch-service.go b/cmd/metal-api/internal/service/switch-service.go
@@ -480,11 +480,6 @@ func (r *switchResource) registerSwitch(request *restful.Request, response *rest
 		return
 	}
 
-	if err := metal.ValidateSwitchOSVendor(s.OS.Vendor); err != nil {
-		r.sendError(request, response, defaultError(err))
-		return
-	}
-
 	returnCode := http.StatusOK
 	if s == nil {
 		s = v1.NewSwitch(requestPayload)
@@ -493,6 +488,11 @@ func (r *switchResource) registerSwitch(request *restful.Request, response *rest
 			return
 		}
 
+		if err := metal.ValidateSwitchOSVendor(s.OS.Vendor); err != nil {
+			r.sendError(request, response, defaultError(err))
+			return
+		}
+
 		err = r.ds.CreateSwitch(s)
 		if err != nil {
 			r.sendError(request, response, defaultError(err))
@@ -502,6 +502,12 @@ func (r *switchResource) registerSwitch(request *restful.Request, response *rest
 		returnCode = http.StatusCreated
 	} else if s.Mode == metal.SwitchReplace {
 		spec := v1.NewSwitch(requestPayload)
+
+		if err := metal.ValidateSwitchOSVendor(spec.OS.Vendor); err != nil {
+			r.sendError(request, response, defaultError(err))
+			return
+		}
+
 		err = r.replaceSwitch(s, spec)
 		if err != nil {
 			r.sendError(request, response, defaultError(err))
@@ -513,6 +519,11 @@ func (r *switchResource) registerSwitch(request *restful.Request, response *rest
 		old := *s
 		spec := v1.NewSwitch(requestPayload)
 
+		if err := metal.ValidateSwitchOSVendor(spec.OS.Vendor); err != nil {
+			r.sendError(request, response, defaultError(err))
+			return
+		}
+
 		uniqueNewNics := spec.Nics.ByIdentifier()
 		if len(requestPayload.Nics) != len(uniqueNewNics) {
 			r.sendError(request, response, httperrors.BadRequest(errors.New("duplicate identifier found in nics")))