commit e3648032f357195d186b7f4f02519fae10a90e41
author Ed Tanous <etanous@nvidia.com> Wed Oct 16 18:06:39 2024 -0700
committer Ed Tanous <ed@tanous.net> Tue Dec 31 21:53:22 2024 +0000
tree aef8e1e151b7c60dbb890df36605257abd74db0d
parent 04adfbca57e786d4145e71e87885022a94aea013

Make trigger use common types

Trigger having its own variant causes us to duplicate code.  This was
left out of the original refactoring because it was complex given
the variant of a variant status.

This commit finally does the port.

Tested: Unclear what tests exist for triggers that would use this code
```
curl  -k --user "root:0penBmc" -H "Content-Type: application/json" -X POST https://192.168.7.2/redfish/v1/TelemetryService/Triggers -d '{"Name": "eds", "NumericThresholds": {"LowerCritical": {"Reading": 1.0, "Activation": "Increasing", "DwellTime": "P1S"}}}'
```

Succeeds.  GET on the resource results in:
{
  "@odata.id": "/redfish/v1/TelemetryService/Triggers/eds",
  "@odata.type": "#Triggers.v1_2_0.Triggers",
  "Id": "eds",
  "Links": {
    "MetricReportDefinitions": []
  },
  "MetricProperties": [],
  "MetricType": "Numeric",
  "Name": "eds",
  "NumericThresholds": {
    "LowerCritical": {
      "Activation": "Increasing",
      "DwellTime": "PT1.000S",
      "Reading": 1.0
    }
  },
  "TriggerActions": []
}

Change-Id: I8f683cc9423ee2ba111d3ca1889e78f7d33433c9
Signed-off-by: Ed Tanous <etanous@nvidia.com>

redfish-core/lib/trigger.hpp

diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp
index 306742a..047fbb7 100644
--- a/redfish-core/lib/trigger.hpp
+++ b/redfish-core/lib/trigger.hpp
@@ -41,18 +41,9 @@
     std::variant<std::vector<NumericThresholdParams>,
                  std::vector<DiscreteThresholdParams>>;
 
-using TriggerThresholdParamsExt =
-    std::variant<std::monostate, std::vector<NumericThresholdParams>,
-                 std::vector<DiscreteThresholdParams>>;
-
 using TriggerSensorsParams =
     std::vector<std::pair<sdbusplus::message::object_path, std::string>>;
 
-using TriggerGetParamsVariant =
-    std::variant<std::monostate, bool, std::string, TriggerThresholdParamsExt,
-                 TriggerSensorsParams, std::vector<std::string>,
-                 std::vector<sdbusplus::message::object_path>>;
-
 inline triggers::TriggerActionEnum
     toRedfishTriggerAction(std::string_view dbusValue)
 {
@@ -740,7 +731,7 @@
 }
 
 inline std::optional<nlohmann::json::array_t>
-    getDiscreteTriggers(const TriggerThresholdParamsExt& thresholdParams)
+    getDiscreteTriggers(const TriggerThresholdParams& thresholdParams)
 {
     nlohmann::json::array_t triggers;
     const std::vector<DiscreteThresholdParams>* discreteParams =
@@ -772,7 +763,7 @@
 }
 
 inline std::optional<nlohmann::json>
-    getNumericThresholds(const TriggerThresholdParamsExt& thresholdParams)
+    getNumericThresholds(const TriggerThresholdParams& thresholdParams)
 {
     nlohmann::json::object_t thresholds;
     const std::vector<NumericThresholdParams>* numericParams =
@@ -841,17 +832,15 @@
     return metricProperties;
 }
 
-inline bool fillTrigger(
-    nlohmann::json& json, const std::string& id,
-    const std::vector<std::pair<std::string, TriggerGetParamsVariant>>&
-        properties)
+inline bool fillTrigger(nlohmann::json& json, const std::string& id,
+                        const dbus::utility::DBusPropertiesMap& properties)
 {
     const std::string* name = nullptr;
     const bool* discrete = nullptr;
     const TriggerSensorsParams* sensors = nullptr;
     const std::vector<sdbusplus::message::object_path>* reports = nullptr;
     const std::vector<std::string>* triggerActions = nullptr;
-    const TriggerThresholdParamsExt* thresholds = nullptr;
+    const TriggerThresholdParams* thresholds = nullptr;
 
     const bool success = sdbusplus::unpackPropertiesNoThrow(
         dbus_utils::UnpackErrorPrinter(), properties, "Name", name, "Discrete",
@@ -1021,9 +1010,7 @@
                     telemetry::triggerInterface,
                     [asyncResp,
                      id](const boost::system::error_code& ec,
-                         const std::vector<std::pair<
-                             std::string, telemetry::TriggerGetParamsVariant>>&
-                             ret) {
+                         const dbus::utility::DBusPropertiesMap& ret) {
                         if (ec.value() == EBADR ||
                             ec == boost::system::errc::host_unreachable)
                         {