Skip to content

Commit

Permalink
configs: Add Compatible iface to IBM systems
Browse files Browse the repository at this point in the history
Add the xyz.openbmc_project.Inventory.Decorator.Compatible interface to
the IBM chassis configs to identify the various chassis models.

This acts the same as the IBMCompatibleSystem interface that is
currently used and will eventually replace it.  For now it will exist
along side it until all of the code switches over to use it, and then
IBMCompatibleSystem will be removed.

Tested:
```
busctl get-property xyz.openbmc_project.EntityManager \
/xyz/openbmc_project/inventory/system/chassis/Rainier_2U_Chassis \
xyz.openbmc_project.Inventory.Decorator.Compatible Names

as 2 "com.ibm.Hardware.Chassis.Model.Rainier2U" "com.ibm.Hardware.Chassis.Model.Rainier"
```

Change-Id: Iac9b45f57e53c4ed1917c5fc10091b2ccf981d58
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
  • Loading branch information
spinler committed Dec 11, 2023
1 parent 535568c commit 9bac640
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 5 deletions.
7 changes: 6 additions & 1 deletion configurations/bonnell.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,10 @@
"Probe": [
"com.ibm.ipzvpd.VSBP({'IM': [80, 0, 64, 0]})"
],
"Type": "Chassis"
"Type": "Chassis",
"xyz.openbmc_project.Inventory.Decorator.Compatible": {
"Names": [
"com.ibm.Hardware.Chassis.Model.Bonnell"
]
}
}
7 changes: 6 additions & 1 deletion configurations/everest.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,10 @@
"Probe": [
"com.ibm.ipzvpd.VSBP({'IM': [80, 0, 48, 0]})"
],
"Type": "Chassis"
"Type": "Chassis",
"xyz.openbmc_project.Inventory.Decorator.Compatible": {
"Names": [
"com.ibm.Hardware.Chassis.Model.Everest"
]
}
}
8 changes: 7 additions & 1 deletion configurations/rainier_1s4u_chassis.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@
"Probe": [
"com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 2]})"
],
"Type": "Chassis"
"Type": "Chassis",
"xyz.openbmc_project.Inventory.Decorator.Compatible": {
"Names": [
"com.ibm.Hardware.Chassis.Model.Rainier1S4U",
"com.ibm.Hardware.Chassis.Model.Rainier"
]
}
}
8 changes: 7 additions & 1 deletion configurations/rainier_2u_chassis.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,11 @@
"OR",
"com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 3]})"
],
"Type": "Chassis"
"Type": "Chassis",
"xyz.openbmc_project.Inventory.Decorator.Compatible": {
"Names": [
"com.ibm.Hardware.Chassis.Model.Rainier2U",
"com.ibm.Hardware.Chassis.Model.Rainier"
]
}
}
8 changes: 7 additions & 1 deletion configurations/rainier_4u_chassis.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,11 @@
"Probe": [
"com.ibm.ipzvpd.VSBP({'IM': [80, 0, 16, 0]})"
],
"Type": "Chassis"
"Type": "Chassis",
"xyz.openbmc_project.Inventory.Decorator.Compatible": {
"Names": [
"com.ibm.Hardware.Chassis.Model.Rainier4U",
"com.ibm.Hardware.Chassis.Model.Rainier"
]
}
}

0 comments on commit 9bac640

Please sign in to comment.