Remove redundant PSU configurations
Now that we have basic math support for templates,
calculate the PSU number based off the bus number.
Tested: Using Flextronics S-1100ADU00-201 config PSUs
were still available
Change-Id: I00baff0ec8967652896dbda8c3de5b459d6402f9
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index 823732b..b8206c3 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -2,9 +2,9 @@
{
"Exposes": [
{
- "Address": "0x5a",
+ "Address": "$ADDRESS % 4 + 88",
"Bus": "$bus",
- "Name": "PSU3",
+ "Name": "PSU$ADDRESS % 4 + 1",
"Thresholds": [
{
"Direction": "greater than",
@@ -59,14 +59,14 @@
"ILimitMax": 0.0,
"ILimitMin": 0.0,
"Inputs": [
- "PSU3 Fan Speed 1"
+ "PSU$ADDRESS % 4 + 1 Fan Speed 1"
],
- "Name": "PSU3 Fan 1",
+ "Name": "PSU$ADDRESS % 4 + 1 Fan 1",
"NegativeHysteresis": 2.0,
"OutLimitMax": 100.0,
"OutLimitMin": 30.0,
"Outputs": [
- "Pwm PSU3 Fan 1"
+ "Pwm PSU$ADDRESS % 4 + 1 Fan 1"
],
"PCoefficient": 0.0,
"PositiveHysteresis": 0.0,
@@ -80,9 +80,9 @@
{
"Class": "Floor",
"Inputs": [
- "PSU3 Temperature"
+ "PSU$ADDRESS % 4 + 1 Temperature"
],
- "Name": "PSU3 LCC",
+ "Name": "PSU$ADDRESS % 4 + 1 LCC",
"NegativeHysteresis": 2,
"Output": [
40.0, 100.0
@@ -99,241 +99,12 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 1300W PSU 3 FRU",
+ "Name": "Solum 1300W PSU$ADDRESS % 4 + 1 FRU",
"Type": "EEPROM"
}
],
- "Name": "Solum 1300W PSU 3",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 82})",
- "Type": "PowerSupply",
- "xyz.openbmc_project.Inventory.Decorator.Asset": {
- "Manufacturer": "$PRODUCT_MANUFACTURER",
- "Model": "$PRODUCT_PRODUCT_NAME",
- "PartNumber": "$PRODUCT_PART_NUMBER",
- "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
- }
- },
-
- {
- "Exposes": [
- {
- "Address": "0x59",
- "Bus": "$bus",
- "Name": "PSU2",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Label": "pin",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1648.4
- },
- {
- "Direction": "greater than",
- "Label": "pin",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 1536.3
- },
- {
- "Direction": "greater than",
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 100
- },
- {
- "Direction": "greater than",
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 65
- },
- {
- "Direction": "greater than",
- "Label": "temp1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 62
- }
- ],
- "Type": "pmbus"
- },
- {
- "Class": "fan",
- "FFGainCoefficient": 0.01,
- "FFOffCoefficient": 0.0,
- "ICoefficient": 0.0,
- "ILimitMax": 0.0,
- "ILimitMin": 0.0,
- "Inputs": [
- "PSU2 Fan Speed 1"
- ],
- "Name": "PSU2 Fan 1",
- "NegativeHysteresis": 2.0,
- "OutLimitMax": 100.0,
- "OutLimitMin": 30.0,
- "Outputs": [
- "Pwm PSU2 Fan 1"
- ],
- "PCoefficient": 0.0,
- "PositiveHysteresis": 0.0,
- "SlewNeg": 0.0,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Class": "Floor",
- "Inputs": [
- "PSU2 Temperature"
- ],
- "Name": "PSU2 LCC",
- "NegativeHysteresis": 2,
- "Output": [
- 40.0, 100.0
- ],
- "PositiveHysteresis": 0,
- "Reading": [
- 30.0, 65.0
- ],
- "Type": "Stepwise",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Address": "$address",
- "Bus": "$bus",
- "Name": "Solum 1300W PSU 2 FRU",
- "Type": "EEPROM"
- }
- ],
- "Name": "Solum 1300W PSU 2",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
- "Type": "PowerSupply",
- "xyz.openbmc_project.Inventory.Decorator.Asset": {
- "Manufacturer": "$PRODUCT_MANUFACTURER",
- "Model": "$PRODUCT_PRODUCT_NAME",
- "PartNumber": "$PRODUCT_PART_NUMBER",
- "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
- }
- },
- {
- "Exposes": [
- {
- "Address": "0x58",
- "Bus": "$bus",
- "Name": "PSU1",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Label": "pin",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1648.4
- },
- {
- "Direction": "greater than",
- "Label": "pin",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 1536.3
- },
- {
- "Direction": "greater than",
- "Label": "iout1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 115
- },
- {
- "Direction": "greater than",
- "Label": "iout1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 100
- },
- {
- "Direction": "greater than",
- "Label": "temp1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 65
- },
- {
- "Direction": "greater than",
- "Label": "temp1",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 62
- }
- ],
- "Type": "pmbus"
- },
- {
- "Class": "fan",
- "FFGainCoefficient": 0.01,
- "FFOffCoefficient": 0.0,
- "ICoefficient": 0.0,
- "ILimitMax": 0.0,
- "ILimitMin": 0.0,
- "Inputs": [
- "PSU1 Fan Speed 1"
- ],
- "Name": "PSU1 Fan 1",
- "NegativeHysteresis": 2.0,
- "OutLimitMax": 100.0,
- "OutLimitMin": 30.0,
- "Outputs": [
- "Pwm PSU1 Fan 1"
- ],
- "PCoefficient": 0.0,
- "PositiveHysteresis": 0.0,
- "SlewNeg": 0.0,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Class": "Floor",
- "Inputs": [
- "PSU1 Temperature"
- ],
- "Name": "PSU1 LCC",
- "NegativeHysteresis": 2,
- "Output": [
- 40.0, 100.0
- ],
- "PositiveHysteresis": 0,
- "Reading": [
- 30.0, 65.0
- ],
- "Type": "Stepwise",
- "Zones": [
- "PSU"
- ]
- },
- {
- "Address": "$address",
- "Bus": "$bus",
- "Name": "Solum 1300W PSU 1 FRU",
- "Type": "EEPROM"
- }
- ],
- "Name": "Solum 1300W PSU 1",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
+ "Name": "Solum 1300W PSU$ADDRESS % 4 + 1",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A'})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",