commit 5880f0c5ac700a78abf6b2a89afe5030a8d2f825
author Boleslaw Ogonczyk Makowski <boleslawx.ogonczyk-makowski@intel.com> Fri Apr 14 15:32:40 2023 +0200
committer Ed Tanous <ed@tanous.net> Tue Apr 25 16:21:44 2023 +0000
tree 18d1549fdbdb41b5921a6f77b66254efa433fe49
parent 72e21377372245b076c151f62a141153ab318bdd

Fix regression in virtual media

VmMode::Proxy was being checked incorrectly in [1] instead of
VmMode::Legacy which didn't allow mounting in legacy mode. Removing
return in [2] caused the code to display an error while unmounting even
when unmounted successfully.

Tested:
Can mount in legacy mode
Unmounting successfully in legacy mode doesn't display an error

[1]: https://github.com/openbmc/bmcweb/commit/365a73f4725a6cefa3d69168ae5500fd05ff8866#diff-3d181e155cfa7f397eface92af17130f3db87773ce4219d9c7e24e00b76b94acR865
[2]: https://github.com/openbmc/bmcweb/commit/365a73f4725a6cefa3d69168ae5500fd05ff8866#diff-3d181e155cfa7f397eface92af17130f3db87773ce4219d9c7e24e00b76b94acL956

Change-Id: I522369cfd81ca084c7379ff97371f8a292950849
Signed-off-by: Boleslaw Ogonczyk Makowski <boleslawx.ogonczyk-makowski@intel.com>

redfish-core/lib/virtual_media.hpp

diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
index 88bdb21..bb17d3f 100644
--- a/redfish-core/lib/virtual_media.hpp
+++ b/redfish-core/lib/virtual_media.hpp
@@ -881,7 +881,7 @@
             for (const auto& object : subtree)
             {
                 VmMode mode = parseObjectPathAndGetMode(object.first, resName);
-                if (mode == VmMode::Proxy)
+                if (mode == VmMode::Legacy)
                 {
                     validateParams(asyncResp, service, resName, actionParams);
 
@@ -948,6 +948,7 @@
                 {
                     doEjectAction(asyncResp, service, resName,
                                   mode == VmMode::Legacy);
+                    return;
                 }
             }
             BMCWEB_LOG_DEBUG << "Parent item not found";