Improve tests for the bootserver

Author: hardikdr

api/v1alpha1/constants.go

@@ -4,10 +4,11 @@
 package v1alpha1
 
 const (
-	DefaultIgnitionKey   = "ignition"        // Key for accessing Ignition configuration data within a Kubernetes Secret object.
-	DefaultIPXEScriptKey = "ipxe-script"     // Key for accessing iPXE script data within the iPXE-specific Secret object.
-	SystemUUIDIndexKey   = "spec.systemUUID" // Field to index resources by their system UUID.
-	SystemIPIndexKey     = "spec.systemIPs"  // Field to index resources by their system IP addresses.
-	DefaultFormatKey     = "format"          // Key for determining the format of the data stored in a Secret, such as fcos or plain-ignition.
-	FCOSFormat           = "fcos"            // Specifies the format value used for Fedora CoreOS specific configurations.
+	DefaultIgnitionKey        = "ignition"                // Key for accessing Ignition configuration data within a Kubernetes Secret object.
+	DefaultIPXEScriptKey      = "ipxe-script"             // Key for accessing iPXE script data within the iPXE-specific Secret object.
+	SystemUUIDIndexKey        = "spec.systemUUID"         // Field to index resources by their system UUID.
+	SystemIPIndexKey          = "spec.systemIPs"          // Field to index resources by their system IP addresses.
+	NetworkIdentifierIndexKey = "spec.networkIdentifiers" // Field to index resources by their network identifiers (IP addresses and MAC addresses).
+	DefaultFormatKey          = "format"                  // Key for determining the format of the data stored in a Secret, such as fcos or plain-ignition.
+	FCOSFormat                = "fcos"                    // Specifies the format value used for Fedora CoreOS specific configurations.
 )

cmd/main.go

@@ -354,7 +354,7 @@ func IndexHTTPBootConfigByNetworkIDs(ctx context.Context, mgr ctrl.Manager) erro
 	return mgr.GetFieldIndexer().IndexField(
 		ctx,
 		&bootv1alpha1.HTTPBootConfig{},
-		bootv1alpha1.SystemIPIndexKey,
+		bootv1alpha1.NetworkIdentifierIndexKey,
 		func(Obj client.Object) []string {
 			HTTPBootConfig := Obj.(*bootv1alpha1.HTTPBootConfig)
 			return HTTPBootConfig.Spec.NetworkIdentifiers

server/bootserver.go

@@ -393,7 +393,7 @@ func handleHTTPBoot(w http.ResponseWriter, r *http.Request, k8sClient client.Cli
 
 	var httpBootConfigs bootv1alpha1.HTTPBootConfigList
 	for _, ip := range clientIPs {
-		if err := k8sClient.List(ctx, &httpBootConfigs, client.MatchingFields{bootv1alpha1.SystemIPIndexKey: ip}); err != nil {
+		if err := k8sClient.List(ctx, &httpBootConfigs, client.MatchingFields{bootv1alpha1.NetworkIdentifierIndexKey: ip}); err != nil {
 			log.Info("Failed to list HTTPBootConfig for IP", "IP", ip, "error", err)
 			continue
 		}

server/bootserver_suit_test.go

@@ -0,0 +1,54 @@
+// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company and IronCore contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package server_test
+
+import (
+	"github.com/go-logr/logr"
+	bootv1alpha1 "github.com/ironcore-dev/boot-operator/api/v1alpha1"
+	"github.com/ironcore-dev/boot-operator/server"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"net/http"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+var (
+	testServerAddr = ":30003"
+	testServerURL  = "http://localhost:30003"
+
+	defaultUKIURL  = "https://example.com/default.efi"
+	ipxeServiceURL = "http://localhost:30004"
+
+	k8sClient client.Client
+)
+
+func TestBootServer(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Boot Server Suite")
+}
+
+var _ = BeforeSuite(func() {
+	scheme := runtime.NewScheme()
+	Expect(corev1.AddToScheme(scheme)).To(Succeed())
+	Expect(bootv1alpha1.AddToScheme(scheme)).To(Succeed())
+
+	k8sClient = fake.NewClientBuilder().
+		WithScheme(scheme).
+		Build()
+
+	go func() {
+		defer GinkgoRecover()
+		server.RunBootServer(testServerAddr, ipxeServiceURL, k8sClient, logr.Discard(), defaultUKIURL)
+	}()
+
+	Eventually(func() error {
+		_, err := http.Get(testServerURL + "/httpboot")
+		return err
+	}, "5s", "200ms").Should(Succeed())
+})

server/bootserver_test.go

@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company and IronCore contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package server_test
+
+import (
+	"encoding/json"
+	"net/http"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+type httpBootResponse struct {
+	ClientIPs  string `json:"ClientIPs"`
+	UKIURL     string `json:"UKIURL"`
+	SystemUUID string `json:"SystemUUID,omitempty"`
+}
+
+var _ = Describe("BootServer", func() {
+	Context("/httpboot endpoint", func() {
+		It("delivers default httpboot data when no HTTPBootConfig matches the client IP", func() {
+			resp, err := http.Get(testServerURL + "/httpboot")
+			Expect(err).NotTo(HaveOccurred())
+			defer resp.Body.Close()
+
+			Expect(resp.StatusCode).To(Equal(http.StatusOK))
+			Expect(resp.Header.Get("Content-Type")).To(Equal("application/json"))
+
+			var body httpBootResponse
+			Expect(json.NewDecoder(resp.Body).Decode(&body)).To(Succeed())
+
+			By("returning the default UKI URL")
+			Expect(body.UKIURL).To(Equal(defaultUKIURL))
+
+			By("including the recorded client IPs")
+			Expect(body.ClientIPs).NotTo(BeEmpty())
+
+			By("not setting a SystemUUID in the default case")
+			Expect(body.SystemUUID).To(SatisfyAny(BeEmpty(), Equal("")))
+		})
+	})
+})