configurations: catalina: revise pdb and hdd sensor config names
Revise the sensor config name (Name) to be the subset of actual sensor
name (in0_Name, in1_Name, etc.) to match with internal naming rule.
TestResults:
EM still works normally after changes
```
root@bmc:~# busctl tree xyz.openbmc_project.EntityManager | grep Catalina_PDB
├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/Catalina_PDB_FRU
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN0_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN0_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN1_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN1_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN2_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN2_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN3_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN3_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN4_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN4_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN5_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN5_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN6_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN6_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN7_TACH_IL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/FAN7_TACH_OL_SPEED_RPM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_CABLE_TSENSE_NEGATIVE
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_CABLE_TSENSE_POSITIVE
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_P12V_FAN
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_P12V_NIC0
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_P12V_NIC1
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_P12V_SCM
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_P48V_HSC1
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_P48V_HSC2
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_POSITIVE_VDROP
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_RETURN_VDROP
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_TEMP_C
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_VR_P12V_AUX
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_VR_P12V_N1
│ └─ /xyz/openbmc_project/inventory/system/board/Catalina_PDB/PDB_VR_P12V_N2
root@bmc:~# busctl tree xyz.openbmc_project.EntityManager | grep Catalina_HDD_Carrier
├─ /xyz/openbmc_project/inventory/system/board/Catalina_HDD_Carrier
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_HDD_Carrier/Catalina_HDD_Board_FRU
│ ├─ /xyz/openbmc_project/inventory/system/board/Catalina_HDD_Carrier/HDDBOARD_SSD0
│ └─ /xyz/openbmc_project/inventory/system/board/Catalina_HDD_Carrier/HDDBOARD_SSD2
```
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: I42ecaab444668acd1b7715d4b78be1d771546f36
diff --git a/configurations/meta/catalina_hdd.json b/configurations/meta/catalina_hdd.json
index 29c9146..84512d0 100644
--- a/configurations/meta/catalina_hdd.json
+++ b/configurations/meta/catalina_hdd.json
@@ -14,7 +14,7 @@
"curr1",
"power1"
],
- "Name": "HDDBOARD_SSD0_INA230",
+ "Name": "HDDBOARD_SSD0",
"PowerState": "On",
"Thresholds": [
{
@@ -47,7 +47,7 @@
"curr1",
"power1"
],
- "Name": "HDDBOARD_SSD2_INA230",
+ "Name": "HDDBOARD_SSD2",
"PowerState": "On",
"Thresholds": [
{
diff --git a/configurations/meta/catalina_pdb.json b/configurations/meta/catalina_pdb.json
index 3dd0bdd..0f719d5 100644
--- a/configurations/meta/catalina_pdb.json
+++ b/configurations/meta/catalina_pdb.json
@@ -495,7 +495,7 @@
"power1",
"temp1"
],
- "Name": "PDB_P12V_NIC0_INA238",
+ "Name": "PDB_P12V_NIC0",
"Thresholds": [
{
"Direction": "greater than",
@@ -529,7 +529,7 @@
"power1",
"temp1"
],
- "Name": "PDB_P12V_NIC1_INA238",
+ "Name": "PDB_P12V_NIC1",
"Thresholds": [
{
"Direction": "greater than",
@@ -563,7 +563,7 @@
"power1",
"temp1"
],
- "Name": "PDB_P12V_SCM_INA238",
+ "Name": "PDB_P12V_SCM",
"Thresholds": [
{
"Direction": "greater than",
@@ -594,7 +594,7 @@
"Labels": [
"in0"
],
- "Name": "PDB_POSITIVE_VDROP_INA238",
+ "Name": "PDB_POSITIVE_VDROP",
"Type": "INA238",
"in0_Max": 1,
"in0_Min": -1,
@@ -606,7 +606,7 @@
"Labels": [
"in0"
],
- "Name": "PDB_RETURN_VDROP_INA238",
+ "Name": "PDB_RETURN_VDROP",
"Type": "INA238",
"in0_Max": 1,
"in0_Min": -1,
@@ -618,7 +618,7 @@
"Labels": [
"in0"
],
- "Name": "PDB_CABLE_TSENSE_POSITIVE_INA238",
+ "Name": "PDB_CABLE_TSENSE_POSITIVE",
"Type": "INA238",
"in0_Max": 1,
"in0_Min": -1,
@@ -630,7 +630,7 @@
"Labels": [
"in0"
],
- "Name": "PDB_CABLE_TSENSE_NEGATIVE_INA238",
+ "Name": "PDB_CABLE_TSENSE_NEGATIVE",
"Type": "INA238",
"in0_Max": 1,
"in0_Min": -1,
@@ -646,7 +646,7 @@
"vin",
"vout1"
],
- "Name": "PDB_P48V_HSC1_LTC4287",
+ "Name": "PDB_P48V_HSC1",
"Thresholds": [
{
"Direction": "greater than",
@@ -714,7 +714,7 @@
"vin",
"vout1"
],
- "Name": "PDB_P48V_HSC2_LTC4287",
+ "Name": "PDB_P48V_HSC2",
"Thresholds": [
{
"Direction": "greater than",
@@ -782,7 +782,7 @@
"vin",
"vout1"
],
- "Name": "PDB_P12V_FAN_MP5990",
+ "Name": "PDB_P12V_FAN",
"Thresholds": [
{
"Direction": "greater than",
@@ -849,7 +849,7 @@
"temp1",
"vout1"
],
- "Name": "PDB_VR_P12V_N1_RAA228004",
+ "Name": "PDB_VR_P12V_N1",
"PowerState": "On",
"Thresholds": [
{
@@ -900,7 +900,7 @@
"temp1",
"vout1"
],
- "Name": "PDB_VR_P12V_N2_RAA228004",
+ "Name": "PDB_VR_P12V_N2",
"PowerState": "On",
"Thresholds": [
{
@@ -951,7 +951,7 @@
"temp1",
"vout1"
],
- "Name": "PDB_VR_P12V_AUX_RAA228004",
+ "Name": "PDB_VR_P12V_AUX",
"Thresholds": [
{
"Direction": "greater than",