meta-ibm: Add more FabricAdapter Port Association
A few example associations were added by [1]. This is to add additional
or missing port associations between FabricAdapter and Port, and to fix
some typos.
The assocication is defined by
https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/62881.
Some FRU examples were added before via
https://gerrit.openbmc.org/c/openbmc/openpower-vpd-parser/+/66540
These associations are used for bmcweb Port schema implementation.
This also fixes Redfish Service Validator related to Cables & Ports.
Tested:
- Verify bmcweb Port schema under `/redfish/v1/Systems/system/FabricAdapters`
- Verify the content of `/redfish/v1/Cables/` tree.
- Redfish Service Validator passes on Cables & Ports
[1] https://github.com/openbmc/openbmc/commit/9f0b0adcf1e79e676df0f879c5be4a7a1cb6cfa7
Change-Id: If047a672c99da54aaa12f5d0206d2dc0334590bf
Signed-off-by: Myung Bae <myungbae@us.ibm.com>
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json
index 2866c7a..50ed82f 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-2u_associations.json
@@ -477,14 +477,14 @@
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector3",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme4",
@@ -2681,6 +2681,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3"
+ ]
}
]
},
@@ -2721,6 +2735,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3"
+ ]
}
]
},
@@ -2741,6 +2769,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3"
+ ]
}
]
},
@@ -3002,6 +3044,8 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5"
]
@@ -3042,6 +3086,8 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5"
]
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json
index cd4da06..8290797 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,blueridge-4u_associations.json
@@ -486,18 +486,18 @@
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_bot",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_top",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_bot",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme0",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme1",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2",
@@ -2827,6 +2827,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3"
+ ]
}
]
},
@@ -2867,6 +2881,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3"
+ ]
}
]
},
@@ -2887,6 +2915,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3"
+ ]
}
]
},
@@ -3148,6 +3190,10 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5"
]
@@ -3188,6 +3234,10 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5"
]
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
index 446cd93..daf7925 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json
@@ -1233,6 +1233,20 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3"
+ ]
}
]
},
@@ -1269,6 +1283,20 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3"
+ ]
}
]
},
@@ -1287,6 +1315,20 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3"
+ ]
}
]
},
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json
index 437cf05..3797117 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,fuji_associations.json
@@ -1233,6 +1233,20 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3"
+ ]
}
]
},
@@ -1269,6 +1283,20 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3"
+ ]
}
]
},
@@ -1287,6 +1315,20 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3"
+ ]
}
]
},
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
index 931f6d5..3559bbf 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-2u_associations.json
@@ -478,14 +478,14 @@
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card10/c10_connector3",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card11/c11_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme4",
@@ -2682,6 +2682,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3"
+ ]
}
]
},
@@ -2722,6 +2736,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3"
+ ]
}
]
},
@@ -2742,6 +2770,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3"
+ ]
}
]
},
@@ -3003,6 +3045,8 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5"
]
@@ -3043,6 +3087,8 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5"
]
diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
index 2281d86..5a90e2c 100644
--- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
+++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,rainier-4u_associations.json
@@ -486,18 +486,18 @@
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4/pcie_card4/cxp_bot",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_top",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/cxp_bot",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card8/c8_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector1",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector2",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card11/c11_connector3",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme0",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme1",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme2",
@@ -2827,6 +2827,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector3"
+ ]
}
]
},
@@ -2867,6 +2881,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector3"
+ ]
}
]
},
@@ -2887,6 +2915,20 @@
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp",
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Local_Temp"
]
+ },
+ {
+ "types":
+ {
+ "rType": "connected_to",
+ "fType": "connecting"
+ },
+ "paths":
+ [
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot11/pcie_card11/c11_connector3"
+ ]
}
]
},
@@ -3148,6 +3190,10 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/dp0_connector5"
]
@@ -3188,6 +3234,10 @@
},
"paths":
[
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector0",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector1",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector2",
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector3",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector4",
"/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane1/dp1_connector5"
]
@@ -5013,7 +5063,7 @@
"paths":
[
"/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8/pcie_card8/c8_connector0",
- "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0"
+ "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10/pcie_card10/c10_connector0"
]
},
{