cnfgs:p10bmc: Rename the IBM config directories
Due to the fan applications now using the
xyz.openbmc_project.Inventory.Decorator.Compatible interface instead of
the xyz.openbmc_project.Configuration.IBMCompatibleSystem one, the names
of the systems have changed as the new interface uses a different
property value format.
Rename all of the directories that mirror those property names to the new
ones.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ie541d15b47a155e88800fb7def76c0e8fbd8182b
diff --git a/control/config_files/p10bmc/ibm,bonnell/events.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/events.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,bonnell/events.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/events.json
diff --git a/control/config_files/p10bmc/ibm,bonnell/fans.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/fans.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,bonnell/fans.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/fans.json
diff --git a/control/config_files/p10bmc/ibm,bonnell/groups.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/groups.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,bonnell/groups.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/groups.json
diff --git a/control/config_files/p10bmc/ibm,bonnell/pcie_cards.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/pcie_cards.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,bonnell/pcie_cards.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/pcie_cards.json
diff --git a/control/config_files/p10bmc/ibm,bonnell/zones.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/zones.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,bonnell/zones.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/zones.json
diff --git a/control/config_files/p10bmc/ibm,everest/events.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/events.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,everest/events.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/events.json
diff --git a/control/config_files/p10bmc/ibm,everest/fans.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/fans.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,everest/fans.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/fans.json
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/groups.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,everest/groups.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/groups.json
diff --git a/control/config_files/p10bmc/ibm,everest/pcie_cards.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/pcie_cards.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,everest/pcie_cards.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/pcie_cards.json
diff --git a/control/config_files/p10bmc/ibm,everest/zones.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/zones.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,everest/zones.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/zones.json
diff --git a/control/config_files/p10bmc/ibm,rainier/fans.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier/fans.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier/fans.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier/fans.json
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/events.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/events.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-1s4u/events.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/events.json
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/fans.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/fans.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-1s4u/fans.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/fans.json
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/groups.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/groups.json
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/pcie_cards.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-1s4u/pcie_cards.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/pcie_cards.json
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/zones.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/zones.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-1s4u/zones.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/zones.json
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/events.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/events.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-2u/events.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/events.json
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/groups.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-2u/groups.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/groups.json
diff --git a/control/config_files/p10bmc/ibm,bonnell/pcie_cards.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/pcie_cards.json
similarity index 100%
copy from control/config_files/p10bmc/ibm,bonnell/pcie_cards.json
copy to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/pcie_cards.json
diff --git a/control/config_files/p10bmc/ibm,bonnell/zones.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/zones.json
similarity index 100%
copy from control/config_files/p10bmc/ibm,bonnell/zones.json
copy to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/zones.json
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/events.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/events.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-4u/events.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/events.json
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/groups.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-4u/groups.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/groups.json
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/pcie_cards.json
similarity index 100%
rename from control/config_files/p10bmc/ibm,rainier-4u/pcie_cards.json
rename to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/pcie_cards.json
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/zones.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/zones.json
similarity index 100%
copy from control/config_files/p10bmc/ibm,rainier-1s4u/zones.json
copy to control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/zones.json
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json b/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json
deleted file mode 100644
index 5b76da5..0000000
--- a/control/config_files/p10bmc/ibm,rainier-2u/pcie_cards.json
+++ /dev/null
@@ -1,188 +0,0 @@
-{
- "cards": [
- {
- "name": "PHYP had errors getting IDs",
- "vendor_id": "0xFFFF",
- "device_id": "0xFFFF",
- "subsystem_vendor_id": "0xFFFF",
- "subsystem_id": "0xFFFF",
- "floor_index": 5
- },
- {
- "name": "Flett",
- "vendor_id": "0x1014",
- "device_id": "0x04F2",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0007",
- "has_temp_sensor": true
- },
- {
- "name": "Bear Lake and Bear River",
- "vendor_id": "0x1014",
- "device_id": "0x04F2",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0004",
- "has_temp_sensor": true
- },
- {
- "name": "Everglades 10Gb 2Port",
- "vendor_id": "0x15B3",
- "device_id": "0x1015",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x061F",
- "floor_index": 1
- },
- {
- "name": "Everglades 25Gb 2Port",
- "vendor_id": "0x15B3",
- "device_id": "0x1015",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x061E",
- "floor_index": 1
- },
- {
- "name": "Cedar Lake 100G 2port",
- "vendor_id": "0x15B3",
- "device_id": "0x101D",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06A6",
- "floor_index": 5
- },
- {
- "name": "Cedar Lake Crypto 100G 2port",
- "vendor_id": "0x15B3",
- "device_id": "0x101D",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06A5",
- "floor_index": 5
- },
- {
- "name": "GTO",
- "vendor_id": "0x1014",
- "device_id": "0x034A",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x033B",
- "floor_index": 3
- },
- {
- "name": "Bolt PCIe3 NVMe Flash Adapter II x8 1.6TB",
- "vendor_id": "0x144D",
- "device_id": "0xA822",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0621",
- "floor_index": 3
- },
- {
- "name": "Bolt PCIe3 NVMe Flash Adapter II x8 3.2TB",
- "vendor_id": "0x144D",
- "device_id": "0xA822",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0622",
- "floor_index": 4
- },
- {
- "name": "Bolt PCIe3 NVMe Flash Adapter II x8 6.4TB",
- "vendor_id": "0x144D",
- "device_id": "0xA822",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0629",
- "floor_index": 4
- },
- {
- "name": "Bolt PCIe3 NVMe Flash Adapter III x8 1.6TB",
- "vendor_id": "0x144D",
- "device_id": "0xA822",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x064A",
- "floor_index": 3
- },
- {
- "name": "Bolt PCIe3 NVMe Flash Adapter III x8 3.2TB",
- "vendor_id": "0x144D",
- "device_id": "0xA822",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x064B",
- "floor_index": 4
- },
- {
- "name": "Bolt PCIe3 NVMe Flash Adapter III x8 6.4TB",
- "vendor_id": "0x144D",
- "device_id": "0xA822",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x064C",
- "floor_index": 4
- },
- {
- "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 1.6TB",
- "vendor_id": "0x144D",
- "device_id": "0xA824",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0682",
- "floor_index": 4
- },
- {
- "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 3.2TB",
- "vendor_id": "0x144D",
- "device_id": "0xA824",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0683",
- "floor_index": 4
- },
- {
- "name": "Kona PCIe4 NVMe U.2 Flash Adapter x8 6.4TB",
- "vendor_id": "0x144D",
- "device_id": "0xA824",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0684",
- "floor_index": 4
- },
- {
- "name": "Puntfish",
- "vendor_id": "0x1077",
- "device_id": "0x2271",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x069E",
- "floor_index": 1
- },
- {
- "name": "Flavafish",
- "vendor_id": "0x1077",
- "device_id": "0x2281",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0651",
- "floor_index": 1
- },
- {
- "name": "Haleakala EN 2Port 100Gb",
- "vendor_id": "0x15B3",
- "device_id": "0x1019",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0635",
- "floor_index": 5
- },
- {
- "name": "Crater Lake Crypto 200G 2Port",
- "vendor_id": "0x15B3",
- "device_id": "0x101D",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06A3",
- "floor_index": 5
- },
- {
- "name": "Crater Lake 200G 2Port",
- "vendor_id": "0x15B3",
- "device_id": "0x101D",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06A4",
- "floor_index": 5
- },
- {
- "name": "Lassen 2 Port IB",
- "vendor_id": "0x15B3",
- "device_id": "0x1019",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0617",
- "floor_index": 5
- }
- ]
-}
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/zones.json b/control/config_files/p10bmc/ibm,rainier-2u/zones.json
deleted file mode 100644
index 48e336a..0000000
--- a/control/config_files/p10bmc/ibm,rainier-2u/zones.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
- "name": "0",
- "poweron_target": 18000,
- "default_floor": 18000,
- "increase_delay": 5,
- "decrease_interval": 30
- }
-]
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/zones.json b/control/config_files/p10bmc/ibm,rainier-4u/zones.json
deleted file mode 100644
index 62cd98b..0000000
--- a/control/config_files/p10bmc/ibm,rainier-4u/zones.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
- "name": "0",
- "poweron_target": 10400,
- "default_floor": 10400,
- "increase_delay": 5,
- "decrease_interval": 60
- }
-]
diff --git a/monitor/config_files/p10bmc/ibm,bonnell/config.json b/monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/config.json
similarity index 100%
rename from monitor/config_files/p10bmc/ibm,bonnell/config.json
rename to monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/config.json
diff --git a/monitor/config_files/p10bmc/ibm,everest/config.json b/monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/config.json
similarity index 100%
rename from monitor/config_files/p10bmc/ibm,everest/config.json
rename to monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/config.json
diff --git a/monitor/config_files/p10bmc/ibm,rainier-1s4u/config.json b/monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/config.json
similarity index 100%
rename from monitor/config_files/p10bmc/ibm,rainier-1s4u/config.json
rename to monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/config.json
diff --git a/monitor/config_files/p10bmc/ibm,rainier-2u/config.json b/monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/config.json
similarity index 100%
rename from monitor/config_files/p10bmc/ibm,rainier-2u/config.json
rename to monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/config.json
diff --git a/monitor/config_files/p10bmc/ibm,rainier-4u/config.json b/monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/config.json
similarity index 100%
rename from monitor/config_files/p10bmc/ibm,rainier-4u/config.json
rename to monitor/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/config.json
diff --git a/presence/config_files/p10bmc/ibm,bonnell/config.json b/presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/config.json
similarity index 100%
rename from presence/config_files/p10bmc/ibm,bonnell/config.json
rename to presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/config.json
diff --git a/presence/config_files/p10bmc/ibm,everest/config.json b/presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/config.json
similarity index 100%
rename from presence/config_files/p10bmc/ibm,everest/config.json
rename to presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Everest/config.json
diff --git a/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json b/presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/config.json
similarity index 100%
rename from presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
rename to presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier1S4U/config.json
diff --git a/presence/config_files/p10bmc/ibm,rainier-2u/config.json b/presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/config.json
similarity index 100%
rename from presence/config_files/p10bmc/ibm,rainier-2u/config.json
rename to presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier2U/config.json
diff --git a/presence/config_files/p10bmc/ibm,rainier-4u/config.json b/presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/config.json
similarity index 100%
rename from presence/config_files/p10bmc/ibm,rainier-4u/config.json
rename to presence/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Rainier4U/config.json