Remove FRU vs Module VPD Handling
Some keywords were arbitrarily chosen to serve as FRU VPD
for dual chip modules (DCM - same FRU with two VPD chips).
However, since we expose both chips in such FRUs as
unique inventory items as well as unique Redfish endpoints,
having one of them serve as the VPD for the entire FRU makes
little sense.
This commit gets rid of all the complexity added to handle
DCMs. There is no need for the "inheritEI" and "type" keys
in the inventory JSONs too.
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: Ia89a44f91daac01f53748409a7633612de8930d6
diff --git a/ibm_vpd_app.cpp b/ibm_vpd_app.cpp
index fce6bf8..7cc0194 100644
--- a/ibm_vpd_app.cpp
+++ b/ibm_vpd_app.cpp
@@ -1190,16 +1190,13 @@
}
}
}
- if (item.value("inheritEI", true))
+ // Populate interfaces and properties that are common to every FRU
+ // and additional interface that might be defined on a per-FRU
+ // basis.
+ if (item.find("extraInterfaces") != item.end())
{
- // Populate interfaces and properties that are common to every FRU
- // and additional interface that might be defined on a per-FRU
- // basis.
- if (item.find("extraInterfaces") != item.end())
- {
- populateInterfaces(item["extraInterfaces"], interfaces, vpdMap,
- isSystemVpd);
- }
+ populateInterfaces(item["extraInterfaces"], interfaces, vpdMap,
+ isSystemVpd);
}
objects.emplace(move(object), move(interfaces));
}