commit 02f6ff1962366dce770e459408bd4f6976c06d53
author Gunnar Mills <gmills@us.ibm.com> Wed Oct 14 15:59:58 2020 -0500
committer Gunnar Mills <gmills@us.ibm.com> Fri Oct 16 13:09:57 2020 +0000
tree a725e83b94da31f0c62435115b63d644874972b1
parent 05030b8edfeeb351c902bc5d36c5041796b8df6d

Chassis Collection: Use getCollectionMembers

Improves code reuse.

Tested: Validator passes.
curl -k https://$bmc/redfish/v1/Chassis/
{
  "@odata.id": "/redfish/v1/Chassis",
  "@odata.type": "#ChassisCollection.ChassisCollection",
  "Members": [
    {
      "@odata.id": "/redfish/v1/Chassis/chassis"
    },
    {
      "@odata.id": "/redfish/v1/Chassis/motherboard"
    }
  ],
  "Members@odata.count": 2,
  "Name": "Chassis Collection"

Change-Id: Ie26f93faec9498124ab1d5747aed8300414b6d96
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>

redfish-core/lib/chassis.hpp

diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp
index be1e947..92bf1a0 100644
--- a/redfish-core/lib/chassis.hpp
+++ b/redfish-core/lib/chassis.hpp
@@ -20,6 +20,7 @@
 #include "node.hpp"
 
 #include <boost/container/flat_map.hpp>
+#include <utils/collection.hpp>
 
 #include <variant>
 
@@ -182,49 +183,12 @@
         res.jsonValue["@odata.id"] = "/redfish/v1/Chassis";
         res.jsonValue["Name"] = "Chassis Collection";
 
-        const std::array<const char*, 2> interfaces = {
-            "xyz.openbmc_project.Inventory.Item.Board",
-            "xyz.openbmc_project.Inventory.Item.Chassis"};
-
         auto asyncResp = std::make_shared<AsyncResp>(res);
-        crow::connections::systemBus->async_method_call(
-            [asyncResp](const boost::system::error_code ec,
-                        const std::vector<std::string>& chassisList) {
-                if (ec)
-                {
-                    messages::internalError(asyncResp->res);
-                    return;
-                }
-                nlohmann::json& chassisArray =
-                    asyncResp->res.jsonValue["Members"];
-                chassisArray = nlohmann::json::array();
-                for (const std::string& objpath : chassisList)
-                {
-                    std::size_t lastPos = objpath.rfind("/");
-                    if (lastPos == std::string::npos)
-                    {
-                        BMCWEB_LOG_ERROR << "Failed to find '/' in " << objpath;
-                        messages::internalError(asyncResp->res);
-                        return;
-                    }
-                    if ((lastPos + 1) >= objpath.size())
-                    {
-                        BMCWEB_LOG_ERROR << "Failed to parse path " << objpath;
-                        messages::internalError(asyncResp->res);
-                        return;
-                    }
-                    chassisArray.push_back(
-                        {{"@odata.id", "/redfish/v1/Chassis/" +
-                                           objpath.substr(lastPos + 1)}});
-                }
 
-                asyncResp->res.jsonValue["Members@odata.count"] =
-                    chassisArray.size();
-            },
-            "xyz.openbmc_project.ObjectMapper",
-            "/xyz/openbmc_project/object_mapper",
-            "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths",
-            "/xyz/openbmc_project/inventory", 0, interfaces);
+        collection_util::getCollectionMembers(
+            asyncResp, "/redfish/v1/Chassis",
+            {"xyz.openbmc_project.Inventory.Item.Board",
+             "xyz.openbmc_project.Inventory.Item.Chassis"});
     }
 };