regulators: Temporarily hard-code config file name
The JSON configuration file name for the current system will be obtained
from a D-Bus interface and property. That interface will be provided by
the EntityManager application.
Unfortunately the interface is not yet completely defined or
implemented. While waiting for this interface to be completed, a
hard-coded JSON config file name will be used. This is expected to be a
very short-term solution (a few weeks).
Signed-off-by: Shawn McCarney <shawnmm@us.ibm.com>
Change-Id: Id1d29ad704860f02e804877489915d16aac70b90
diff --git a/phosphor-regulators/src/manager.cpp b/phosphor-regulators/src/manager.cpp
index 2c44916..9e2f031 100644
--- a/phosphor-regulators/src/manager.cpp
+++ b/phosphor-regulators/src/manager.cpp
@@ -23,27 +23,29 @@
#include <chrono>
#include <variant>
-namespace phosphor
-{
-namespace power
-{
-namespace regulators
+namespace phosphor::power::regulators
{
Manager::Manager(sdbusplus::bus::bus& bus, const sdeventplus::Event& event) :
ManagerObject(bus, objPath, true), bus(bus), eventLoop(event), fileName("")
{
- // Subscribe to interfacesAdded signal for filename property
- std::unique_ptr<sdbusplus::server::match::match> matchPtr =
- std::make_unique<sdbusplus::server::match::match>(
- bus,
- sdbusplus::bus::match::rules::interfacesAdded(sysDbusObj).c_str(),
- std::bind(std::mem_fn(&Manager::signalHandler), this,
- std::placeholders::_1));
- signals.emplace_back(std::move(matchPtr));
+ /* Temporarily comment out until D-Bus interface is defined and available.
+ // Subscribe to interfacesAdded signal for filename property
+ std::unique_ptr<sdbusplus::server::match::match> matchPtr =
+ std::make_unique<sdbusplus::server::match::match>(
+ bus,
+ sdbusplus::bus::match::rules::interfacesAdded(sysDbusObj).c_str(),
+ std::bind(std::mem_fn(&Manager::signalHandler), this,
+ std::placeholders::_1));
+ signals.emplace_back(std::move(matchPtr));
- // Attempt to get the filename property from dbus
- setFileName(getFileNameDbus());
+ // Attempt to get the filename property from dbus
+ setFileName(getFileNameDbus());
+ */
+
+ // Temporarily hard-code JSON config file name to first system that will use
+ // this application. Remove this when D-Bus interface is available.
+ fileName = "ibm_rainier.json";
if (!fileName.empty())
{
@@ -149,6 +151,4 @@
return fileName;
}
-} // namespace regulators
-} // namespace power
-} // namespace phosphor
+} // namespace phosphor::power::regulators