firmware inventory manager: use PDI constants
Use PDI constants instead of local definitions.
Tested: Inspection only.
Change-Id: I39a548046ca650fef116bf0df31f8d64dc023551
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/fw-update/firmware_inventory_manager.cpp b/fw-update/firmware_inventory_manager.cpp
index a3e0ac9..0788fcb 100644
--- a/fw-update/firmware_inventory_manager.cpp
+++ b/fw-update/firmware_inventory_manager.cpp
@@ -4,6 +4,13 @@
#include "common/utils.hpp"
#include <phosphor-logging/lg2.hpp>
+#include <xyz/openbmc_project/Inventory/Item/Board/common.hpp>
+#include <xyz/openbmc_project/Software/Version/common.hpp>
+
+using InventoryItemBoard =
+ sdbusplus::common::xyz::openbmc_project::inventory::item::Board;
+using SoftwareVersion =
+ sdbusplus::common::xyz::openbmc_project::software::Version;
PHOSPHOR_LOG2_USING;
@@ -38,7 +45,7 @@
}
const auto boardName = boardPath->filename().string();
const auto softwarePath =
- std::format("/xyz/openbmc_project/software/{}_{}_{}", boardName,
+ std::format("{}/{}_{}_{}", SoftwareVersion::namespace_path, boardName,
softwareName, utils::generateSwId());
softwareMap.insert_or_assign(
@@ -60,12 +67,12 @@
std::optional<std::filesystem::path> getBoardPath(
const pldm::utils::DBusHandler& handler, const InventoryPath& path)
{
- constexpr auto boardInterface = "xyz.openbmc_project.Inventory.Item.Board";
pldm::utils::GetAncestorsResponse response;
try
{
- response = handler.getAncestors(path.c_str(), {boardInterface});
+ response =
+ handler.getAncestors(path.c_str(), {InventoryItemBoard::interface});
}
catch (const sdbusplus::exception_t& e)
{