regulators: Add SensorMonitoring::execute()
Implementation and Testing for SensorMonitoring::execute().
Signed-off-by: Bob King <Bob_King@wistron.com>
Change-Id: If2b39b70997cd5cb84adc6c4b601d87556b82f55
diff --git a/phosphor-regulators/src/meson.build b/phosphor-regulators/src/meson.build
index 4adeb58..6f067b5 100644
--- a/phosphor-regulators/src/meson.build
+++ b/phosphor-regulators/src/meson.build
@@ -13,6 +13,7 @@
'id_map.cpp',
'pmbus_utils.cpp',
'rail.cpp',
+ 'sensor_monitoring.cpp',
'system.cpp',
'actions/if_action.cpp',
diff --git a/phosphor-regulators/src/sensor_monitoring.cpp b/phosphor-regulators/src/sensor_monitoring.cpp
new file mode 100644
index 0000000..6135b50
--- /dev/null
+++ b/phosphor-regulators/src/sensor_monitoring.cpp
@@ -0,0 +1,54 @@
+/**
+ * Copyright © 2020 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "sensor_monitoring.hpp"
+
+#include "action_environment.hpp"
+#include "action_utils.hpp"
+#include "chassis.hpp"
+#include "device.hpp"
+#include "exception_utils.hpp"
+#include "journal.hpp"
+#include "rail.hpp"
+#include "system.hpp"
+
+#include <exception>
+
+namespace phosphor::power::regulators
+{
+
+void SensorMonitoring::execute(System& system, Chassis& /*chassis*/,
+ Device& device, Rail& rail)
+{
+ try
+ {
+ // Create ActionEnvironment
+ ActionEnvironment environment{system.getIDMap(), device.getID()};
+
+ // Execute the actions
+ action_utils::execute(actions, environment);
+ }
+ catch (const std::exception& e)
+ {
+ // Log error messages in journal
+ exception_utils::log(e);
+ journal::logErr("Unable to monitor sensors for rail " + rail.getID());
+
+ // TODO: Create error log entry
+ }
+}
+
+} // namespace phosphor::power::regulators
diff --git a/phosphor-regulators/src/sensor_monitoring.hpp b/phosphor-regulators/src/sensor_monitoring.hpp
index 7572436..f3491cd 100644
--- a/phosphor-regulators/src/sensor_monitoring.hpp
+++ b/phosphor-regulators/src/sensor_monitoring.hpp
@@ -24,6 +24,12 @@
namespace phosphor::power::regulators
{
+// Forward declarations to avoid circular dependencies
+class Chassis;
+class Device;
+class Rail;
+class System;
+
/**
* @class SensorMonitoring
*
@@ -61,12 +67,13 @@
/**
* Executes the actions to read the sensors for a rail.
+ *
+ * @param system system that contains the chassis
+ * @param chassis chassis that contains the device
+ * @param device device that contains the rail
+ * @param rail rail associated with the sensors
*/
- void execute()
- {
- // TODO: Create ActionEnvironment, execute actions, store sensor values
- // on D-Bus, catch and handle any exceptions
- }
+ void execute(System& system, Chassis& chassis, Device& device, Rail& rail);
/**
* Returns the actions that read the sensors for a rail.