mirror of
https://github.com/davidallendj/magellan.git
synced 2025-12-20 03:27:03 -07:00
Removed unused updating code and bmclib dependency and other minor changes
This commit is contained in:
parent
9b3c21a20a
commit
0922bbf5f9
5 changed files with 33 additions and 149 deletions
|
|
@ -1,21 +1,11 @@
|
|||
package magellan
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/OpenCHAMI/magellan/internal/log"
|
||||
"github.com/OpenCHAMI/magellan/internal/util"
|
||||
bmclib "github.com/bmc-toolbox/bmclib/v2"
|
||||
"github.com/bmc-toolbox/bmclib/v2/constants"
|
||||
bmclibErrs "github.com/bmc-toolbox/bmclib/v2/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type UpdateParams struct {
|
||||
|
|
@ -26,110 +16,9 @@ type UpdateParams struct {
|
|||
TransferProtocol string
|
||||
}
|
||||
|
||||
// UpdateFirmware() uses 'bmc-toolbox/bmclib' to update the firmware of a BMC node.
|
||||
// UpdateFirmwareRemote() uses 'gofish' to update the firmware of a BMC node.
|
||||
// The function expects the firmware URL, firmware version, and component flags to be
|
||||
// set from the CLI to perform a firmware update.
|
||||
//
|
||||
// NOTE: Multipart HTTP updating may not work since older verions of OpenBMC, which bmclib
|
||||
// uses underneath, did not support support multipart updates. This was changed with the
|
||||
// inclusion of support for MultipartHttpPushUri in OpenBMC (https://gerrit.openbmc.org/c/openbmc/bmcweb/+/32174).
|
||||
// Also, related to bmclib: https://github.com/bmc-toolbox/bmclib/issues/341
|
||||
func UpdateFirmware(client *bmclib.Client, l *log.Logger, q *UpdateParams) error {
|
||||
if q.Component == "" {
|
||||
return fmt.Errorf("component is required")
|
||||
}
|
||||
|
||||
// open BMC session and update driver registry
|
||||
ctx, ctxCancel := context.WithTimeout(context.Background(), time.Second*time.Duration(q.Timeout))
|
||||
client.Registry.FilterForCompatible(ctx)
|
||||
err := client.Open(ctx)
|
||||
if err != nil {
|
||||
ctxCancel()
|
||||
return fmt.Errorf("failed toconnect to bmc: %v", err)
|
||||
}
|
||||
|
||||
defer client.Close(ctx)
|
||||
|
||||
file, err := os.Open(q.FirmwarePath)
|
||||
if err != nil {
|
||||
ctxCancel()
|
||||
return fmt.Errorf("failed toopen firmware path: %v", err)
|
||||
}
|
||||
|
||||
defer file.Close()
|
||||
|
||||
taskId, err := client.FirmwareInstall(ctx, q.Component, constants.FirmwareApplyOnReset, true, file)
|
||||
if err != nil {
|
||||
ctxCancel()
|
||||
return fmt.Errorf("failed toinstall firmware: %v", err)
|
||||
}
|
||||
|
||||
for {
|
||||
if ctx.Err() != nil {
|
||||
ctxCancel()
|
||||
return fmt.Errorf("context error: %v", ctx.Err())
|
||||
}
|
||||
|
||||
state, err := client.FirmwareInstallStatus(ctx, q.FirmwareVersion, q.Component, taskId)
|
||||
if err != nil {
|
||||
// when its under update a connection refused is returned
|
||||
if strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "operation timed out") {
|
||||
l.Log.Info("BMC refused connection, BMC most likely resetting...")
|
||||
time.Sleep(2 * time.Second)
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if errors.Is(err, bmclibErrs.ErrSessionExpired) || strings.Contains(err.Error(), "session expired") {
|
||||
err := client.Open(ctx)
|
||||
if err != nil {
|
||||
l.Log.Fatal(err, "bmc re-login failed")
|
||||
}
|
||||
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("BMC session expired, logging in...")
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
l.Log.Fatal(err)
|
||||
}
|
||||
|
||||
switch state {
|
||||
case constants.FirmwareInstallRunning, constants.FirmwareInstallInitializing:
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("firmware install running")
|
||||
|
||||
case constants.FirmwareInstallFailed:
|
||||
ctxCancel()
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("firmware install failed")
|
||||
return fmt.Errorf("failed to install firmware")
|
||||
|
||||
case constants.FirmwareInstallComplete:
|
||||
ctxCancel()
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("firmware install completed")
|
||||
return nil
|
||||
|
||||
case constants.FirmwareInstallPowerCyleHost:
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("host powercycle required")
|
||||
|
||||
if _, err := client.SetPowerState(ctx, "cycle"); err != nil {
|
||||
ctxCancel()
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("error power cycling host for install")
|
||||
return fmt.Errorf("failed to install firmware")
|
||||
}
|
||||
|
||||
ctxCancel()
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("host power cycled, all done!")
|
||||
return nil
|
||||
default:
|
||||
l.Log.WithFields(logrus.Fields{"state": state, "component": q.Component}).Info("unknown state returned")
|
||||
}
|
||||
|
||||
time.Sleep(2 * time.Second)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateFirmwareRemote(q *UpdateParams) error {
|
||||
url := baseRedfishUrl(&q.QueryParams) + "/redfish/v1/UpdateService/Actions/SimpleUpdate"
|
||||
headers := map[string]string{
|
||||
|
|
@ -143,7 +32,7 @@ func UpdateFirmwareRemote(q *UpdateParams) error {
|
|||
}
|
||||
data, err := json.Marshal(b)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed tomarshal data: %v", err)
|
||||
return fmt.Errorf("failed to marshal data: %v", err)
|
||||
}
|
||||
res, body, err := util.MakeRequest(nil, url, "POST", data, headers)
|
||||
if err != nil {
|
||||
|
|
@ -172,27 +61,3 @@ func GetUpdateStatus(q *UpdateParams) error {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// func UpdateFirmwareLocal(q *UpdateParams) error {
|
||||
// fwUrl := baseUrl(&q.QueryParams) + ""
|
||||
// url := baseUrl(&q.QueryParams) + "UpdateService/Actions/"
|
||||
// headers := map[string]string {
|
||||
|
||||
// }
|
||||
|
||||
// // get etag from FW inventory
|
||||
// response, err := util.MakeRequest()
|
||||
|
||||
// // load file from disk
|
||||
// file, err := os.ReadFile(q.FirmwarePath)
|
||||
// if err != nil {
|
||||
// return fmt.Errorf("failed toread file: %v", err)
|
||||
// }
|
||||
|
||||
// switch q.TransferProtocol {
|
||||
// case "HTTP":
|
||||
// default:
|
||||
// return fmt.Errorf("transfer protocol not supported")
|
||||
// }
|
||||
// return nil
|
||||
// }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue