commit 315b0b62d783e2c91a4b9c5017b493890480755b
author Bob King <Bob_King@wistron.com> Fri Apr 03 21:47:58 2020 +0800
committer Bob King <Bob_King@wistron.com> Wed Apr 08 15:08:13 2020 +0800
tree a4afc28757d1d8e8db18214c29521036eec31b2c
parent bafcb86c6d61c71383c87c377381ff67d97dddad

regulators: Implements support for run_rule

Implements support for parsing the run_rule JSON elements in the
configuration file parser.

Signed-off-by: Bob King <Bob_King@wistron.com>
Change-Id: I9b8d96716a7710e3829fc346d89ef418cc091858

phosphor-regulators/src/config_file_parser.cpp

diff --git a/phosphor-regulators/src/config_file_parser.cpp b/phosphor-regulators/src/config_file_parser.cpp
index 3959978..1d64c96 100644
--- a/phosphor-regulators/src/config_file_parser.cpp
+++ b/phosphor-regulators/src/config_file_parser.cpp
@@ -148,9 +148,8 @@
     }
     else if (element.contains("run_rule"))
     {
-        // TODO: Not implemented yet
-        // action = parseRunRule(element["run_rule"]);
-        // ++propertyCount;
+        action = parseRunRule(element["run_rule"]);
+        ++propertyCount;
     }
     else if (element.contains("set_device"))
     {
@@ -422,6 +421,14 @@
     return rules;
 }
 
+std::unique_ptr<RunRuleAction> parseRunRule(const json& element)
+{
+    // String ruleID
+    std::string ruleID = parseString(element);
+
+    return std::make_unique<RunRuleAction>(ruleID);
+}
+
 } // namespace internal
 
 } // namespace phosphor::power::regulators::config_file_parser

phosphor-regulators/src/config_file_parser.hpp

diff --git a/phosphor-regulators/src/config_file_parser.hpp b/phosphor-regulators/src/config_file_parser.hpp
index a8286f1..0a931d8 100644
--- a/phosphor-regulators/src/config_file_parser.hpp
+++ b/phosphor-regulators/src/config_file_parser.hpp
@@ -22,6 +22,7 @@
 #include "i2c_write_bytes_action.hpp"
 #include "pmbus_write_vout_command_action.hpp"
 #include "rule.hpp"
+#include "run_rule_action.hpp"
 
 #include <nlohmann/json.hpp>
 
@@ -367,6 +368,18 @@
     parseRuleArray(const nlohmann::json& element);
 
 /**
+ * Parses a JSON element containing a run_rule action.
+ *
+ * Returns the corresponding C++ RunRuleAction object.
+ *
+ * Throws an exception if parsing fails.
+ *
+ * @param element JSON element
+ * @return RunRuleAction object
+ */
+std::unique_ptr<RunRuleAction> parseRunRule(const nlohmann::json& element);
+
+/**
  * Parses a JSON element containing a string.
  *
  * Returns the corresponding C++ string.