Add support for sensorName field in yaml
We want to have ability to specify the human readable names for the OCC
sensors. E.g. `CPU0_OCC` instead of `occ_4_0050`.
This commit allows to specify a `sensorName` field in the YAML config
for each sensor, and this name will be used in the sensor object DBus
path. If the field is not specified, previous behavior will be used.
Tested: the command `busctl tree org.open_power.OCC.Control --list` must
show specified names.
Change-Id: I2f05f7bf44120554ea07b9ee0aac9cfbd33ac376
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
diff --git a/occ_sensor.mako.hpp b/occ_sensor.mako.hpp
index b5fac53..19c785f 100755
--- a/occ_sensor.mako.hpp
+++ b/occ_sensor.mako.hpp
@@ -6,6 +6,8 @@
#pragma once
#include <map>
+#include <string>
+#include <tuple>
namespace open_power
{
@@ -14,15 +16,18 @@
using instanceID = int;
using sensorID = uint8_t;
-const std::map<instanceID, sensorID> Status::sensorMap = {
+using sensorName = std::string;
+using sensorDefs = std::tuple<sensorID, sensorName>;
+const std::map<instanceID, sensorDefs> Status::sensorMap = {
\
% for occ in occDict:
<%
instance = occ.get("Instance")
id = occ.get("SensorID")
+ name = occ.get("SensorName")
%>\
\
- { ${instance}, ${id} },\
+ { ${instance}, { ${id}, "${name}" }},\
% endfor
};