presence: Use inventory compatible interface
This interface contains an expected set of entries that are ordered from
least specific to the most specific of compatibility. Use the compatible
interface on the system chassis inventory object to determine the
location of the configuration file to use. The first entry found to
contain a configuration file is used. When this interface (and the
associated "Names" property) is not available, use the default
configuration file location.
Tested:
Config file loaded from correct location based on property value
Default config file loaded when property not available
Default config file loaded when property exists but no file located
Change-Id: I6eaa5f071af725b72535778700731ee849bb7742
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/presence/json_config.cpp b/presence/json_config.cpp
index 1974c76..859948d 100644
--- a/presence/json_config.cpp
+++ b/presence/json_config.cpp
@@ -92,45 +92,36 @@
return confFile;
}
- // Check base path location
- confFile = fs::path{confBasePath} / confFileName;
- if (fs::exists(confFile))
+ try
{
- return confFile;
+ // Retrieve json config relative path location from dbus
+ auto confDbusValue =
+ util::SDBusPlus::getProperty<std::vector<std::string>>(
+ _bus, confDbusPath, confDbusIntf, confDbusProp);
+ // Look for a config file at each entry relative to the base
+ // path and use the first one found
+ auto it = std::find_if(confDbusValue.begin(), confDbusValue.end(),
+ [&confFile](auto const& entry) {
+ confFile = fs::path{confBasePath} / entry /
+ confFileName;
+ return fs::exists(confFile);
+ });
+ if (it == confDbusValue.end())
+ {
+ // Property exists, but no config file found. Use default base path
+ confFile = fs::path{confBasePath} / confFileName;
+ }
+ }
+ catch (const util::DBusError&)
+ {
+ // Property unavailable, attempt default base path
+ confFile = fs::path{confBasePath} / confFileName;
}
- // Check dbus interface & property
- // Use first object returned in the subtree
- // (Should really be only one object with the config interface)
- auto objects = util::SDBusPlus::getSubTreeRaw(_bus, "/", confDbusIntf, 0);
- auto itObj = objects.begin();
- if (itObj != objects.end())
- {
- auto itServ = itObj->second.begin();
- if (itServ != itObj->second.end())
- {
- // Retrieve json config relative path location from dbus
- auto relPathLoc = util::SDBusPlus::getProperty<std::string>(
- _bus, itServ->first, itObj->first, confDbusIntf, confDbusProp);
- confFile = fs::path{confBasePath} / relPathLoc / confFileName;
- if (!fs::exists(confFile))
- {
- log<level::ERR>("No JSON config file found",
- entry("NO_FILE=%s", confFile.c_str()));
- throw std::runtime_error("No JSON config file found");
- }
- }
- else
- {
- log<level::ERR>("No JSON config file found",
- entry("NO_SERVICE=%s", itObj->first.c_str()));
- throw std::runtime_error("No JSON config file found");
- }
- }
- else
+ if (!fs::exists(confFile))
{
log<level::ERR>("No JSON config file found",
- entry("NO_INTERFACE=%s", confDbusIntf));
+ entry("DEFAULT_FILE=%s", confFile.c_str()));
throw std::runtime_error("No JSON config file found");
}
diff --git a/presence/json_config.hpp b/presence/json_config.hpp
index 6045e90..0a921e0 100644
--- a/presence/json_config.hpp
+++ b/presence/json_config.hpp
@@ -26,8 +26,10 @@
constexpr auto confFileName = "config.json";
constexpr auto confOverridePath = "/etc/phosphor-fan-presence/presence";
constexpr auto confBasePath = "/usr/share/phosphor-fan-presence/presence";
-constexpr auto confDbusIntf = "xyz.openbmc_project.Configs.ThermalApps";
-constexpr auto confDbusProp = "FanPresence";
+constexpr auto confDbusPath = "/xyz/openbmc_project/inventory/system/chassis";
+constexpr auto confDbusIntf =
+ "xyz.openbmc_project.Inventory.Decorator.Compatible";
+constexpr auto confDbusProp = "Names";
using policies = std::vector<std::unique_ptr<RedundancyPolicy>>;