Use openbmcGetStatus

providers/redfish/firmware.go

@@ -163,45 +163,21 @@ func (c *Conn) FirmwareInstallStatus(ctx context.Context, installVersion, compon
 		task, err = c.dellJobAsRedfishTask(taskID)
 	case strings.Contains(vendor, constants.Packet):
 		resp, _ := c.redfishwrapper.Get("/redfish/v1/TaskService/Tasks/" + taskID)
-
-		type TaskMsg struct {
-			Message string
-		}
-
-		type TaskStatus struct {
-			TaskState  string
-			TaskStatus string
-			Messages   []TaskMsg
-		}
-
-		var status TaskStatus
-
 		if resp.StatusCode != 200 {
 			err = errors.Wrap(
 				bmclibErrs.ErrFirmwareInstall,
 				"HTTP Error: "+fmt.Sprint(resp.StatusCode),
 			)
 
 			state = "failed"
+			break
+		}
 
-		} else {
-			data, _ := io.ReadAll(resp.Body)
-			resp.Body.Close()
+		data, _ := io.ReadAll(resp.Body)
+		resp.Body.Close()
+
+		state, err = c.openbmcGetStatus(data)
 
-			err = json.Unmarshal(data, &status)
-			if err != nil {
-				fmt.Println(err)
-			} else {
-				state = strings.ToLower(status.TaskState)
-				if state != "running" {
-					// Display all messages when not running (failed or completed)
-					fmt.Println(status.TaskState, status.TaskStatus)
-					for _, m := range status.Messages {
-						fmt.Println(m.Message)
-					}
-				}
-			}
-		}
 	default:
 		err = errors.Wrap(
 			bmclibErrs.ErrNotImplemented,

providers/redfish/firmware_test.go

@@ -19,7 +19,7 @@ import (
 	"github.com/bmc-toolbox/common"
 )
 
-// handler registered in mock_test.go
+// handler registered in main_test.go
 func multipartUpload(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "POST" {
 		w.WriteHeader(http.StatusNotFound)