Skip to content
Open
Changes from all commits
Commits
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
78 changes: 65 additions & 13 deletions Server/OCPServerHardwareManagement.v1_1_0.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -132,12 +155,14 @@
"ReadRequirement": "Mandatory",
Copy link
Contributor Author

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).

"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": {},
Expand Down Expand Up @@ -193,7 +218,7 @@
}
},
"Power": {
"ReadRequirement": "Mandatory",
"ReadRequirement": "IfImplemented",
"PropertyRequirements": {
"PowerControl": {
"PropertyRequirements": {
Expand All @@ -209,11 +234,24 @@
}
}
},
"Thermal": {
"PowerSubsystem": {
"PropertyRequirements": {
"EnvironmentMetrics": {
"ReadRequirement": "IfImplemented",
"PropertyRequirements": {
Copy link
Collaborator

Choose a reason for hiding this comment

The 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": {},
Copy link
Collaborator

Choose a reason for hiding this comment

The 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": {},
Expand Down Expand Up @@ -248,7 +286,21 @@
}
}
},
"ServiceRoot": {
"ThermalSubsystem": {
"ReadRequirement": "IfImplemented",
"PropertyRequirements": {
"ThermalMetrics": {
"PropertyRequirements": {
Copy link
Collaborator

Choose a reason for hiding this comment

The 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": {}
}
Expand Down