diff options
| author | James Feist <james.feist@linux.intel.com> | 2019-10-02 16:42:22 -0700 |
|---|---|---|
| committer | James Feist <james.feist@linux.intel.com> | 2019-10-10 17:46:40 +0000 |
| commit | 49d734ff2f17f5f623e60e52a144d6304866aad3 (patch) | |
| tree | d64d66d82f8ad04773d905266a4bb7316149a227 | |
| parent | f55cc5666488c964e5a60749a5f01e9d02b86a38 (diff) | |
| download | bmcweb-49d734ff2f17f5f623e60e52a144d6304866aad3.tar.gz bmcweb-49d734ff2f17f5f623e60e52a144d6304866aad3.zip | |
SoftwareInventory: Catch more interfaces
Expand the path to a larger namespace, and allow non
updateable interfaces to not error out.
Tested: More interfaces appeared without error
Change-Id: I4a6e3092c868cb5f3fe66401269d5c99f69328c8
Signed-off-by: James Feist <james.feist@linux.intel.com>
| -rw-r--r-- | redfish-core/include/utils/fw_utils.hpp | 5 | ||||
| -rw-r--r-- | redfish-core/lib/update_service.hpp | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/redfish-core/include/utils/fw_utils.hpp b/redfish-core/include/utils/fw_utils.hpp index 2341e8a..c5cf1f8 100644 --- a/redfish-core/include/utils/fw_utils.hpp +++ b/redfish-core/include/utils/fw_utils.hpp @@ -239,10 +239,7 @@ void getFwStatus(std::shared_ptr<AsyncResp> asyncResp, &propertiesList) { if (error_code) { - messages::internalError(asyncResp->res); - BMCWEB_LOG_ERROR - << "getFwStatus: Error trying to get Activation for " - << *swId; + // not all fwtypes are updateable, this is ok return; } boost::container::flat_map<std::string, VariantType>::const_iterator diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp index 9e72fa7..a3d7196 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -511,8 +511,7 @@ class SoftwareInventoryCollection : public Node }, "xyz.openbmc_project.ObjectMapper", "/xyz/openbmc_project/object_mapper", - "xyz.openbmc_project.ObjectMapper", "GetSubTree", - "/xyz/openbmc_project/software", int32_t(1), + "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", int32_t(0), std::array<const char *, 1>{ "xyz.openbmc_project.Software.Version"}); } @@ -720,8 +719,7 @@ class SoftwareInventory : public Node }, "xyz.openbmc_project.ObjectMapper", "/xyz/openbmc_project/object_mapper", - "xyz.openbmc_project.ObjectMapper", "GetSubTree", - "/xyz/openbmc_project/software", int32_t(1), + "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", int32_t(0), std::array<const char *, 1>{ "xyz.openbmc_project.Software.Version"}); } |
