regulators: Implements support for rail
Enhance the configuration file parser to support the rail element.
Signed-off-by: Bob King <Bob_King@wistron.com>
Change-Id: Id10809cac4271295c5eb3bd318be775e1d470286
diff --git a/phosphor-regulators/src/config_file_parser.cpp b/phosphor-regulators/src/config_file_parser.cpp
index ce95d2d..cc96545 100644
--- a/phosphor-regulators/src/config_file_parser.cpp
+++ b/phosphor-regulators/src/config_file_parser.cpp
@@ -519,15 +519,55 @@
exponent, isVerified);
}
+std::unique_ptr<Rail> parseRail(const json& element)
+{
+ verifyIsObject(element);
+ unsigned int propertyCount{0};
+
+ // Optional comments property; value not stored
+ if (element.contains("comments"))
+ {
+ ++propertyCount;
+ }
+
+ // Required id property
+ const json& idElement = getRequiredProperty(element, "id");
+ std::string id = parseString(idElement);
+ ++propertyCount;
+
+ // Optional configuration property
+ std::unique_ptr<Configuration> configuration{};
+ auto configurationIt = element.find("configuration");
+ if (configurationIt != element.end())
+ {
+ configuration = parseConfiguration(*configurationIt);
+ ++propertyCount;
+ }
+
+ // Optional sensor_monitoring property
+ std::unique_ptr<SensorMonitoring> sensorMonitoring{};
+ auto sensorMonitoringIt = element.find("sensor_monitoring");
+ if (sensorMonitoringIt != element.end())
+ {
+ sensorMonitoring = parseSensorMonitoring(*sensorMonitoringIt);
+ ++propertyCount;
+ }
+
+ // Verify no invalid properties exist
+ verifyPropertyCount(element, propertyCount);
+
+ return std::make_unique<Rail>(id, std::move(configuration),
+ std::move(sensorMonitoring));
+}
+
std::vector<std::unique_ptr<Rail>> parseRailArray(const json& element)
{
verifyIsArray(element);
std::vector<std::unique_ptr<Rail>> rails;
- // TODO: Not implemented yet
- // for (auto& railElement : element)
- // {
- // rails.emplace_back(parseRail(railElement));
- // }
+ for (auto& railElement : element)
+ {
+ rails.emplace_back(parseRail(railElement));
+ }
return rails;
}
@@ -638,6 +678,28 @@
return std::make_unique<RunRuleAction>(ruleID);
}
+std::unique_ptr<SensorMonitoring> parseSensorMonitoring(const json& element)
+{
+ verifyIsObject(element);
+ unsigned int propertyCount{0};
+
+ // Optional comments property; value not stored
+ if (element.contains("comments"))
+ {
+ ++propertyCount;
+ }
+
+ // Required rule_id or actions property
+ std::vector<std::unique_ptr<Action>> actions{};
+ actions = parseRuleIDOrActionsProperty(element);
+ ++propertyCount;
+
+ // Verify no invalid properties exist
+ verifyPropertyCount(element, propertyCount);
+
+ return std::make_unique<SensorMonitoring>(std::move(actions));
+}
+
} // namespace internal
} // namespace phosphor::power::regulators::config_file_parser