p10bmc: Allow generic NVMe drive name (#11)
Not all drives are Samsung PM1735s, and for lab systems we can't learn
the drive model in order to state accurately what has been plugged.
Instead, defer to what we do know, which is that it's an NVMe drive.
This is a transition change. It needs to be followed by integration of
an entity-manager change to switch the drive names, then finally by a
change to drop the old drive names from the fan configuration.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I334cf2b518257ed445f4df9bfbed6968d33f1341
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index ff8e5ec..d6a0550 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -899,7 +899,17 @@
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_7_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_9_Temp",
- "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_10_Temp"
+ "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp"
]
},
{
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index 110cf09..58e0169 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -305,7 +305,31 @@
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_21_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_22_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_23_Temp",
- "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_24_Temp"
+ "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_24_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
]
},
{
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index 36dce74..45fff8a 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -509,7 +509,15 @@
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_5_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_6_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_7_Temp",
- "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp"
+ "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp"
]
},
{
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
index faa58cb..6fd42a3 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
@@ -521,7 +521,31 @@
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_21_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_22_Temp",
"/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_23_Temp",
- "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_24_Temp"
+ "/xyz/openbmc_project/sensors/temperature/Samsung_PM1735_24_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_1_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_5_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_6_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_11_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_12_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_13_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_14_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_15_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_16_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_17_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_18_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_19_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_20_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_21_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_22_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_23_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_24_Temp"
]
},
{