-
Notifications
You must be signed in to change notification settings - Fork 20
Changes to support PowerSubsystem and ThermalSubsystem #126
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
1fc585d
00667a2
09b8b3b
515a5c5
779a321
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,23 +28,46 @@ | |
| "ReadRequirement": "Mandatory", | ||
| "CompareType": "AnyOf", | ||
| "CompareProperty": "ChassisType", | ||
| "CompareValues": ["RackMount", "Tray", "Sled", "Drawer"] | ||
| "CompareValues": ["RackMount", "Sled", "Drawer"] | ||
| } | ||
| ] | ||
| }, | ||
| "Power": { | ||
| "ThermalSubsystem": { | ||
| "ReadRequirement": "Recommended", | ||
| "ConditionalRequirements": [ | ||
| { | ||
| "Purpose": "Required if ChassisType are specific values", | ||
| "ReadRequirement": "Mandatory", | ||
| "CompareType": "AnyOf", | ||
| "CompareProperty": "ChassisType", | ||
| "CompareValues": ["RackMount", "Tray", "Sled", "Drawer"] | ||
| "CompareValues": ["RackMount", "Sled", "Drawer"] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "Power": { | ||
| "ReadRequirement": "Recommended", | ||
| "ConditionalRequirements": [ | ||
| { | ||
| "Purpose": "Required if ChassisType are specific values", | ||
| "ReadRequirement": "Mandatory", | ||
| "CompareType": "AnyOf", | ||
| "CompareProperty": "ChassisType", | ||
| "CompareValues": ["RackMount", "Sled", "Drawer"] | ||
| } | ||
| ] | ||
| }, | ||
| "PowerSubsystem": { | ||
| "ReadRequirement": "Recommended", | ||
| "ConditionalRequirements": [ | ||
| { | ||
| "Purpose": "Required if ChassisType are specific values", | ||
| "ReadRequirement": "Mandatory", | ||
| "CompareType": "AnyOf", | ||
| "CompareProperty": "ChassisType", | ||
| "CompareValues": ["RackMount", "Sled", "Drawer"] | ||
| } | ||
| ] | ||
| } } | ||
|
|
||
| }, | ||
| "ComputerSystem": { | ||
|
|
@@ -132,12 +155,14 @@ | |
| "ReadRequirement": "Mandatory", | ||
| "Purpose": "SSH or IPMI-based serial remote console is required.", | ||
| "PropertyRequirements": { | ||
| "ConnectTypesSupported": { | ||
| "Values": [ "SSH", "IPMI"], | ||
| "Comparison": "AnyOf" | ||
| "SSH": { | ||
| "ReadRequirement": "IfImplemented" | ||
| }, | ||
| "IPMI": { | ||
| "ReadRequirement": "IfImplemented" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "Links": { | ||
| "PropertyRequirements": { | ||
| "Chassis": {}, | ||
|
|
@@ -193,7 +218,7 @@ | |
| } | ||
| }, | ||
| "Power": { | ||
| "ReadRequirement": "Mandatory", | ||
| "ReadRequirement": "IfImplemented", | ||
| "PropertyRequirements": { | ||
| "PowerControl": { | ||
| "PropertyRequirements": { | ||
|
|
@@ -209,11 +234,24 @@ | |
| } | ||
| } | ||
| }, | ||
| "Thermal": { | ||
| "PowerSubsystem": { | ||
| "PropertyRequirements": { | ||
| "EnvironmentMetrics": { | ||
| "ReadRequirement": "IfImplemented", | ||
| "PropertyRequirements": { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs to go into an EnvrionmentMetrics resource set of requirements... But there's also no "EnvironmentMetrics" in PowerSubsystem... |
||
| "PowerConsumedWatts": {}, | ||
| "PowerCapacityWatts": {}, | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move to inside of "PowerSubsystem"; CapacityWatts is the property name. |
||
| "PowerLimitWatts": {} | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "Thermal": { | ||
| "MinVersion": "1.1.0", | ||
| "ReadRequirement": "IfImplemented", | ||
| "PropertyRequirements": { | ||
| "Temperatures": { | ||
| "ReadRequirement": "Mandatory", | ||
| "ReadRequirement": "IfImplemented", | ||
| "MinCount": 3, | ||
| "PropertyRequirements": { | ||
| "ReadingCelsius": {}, | ||
|
|
@@ -248,7 +286,21 @@ | |
| } | ||
| } | ||
| }, | ||
| "ServiceRoot": { | ||
| "ThermalSubsystem": { | ||
| "ReadRequirement": "IfImplemented", | ||
| "PropertyRequirements": { | ||
| "ThermalMetrics": { | ||
| "PropertyRequirements": { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs to go into a "ThermalMetrics" resource block. |
||
| "TemperatureSummaryCelsius": { | ||
| "PropertyRequirements": { | ||
| "Exhaust": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "ServiceRoot": { | ||
| "PropertyRequirements": { | ||
| "Systems": {} | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make this Recommended. (Check that this is still in Managers).