Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround for NVIDIA PowerSubsystem issue #331

Merged
merged 1 commit into from
May 7, 2024
Merged

Workaround for NVIDIA PowerSubsystem issue #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion redfish/powersubsystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,22 @@ func (powersubsystem *PowerSubsystem) UnmarshalJSON(b []byte) error {

err := json.Unmarshal(b, &t)
if err != nil {
return err
// Work around a bug in NVIDIA's implementation
var u struct {
temp
Batteries common.Link
PowerSupplies common.Link
Allocation []interface{}
}
err2 := json.Unmarshal(b, &u)
if err2 != nil {
// Still didn't work, return original error
return err
}

t.temp = u.temp
t.Batteries = u.Batteries
t.PowerSupplies = u.PowerSupplies
}

*powersubsystem = PowerSubsystem(t.temp)
Expand Down
60 changes: 60 additions & 0 deletions redfish/powersubsystem_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,56 @@ var powerSubsystemBody = `{
"@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem"
}`

var powerSubsystemNVBody = `{
"@odata.context": "/redfish/v1/$metadata#PowerSubsystem.PowerSubsystem",
"@odata.etag": "\"1715094363\"",
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem",
"@odata.type": "#PowerSubsystem.v1_1_0.PowerSubsystem",
"Allocation": [],
"Description": "PowerSubsytem for this Chassis",
"Id": "PowerSubsytem",
"Name": "PowerSubsytem",
"PowerSupplies": {
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies"
},
"PowerSupplyRedundancy": [
{
"MaxSupportedInGroup": 6,
"MinNeededInGroup": 1,
"RedundancyGroup": [
{
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies/PSU0"
},
{
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies/PSU1"
},
{
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies/PSU2"
},
{
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies/PSU3"
},
{
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies/PSU4"
},
{
"@odata.id": "/redfish/v1/Chassis/DGX/PowerSubsystem/PowerSupplies/PSU5"
}
],
"[email protected]": 6,
"RedundancyType": "NPlusM",
"Status": {
"Health": "OK",
"State": "Enabled"
}
}
],
"Status": {
"Health": "OK",
"State": "Enabled"
}
}`

// TestPowerSubsystem tests the parsing of PowerSubsystem objects.
func TestPowerSubsystem(t *testing.T) {
var result PowerSubsystem
Expand All @@ -67,3 +117,13 @@ func TestPowerSubsystem(t *testing.T) {
assertEquals(t, "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2", result.PowerSupplyRedundancy[0].redundancyGroup[1])
assertEquals(t, "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies", result.powerSupplies)
}

// TestPowerSubsystemNVWorkaround tests the workaround for a non-spec implementation of PowerSubsystem objects.
func TestPowerSubsystemNVWorkaround(t *testing.T) {
var result PowerSubsystem
err := json.NewDecoder(strings.NewReader(powerSubsystemNVBody)).Decode(&result)

if err != nil {
t.Errorf("Error decoding JSON: %s", err)
}
}