commit 23ac24c166c33159032e631c3fe3c6bb4c4f7cb2
author Matthew Barth <msbarth@us.ibm.com> Tue Aug 04 13:55:43 2020 -0500
committer Matthew Barth <msbarth@us.ibm.com> Tue Nov 10 06:52:36 2020 -0600
tree 1f6942cc95257200602b37fb0f41016c02c46183
parent 167d2dd7a647f1100a3ae4e93ff13fe645f9b962

control: Setup configured zone groups retrieval

Configured zone groups come from either a compile time YAML generated
`_zoneLayouts` list or from a future list created at runtime after
parsing a set of JSON configuration files.

Tested:
    No impact to YAML driven configurations
    Empty list of zone groups created when use of JSON enabled

Change-Id: I3253ccf5c54e5397d5de0b7105fc3918dc59e24a
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

control/json_parser.cpp

diff --git a/control/json_parser.cpp b/control/json_parser.cpp
index 2f5ddae..c43d961 100644
--- a/control/json_parser.cpp
+++ b/control/json_parser.cpp
@@ -15,5 +15,18 @@
  */
 #include "json_parser.hpp"
 
+#include "types.hpp"
+
+#include <sdbusplus/bus.hpp>
+
 namespace phosphor::fan::control
-{} // namespace phosphor::fan::control
+{
+
+const std::vector<ZoneGroup> getZoneGroups(sdbusplus::bus::bus& bus)
+{
+    std::vector<ZoneGroup> zoneGrps;
+
+    return zoneGrps;
+}
+
+} // namespace phosphor::fan::control

control/json_parser.hpp

diff --git a/control/json_parser.hpp b/control/json_parser.hpp
index 4a59b2e..42a89a6 100644
--- a/control/json_parser.hpp
+++ b/control/json_parser.hpp
@@ -15,9 +15,23 @@
  */
 #pragma once
 
+#include "types.hpp"
+
+#include <sdbusplus/bus.hpp>
+
 namespace phosphor::fan::control
 {
 
 constexpr auto confAppName = "control";
 
+/**
+ * @brief Get the configuration definitions for zone groups
+ *
+ * @param[in] bus - The dbus bus object
+ *
+ * @return List of zone group objects
+ *     Generated list of zone groups including their control configurations
+ */
+const std::vector<ZoneGroup> getZoneGroups(sdbusplus::bus::bus& bus);
+
 } // namespace phosphor::fan::control

control/manager.cpp

diff --git a/control/manager.cpp b/control/manager.cpp
index d202fea..9213fd7 100644
--- a/control/manager.cpp
+++ b/control/manager.cpp
@@ -19,6 +19,9 @@
 
 #include "sdbusplus.hpp"
 #include "utility.hpp"
+#ifdef CONTROL_USE_JSON
+#include "json_parser.hpp"
+#endif
 
 #include <unistd.h>
 
@@ -88,10 +91,14 @@
 {
     // Create the appropriate Zone objects based on the
     // actual system configuration.
+#ifdef CONTROL_USE_JSON
+    auto zoneLayouts = getZoneGroups(bus);
+#else
+    auto zoneLayouts = _zoneLayouts;
+#endif
 
     // Find the 1 ZoneGroup that meets all of its conditions
-#ifndef CONTROL_USE_JSON
-    for (auto& group : _zoneLayouts)
+    for (auto& group : zoneLayouts)
     {
         auto& conditions = std::get<conditionListPos>(group);
 
@@ -115,7 +122,6 @@
             break;
         }
     }
-#endif
 
     if (mode == Mode::control)
     {