commit 48fb20b9ddcf08743d34ce53582569c8a34d7da3
author Ed Tanous <etanous@nvidia.com> Sun Nov 17 11:51:13 2024 -0800
committer Ed Tanous <ed@tanous.net> Fri Nov 22 21:15:32 2024 +0000
tree 5fd125c9a4a511fd55e2857f8a5e1124a71238cf
parent 644cdcb8d550e1e3b21379345f7011702a1479fb

Update error types to use dmtf

In a prior patch these were InvalidUpload, an openbmc oem defined
message.  Map the messages to dmtf base registry messages, primarily
MissingOrMalformedPart

Tested: on last patch of series.

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

redfish-core/lib/update_service.hpp

diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index ad6bafe..74c6f92 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -336,21 +336,21 @@
 
 inline void
     handleUpdateErrorType(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
-                          const std::string& /*url*/, const std::string& type)
+                          const std::string& url, const std::string& type)
 {
     // NOLINTBEGIN(bugprone-branch-clone)
     if (type == "xyz.openbmc_project.Software.Image.Error.UnTarFailure")
     {
-        messages::internalError(asyncResp->res);
+        messages::missingOrMalformedPart(asyncResp->res);
     }
     else if (type ==
              "xyz.openbmc_project.Software.Image.Error.ManifestFileFailure")
     {
-        messages::internalError(asyncResp->res);
+        messages::missingOrMalformedPart(asyncResp->res);
     }
     else if (type == "xyz.openbmc_project.Software.Image.Error.ImageFailure")
     {
-        messages::internalError(asyncResp->res);
+        messages::missingOrMalformedPart(asyncResp->res);
     }
     else if (type == "xyz.openbmc_project.Software.Version.Error.AlreadyExists")
     {
@@ -359,7 +359,7 @@
     }
     else if (type == "xyz.openbmc_project.Software.Image.Error.BusyFailure")
     {
-        messages::internalError(asyncResp->res);
+        messages::serviceTemporarilyUnavailable(asyncResp->res, url);
     }
     else if (type == "xyz.openbmc_project.Software.Version.Error.Incompatible")
     {
@@ -373,14 +373,14 @@
     else if (type ==
              "xyz.openbmc_project.Software.Version.Error.InvalidSignature")
     {
-        messages::internalError(asyncResp->res);
+        messages::missingOrMalformedPart(asyncResp->res);
     }
     else if (type ==
                  "xyz.openbmc_project.Software.Image.Error.InternalFailure" ||
              type == "xyz.openbmc_project.Software.Version.Error.HostFile")
     {
         BMCWEB_LOG_ERROR("Software Image Error type={}", type);
-        redfish::messages::internalError(asyncResp->res);
+        messages::internalError(asyncResp->res);
     }
     else
     {