From 5f04ab335cd4c8c6cba21218f5ae2fbefc4570d1 Mon Sep 17 00:00:00 2001
From: abhilashraju <abhilash.kollam@gmail.com>
Date: Thu, 30 Jan 2025 23:21:09 +0530
Subject: [PATCH] Fix 670598: dbus_util changes to fix response (#1135)

Taking latest upstream changes to fix multiple success message seen in
response. Now the behaviour is similar to what upstream does, which mean
there is no message in the response. The response is set with no_content
flag.

Signed-off-by: Abhilash Raju <abhilash.kollam@gmail.com>
---
 redfish-core/src/utils/dbus_utils.cpp         |  5 ++--
 .../redfish-core/include/utils/dbus_utils.cpp | 23 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/redfish-core/src/utils/dbus_utils.cpp b/redfish-core/src/utils/dbus_utils.cpp
index bf11aab7c..e1422c808 100644
--- a/redfish-core/src/utils/dbus_utils.cpp
+++ b/redfish-core/src/utils/dbus_utils.cpp
@@ -10,6 +10,7 @@
 #include <boost/asio/error.hpp>
 #include <boost/beast/http/status.hpp>
 #include <boost/system/error_code.hpp>
+#include <nlohmann/json.hpp>
 #include <sdbusplus/message.hpp>
 
 #include <memory>
@@ -83,10 +84,10 @@ void afterSetProperty(
         messages::internalError(asyncResp->res);
         return;
     }
-    // Only set success if another error hasn't already happened.
+    // Only set 204 if another error hasn't already happened.
     if (asyncResp->res.result() == boost::beast::http::status::ok)
     {
-        messages::success(asyncResp->res);
+        asyncResp->res.result(boost::beast::http::status::no_content);
     }
 };
 
diff --git a/test/redfish-core/include/utils/dbus_utils.cpp b/test/redfish-core/include/utils/dbus_utils.cpp
index 148f9c8c9..ebde409d1 100644
--- a/test/redfish-core/include/utils/dbus_utils.cpp
+++ b/test/redfish-core/include/utils/dbus_utils.cpp
@@ -1,19 +1,17 @@
 
 #include "utils/dbus_utils.hpp"
 
-#include "http_request.hpp"
+#include "async_resp.hpp"
 #include "http_response.hpp"
 
 #include <boost/beast/http/status.hpp>
+#include <boost/system/errc.hpp>
 #include <nlohmann/json.hpp>
+#include <sdbusplus/message.hpp>
 
-#include <cstdint>
-#include <optional>
+#include <memory>
 #include <string>
-#include <system_error>
-#include <vector>
 
-#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace redfish::details
@@ -31,6 +29,19 @@ TEST(DbusUtils, AfterPropertySetSuccess)
     afterSetProperty(asyncResp, "MyRedfishProperty",
                      nlohmann::json("MyRedfishValue"), ec, msg);
 
+    EXPECT_EQ(asyncResp->res.result(), boost::beast::http::status::no_content);
+}
+
+TEST(DbusUtils, AfterActionPropertySetSuccess)
+{
+    std::shared_ptr<bmcweb::AsyncResp> asyncResp =
+        std::make_shared<bmcweb::AsyncResp>();
+
+    boost::system::error_code ec;
+    sdbusplus::message_t msg;
+    afterSetPropertyAction(asyncResp, "MyRedfishProperty",
+                           nlohmann::json("MyRedfishValue"), ec, msg);
+
     EXPECT_EQ(asyncResp->res.result(), boost::beast::http::status::ok);
     EXPECT_EQ(asyncResp->res.jsonValue,
               R"({