address review comments

Author: xkonni

internal/controller/server_controller.go

@@ -937,7 +937,9 @@ func (r *ServerReconciler) patchServerURI(ctx context.Context, bmcClient bmc.BMC
 	}
 
 	// Try to find system by UUID if one is provided
-	if len(server.Spec.SystemUUID) > 0 {
+	uuidProvided := len(server.Spec.SystemUUID) > 0
+	uuidMatched := false
+	if uuidProvided {
 		for _, system := range systems {
 			if strings.EqualFold(system.UUID, server.Spec.SystemUUID) {
 				serverBase := server.DeepCopy()
@@ -948,11 +950,22 @@ func (r *ServerReconciler) patchServerURI(ctx context.Context, bmcClient bmc.BMC
 				return true, nil
 			}
 		}
+		// UUID was provided but didn't match any system
+		uuidMatched = false
 	}
 
 	// If no system found by UUID or UUID is empty, and we only have one system, use it
 	// This handles cases where the Redfish implementation doesn't provide System.UUID
 	if len(systems) == 1 {
+		// If a UUID was provided but didn't match the only available system, report an error
+		if uuidProvided && !uuidMatched {
+			system := systems[0]
+			log.V(1).Info("Provided SystemUUID does not match the only available system",
+				"requestedUUID", server.Spec.SystemUUID, "systemUUID", system.UUID, "systemSerialNumber", system.SerialNumber)
+			return false, fmt.Errorf("provided SystemUUID %q does not match the only available system (UUID: %q, SerialNumber: %q); check your configuration",
+				server.Spec.SystemUUID, system.UUID, system.SerialNumber)
+		}
+
 		system := systems[0]
 		serverBase := server.DeepCopy()
 		server.Spec.SystemURI = system.URI

internal/controller/server_controller_test.go

@@ -977,7 +977,7 @@ var _ = Describe("generatePseudoUUID", func() {
 		}
 	})
 
-	It("Should generate deterministic UUIDs", func() {
+	It("Should generate UUIDs that are deterministic", func() {
 		serial := "TEST-SERIAL-12345"
 		uuid1 := generatePseudoUUID(serial)
 		uuid2 := generatePseudoUUID(serial)
@@ -986,7 +986,7 @@ var _ = Describe("generatePseudoUUID", func() {
 			"Same serial should always produce same UUID")
 	})
 
-	It("Should generate unique UUIDs for different inputs", func() {
+	It("Should generate UUIDs that are unique for different inputs", func() {
 		serials := []string{"SN001", "SN002", "SN003", "SN004", "SN005"}
 		uuids := make(map[string]bool)
 
@@ -1000,7 +1000,7 @@ var _ = Describe("generatePseudoUUID", func() {
 		Expect(uuids).To(HaveLen(len(serials)))
 	})
 
-	It("Should handle varying lengths and complexity", func() {
+	It("Should generate UUIDs that handle serials of varying length and complexity", func() {
 		testCases := []string{
 			"X",          // minimal
 			"SHORT",      // short