control: Add creating config object without a dbus object
For those configuration objects that do not need a dbus object, create
them using a similar method without requiring a dbus object to be given.
Updated each object to correctly reflect their current need of a dbus
object which was driven by moving the creation of the available group
objects to within the event.
Change-Id: I8ce4ea7baf4cfd1ad86268b760a334fcf0a4f25e
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/json_parser.cpp b/control/json_parser.cpp
index de7bc26..b69bab1 100644
--- a/control/json_parser.cpp
+++ b/control/json_parser.cpp
@@ -64,18 +64,13 @@
std::vector<ZoneGroup> zoneGrps;
// Profiles are optional
- auto profiles = getConfig<json::Profile>(bus, true);
+ auto profiles = getConfig<json::Profile>(true);
// Fans to be controlled
auto fans = getConfig<json::Fan>(bus);
// Zones within the system
- auto zones = getConfig<json::Zone>(bus);
+ auto zones = getConfig<json::Zone>();
// Fan control events are optional
auto events = getConfig<json::Event>(bus, true);
- if (!events.empty())
- {
- // Groups to include in events
- auto groups = getConfig<json::Group>(bus);
- }
// Ensure all configurations use the same set of active profiles
// (In case a profile's active state changes during configuration)