collect: return collection output from CollectInventory()

This commit is contained in:
David Allen 2025-02-26 16:18:42 -07:00
parent 1477da9693
commit 524a38a475
Signed by: towk
GPG key ID: 793B2924A49B3A3F
2 changed files with 10 additions and 48 deletions

View file

@ -32,7 +32,6 @@ type UpdateParams struct {
// 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.
<<<<<<< HEAD
// Example:
// ./magellan update https://192.168.23.40 --username root --password 0penBmc
// --firmware-url http://192.168.23.19:1337/obmc-phosphor-image.static.mtd.tar
@ -42,15 +41,12 @@ type UpdateParams struct {
// q.URI https://192.168.23.40
// q.TransferProtocol TFTP
// q.FirmwarePath http://192.168.23.19:1337/obmc-phosphor-image.static.mtd.tar
=======
>>>>>>> 81116ec (refactor: moved internal functions to pkg and updated refs)
func UpdateFirmwareRemote(q *UpdateParams) error {
// parse URI to set up full address
uri, err := url.ParseRequestURI(q.URI)
if err != nil {
return fmt.Errorf("failed to parse URI: %w", err)
}
<<<<<<< HEAD
// Connect to the Redfish service using gofish
client, err := gofish.Connect(gofish.ClientConfig{Endpoint: uri.String(), Username: q.Username, Password: q.Password, Insecure: q.Insecure})
@ -77,34 +73,6 @@ func UpdateFirmwareRemote(q *UpdateParams) error {
return fmt.Errorf("firmware update failed: %w", err)
}
fmt.Println("Firmware update initiated successfully.")
=======
uri.User = url.UserPassword(q.Username, q.Password)
// set up other vars
updateUrl := fmt.Sprintf("%s/redfish/v1/UpdateService/Actions/SimpleUpdate", uri.String())
headers := map[string]string{
"Content-Type": "application/json",
"cache-control": "no-cache",
}
b := map[string]any{
"UpdateComponent": q.Component, // BMC, BIOS
"TransferProtocol": q.TransferProtocol,
"ImageURI": q.FirmwarePath,
}
data, err := json.Marshal(b)
if err != nil {
return fmt.Errorf("failed to marshal data: %v", err)
}
res, body, err := client.MakeRequest(nil, updateUrl, "POST", data, headers)
if err != nil {
return fmt.Errorf("something went wrong: %v", err)
} else if res == nil {
return fmt.Errorf("no response returned (url: %s)", updateUrl)
}
if len(body) > 0 {
fmt.Printf("%d: %v\n", res.StatusCode, string(body))
}
>>>>>>> 81116ec (refactor: moved internal functions to pkg and updated refs)
return nil
}
@ -114,7 +82,6 @@ func GetUpdateStatus(q *UpdateParams) error {
if err != nil {
return fmt.Errorf("failed to parse URI: %w", err)
}
<<<<<<< HEAD
// Connect to the Redfish service using gofish
client, err := gofish.Connect(gofish.ClientConfig{Endpoint: uri.String(), Username: q.Username, Password: q.Password, Insecure: q.Insecure})
@ -133,20 +100,5 @@ func GetUpdateStatus(q *UpdateParams) error {
status := updateService.Status
fmt.Printf("Update Status: %v\n", status)
=======
uri.User = url.UserPassword(q.Username, q.Password)
updateUrl := fmt.Sprintf("%s/redfish/v1/UpdateService", uri.String())
res, body, err := client.MakeRequest(nil, updateUrl, "GET", nil, nil)
if err != nil {
return fmt.Errorf("something went wrong: %v", err)
} else if res == nil {
return fmt.Errorf("no response returned (url: %s)", updateUrl)
} else if res.StatusCode != http.StatusOK {
return fmt.Errorf("returned status code %d", res.StatusCode)
}
if len(body) > 0 {
fmt.Printf("%v\n", string(body))
}
>>>>>>> 81116ec (refactor: moved internal functions to pkg and updated refs)
return nil
}