Add parameter to bypass Open on FirmwareTaskStatus

metal-toolbox · Nov 23, 2023 · ecc737b · ecc737b
1 parent aef181c
commit ecc737b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/internal/model/model.go b/internal/model/model.go
@@ -126,7 +126,7 @@ type DeviceQueryor interface {
 
 	FirmwareUpload(ctx context.Context, component string, reader *os.File) (uploadVerifyTaskID string, err error)
 
-	FirmwareTaskStatus(ctx context.Context, kind bconsts.FirmwareInstallStep, component, taskID, installVersion string) (state, status string, err error)
+	FirmwareTaskStatus(ctx context.Context, kind bconsts.FirmwareInstallStep, component, taskID, installVersion string, tryOpen bool) (state, status string, err error)
 
 	FirmwareInstallUploaded(ctx context.Context, component, uploadVerifyTaskID string) (installTaskID string, err error)
 }
diff --git a/internal/outofband/action_handlers.go b/internal/outofband/action_handlers.go
@@ -595,6 +595,7 @@ func (h *actionHandler) pollFirmwareTaskStatus(a sw.StateSwitch, c sw.Transition
 			action.Firmware.Component,
 			action.BMCTaskID,
 			action.Firmware.Version,
+			true, // need to be false for AsRockRack E3C256D4ID-NL
 		)
 
 		tctx.Logger.WithFields(

diff --git a/internal/outofband/action_handlers_test.go b/internal/outofband/action_handlers_test.go
@@ -325,6 +325,7 @@ func TestPollFirmwareInstallStatus(t *testing.T) {
 				gomock.Any(),
 				gomock.Any(),
 				gomock.Any(),
+				gomock.Any(),
 			).AnyTimes().Return(tc.state, "some status", tc.errorContains)
 
 			if err := handler.pollFirmwareTaskStatus(&action, handlerCtx); err != nil {

diff --git a/internal/outofband/actions_test.go b/internal/outofband/actions_test.go
@@ -423,6 +423,7 @@ func TestActionStateMachine(t *testing.T) {
 					gomock.Any(),
 					gomock.Any(),
 					gomock.Any(),
+					gomock.Any(),
 				).AnyTimes().Return(bconsts.FirmwareInstallComplete, "some status", nil)
 
 				return ctrl, q
@@ -469,6 +470,7 @@ func TestActionStateMachine(t *testing.T) {
 					gomock.Any(),
 					gomock.Any(),
 					gomock.Any(),
+					gomock.Any(),
 				).AnyTimes().Return(bconsts.FirmwareInstallFailed, "some status", nil)
 
 				return ctrl, q

diff --git a/internal/outofband/bmc.go b/internal/outofband/bmc.go
@@ -167,9 +167,11 @@ func (b *bmc) FirmwareInstall(ctx context.Context, componentSlug string, force b
 }
 
 // FirmwareTaskStatus looks up the firmware upload/install state and status values
-func (b *bmc) FirmwareTaskStatus(ctx context.Context, kind bconsts.FirmwareInstallStep, component, taskID, installVersion string) (state, status string, err error) {
-	if err := b.Open(ctx); err != nil {
-		return "", "", errors.Wrap(ErrBMCQuery, err.Error())
+func (b *bmc) FirmwareTaskStatus(ctx context.Context, kind bconsts.FirmwareInstallStep, component, taskID, installVersion string, tryOpen bool) (state, status string, err error) {
+	if tryOpen {
+		if err := b.Open(ctx); err != nil {
+			return "", "", errors.Wrap(ErrBMCQuery, err.Error())
+		}
 	}
 
 	return b.client.FirmwareTaskStatus(ctx, kind, component, taskID, installVersion)