Use getAssetInfo util function
This commit is to use getAssetInfo utility function for GET AssetInfo in
various places like
- Chassis
- FabricAdapter
This will also include `Manufacturer` property if available on dbus.
- Fan
- PCIeDevice
- PowerSupply
- Storage
- System
Tested:
- GET the above schemas
- Redfish Service Validator passes
Change-Id: I9d01d583212fe4916d5fdd144d2b8e52ad865d16
Signed-off-by: Myung Bae <myungbae@us.ibm.com>
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index a336988..3123f06 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -21,6 +21,7 @@
#include "query.hpp"
#include "redfish_util.hpp"
#include "registries/privilege_registry.hpp"
+#include "utils/asset_utils.hpp"
#include "utils/dbus_utils.hpp"
#include "utils/json_utils.hpp"
#include "utils/pcie_util.hpp"
@@ -297,16 +298,13 @@
}
BMCWEB_LOG_DEBUG("Got {} properties for system", propertiesList.size());
- const std::string* partNumber = nullptr;
- const std::string* serialNumber = nullptr;
- const std::string* manufacturer = nullptr;
- const std::string* model = nullptr;
+ asset_utils::extractAssetInfo(asyncResp, ""_json_pointer, propertiesList,
+ false);
+
const std::string* subModel = nullptr;
const bool success = sdbusplus::unpackPropertiesNoThrow(
- dbus_utils::UnpackErrorPrinter(), propertiesList, "PartNumber",
- partNumber, "SerialNumber", serialNumber, "Manufacturer", manufacturer,
- "Model", model, "SubModel", subModel);
+ dbus_utils::UnpackErrorPrinter(), propertiesList, "SubModel", subModel);
if (!success)
{
@@ -314,26 +312,6 @@
return;
}
- if (partNumber != nullptr)
- {
- asyncResp->res.jsonValue["PartNumber"] = *partNumber;
- }
-
- if (serialNumber != nullptr)
- {
- asyncResp->res.jsonValue["SerialNumber"] = *serialNumber;
- }
-
- if (manufacturer != nullptr)
- {
- asyncResp->res.jsonValue["Manufacturer"] = *manufacturer;
- }
-
- if (model != nullptr)
- {
- asyncResp->res.jsonValue["Model"] = *model;
- }
-
if (subModel != nullptr)
{
asyncResp->res.jsonValue["SubModel"] = *subModel;