Vpd-tool defect fix:data not shown for primed objects
Issue:
Some of the primed objects data were not shown by vpd-tool.
For those inventory paths whose inherit is true, the tool checks for
specific VINI properties presence. If any VINI property is not present,
the tool considered dbus object itself is not present.
And the output json was emplaced with null object.
Thus ended up in showing empty data for primed frus
with no common interfaces properties.
Fix:
Emplace null object for the inventory path, only when the
inventory path is not found in dbus.
Other Fixes:
-> Removed checking inherit value, as whether or not inherit
is true/false, we need both common interfaces and location
code(for some frus like powersupply).
So in this fix, if the common interface keywords are
not present, we ignore and get only the extra interfaces
properties.
-> Removed unwanted null object emplacement.
-> Logic which adds fan type interface for fan frus.
Tested on rainier:
1. Frus without common interface properties are displayed with
its extra interface properties.
"/system/chassis/motherboard/dimm29": {
"LocationCode": "U78DB.ND0.WZS000G-P0-C46",
"TYPE": "FRU",
"type": "xyz.openbmc_project.Inventory.Item.Dimm"
},
"/system/chassis/motherboard/dimm3": {
"LocationCode": "U78DB.ND0.WZS000G-P0-C17",
"TYPE": "FRU",
"type": "xyz.openbmc_project.Inventory.Item.Dimm"
},
2. cable card10 and its connectors are physically present on the
system
"/system/chassis/motherboard/pcie_cable_card10": {
"CC": "6B87",
"DR": "NVME JBOF RISER",
"FN": "03FL205",
"LocationCode": "U78DA.ND0.WZS004K-P0-C10",
"PN": "03FL204",
"SN": "YA31UF07200Z",
"TYPE": "FRU",
"type": "xyz.openbmc_project.Inventory.Item.FabricAdapter"
},
"/system/chassis/motherboard/pcie_cable_card10/cxp_bot": {
"LocationCode": "U78DA.ND0.WZS004K-P0-C10-T1",
"TYPE": "FRU",
"type": "xyz.openbmc_project.Inventory.Item.Connector"
},
"/system/chassis/motherboard/pcie_cable_card10/cxp_top": {
"LocationCode": "U78DA.ND0.WZS004K-P0-C10-T0",
"TYPE": "FRU",
"type": "xyz.openbmc_project.Inventory.Item.Connector"
},
3. cable card3 and its connectors are not present on the system
"/system/chassis/motherboard/pcie_cable_card3": {
"LocationCode": "U78DA.ND0.WZS004K-P0-C3",
"TYPE": "FRU",
"type": "xyz.openbmc_project.Inventory.Item.FabricAdapter"
},
"/system/chassis/motherboard/pcie_cable_card3/cxp_bot": {},
"/system/chassis/motherboard/pcie_cable_card3/cxp_top": {},
4. Fan frus showing up with its Item inteface
"/system/chassis/motherboard/fan1": {
"LocationCode": "U78DB.ND0.WZS000G-A1",
"type": "xyz.openbmc_project.Inventory.Item.Fan"
},
Signed-off-by: PriyangaRamasamy <priyanga24@in.ibm.com>
Change-Id: I38467642944fffec381d070d2a1a7dd3b9882399
diff --git a/meson.build b/meson.build
index 345b84b..c2f2806 100644
--- a/meson.build
+++ b/meson.build
@@ -51,7 +51,8 @@
'INVENTORY_JSON_EVEREST': '"'+get_option('INVENTORY_JSON_EVEREST')+'"',
'DBUS_PROP_JSON': '"'+get_option('DBUS_PROP_JSON')+'"',
'SYSTEM_JSON' : '"'+get_option('SYSTEM_JSON')+'"',
- 'BAD_VPD_DIR': '"'+get_option('BAD_VPD_DIR')+'"'
+ 'BAD_VPD_DIR': '"'+get_option('BAD_VPD_DIR')+'"',
+ 'FAN_INTERFACE': '"'+get_option('FAN_INTERFACE')+'"'
}
)