commit 049079f651fbfc465f136c8e9fe6acbd67f0434a
author Jagpal Singh Gill <paligill@gmail.com> Sun Jun 02 18:11:13 2024 -0700
committer Ed Tanous <ed@tanous.net> Tue Jun 04 20:56:30 2024 +0000
tree cce91181057496cd6cebdfc87a271b741fe648af
parent 38221509e6cc06a6897e8b9b2aa049a70c033840

update service: update applytime value

Update interface has been updated to use ApplyTime from ApplyTime
interface. This helps to avoid any conversions between the values. Hence
update the BMCWeb to reflect this change.

Tested:
```
curl  -k -H "X-Auth-Token: $token"  -H "Content-Type:multipart/form-data"          -X POST  -F UpdateParameters="{\"Targets\":[\"/redfish/v1/UpdateService/FirmwareInventory/3c956be0\"],\"@Redfish.OperationApplyTime\":\"Immediate\"}
;type=application/json"         -F "UpdateFile=@obmc-phosphor-image-romulus-20240529184214.static.mtd.tar;type=application/octet-stream"         https://${bmc}/redfish/v1/UpdateService/update
{
  "@odata.id": "/redfish/v1/TaskService/Tasks/2",
  "@odata.type": "#Task.v1_4_3.Task",
  "Id": "2",
  "TaskState": "Running",
  "TaskStatus": "OK"
}
```

Change-Id: I311d8048d80616cc8933c3e32ca44b4cfa64b1e9
Signed-off-by: Jagpal Singh Gill <paligill@gmail.com>

redfish-core/lib/update_service.hpp

diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 89c4c7d..23b5a3c 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -707,12 +707,12 @@
     if (applyTime == "Immediate")
     {
         applyTimeNewVal =
-            "xyz.openbmc_project.Software.Update.ApplyTimes.Immediate";
+            "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.Immediate";
     }
     else if (applyTime == "OnReset")
     {
         applyTimeNewVal =
-            "xyz.openbmc_project.Software.Update.ApplyTimes.OnReset";
+            "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.OnReset";
     }
     else
     {
@@ -729,22 +729,8 @@
                          const std::string& applyTime)
 {
     std::string applyTimeNewVal;
-    if (applyTime == "Immediate")
+    if (!convertApplyTime(asyncResp->res, applyTime, applyTimeNewVal))
     {
-        applyTimeNewVal =
-            "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.Immediate";
-    }
-    else if (applyTime == "OnReset")
-    {
-        applyTimeNewVal =
-            "xyz.openbmc_project.Software.ApplyTime.RequestedApplyTimes.OnReset";
-    }
-    else
-    {
-        BMCWEB_LOG_INFO(
-            "ApplyTime value is not in the list of acceptable values");
-        messages::propertyValueNotInList(asyncResp->res, applyTime,
-                                         "ApplyTime");
         return;
     }