remove unstructured HTTP patch for ApplyOptions
Remove the support for Unstructured HTTP patch as the main user of this
Redfish API is IBM and they only use this API to set the ApplyTime as
immediate. Hence ApplyTime will be passed as immediate (as default) for
Unstructured HTTP POST updates. Modify the get for ApplyTime to only
return immediate.
Tested:
Patch operation removal test:
```
> curl -k -H "X-Auth-Token: $token" -H "Content-Type: application/json" -X PATCH -d '{"HttpPushUriOptions":{"HttpPushUriApplyTime":{"ApplyTime":"Immediate"}}}' https://${bmc}/redfish/v1/UpdateService
{
"error": {
"@Message.ExtendedInfo": [
{
"@odata.type": "#Message.v1_1_1.Message",
"Message": "The HTTP method is not allowed on this resource.",
"MessageArgs": [],
"MessageId": "Base.1.16.0.OperationNotAllowed",
"MessageSeverity": "Critical",
"Resolution": "None."
}
],
"code": "Base.1.16.0.OperationNotAllowed",
"message": "The HTTP method is not allowed on this resource."
}
}
```
ApplyTime get test:
```
> curl -k -H "X-Auth-Token: $token" https://${bmc}/redfish/v1/UpdateService
{
"@odata.id": "/redfish/v1/UpdateService",
"@odata.type": "#UpdateService.v1_11_1.UpdateService",
"Actions": {
"#UpdateService.SimpleUpdate": {
"TransferProtocol@Redfish.AllowableValues": [
"HTTPS"
],
"target": "/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate"
}
},
"Description": "Service for Software Update",
"FirmwareInventory": {
"@odata.id": "/redfish/v1/UpdateService/FirmwareInventory"
},
"HttpPushUri": "/redfish/v1/UpdateService/update",
"HttpPushUriOptions": {
"HttpPushUriApplyTime": {
"ApplyTime": "Immediate"
}
},
"Id": "UpdateService",
"MaxImageSizeBytes": 31457280,
"MultipartHttpPushUri": "/redfish/v1/UpdateService/update",
"Name": "Update Service",
"ServiceEnabled": true
}
```
Change-Id: I25d21119d74a3411cd1fd581c9d56e1e9e1604f8
Signed-off-by: Jagpal Singh Gill <paligill@gmail.com>
diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 23b5a3c..36ee8a0 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -1172,60 +1172,8 @@
updateSvcSimpleUpdate["TransferProtocol@Redfish.AllowableValues"] =
std::move(allowed);
- // Get the current ApplyTime value
- sdbusplus::asio::getProperty<std::string>(
- *crow::connections::systemBus, "xyz.openbmc_project.Settings",
- "/xyz/openbmc_project/software/apply_time",
- "xyz.openbmc_project.Software.ApplyTime", "RequestedApplyTime",
- [asyncResp](const boost::system::error_code& ec,
- const std::string& applyTime) {
- if (ec)
- {
- BMCWEB_LOG_DEBUG("DBUS response error {}", ec);
- messages::internalError(asyncResp->res);
- return;
- }
-
- // Store the ApplyTime Value
- if (applyTime == "xyz.openbmc_project.Software.ApplyTime."
- "RequestedApplyTimes.Immediate")
- {
- asyncResp->res.jsonValue["HttpPushUriOptions"]
- ["HttpPushUriApplyTime"]["ApplyTime"] =
- "Immediate";
- }
- else if (applyTime == "xyz.openbmc_project.Software.ApplyTime."
- "RequestedApplyTimes.OnReset")
- {
- asyncResp->res.jsonValue["HttpPushUriOptions"]
- ["HttpPushUriApplyTime"]["ApplyTime"] =
- "OnReset";
- }
- });
-}
-
-inline void handleUpdateServicePatch(
- App& app, const crow::Request& req,
- const std::shared_ptr<bmcweb::AsyncResp>& asyncResp)
-{
- if (!redfish::setUpRedfishRoute(app, req, asyncResp))
- {
- return;
- }
- BMCWEB_LOG_DEBUG("doPatch...");
-
- std::optional<std::string> applyTime;
- if (!json_util::readJsonPatch(
- req, asyncResp->res,
- "HttpPushUriOptions/HttpPushUriApplyTime/ApplyTime", applyTime))
- {
- return;
- }
-
- if (applyTime)
- {
- setApplyTime(asyncResp, *applyTime);
- }
+ asyncResp->res.jsonValue["HttpPushUriOptions"]["HttpPushUriApplyTime"]
+ ["ApplyTime"] = "Immediate";
}
inline void handleUpdateServiceFirmwareInventoryCollectionGet(
@@ -1439,11 +1387,6 @@
.methods(boost::beast::http::verb::get)(
std::bind_front(handleUpdateServiceGet, std::ref(app)));
- BMCWEB_ROUTE(app, "/redfish/v1/UpdateService/")
- .privileges(redfish::privileges::patchUpdateService)
- .methods(boost::beast::http::verb::patch)(
- std::bind_front(handleUpdateServicePatch, std::ref(app)));
-
BMCWEB_ROUTE(app, "/redfish/v1/UpdateService/update/")
.privileges(redfish::privileges::postUpdateService)
.methods(boost::beast::http::verb::post)(