Supermicro X13 inventory/firmware support FS-1671 #394
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
splaspood
force-pushed
the
fs-1671-supermicro-x13-0
branch
2 times, most recently
from
b826034
to
5519890
Compare
joelrebel
reviewed
Sep 9, 2024
| @@ -300,6 +320,11 @@ func (c *Client) bmcQueryor(ctx context.Context) (bmcQueryor, error) { | |||
| return nil, errors.Wrap(ErrModelUnknown, err.Error()) | |||
| } | |||
|
|
|||
| // ensure the device model matches the expected queryor | |||
| if !expected(deviceModel, bmc) { | |||
There was a problem hiding this comment.
include a bmc.Close() before the continue here to ensure we don't leave a successful connection open
DoctorVin
reviewed
Sep 27, 2024
| @@ -303,8 +334,8 @@ func (c *Client) bmcQueryor(ctx context.Context) (bmcQueryor, error) { | |||
| } | |||
|
|
|||
| model := strings.ToLower(queryor.deviceModel()) | |||
| if !strings.HasPrefix(model, "x12") && !strings.HasPrefix(model, "x11") { | |||
| return nil, errors.Wrap(ErrModelUnsupported, "expected one of X11* or X12*, got:"+model) | |||
| if !strings.HasPrefix(model, "x13") && !strings.HasPrefix(model, "x12") && !strings.HasPrefix(model, "x11") { | |||
There was a problem hiding this comment.
With your new expected function I don't think you'll actually get here if it's not x11, x12, or x13. I think the queryor nil check @ 301 covers you.
| // For X13 the full Task structure is returned in the body. If we can Unmarshall then we can safely assume | ||
| // that redfishTask.ID contains the ID. | ||
| redfishTask := &redfish.Task{} | ||
| err = json.Unmarshal(response, redfishTask) |
There was a problem hiding this comment.
Just a note, if response is valid JSON but isn't a redfish.Task I believe you'll get no error and zero value for the Task. It might be worth a sanity check that the task id isn't an empty string here.
…roper X13 model(s)
…, then pull TaskID from there directly
splaspood
force-pushed
the
fs-1671-supermicro-x13-0
branch
from
c7d0deb
to
2a3bfc2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR implement/change/remove?
Support for hw inventory and firmware management for Supermicro X13 boards.
The HW vendor this change applies to (if applicable)
Supermicro
The HW model number, product name this change applies to (if applicable)
X13
Description for changelog/release notes