configurations/tyan: configure reworked topology
Add configuration records for the reworked topology schema some
powersupplies and some tyan baseboards.
Tested: On Tyan S8030 with 2 PSUs
Partial ObjectMapper busctl
```
busctl tree xyz.openbmc_project.ObjectMapper
`- /xyz
`- /xyz/openbmc_project
|- /xyz/openbmc_project/inventory
| `- /xyz/openbmc_project/inventory/system
| |- /xyz/openbmc_project/inventory/system/board
| | `- /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard
| | |- /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard/all_sensors
| | |- /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard/contained_by
| | |- /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard/powered_by
| | `- /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard/ran_on
| |- /xyz/openbmc_project/inventory/system/chassis
| | `- /xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis
| | |- /xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis/all_sensors
| | |- /xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis/containing
| | `- /xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis/sensors
| `- /xyz/openbmc_project/inventory/system/powersupply
| |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0
| | |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0/all_sensors
| | |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0/contained_by
| | |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0/powering
| | `- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0/sensors
| `- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1
| |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1/all_sensors
| |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1/contained_by
| |- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1/powering
| `- /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1/sensors
...
```
Each powersupply has `powering` association to baseboard:
```
busctl get-property xyz.openbmc_project.ObjectMapper /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0/powering xyz.openbmc_project.Association endpoints
as 1 "/xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard"
```
```
busctl get-property xyz.openbmc_project.ObjectMapper /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1/powering xyz.openbmc_project.Association endpoints
as 1 "/xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard"
```
Each powersupply is contained by the chassis
```
busctl get-property xyz.openbmc_project.ObjectMapper /xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0/contained_by xyz.openbmc_project.Association endpoints
as 1 "/xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis"
```
The baseboard has `powered_by` association to both powersupplies.
```
busctl get-property xyz.openbmc_project.ObjectMapper /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard/powered_by xyz.openbmc_project.Association endpoints
as 2 "/xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1" "/xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0"
```
The baseboard is contained by the chassis
```
busctl get-property xyz.openbmc_project.ObjectMapper /xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard/contained_by xyz.openbmc_project.Association endpoints
as 1 "/xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis"
```
The chassis is containing the baseboard and both PSUs
```
busctl get-property xyz.openbmc_project.ObjectMapper /xyz/openbmc_project/inventory/system/chassis/MBX_1_57_Chassis/containing xyz.openbmc_project.Association endpoints
as 3 "/xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_1" "/xyz/openbmc_project/inventory/system/powersupply/Supermicro_PWS_920P_SQ_0" "/xyz/openbmc_project/inventory/system/board/Tyan_S8030_Baseboard"
```
While this is a fairly standard system configuration, it shows something
which was not possible with the previous code: The associations are
configured separately, so `powering` does not imply `contained_by`.
Change-Id: Ie68dfa146659c4ebca6a9d926a8591b7ce9d3904
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/configurations/compuware_cdr_9011_3m1_psu.json b/configurations/compuware_cdr_9011_3m1_psu.json
index a2bacf9..14dd83b 100644
--- a/configurations/compuware_cdr_9011_3m1_psu.json
+++ b/configurations/compuware_cdr_9011_3m1_psu.json
@@ -13,6 +13,16 @@
"Type": "PSUPresence"
},
{
+ "Name": "GenericPowerPort",
+ "PortType": "powering",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
"Address": "$address + 8",
"Bus": "$bus",
"Labels": [
diff --git a/configurations/supermicro-pws-920p-sq_psu.json b/configurations/supermicro-pws-920p-sq_psu.json
index e955eba..198f4b6 100644
--- a/configurations/supermicro-pws-920p-sq_psu.json
+++ b/configurations/supermicro-pws-920p-sq_psu.json
@@ -14,6 +14,16 @@
"Type": "PSUPresence"
},
{
+ "Name": "GenericPowerPort",
+ "PortType": "powering",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
"Address": "$address + 4",
"Bus": "$bus",
"Labels": [
diff --git a/configurations/tyan/tyan_s5549_baseboard.json b/configurations/tyan/tyan_s5549_baseboard.json
index eceee55..14d442d 100644
--- a/configurations/tyan/tyan_s5549_baseboard.json
+++ b/configurations/tyan/tyan_s5549_baseboard.json
@@ -463,6 +463,16 @@
"Type": "IpmbSensor"
},
{
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericPowerPort",
+ "PortType": "powered_by",
+ "Type": "Port"
+ },
+ {
"Address": "0x49",
"Bus": 6,
"Name": "AIR_INLET_TEMP",
diff --git a/configurations/tyan/tyan_s7106_baseboard.json b/configurations/tyan/tyan_s7106_baseboard.json
index 5206b02..f91731d 100644
--- a/configurations/tyan/tyan_s7106_baseboard.json
+++ b/configurations/tyan/tyan_s7106_baseboard.json
@@ -231,6 +231,16 @@
"Type": "BMC"
},
{
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericPowerPort",
+ "PortType": "powered_by",
+ "Type": "Port"
+ },
+ {
"Address": "0x28",
"Bus": 0,
"EntityId": 7,
diff --git a/configurations/tyan/tyan_s8030_baseboard.json b/configurations/tyan/tyan_s8030_baseboard.json
index 6c3c468..73a50f3 100644
--- a/configurations/tyan/tyan_s8030_baseboard.json
+++ b/configurations/tyan/tyan_s8030_baseboard.json
@@ -404,6 +404,16 @@
"Type": "NCT7802"
},
{
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericPowerPort",
+ "PortType": "powered_by",
+ "Type": "Port"
+ },
+ {
"FirmwareInfo": {
"CompatibleHardware": "com.tyan.Hardware.S8030.SPI.Host",
"VendorIANA": 6653
diff --git a/configurations/tyan/tyan_s8036_baseboard.json b/configurations/tyan/tyan_s8036_baseboard.json
index 23edab6..f4e8f63 100644
--- a/configurations/tyan/tyan_s8036_baseboard.json
+++ b/configurations/tyan/tyan_s8036_baseboard.json
@@ -228,6 +228,16 @@
"Type": "NCT7802"
},
{
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericPowerPort",
+ "PortType": "powered_by",
+ "Type": "Port"
+ },
+ {
"Address": "0x4c",
"Bus": 0,
"Name": "cpu0",
diff --git a/configurations/tyan/tyan_s8040_baseboard.json b/configurations/tyan/tyan_s8040_baseboard.json
index 43d46cc..2b2dce7 100644
--- a/configurations/tyan/tyan_s8040_baseboard.json
+++ b/configurations/tyan/tyan_s8040_baseboard.json
@@ -401,6 +401,16 @@
}
],
"Type": "NCT7802"
+ },
+ {
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericPowerPort",
+ "PortType": "powered_by",
+ "Type": "Port"
}
],
"Name": "Tyan S8040 Baseboard",
diff --git a/configurations/tyan/tyan_s8047_baseboard.json b/configurations/tyan/tyan_s8047_baseboard.json
index 4e09839..248c3a0 100644
--- a/configurations/tyan/tyan_s8047_baseboard.json
+++ b/configurations/tyan/tyan_s8047_baseboard.json
@@ -536,6 +536,16 @@
"Type": "Pid.Zone"
},
{
+ "Name": "GenericContainPort",
+ "PortType": "contained_by",
+ "Type": "Port"
+ },
+ {
+ "Name": "GenericPowerPort",
+ "PortType": "powered_by",
+ "Type": "Port"
+ },
+ {
"Address": "0x3c",
"Bus": "5",
"Labels": [