commit 93f5d7c72a50b710f9fd6f011212011d6913a816
author Wludzik, Jozef <jozef.wludzik@intel.com> Fri Jul 24 17:05:38 2020 +0200
committer AppaRao Puli <apparao.puli@linux.intel.com> Wed Sep 09 02:19:06 2020 +0000
tree a86bde8e26bbd77f4448d17f951fe349f4780efc
parent dd28ba829972906cbe2d372cf4ec00fdf82fbb83

EventService: Fix type mismatch in MetricReport

Fix the type mismatch in MetricReport data which
is sent to Event Subscribers. Change below properties
type to match with MetricReport schema.
 - Timestamp: It should be uint32_t type.
 - MetricValue: It should be string type.
 
 Tested:
  - Create MetricReport subscription and report contains
    correct data types for Timestamp and MetricValue.

Signed-off-by: Wludzik, Jozef <jozef.wludzik@intel.com>
Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
Change-Id: I0a52b6963e7bedda89a216256f64764cd8799bf1

redfish-core/include/event_service_manager.hpp

diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index 64c3b7f..eeff817 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -38,7 +38,7 @@
 {
 
 using ReadingsObjType =
-    std::vector<std::tuple<std::string, std::string, double, std::string>>;
+    std::vector<std::tuple<std::string, std::string, double, int32_t>>;
 using EventServiceConfig = std::tuple<bool, uint32_t, uint32_t>;
 
 static constexpr const char* eventFormatType = "Event";
@@ -534,10 +534,12 @@
             metricValuesArray.push_back({});
             nlohmann::json& entry = metricValuesArray.back();
 
-            entry = {{"MetricId", std::get<0>(it)},
-                     {"MetricProperty", std::get<1>(it)},
-                     {"MetricValue", std::to_string(std::get<2>(it))},
-                     {"Timestamp", std::get<3>(it)}};
+            auto& [id, property, value, timestamp] = it;
+
+            entry = {{"MetricId", id},
+                     {"MetricProperty", property},
+                     {"MetricValue", std::to_string(value)},
+                     {"Timestamp", crow::utility::getDateTime(timestamp)}};
         }
 
         nlohmann::json msg = {
@@ -1357,7 +1359,7 @@
             [idStr{std::move(idStr)}](
                 const boost::system::error_code ec,
                 boost::container::flat_map<
-                    std::string, std::variant<std::string, ReadingsObjType>>&
+                    std::string, std::variant<int32_t, ReadingsObjType>>&
                     resp) {
                 if (ec)
                 {
@@ -1366,8 +1368,8 @@
                     return;
                 }
 
-                const std::string* timestampPtr =
-                    std::get_if<std::string>(&resp["Timestamp"]);
+                const int32_t* timestampPtr =
+                    std::get_if<int32_t>(&resp["Timestamp"]);
                 if (!timestampPtr)
                 {
                     BMCWEB_LOG_DEBUG << "Failed to Get timestamp.";
@@ -1394,8 +1396,9 @@
                     std::shared_ptr<Subscription> entry = it.second;
                     if (entry->eventFormatType == metricReportFormatType)
                     {
-                        entry->filterAndSendReports(idStr, *timestampPtr,
-                                                    *readingsPtr);
+                        entry->filterAndSendReports(
+                            idStr, crow::utility::getDateTime(*timestampPtr),
+                            *readingsPtr);
                     }
                 }
             },