Fix the Redfish validator fail for Storage
This commit fixes the problem that Redfish Validator has not passed
because of the analytical URL failure
(Redfish/V1/Systems/System/System/Storage/1/Drives/Media0).
Redfish validator error message:
```
*** /redfish/v1/Systems/system/Storage/1
INFO - Type (Storage.v1_7_1.Storage), GET SUCCESS \
(time: 0:00:00.184274)
INFO - Attempt 1 of /redfish/v1/Systems/system/Storage/1/ \
Drives/media0
INFO - Response Time for GET to /redfish/v1/Systems/system/Storage/ \
1/Drives/media0: 0.15951547500117158 seconds.
ERROR - Drives: GET of resource at URI /redfish/v1/Systems/system/ \
Storage/1/Drives/media0 returned HTTP error. Check URI.
INFO - FAIL...
INFO -
*** /redfish/v1/Systems/system/Storage/1/Drives/media0
ERROR - URI did not return resource /redfish/v1/Systems/system/ \
Storage/1/Drives/media0
```
Tested: Redfish validator passes.
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I1c7ff0e8103ce2e65cd3d73f6ef20abfe70a01b5
diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp
index 3bc8419..a77bb91 100644
--- a/redfish-core/lib/storage.hpp
+++ b/redfish-core/lib/storage.hpp
@@ -18,6 +18,7 @@
#include "app.hpp"
#include "dbus_utility.hpp"
#include "generated/enums/drive.hpp"
+#include "generated/enums/protocol.hpp"
#include "health.hpp"
#include "human_sort.hpp"
#include "openbmc_dbus_rest.hpp"
@@ -388,40 +389,50 @@
});
}
-inline std::optional<std::string> convertDriveType(const std::string& type)
+inline std::optional<drive::MediaType> convertDriveType(std::string_view type)
{
if (type == "xyz.openbmc_project.Inventory.Item.Drive.DriveType.HDD")
{
- return "HDD";
+ return drive::MediaType::HDD;
}
if (type == "xyz.openbmc_project.Inventory.Item.Drive.DriveType.SSD")
{
- return "SSD";
+ return drive::MediaType::SSD;
+ }
+ if (type == "xyz.openbmc_project.Inventory.Item.Drive.DriveType.Unknown")
+ {
+ return std::nullopt;
}
- return std::nullopt;
+ return drive::MediaType::Invalid;
}
-inline std::optional<std::string> convertDriveProtocol(const std::string& proto)
+inline std::optional<protocol::Protocol>
+ convertDriveProtocol(std::string_view proto)
{
if (proto == "xyz.openbmc_project.Inventory.Item.Drive.DriveProtocol.SAS")
{
- return "SAS";
+ return protocol::Protocol::SAS;
}
if (proto == "xyz.openbmc_project.Inventory.Item.Drive.DriveProtocol.SATA")
{
- return "SATA";
+ return protocol::Protocol::SATA;
}
if (proto == "xyz.openbmc_project.Inventory.Item.Drive.DriveProtocol.NVMe")
{
- return "NVMe";
+ return protocol::Protocol::NVMe;
}
if (proto == "xyz.openbmc_project.Inventory.Item.Drive.DriveProtocol.FC")
{
- return "FC";
+ return protocol::Protocol::FC;
+ }
+ if (proto ==
+ "xyz.openbmc_project.Inventory.Item.Drive.DriveProtocol.Unknown")
+ {
+ return std::nullopt;
}
- return std::nullopt;
+ return protocol::Protocol::Invalid;
}
inline void
@@ -459,11 +470,16 @@
return;
}
- std::optional<std::string> mediaType = convertDriveType(*value);
+ std::optional<drive::MediaType> mediaType =
+ convertDriveType(*value);
if (!mediaType)
{
- BMCWEB_LOG_ERROR << "Unsupported DriveType Interface: "
- << *value;
+ BMCWEB_LOG_WARNING << "UnknownDriveType Interface: "
+ << *value;
+ continue;
+ }
+ if (*mediaType == drive::MediaType::Invalid)
+ {
messages::internalError(asyncResp->res);
return;
}
@@ -499,11 +515,16 @@
return;
}
- std::optional<std::string> proto = convertDriveProtocol(*value);
+ std::optional<protocol::Protocol> proto =
+ convertDriveProtocol(*value);
if (!proto)
{
- BMCWEB_LOG_ERROR << "Unsupported DrivePrototype Interface: "
- << *value;
+ BMCWEB_LOG_WARNING << "Unknown DrivePrototype Interface: "
+ << *value;
+ continue;
+ }
+ if (*proto == protocol::Protocol::Invalid)
+ {
messages::internalError(asyncResp->res);
return;
}