commit c33a90ec049bc82054106bd4e09381797df72002
author James Feist <james.feist@linux.intel.com> Fri Mar 01 10:17:44 2019 -0800
committer Ed Tanous <ed.tanous@intel.com> Fri Mar 01 20:45:18 2019 +0000
tree 620de0aead5e81fbda925805226079d4938e4bda
parent d3ec07f80e5c234611580b52c5a92eee7e8394a2

pid: add direction to stepwise

We now have upper and lower clipping curves, add direction
so we can tell which is which.

Tested-by: GET and PATCH work

Change-Id: I0cdfa159a3a27355a8e67c65e42e765f191f7719
Signed-off-by: James Feist <james.feist@linux.intel.com>

redfish-core/lib/managers.hpp

diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index d109a19..936d655 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -195,6 +195,14 @@
                     std::string name = *namePtr;
                     dbus::utility::escapePathForDbus(name);
                     nlohmann::json* config = nullptr;
+
+                    const std::string* classPtr = nullptr;
+                    auto findClass = intfPair.second.find("Class");
+                    if (findClass != intfPair.second.end())
+                    {
+                        classPtr = std::get_if<std::string>(&findClass->second);
+                    }
+
                     if (intfPair.first == pidZoneConfigurationIface)
                     {
                         std::string chassis;
@@ -217,6 +225,13 @@
 
                     else if (intfPair.first == stepwiseConfigurationIface)
                     {
+                        if (classPtr == nullptr)
+                        {
+                            BMCWEB_LOG_ERROR << "Pid Class Field illegal";
+                            messages::internalError(asyncResp->res);
+                            return;
+                        }
+
                         nlohmann::json& controller = stepwise[name];
                         config = &controller;
 
@@ -230,18 +245,13 @@
                         controller["@odata.context"] =
                             "/redfish/v1/"
                             "$metadata#OemManager.StepwiseController";
+                        controller["Direction"] = *classPtr;
                     }
 
                     // pid and fans are off the same configuration
                     else if (intfPair.first == pidConfigurationIface)
                     {
-                        const std::string* classPtr = nullptr;
-                        auto findClass = intfPair.second.find("Class");
-                        if (findClass != intfPair.second.end())
-                        {
-                            classPtr =
-                                std::get_if<std::string>(&findClass->second);
-                        }
+
                         if (classPtr == nullptr)
                         {
                             BMCWEB_LOG_ERROR << "Pid Class Field illegal";
@@ -739,10 +749,12 @@
         std::optional<std::vector<std::string>> inputs;
         std::optional<double> positiveHysteresis;
         std::optional<double> negativeHysteresis;
+        std::optional<std::string> direction; // upper clipping curve vs lower
         if (!redfish::json_util::readJson(
                 it.value(), response->res, "Zones", zones, "Steps", steps,
                 "Inputs", inputs, "PositiveHysteresis", positiveHysteresis,
-                "NegativeHysteresis", negativeHysteresis))
+                "NegativeHysteresis", negativeHysteresis, "Direction",
+                direction))
         {
             BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
                              << it.value().dump();
@@ -805,6 +817,19 @@
         {
             output["PositiveHysteresis"] = *positiveHysteresis;
         }
+        if (direction)
+        {
+            constexpr const std::array<const char*, 2> allowedDirections = {
+                "Ceiling", "Floor"};
+            if (std::find(allowedDirections.begin(), allowedDirections.end(),
+                          *direction) == allowedDirections.end())
+            {
+                messages::propertyValueTypeError(response->res, "Direction",
+                                                 *direction);
+                return CreatePIDRet::fail;
+            }
+            output["Class"] = *direction;
+        }
     }
     else
     {