Minor tweaks, first attempt of fixing the test.

metal3-io · Oct 16, 2024 · 206eb33 · 206eb33
1 parent 7eda476
commit 206eb33
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/apis/metal3.io/v1alpha1/.baremetalhost_types_test.go.swp b/apis/metal3.io/v1alpha1/.baremetalhost_types_test.go.swp
diff --git a/controllers/metal3.io/baremetalhost_controller.go b/controllers/metal3.io/baremetalhost_controller.go
@@ -1365,15 +1365,16 @@ func (r *BareMetalHostReconciler) checkServicing(prov provisioner.Provisioner, i
 	// (NOTE)janders: since Servicing is an opt-in feature that requires HostUpdatePolicy to be created and set to onReboot
 	// set below booleans to false by default and change to true based on policy settings
 
-	servicingData.LiveFirmwareSettingsAllowed = false
+	var LiveFirmwareSettingsAllowed bool
+	LiveFirmwareSettingsAllowed = false
 
 	if hup != nil {
 		if hup.Spec.FirmwareSettings == metal3api.HostUpdatePolicyOnReboot {
-			servicingData.LiveFirmwareSettingsAllowed = true
+			LiveFirmwareSettingsAllowed = true
 		}
 	}
 
-	if servicingData.LiveFirmwareSettingsAllowed {
+	if LiveFirmwareSettingsAllowed {
 		var hfs *metal3api.HostFirmwareSettings
 		var err error
 		dirty, hfs, err = r.getHostFirmwareSettings(info)

diff --git a/controllers/metal3.io/baremetalhost_controller_test.go b/controllers/metal3.io/baremetalhost_controller_test.go
@@ -28,6 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -811,8 +812,22 @@ func TestRebootWithServicing(t *testing.T) {
 		VirtualizationEnabled: ptr.To(true),
 	}
 	host.Status.Provisioning.Image.URL = "foo"
+	hup := &metal3api.HostUpdatePolicy{
+			ObjectMeta: metav1.ObjectMeta{
+			Name:      host.Name,
+			Namespace: namespace,
+		},
+		Spec: metal3api.HostUpdatePolicySpec{
+			FirmwareSettings: metal3api.HostUpdatePolicyOnReboot,
+			FirmwareUpdates: metal3api.HostUpdatePolicyOnReboot,
+		},
+	}
 
-	r := newTestReconciler(host)
+	r := newTestReconciler(host, hup)
+
+	err := r.Create(context.TODO(), hup)
+	require.NoError(t, err)
+	fmt.Printf("janders-hup-debug: HostUpdatePolicy object (no helper used): %+v", hup)
 
 	tryReconcile(t, r, host,
 		func(host *metal3api.BareMetalHost, result reconcile.Result) bool {

diff --git a/pkg/provisioner/provisioner.go b/pkg/provisioner/provisioner.go
@@ -108,11 +108,9 @@ type PrepareData struct {
 }
 
 type ServicingData struct {
-	FirmwareConfig              *metal3api.FirmwareConfig
-	TargetFirmwareSettings      metal3api.DesiredSettingsMap
-	ActualFirmwareSettings      metal3api.SettingsMap
-	LiveFirmwareUpdateAllowed   bool
-	LiveFirmwareSettingsAllowed bool
+	FirmwareConfig         *metal3api.FirmwareConfig
+	TargetFirmwareSettings metal3api.DesiredSettingsMap
+	ActualFirmwareSettings metal3api.SettingsMap
 	// TargetFirmwareComponents []metal3api.FirmwareUpdate
 }