control: Parse optional "manager.json"
Parse the optional "manager.json" configuration file which currently
provides a single optional attribute "power_on_delay". When the
"power_on_delay" attribute is not present, it is defaulted to 0.
An example "manager.json" file:
```
{
"power_on_delay": 20
}
```
Tested:
Power on delay of 0 when no "manager.json" file present
Power on delay of 0 when no "power_on_delay" JSON attribute present
Power on delay set to value given in "power_on_delay"
Change-Id: I5506ad4e853bdea249b9a794ce335261fdfcaa9f
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/json/Makefile.am b/control/json/Makefile.am
index 9011bd1..c986bda 100644
--- a/control/json/Makefile.am
+++ b/control/json/Makefile.am
@@ -10,4 +10,5 @@
$(SDBUSPLUS_CFLAGS)
libfan_control_json_la_SOURCES = \
+ manager.cpp \
profiles.cpp
diff --git a/control/json/manager.cpp b/control/json/manager.cpp
new file mode 100644
index 0000000..0ec0d0d
--- /dev/null
+++ b/control/json/manager.cpp
@@ -0,0 +1,52 @@
+/**
+ * Copyright © 2020 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "manager.hpp"
+
+#include "json_config.hpp"
+#include "json_parser.hpp"
+
+#include <sdbusplus/bus.hpp>
+
+#include <filesystem>
+
+namespace phosphor::fan::control::json
+{
+
+Manager::Manager(sdbusplus::bus::bus& bus)
+{
+ // Manager JSON config file is optional
+ auto confFile =
+ fan::JsonConfig::getConfFile(bus, confAppName, confFileName, true);
+ if (!confFile.empty())
+ {
+ _jsonObj = fan::JsonConfig::load(confFile);
+ }
+}
+
+unsigned int Manager::getPowerOnDelay()
+{
+ auto powerOnDelay = 0;
+
+ // Parse optional "power_on_delay" from JSON object
+ if (!_jsonObj.empty() && _jsonObj.contains("power_on_delay"))
+ {
+ powerOnDelay = _jsonObj["power_on_delay"].get<unsigned int>();
+ }
+
+ return powerOnDelay;
+}
+
+} // namespace phosphor::fan::control::json
diff --git a/control/json/manager.hpp b/control/json/manager.hpp
new file mode 100644
index 0000000..30669eb
--- /dev/null
+++ b/control/json/manager.hpp
@@ -0,0 +1,72 @@
+/**
+ * Copyright © 2020 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#pragma once
+
+#include <nlohmann/json.hpp>
+#include <sdbusplus/bus.hpp>
+
+namespace phosphor::fan::control::json
+{
+
+using json = nlohmann::json;
+
+/**
+ * @class Manager - Represents the fan control manager's configuration
+ *
+ * A fan control manager configuration is optional, therefore the "manager.json"
+ * file is also optional. The manager configuration is used to populate
+ * fan control's manager parameters which are used in how the application
+ * operates, not in how the fans are controlled.
+ *
+ * When no manager configuration exists, the fan control application starts,
+ * processes any configured events and then begins controlling fans according
+ * to those events.
+ */
+class Manager
+{
+ public:
+ Manager() = delete;
+ Manager(const Manager&) = delete;
+ Manager(Manager&&) = delete;
+ Manager& operator=(const Manager&) = delete;
+ Manager& operator=(Manager&&) = delete;
+ ~Manager() = default;
+
+ /**
+ * Constructor
+ * Parses and populates the fan control manager attributes from a json file
+ *
+ * @param[in] bus - sdbusplus bus object
+ */
+ explicit Manager(sdbusplus::bus::bus& bus);
+
+ /**
+ * @brief Get the configured power on delay(OPTIONAL)
+ *
+ * @return Power on delay in seconds
+ * Configured power on delay in seconds, otherwise 0
+ */
+ unsigned int getPowerOnDelay();
+
+ private:
+ /* JSON file name for manager configuration attributes */
+ static constexpr auto confFileName = "manager.json";
+
+ /* The parsed JSON object */
+ json _jsonObj;
+};
+
+} // namespace phosphor::fan::control::json
diff --git a/control/json_parser.cpp b/control/json_parser.cpp
index 9cd4f6f..3a0e7c2 100644
--- a/control/json_parser.cpp
+++ b/control/json_parser.cpp
@@ -15,6 +15,7 @@
*/
#include "json_parser.hpp"
+#include "json/manager.hpp"
#include "types.hpp"
#include <sdbusplus/bus.hpp>
@@ -31,9 +32,8 @@
const unsigned int getPowerOnDelay(sdbusplus::bus::bus& bus)
{
- auto powerOnDelay = 0;
-
- return powerOnDelay;
+ json::Manager mgr{bus};
+ return mgr.getPowerOnDelay();
}
} // namespace phosphor::fan::control