| commit | 7ead48e61a7b507eb187933d9497ed9b31e4401f | [log] [tgz] |
|---|---|---|
| author | Boleslaw Ogonczyk Makowski <boleslawx.ogonczyk-makowski@intel.com> | Fri Sep 01 15:57:10 2023 +0200 |
| committer | Ed Tanous <ed@tanous.net> | Fri Sep 01 16:33:00 2023 +0000 |
| tree | 6b0cf9873b66920f9fc490f835d2a14f7c766bab | |
| parent | 9bd80831179c07e24694d23e202147df10f7a712 [diff] |
Fix mounting in legacy mode in virtual media Mounting in legacy mode doesn't provide "TransferProtocolType" in json, the protocol is specified in the uri instead which means paramTransferProtocolType was empty and always failing the new check [1], that was added because of a clang-tidy warning (sounds like a clang-tidy bug). Restored original behavior and added checking paramTransferProtocolType explicitly. [1]: https://github.com/openbmc/bmcweb/commit/e01d0c36af115ed46d54b5dbbacfe3ad92226bd3#diff-3d181e155cfa7f397eface92af17130f3db87773ce4219d9c7e24e00b76b94acR767 Change-Id: I9bbebad262356933a9482f73b78597c838777f65 Signed-off-by: Boleslaw Ogonczyk Makowski <boleslawx.ogonczyk-makowski@intel.com>
diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp index 304fffa..f3113fa 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp
@@ -765,14 +765,9 @@ return; } } - if (!paramTransferProtocolType) - { - messages::internalError(asyncResp->res); - return; - } // validation passed, add protocol to URI if needed - if (!uriTransferProtocolType) + if (!uriTransferProtocolType && paramTransferProtocolType) { actionParams.imageUrl = getUriWithTransferProtocol( *actionParams.imageUrl, *paramTransferProtocolType);