Rename all properties to UpperCamelCase
Upstream dbus standard is UpperCamelCase, start matching and
check in json schema to start failing builds that don't match.
Change-Id: I2d2c6fec5a5a0b07c88c843257fa7c88d420c4e5
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index 81f2be2..5d5b840 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -1,53 +1,53 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x48",
- "bus": "$bus",
+ "Address": "0x48",
+ "Bus": "$bus",
"Name": "Riser 1 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 80
+ "Severity": 1,
+ "Value": 80
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 75
+ "Severity": 0,
+ "Value": 75
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x72",
- "bus": "$bus",
+ "Address": "0x72",
+ "Bus": "$bus",
"Name": "Riser 1 Mux",
"Type": "PCA9543Mux"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Riser 1 Fru",
"Type": "IntelFruDevice"
}
],
"Name": "1Ux16 Riser 1",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 80})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
@@ -56,54 +56,54 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x49",
- "bus": "$bus",
+ "Address": "0x49",
+ "Bus": "$bus",
"Name": "Riser 2 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 80
+ "Severity": 1,
+ "Value": 80
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 75
+ "Severity": 0,
+ "Value": 75
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x73",
- "bus": "$bus",
+ "Address": "0x73",
+ "Bus": "$bus",
"Name": "Riser 2 Mux",
"Type": "PCA9543Mux"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Riser 2 Fru",
"Type": "IntelFruDevice"
}
],
"Name": "1Ux16 Riser 2",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 81})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index cf2540b..94b8026 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -1,53 +1,53 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x48",
- "bus": "$bus",
+ "Address": "0x48",
+ "Bus": "$bus",
"Name": "Riser 1 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 80
+ "Severity": 1,
+ "Value": 80
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 75
+ "Severity": 0,
+ "Value": 75
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x72",
- "bus": "$bus",
+ "Address": "0x72",
+ "Bus": "$bus",
"Name": "Riser 1 Mux",
"Type": "PCA9545Mux"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Riser 1 Fru",
"Type": "IntelFruDevice"
}
],
"Name": "2Ux8 Riser 1",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': 80})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
@@ -56,54 +56,54 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x49",
- "bus": "$bus",
+ "Address": "0x49",
+ "Bus": "$bus",
"Name": "Riser 2 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 80
+ "Severity": 1,
+ "Value": 80
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 75
+ "Severity": 0,
+ "Value": 75
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x73",
- "bus": "$bus",
+ "Address": "0x73",
+ "Bus": "$bus",
"Name": "Riser 2 Mux",
"Type": "PCA9545Mux"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Riser 2 Fru",
"Type": "IntelFruDevice"
}
],
"Name": "2Ux8 Riser 2",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': 81})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/8X25 HSBP.json b/configurations/8X25 HSBP.json
index ca7574f..c21a8be 100644
--- a/configurations/8X25 HSBP.json
+++ b/configurations/8X25 HSBP.json
@@ -1,7 +1,7 @@
{
- "exposes": [
+ "Exposes": [
{
- "address": "0xEB",
+ "Address": "0xEB",
"Name": "HSBP $index Drive Mux",
"Type": "GenericSMBusMux"
},
@@ -15,5 +15,5 @@
}
],
"Name": "1U_HSBP",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})"
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})"
}
\ No newline at end of file
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index e22bb96..57887b3 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -1,21 +1,21 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x59",
- "bus": "$bus",
+ "Address": "0x59",
+ "Bus": "$bus",
"Name": "Delta DPS-750XB PSU Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Delta DPS-750XB PSU FRU",
"Type": "IntelFruDevice"
}
],
"Name": "Delta DPS-750XB PSU 2",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 81})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
@@ -25,22 +25,22 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x58",
- "bus": "$bus",
+ "Address": "0x58",
+ "Bus": "$bus",
"Name": "Delta DPS-750XB PSU Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Delta DPS-750XB PSU FRU",
"Type": "IntelFruDevice"
}
],
"Name": "Delta DPS-750XB PSU 1",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 80})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/F2U12X35S3P_riser.json b/configurations/F2U12X35S3P_riser.json
index d412248..dc7846a 100644
--- a/configurations/F2U12X35S3P_riser.json
+++ b/configurations/F2U12X35S3P_riser.json
@@ -1,47 +1,47 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x48",
- "bus": "$bus",
+ "Address": "0x48",
+ "Bus": "$bus",
"Name": "Riser1 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 80
+ "Severity": 1,
+ "Value": 80
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 75
+ "Severity": 0,
+ "Value": 75
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Riser 1 Fru",
"Type": "IntelFruDevice"
}
],
"Name": "2U12x35 Riser1",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 80})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
@@ -50,48 +50,48 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x49",
- "bus": "$bus",
+ "Address": "0x49",
+ "Bus": "$bus",
"Name": "Riser2 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 80
+ "Severity": 1,
+ "Value": 80
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 75
+ "Severity": 0,
+ "Value": 75
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Riser 2 Fru",
"Type": "IntelFruDevice"
}
],
"Name": "2U12x35 Riser2",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 81})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index a96b4e6..82a3b6c 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -1,21 +1,21 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x59",
- "bus": "$bus",
+ "Address": "0x59",
+ "Bus": "$bus",
"Name": "Flextronics S-1100ADU00-201 PSU Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Flextronics S-1100ADU00-201 PSU FRU",
"Type": "IntelFruDevice"
}
],
"Name": "Flextronics S-1100ADU00-201 PSU 2",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 81})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
@@ -25,22 +25,22 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x58",
- "bus": "$bus",
+ "Address": "0x58",
+ "Bus": "$bus",
"Name": "Flextronics S-1100ADU00-201 PSU Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Flextronics S-1100ADU00-201 PSU FRU",
"Type": "IntelFruDevice"
}
],
"Name": "Flextronics S-1100ADU00-201 PSU 1",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 80})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index 4e55cac..c4319e8 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -1,46 +1,46 @@
{
- "exposes": [
+ "Exposes": [
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Front Panel FRU",
"Type": "IntelFruDevice"
},
{
- "address": "0x4D",
- "bus": "$bus",
+ "Address": "0x4D",
+ "Bus": "$bus",
"Name": "Front Panel Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 55
+ "Severity": 1,
+ "Value": 55
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 50
+ "Severity": 0,
+ "Value": 50
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
}
],
"Name": "Intel Front Panel",
- "probe": [
+ "Probe": [
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})",
"OR",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2USTOPANEL'})"
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index 9ac9ce6..c2bf944 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -1,20 +1,20 @@
{
- "exposes": [
+ "Exposes": [
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "PCIE SSD Retimer FRU",
"Type": "IntelFruDevice"
},
{
- "address": "0x4F",
- "bus": "$bus",
+ "Address": "0x4F",
+ "Bus": "$bus",
"Name": "PCIE SSD Retimer Temp",
"Type": "TMP75"
}
],
"Name": "PCIE SSD Retimer",
- "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
"Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
old mode 100755
new mode 100644
index 7182cfc..dcba8f0
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -1,21 +1,21 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x59",
- "bus": "$bus",
+ "Address": "0x59",
+ "Bus": "$bus",
"Name": "Solum 1300W PSU 2 Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Solum 1300W PSU 2 FRU",
"Type": "IntelFruDevice"
}
],
"Name": "Solum 1300W PSU 2",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
@@ -25,22 +25,22 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x58",
- "bus": "$bus",
+ "Address": "0x58",
+ "Bus": "$bus",
"Name": "Solum 1300W PSU 1 Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "Solum 1300W PSU 1 FRU",
"Type": "IntelFruDevice"
}
],
"Name": "Solum 1300W PSU 1",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 9394579..99fff13 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -1,241 +1,241 @@
{
- "exposes": [
+ "Exposes": [
{
- "bind_connector": "1U System Fan connector 1",
- "index": 0,
+ "BindConnector": "1U System Fan connector 1",
+ "Index": 0,
"Name": "Fan 1a",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1080
+ "Severity": 1,
+ "Value": 1080
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1260
+ "Severity": 0,
+ "Value": 1260
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 1",
- "index": 1,
+ "BindConnector": "1U System Fan connector 1",
+ "Index": 1,
"Name": "Fan 1b",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1110
+ "Severity": 1,
+ "Value": 1110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1295
+ "Severity": 0,
+ "Value": 1295
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 2",
- "index": 2,
+ "BindConnector": "1U System Fan connector 2",
+ "Index": 2,
"Name": "Fan 2a",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1080
+ "Severity": 1,
+ "Value": 1080
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1260
+ "Severity": 0,
+ "Value": 1260
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 2",
- "index": 3,
+ "BindConnector": "1U System Fan connector 2",
+ "Index": 3,
"Name": "Fan 2b",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1110
+ "Severity": 1,
+ "Value": 1110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1295
+ "Severity": 0,
+ "Value": 1295
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 3",
- "index": 4,
+ "BindConnector": "1U System Fan connector 3",
+ "Index": 4,
"Name": "Fan 3a",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1080
+ "Severity": 1,
+ "Value": 1080
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1260
+ "Severity": 0,
+ "Value": 1260
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 3",
- "index": 5,
+ "BindConnector": "1U System Fan connector 3",
+ "Index": 5,
"Name": "Fan 3b",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1110
+ "Severity": 1,
+ "Value": 1110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1295
+ "Severity": 0,
+ "Value": 1295
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 4",
- "index": 6,
+ "BindConnector": "1U System Fan connector 4",
+ "Index": 6,
"Name": "Fan 4a",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1080
+ "Severity": 1,
+ "Value": 1080
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1260
+ "Severity": 0,
+ "Value": 1260
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 4",
- "index": 7,
+ "BindConnector": "1U System Fan connector 4",
+ "Index": 7,
"Name": "Fan 4b",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1110
+ "Severity": 1,
+ "Value": 1110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1295
+ "Severity": 0,
+ "Value": 1295
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 5",
- "index": 8,
+ "BindConnector": "1U System Fan connector 5",
+ "Index": 8,
"Name": "Fan 5a",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1080
+ "Severity": 1,
+ "Value": 1080
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1260
+ "Severity": 0,
+ "Value": 1260
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 5",
- "index": 9,
+ "BindConnector": "1U System Fan connector 5",
+ "Index": 9,
"Name": "Fan 5b",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1110
+ "Severity": 1,
+ "Value": 1110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1295
+ "Severity": 0,
+ "Value": 1295
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 6",
- "index": 10,
+ "BindConnector": "1U System Fan connector 6",
+ "Index": 10,
"Name": "Fan 6a",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1080
+ "Severity": 1,
+ "Value": 1080
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1260
+ "Severity": 0,
+ "Value": 1260
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "1U System Fan connector 6",
- "index": 11,
+ "BindConnector": "1U System Fan connector 6",
+ "Index": 11,
"Name": "Fan 6b",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1110
+ "Severity": 1,
+ "Value": 1110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1295
+ "Severity": 0,
+ "Value": 1295
}
],
"Type": "AspeedFan"
@@ -405,7 +405,7 @@
}
],
"Name": "R1000 Chassis",
- "probe": [
+ "Probe": [
"FOUND('WFP Baseboard')",
"AND",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d'})",
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index b4181ab..304e8c3 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -1,128 +1,128 @@
{
- "exposes": [
+ "Exposes": [
{
- "bind_connector": "2U System Fan connector 1",
- "index": 0,
+ "BindConnector": "2U System Fan connector 1",
+ "Index": 0,
"Name": "Fan 1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "2U System Fan connector 2",
- "index": 2,
+ "BindConnector": "2U System Fan connector 2",
+ "Index": 2,
"Name": "Fan 2",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "2U System Fan connector 3",
- "index": 4,
+ "BindConnector": "2U System Fan connector 3",
+ "Index": 4,
"Name": "Fan 3",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "2U System Fan connector 4",
- "index": 6,
+ "BindConnector": "2U System Fan connector 4",
+ "Index": 6,
"Name": "Fan 4",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "2U System Fan connector 5",
- "index": 8,
+ "BindConnector": "2U System Fan connector 5",
+ "Index": 8,
"Name": "Fan 5",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "2U System Fan connector 6",
- "index": 10,
+ "BindConnector": "2U System Fan connector 6",
+ "Index": 10,
"Name": "Fan 6",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
}
],
"Name": "R2000 Chassis",
- "probe": [
+ "Probe": [
"FOUND('WFP Baseboard')",
"AND",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL\\d+RISER\\d'})",
diff --git a/configurations/SAS Module.json b/configurations/SAS Module.json
index 10363e9..2a1ad36 100644
--- a/configurations/SAS Module.json
+++ b/configurations/SAS Module.json
@@ -1,17 +1,17 @@
{
- "exposes": [
+ "Exposes": [
{
- "bus": "$bus",
+ "Bus": "$bus",
"Name": "SAS Module FRU",
"Type": "IntelFruDevice"
},
{
- "address": "0x98",
- "bus": "$bus",
+ "Address": "0x98",
+ "Bus": "$bus",
"Name": "SAS Module Temperature",
"Type": "TMP75"
}
],
"Name": "SAS Module",
- "probe": "FALSE"
+ "Probe": "FALSE"
}
\ No newline at end of file
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 42be150..2730c24 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -1,21 +1,21 @@
[
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x59",
- "bus": "$bus",
+ "Address": "0x59",
+ "Bus": "$bus",
"Name": "SOLUM CO IS162F22 PSU Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "SOLUM CO IS162F22 PSU FRU",
"Type": "IntelFruDevice"
}
],
"Name": "SOLUM CO IS162F22 PSU 2",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22', 'ADDRESS': 81})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22', 'ADDRESS': 81})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
@@ -25,22 +25,22 @@
}
},
{
- "exposes": [
+ "Exposes": [
{
- "address": "0x58",
- "bus": "$bus",
+ "Address": "0x58",
+ "Bus": "$bus",
"Name": "SOLUM CO IS162F22 PSU Device",
"Type": "pmbus"
},
{
- "address": "$address",
- "bus": "$bus",
+ "Address": "$address",
+ "Bus": "$bus",
"Name": "SOLUM CO IS162F22 PSU FRU",
"Type": "IntelFruDevice"
}
],
"Name": "SOLUM CO IS162F22 PSU 1",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 80})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 80})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 88d417e..c3d64b3 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -1,852 +1,844 @@
{
- "exposes": [
+ "Exposes": [
{
- "fault_led": 0,
"Name": "4U System Fan connector 1",
"present": 0,
- "pwm": 1,
- "status": "disabled",
- "tachs": [
+ "Pwm": 1,
+ "Status": "disabled",
+ "Tachs": [
1
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 1,
"Name": "4U System Fan connector 2",
"present": 1,
- "pwm": 2,
- "status": "disabled",
- "tachs": [
+ "Pwm": 2,
+ "Status": "disabled",
+ "Tachs": [
2
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 2,
"Name": "4U System Fan connector 3",
"present": 2,
- "pwm": 3,
- "status": "disabled",
- "tachs": [
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
3
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 3,
"Name": "4U System Fan connector 4",
"present": 3,
- "pwm": 4,
- "status": "disabled",
- "tachs": [
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
4
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 4,
"Name": "4U System Fan connector 5",
"present": 4,
- "pwm": 5,
- "status": "disabled",
- "tachs": [
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
5
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 5,
"Name": "4U System Fan connector 6",
"present": 5,
- "pwm": 6,
- "status": "disabled",
- "tachs": [
+ "Pwm": 6,
+ "Status": "disabled",
+ "Tachs": [
6
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 6,
"Name": "4U CPU 0 fan connector",
- "pwm": 7,
- "status": "disabled",
- "tachs": [
+ "Pwm": 7,
+ "Status": "disabled",
+ "Tachs": [
7
],
"Type": "IntelFanConnector"
},
{
- "fault_led": 7,
"Name": "4U CPU 1 fan connector",
- "pwm": 8,
- "status": "disabled",
- "tachs": [
+ "Pwm": 8,
+ "Status": "disabled",
+ "Tachs": [
8
],
"Type": "IntelFanConnector"
},
{
"Name": "4U System Fan connector 7",
- "pwm": 9,
- "status": "disabled",
- "tachs": [
+ "Pwm": 9,
+ "Status": "disabled",
+ "Tachs": [
9
],
"Type": "IntelFanConnector"
},
{
- "address": "0x48",
- "bus": 6,
+ "Address": "0x48",
+ "Bus": 6,
"Name": "M_2 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x4F",
- "bus": 6,
+ "Address": "0x4F",
+ "Bus": 6,
"Name": "Memory VRM Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x4E",
- "bus": 6,
+ "Address": "0x4E",
+ "Bus": 6,
"Name": "LR Memory Board Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x4C",
- "bus": 6,
+ "Address": "0x4C",
+ "Bus": 6,
"Name": "BMC Temp",
"Name1": "TMP421 Internal Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP421"
},
{
- "address": "0x49",
- "bus": 6,
+ "Address": "0x49",
+ "Bus": 6,
"Name": "CPU VR Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x4D",
- "bus": 6,
+ "Address": "0x4D",
+ "Bus": 6,
"Name": "Ambient Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "index": 0,
+ "Index": 0,
"Name": "PSU 12 Volt",
- "scale_factor": 0.1124,
- "thresholds": [
+ "ScaleFactor": 0.1124,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 13.494
+ "Severity": 1,
+ "Value": 13.494
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 13.101
+ "Severity": 0,
+ "Value": 13.101
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 10.945
+ "Severity": 0,
+ "Value": 10.945
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 10.616
+ "Severity": 1,
+ "Value": 10.616
}
],
"Type": "ADC"
},
{
- "index": 1,
+ "Index": 1,
"Name": "P3V3",
- "scale_factor": 0.4107,
- "thresholds": [
+ "ScaleFactor": 0.4107,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 3.647
+ "Severity": 1,
+ "Value": 3.647
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 3.066
+ "Severity": 0,
+ "Value": 3.066
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 3.066
+ "Severity": 0,
+ "Value": 3.066
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 2.974
+ "Severity": 1,
+ "Value": 2.974
}
],
"Type": "ADC"
},
{
- "index": 2,
+ "Index": 2,
"Name": "PVNN_PCH_AUX",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.081
+ "Severity": 1,
+ "Value": 1.081
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.049
+ "Severity": 0,
+ "Value": 1.049
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.807
+ "Severity": 0,
+ "Value": 0.807
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.783
+ "Severity": 1,
+ "Value": 0.783
}
],
"Type": "ADC"
},
{
- "index": 3,
+ "Index": 3,
"Name": "P1V05_PCH_AUX",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.139
+ "Severity": 1,
+ "Value": 1.139
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.106
+ "Severity": 0,
+ "Value": 1.106
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.995
+ "Severity": 0,
+ "Value": 0.995
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.966
+ "Severity": 1,
+ "Value": 0.966
}
],
"Type": "ADC"
},
{
- "index": 4,
+ "Index": 4,
"Name": "P0V83_LAN_AUX",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 0.901
+ "Severity": 1,
+ "Value": 0.901
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 0.875
+ "Severity": 0,
+ "Value": 0.875
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.786
+ "Severity": 0,
+ "Value": 0.786
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.763
+ "Severity": 1,
+ "Value": 0.763
}
],
"Type": "ADC"
},
{
- "index": 5,
+ "Index": 5,
"Name": "P5V_STBY",
- "scale_factor": 0.2717,
- "thresholds": [
+ "ScaleFactor": 0.2717,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 13.494
+ "Severity": 1,
+ "Value": 13.494
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 13.101
+ "Severity": 0,
+ "Value": 13.101
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 10.945
+ "Severity": 0,
+ "Value": 10.945
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 10.616
+ "Severity": 1,
+ "Value": 10.616
}
],
"Type": "ADC"
},
{
- "index": 6,
+ "Index": 6,
"Name": "P1V8_PCH_AUX",
- "scale_factor": 0.7505,
- "thresholds": [
+ "ScaleFactor": 0.7505,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.961
+ "Severity": 1,
+ "Value": 1.961
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.904
+ "Severity": 0,
+ "Value": 1.904
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.699
+ "Severity": 0,
+ "Value": 1.699
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.648
+ "Severity": 1,
+ "Value": 1.648
}
],
"Type": "ADC"
},
{
- "index": 7,
+ "Index": 7,
"Name": "P3V_BAT",
- "scale_factor": 0.3333,
- "thresholds": [
+ "ScaleFactor": 0.3333,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 3.296
+ "Severity": 1,
+ "Value": 3.296
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 3.263
+ "Severity": 0,
+ "Value": 3.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2.457
+ "Severity": 0,
+ "Value": 2.457
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 2.138
+ "Severity": 1,
+ "Value": 2.138
}
],
"Type": "ADC"
},
{
- "index": 8,
+ "Index": 8,
"Name": "PVCCIN_CPU0",
- "scale_factor": 0.7505,
- "thresholds": [
+ "ScaleFactor": 0.7505,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 2.151
+ "Severity": 1,
+ "Value": 2.151
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 2.088
+ "Severity": 0,
+ "Value": 2.088
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.418
+ "Severity": 0,
+ "Value": 1.418
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.376
+ "Severity": 1,
+ "Value": 1.376
}
],
"Type": "ADC"
},
{
- "index": 9,
+ "Index": 9,
"Name": "PVCCIN_CPU1",
- "scale_factor": 0.7505,
- "thresholds": [
+ "ScaleFactor": 0.7505,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 2.151
+ "Severity": 1,
+ "Value": 2.151
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 2.088
+ "Severity": 0,
+ "Value": 2.088
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.418
+ "Severity": 0,
+ "Value": 1.418
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.376
+ "Severity": 1,
+ "Value": 1.376
}
],
"Type": "ADC"
},
{
- "index": 10,
+ "Index": 10,
"Name": "PVDDQ_ABC_CPU0",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 11,
+ "Index": 11,
"Name": "PVDDQ_DEF_CPU0",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 12,
+ "Index": 12,
"Name": "PVDDQ_ABC_CPU1",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 13,
+ "Index": 13,
"Name": "PVDDQ_DEF_CPU1",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 14,
+ "Index": 14,
"Name": "PVCCIO_CPU0",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.19
+ "Severity": 1,
+ "Value": 1.19
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.155
+ "Severity": 0,
+ "Value": 1.155
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.752
+ "Severity": 0,
+ "Value": 0.752
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.729
+ "Severity": 1,
+ "Value": 0.729
}
],
"Type": "ADC"
},
{
- "index": 15,
+ "Index": 15,
"Name": "PVCCIO_CPU1",
- "scale_factor": 1.0,
- "thresholds": [
+ "ScaleFactor": 1.0,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.19
+ "Severity": 1,
+ "Value": 1.19
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.155
+ "Severity": 0,
+ "Value": 1.155
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.752
+ "Severity": 0,
+ "Value": 0.752
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.729
+ "Severity": 1,
+ "Value": 0.729
}
],
"Type": "ADC"
},
{
- "address": "0x30",
- "cpu_id": 0,
+ "Address": "0x30",
+ "CpuID": 0,
"Name": "Skylake CPU 0",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper critical",
- "severity": 1,
- "value": 99
+ "Severity": 1,
+ "Value": 99
},
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper non critical",
- "severity": 0,
- "value": 89
+ "Severity": 0,
+ "Value": 89
}
],
"Type": "SkylakeCPU"
},
{
- "address": "0x31",
- "cpu_id": 1,
+ "Address": "0x31",
+ "CpuID": 1,
"Name": "Skylake CPU 1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper critical",
- "severity": 1,
- "value": 99
+ "Severity": 1,
+ "Value": 99
},
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper non critical",
- "severity": 0,
- "value": 89
+ "Severity": 0,
+ "Value": 89
}
],
"Type": "SkylakeCPU"
}
],
"Name": "STP Baseboard",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/STP P4000 Chassis.json b/configurations/STP P4000 Chassis.json
index 110b916..cf67cdb 100644
--- a/configurations/STP P4000 Chassis.json
+++ b/configurations/STP P4000 Chassis.json
@@ -1,128 +1,128 @@
{
- "exposes": [
+ "Exposes": [
{
- "bind_connector": "4U System Fan connector 1",
- "index": 0,
+ "BindConnector": "4U System Fan connector 1",
+ "Index": 0,
"Name": "Fan 1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "4U System Fan connector 2",
- "index": 1,
+ "BindConnector": "4U System Fan connector 2",
+ "Index": 1,
"Name": "Fan 2",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "4U System Fan connector 3",
- "index": 2,
+ "BindConnector": "4U System Fan connector 3",
+ "Index": 2,
"Name": "Fan 3",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "4U System Fan connector 4",
- "index": 3,
+ "BindConnector": "4U System Fan connector 4",
+ "Index": 3,
"Name": "Fan 4",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "4U System Fan connector 5",
- "index": 4,
+ "BindConnector": "4U System Fan connector 5",
+ "Index": 4,
"Name": "Fan 5",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
},
{
- "bind_connector": "4U System Fan connector 6",
- "index": 5,
+ "BindConnector": "4U System Fan connector 6",
+ "Index": 5,
"Name": "Fan 6",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1750
+ "Severity": 1,
+ "Value": 1750
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2000
+ "Severity": 0,
+ "Value": 2000
}
],
"Type": "AspeedFan"
}
],
"Name": "P4000 Chassis",
- "probe": [
+ "Probe": [
"FOUND('STP Baseboard')",
"AND",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})"
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 8e3a222..e7381bd 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,10 +1,10 @@
{
- "exposes": [
+ "Exposes": [
{
"Name": "1U System Fan connector 1",
- "pwm": 0,
- "status": "disabled",
- "tachs": [
+ "Pwm": 0,
+ "Status": "disabled",
+ "Tachs": [
0,
1
],
@@ -12,9 +12,9 @@
},
{
"Name": "1U System Fan connector 2",
- "pwm": 1,
- "status": "disabled",
- "tachs": [
+ "Pwm": 1,
+ "Status": "disabled",
+ "Tachs": [
2,
3
],
@@ -22,9 +22,9 @@
},
{
"Name": "1U System Fan connector 3",
- "pwm": 2,
- "status": "disabled",
- "tachs": [
+ "Pwm": 2,
+ "Status": "disabled",
+ "Tachs": [
4,
5
],
@@ -32,9 +32,9 @@
},
{
"Name": "1U System Fan connector 4",
- "pwm": 3,
- "status": "disabled",
- "tachs": [
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
6,
7
],
@@ -42,9 +42,9 @@
},
{
"Name": "1U System Fan connector 5",
- "pwm": 4,
- "status": "disabled",
- "tachs": [
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
8,
9
],
@@ -52,9 +52,9 @@
},
{
"Name": "1U System Fan connector 6",
- "pwm": 5,
- "status": "disabled",
- "tachs": [
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
10,
11
],
@@ -62,779 +62,779 @@
},
{
"Name": "2U System Fan connector 1",
- "pwm": 0,
- "status": "disabled",
- "tachs": [
+ "Pwm": 0,
+ "Status": "disabled",
+ "Tachs": [
0
],
"Type": "IntelFanConnector"
},
{
"Name": "2U System Fan connector 2",
- "pwm": 1,
- "status": "disabled",
- "tachs": [
+ "Pwm": 1,
+ "Status": "disabled",
+ "Tachs": [
2
],
"Type": "IntelFanConnector"
},
{
"Name": "2U System Fan connector 3",
- "pwm": 2,
- "status": "disabled",
- "tachs": [
+ "Pwm": 2,
+ "Status": "disabled",
+ "Tachs": [
4
],
"Type": "IntelFanConnector"
},
{
"Name": "2U System Fan connector 4",
- "pwm": 3,
- "status": "disabled",
- "tachs": [
+ "Pwm": 3,
+ "Status": "disabled",
+ "Tachs": [
6
],
"Type": "IntelFanConnector"
},
{
"Name": "2U System Fan connector 5",
- "pwm": 4,
- "status": "disabled",
- "tachs": [
+ "Pwm": 4,
+ "Status": "disabled",
+ "Tachs": [
8
],
"Type": "IntelFanConnector"
},
{
"Name": "2U System Fan connector 6",
- "pwm": 5,
- "status": "disabled",
- "tachs": [
+ "Pwm": 5,
+ "Status": "disabled",
+ "Tachs": [
10
],
"Type": "IntelFanConnector"
},
{
- "address": "0x4A",
- "bus": 6,
+ "Address": "0x4A",
+ "Bus": 6,
"Name": "BMC Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "index": 0,
+ "Index": 0,
"Name": "Baseboard 12 Volt",
- "scale_factor": 0.1124,
- "thresholds": [
+ "ScaleFactor": 0.1124,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 13.494
+ "Severity": 1,
+ "Value": 13.494
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 13.101
+ "Severity": 0,
+ "Value": 13.101
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 10.945
+ "Severity": 0,
+ "Value": 10.945
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 10.616
+ "Severity": 1,
+ "Value": 10.616
}
],
"Type": "ADC"
},
{
"Name": "CPU 1 Fan Connector",
- "pwm": 7,
- "status": "disabled",
- "tachs": [
+ "Pwm": 7,
+ "Status": "disabled",
+ "Tachs": [
13
],
"Type": "IntelFanConnector"
},
{
"Name": "CPU 2 Fan Connector",
- "pwm": 8,
- "status": "disabled",
- "tachs": [
+ "Pwm": 8,
+ "Status": "disabled",
+ "Tachs": [
14
],
"Type": "IntelFanConnector"
},
{
- "address": "0x49",
- "bus": 6,
+ "Address": "0x49",
+ "Bus": 6,
"Name": "Left Rear Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "index": 4,
+ "Index": 4,
"Name": "P0V83_LAN_AUX",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 0.901
+ "Severity": 1,
+ "Value": 0.901
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 0.875
+ "Severity": 0,
+ "Value": 0.875
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.786
+ "Severity": 0,
+ "Value": 0.786
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.763
+ "Severity": 1,
+ "Value": 0.763
}
],
"Type": "ADC"
},
{
- "index": 3,
+ "Index": 3,
"Name": "P105_PCH_AUX",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.139
+ "Severity": 1,
+ "Value": 1.139
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.106
+ "Severity": 0,
+ "Value": 1.106
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.995
+ "Severity": 0,
+ "Value": 0.995
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.966
+ "Severity": 1,
+ "Value": 0.966
}
],
"Type": "ADC"
},
{
- "index": 5,
+ "Index": 5,
"Name": "P12V_AUX",
- "scale_factor": 0.2717,
- "thresholds": [
+ "ScaleFactor": 0.2717,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 13.494
+ "Severity": 1,
+ "Value": 13.494
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 13.101
+ "Severity": 0,
+ "Value": 13.101
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 10.945
+ "Severity": 0,
+ "Value": 10.945
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 10.616
+ "Severity": 1,
+ "Value": 10.616
}
],
"Type": "ADC"
},
{
- "index": 6,
+ "Index": 6,
"Name": "P1V8_PCH",
- "scale_factor": 0.7505,
- "thresholds": [
+ "ScaleFactor": 0.7505,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.961
+ "Severity": 1,
+ "Value": 1.961
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.904
+ "Severity": 0,
+ "Value": 1.904
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.699
+ "Severity": 0,
+ "Value": 1.699
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.648
+ "Severity": 1,
+ "Value": 1.648
}
],
"Type": "ADC"
},
{
- "index": 1,
+ "Index": 1,
"Name": "P3V3",
- "scale_factor": 0.4107,
- "thresholds": [
+ "ScaleFactor": 0.4107,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 3.647
+ "Severity": 1,
+ "Value": 3.647
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 3.066
+ "Severity": 0,
+ "Value": 3.066
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 3.066
+ "Severity": 0,
+ "Value": 3.066
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 2.974
+ "Severity": 1,
+ "Value": 2.974
}
],
"Type": "ADC"
},
{
- "index": 7,
+ "Index": 7,
"Name": "P3VBAT",
- "scale_factor": 0.3333,
- "thresholds": [
+ "ScaleFactor": 0.3333,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 3.296
+ "Severity": 1,
+ "Value": 3.296
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 3.263
+ "Severity": 0,
+ "Value": 3.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 2.457
+ "Severity": 0,
+ "Value": 2.457
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 2.138
+ "Severity": 1,
+ "Value": 2.138
}
],
"Type": "ADC"
},
{
- "index": 8,
+ "Index": 8,
"Name": "PVCCIN_CPU0",
- "scale_factor": 0.7505,
- "thresholds": [
+ "ScaleFactor": 0.7505,
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 2.151
+ "Severity": 1,
+ "Value": 2.151
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 2.088
+ "Severity": 0,
+ "Value": 2.088
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.418
+ "Severity": 0,
+ "Value": 1.418
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.376
+ "Severity": 1,
+ "Value": 1.376
}
],
"Type": "ADC"
},
{
- "index": 9,
+ "Index": 9,
"Name": "PVCCIN_CPU1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 2.151
+ "Severity": 1,
+ "Value": 2.151
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 2.088
+ "Severity": 0,
+ "Value": 2.088
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.418
+ "Severity": 0,
+ "Value": 1.418
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.376
+ "Severity": 1,
+ "Value": 1.376
}
],
"Type": "ADC"
},
{
- "index": 14,
+ "Index": 14,
"Name": "PVCCIO_CPU0",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.19
+ "Severity": 1,
+ "Value": 1.19
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.155
+ "Severity": 0,
+ "Value": 1.155
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.752
+ "Severity": 0,
+ "Value": 0.752
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.729
+ "Severity": 1,
+ "Value": 0.729
}
],
"Type": "ADC"
},
{
- "index": 15,
+ "Index": 15,
"Name": "PVCCIO_CPU1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.19
+ "Severity": 1,
+ "Value": 1.19
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.155
+ "Severity": 0,
+ "Value": 1.155
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.752
+ "Severity": 0,
+ "Value": 0.752
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.729
+ "Severity": 1,
+ "Value": 0.729
}
],
"Type": "ADC"
},
{
- "index": 10,
+ "Index": 10,
"Name": "PVDQ_ABC_CPU0",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 12,
+ "Index": 12,
"Name": "PVDQ_ABC_CPU1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 11,
+ "Index": 11,
"Name": "PVDQ_DEF_CPU0",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 13,
+ "Index": 13,
"Name": "PVDQ_DEF_CPU1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.301
+ "Severity": 1,
+ "Value": 1.301
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.263
+ "Severity": 0,
+ "Value": 1.263
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 1.138
+ "Severity": 0,
+ "Value": 1.138
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 1.104
+ "Severity": 1,
+ "Value": 1.104
}
],
"Type": "ADC"
},
{
- "index": 2,
+ "Index": 2,
"Name": "PVNN_PCH_AUX",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 1.081
+ "Severity": 1,
+ "Value": 1.081
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 1.049
+ "Severity": 0,
+ "Value": 1.049
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 0.807
+ "Severity": 0,
+ "Value": 0.807
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0.783
+ "Severity": 1,
+ "Value": 0.783
}
],
"Type": "ADC"
},
{
- "address": "0x4D",
- "bus": 6,
+ "Address": "0x4D",
+ "Bus": 6,
"Name": "Right Rear Board Temp",
"Name1": "Right Rear TMP421 Internal Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP421"
},
{
- "address": "0x48",
- "bus": 6,
+ "Address": "0x48",
+ "Bus": 6,
"Name": "Voltage Regulator 1 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x4B",
- "bus": 6,
+ "Address": "0x4B",
+ "Bus": 6,
"Name": "Voltage Regulator 2 Temp",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper critical",
- "severity": 1,
- "value": 115
+ "Severity": 1,
+ "Value": 115
},
{
- "direction": "greater than",
+ "Direction": "greater than",
"Name": "upper non critical",
- "severity": 0,
- "value": 110
+ "Severity": 0,
+ "Value": 110
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower non critical",
- "severity": 0,
- "value": 5
+ "Severity": 0,
+ "Value": 5
},
{
- "direction": "less than",
+ "Direction": "less than",
"Name": "lower critical",
- "severity": 1,
- "value": 0
+ "Severity": 1,
+ "Value": 0
}
],
"Type": "TMP75"
},
{
- "address": "0x30",
- "cpu_id": 0,
+ "Address": "0x30",
+ "CpuID": 0,
"Name": "Skylake CPU 0",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper critical",
- "severity": 1,
- "value": 99
+ "Severity": 1,
+ "Value": 99
},
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper non critical",
- "severity": 0,
- "value": 89
+ "Severity": 0,
+ "Value": 89
}
],
"Type": "SkylakeCPU"
},
{
- "address": "0x31",
- "cpu_id": 1,
+ "Address": "0x31",
+ "CpuID": 1,
"Name": "Skylake CPU 1",
- "thresholds": [
+ "Thresholds": [
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper critical",
- "severity": 1,
- "value": 99
+ "Severity": 1,
+ "Value": 99
},
{
- "direction": "greater than",
- "label": "DIMM",
+ "Direction": "greater than",
+ "Label": "DIMM",
"Name": "upper non critical",
- "severity": 0,
- "value": 89
+ "Severity": 0,
+ "Value": 89
}
],
"Type": "SkylakeCPU"
@@ -865,7 +865,7 @@
}
],
"Name": "WFP Baseboard",
- "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",