Remove ResetToDefaultsType since time
ResetToDefaultsType states remove in 2Q24, it is now 2Q25 so let's do
that.
Don't see this used in any of our code.
More of the history can be found on the commit adding the correct
parameter type ResetType [1].
[1]: https://github.com/openbmc/bmcweb/commit/9970e93f794d0110de436828775e333e81330ad5
Tested: Builds. Removes code only, changes a comment. Just a
crazy amount of formatting for some reason.
Change-Id: Ic8bc941ac98bec398972de979eef336b9faae21f
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index 85b4044..c67cba3 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -208,80 +208,69 @@
* BMC code updater factory reset wipes the whole BMC read-write
* filesystem which includes things like the network settings.
*
- * OpenBMC only supports ResetToDefaultsType "ResetAll".
+ * OpenBMC only supports ResetType "ResetAll".
*/
BMCWEB_ROUTE(app,
"/redfish/v1/Managers/<str>/Actions/Manager.ResetToDefaults/")
.privileges(redfish::privileges::postManager)
- .methods(
- boost::beast::http::verb::
- post)([&app](
- const crow::Request& req,
- const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
- const std::string& managerId) {
- if (!redfish::setUpRedfishRoute(app, req, asyncResp))
- {
- return;
- }
+ .methods(boost::beast::http::verb::post)(
+ [&app](const crow::Request& req,
+ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
+ const std::string& managerId) {
+ if (!redfish::setUpRedfishRoute(app, req, asyncResp))
+ {
+ return;
+ }
- if (managerId != BMCWEB_REDFISH_MANAGER_URI_NAME)
- {
- messages::resourceNotFound(asyncResp->res, "Manager",
- managerId);
- return;
- }
+ if (managerId != BMCWEB_REDFISH_MANAGER_URI_NAME)
+ {
+ messages::resourceNotFound(asyncResp->res, "Manager",
+ managerId);
+ return;
+ }
- BMCWEB_LOG_DEBUG("Post ResetToDefaults.");
+ BMCWEB_LOG_DEBUG("Post ResetToDefaults.");
- std::optional<std::string> resetType;
- std::optional<std::string> resetToDefaultsType;
+ std::optional<std::string> resetType;
- if (!json_util::readJsonAction( //
- req, asyncResp->res, //
- "ResetToDefaultsType", resetToDefaultsType, //
- "ResetType", resetType //
- ))
- {
- BMCWEB_LOG_DEBUG("Missing property ResetType.");
+ if (!json_util::readJsonAction( //
+ req, asyncResp->res, //
+ "ResetType", resetType //
+ ))
+ {
+ BMCWEB_LOG_DEBUG("Missing property ResetType.");
- messages::actionParameterMissing(
- asyncResp->res, "ResetToDefaults", "ResetType");
- return;
- }
+ messages::actionParameterMissing(
+ asyncResp->res, "ResetToDefaults", "ResetType");
+ return;
+ }
- if (resetToDefaultsType && !resetType)
- {
- BMCWEB_LOG_WARNING(
- "Using deprecated ResetToDefaultsType, should be ResetType."
- "Support for the ResetToDefaultsType will be dropped in 2Q24");
- resetType = resetToDefaultsType;
- }
+ if (resetType != "ResetAll")
+ {
+ BMCWEB_LOG_DEBUG("Invalid property value for ResetType: {}",
+ *resetType);
+ messages::actionParameterNotSupported(
+ asyncResp->res, *resetType, "ResetType");
+ return;
+ }
- if (resetType != "ResetAll")
- {
- BMCWEB_LOG_DEBUG("Invalid property value for ResetType: {}",
- *resetType);
- messages::actionParameterNotSupported(asyncResp->res,
- *resetType, "ResetType");
- return;
- }
-
- crow::connections::systemBus->async_method_call(
- [asyncResp](const boost::system::error_code& ec) {
- if (ec)
- {
- BMCWEB_LOG_DEBUG("Failed to ResetToDefaults: {}", ec);
- messages::internalError(asyncResp->res);
- return;
- }
- // Factory Reset doesn't actually happen until a reboot
- // Can't erase what the BMC is running on
- doBMCGracefulRestart(asyncResp);
- },
- getBMCUpdateServiceName(), getBMCUpdateServicePath(),
- "xyz.openbmc_project.Common.FactoryReset", "Reset");
- });
+ crow::connections::systemBus->async_method_call(
+ [asyncResp](const boost::system::error_code& ec) {
+ if (ec)
+ {
+ BMCWEB_LOG_DEBUG("Failed to ResetToDefaults: {}",
+ ec);
+ messages::internalError(asyncResp->res);
+ return;
+ }
+ // Factory Reset doesn't actually happen until a reboot
+ // Can't erase what the BMC is running on
+ doBMCGracefulRestart(asyncResp);
+ },
+ getBMCUpdateServiceName(), getBMCUpdateServicePath(),
+ "xyz.openbmc_project.Common.FactoryReset", "Reset");
+ });
}
/**