commit ef6ca6e4e65b303763159831a2c7e32aa49b5c7f
author Chicago Duan <duanzhijia01@inspur.com> Fri Nov 27 16:23:05 2020 +0800
committer Ed Tanous <ed@tanous.net> Wed Dec 02 16:37:22 2020 +0000
tree afc3864dd0eb1198cd4042e54fc07c7aff0e87c3
parent ae907c720c9fef0a6c0d27f931d2cf399e2a55f1

Redfish: Manager: Implement Manufacturer,PartNumber and SerialNumber

Implement Manufacturer,PartNumber and SerialNumber in /redfish/v1/Managers/bmc

The Redfish manager defines these new properties:
https://redfish.dmtf.org/schemas/v1/Manager.v1_10_0.json

Tested:
Validator passes
curl -k -H "X-Auth-Token: $token" -X GET https://${bmc}/redfish/v1/Managers/bmc
{
  "@odata.id": "/redfish/v1/Managers/bmc",
  "@odata.type": "#Manager.v1_9_0.Manager",
  "Actions": {
    "#Manager.Reset": {
      "@Redfish.ActionInfo": "/redfish/v1/Managers/bmc/ResetActionInfo",
      "target": "/redfish/v1/Managers/bmc/Actions/Manager.Reset"
    },
    "#Manager.ResetToDefaults": {
      "ResetType@Redfish.AllowableValues": [
        "ResetAll"
      ],
      "target": "/redfish/v1/Managers/bmc/Actions/Manager.ResetToDefaults"
    }
  },
  ... ...
  "Manufacturer": "testManufacturer",
  ... ...
  "PartNumber": "testPartNumber",
  ... ...
  "SerialNumber": "testSerialNumber",
  ... ...
  "Status": {
    "Health": "OK",
    "HealthRollup": "OK",
    "State": "Enabled"
  },
  "UUID": "d80b997e-d7eb-4773-b375-ed18e87a4ed4"
}

Signed-off-by: Chicago Duan <duanzhijia01@inspur.com>
Change-Id: Id3765cfb8d80b5958fb0f82ecd7f5d89f90f893a

redfish-core/lib/managers.hpp

diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index d8e2fe8..6347caf 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -1833,6 +1833,86 @@
                 "org.freedesktop.DBus.Properties", "Get",
                 "org.freedesktop.systemd1.Manager", "Progress");
         }
+
+        crow::connections::systemBus->async_method_call(
+            [asyncResp](
+                const boost::system::error_code ec,
+                const std::vector<std::pair<
+                    std::string, std::vector<std::pair<
+                                     std::string, std::vector<std::string>>>>>&
+                    subtree) {
+                if (ec)
+                {
+                    BMCWEB_LOG_DEBUG << "D-Bus response error on GetSubTree "
+                                     << ec;
+                    return;
+                }
+                if (subtree.size() == 0)
+                {
+                    BMCWEB_LOG_DEBUG << "Can't find bmc D-Bus object!";
+                    return;
+                }
+                // Assume only 1 bmc D-Bus object
+                // Throw an error if there is more than 1
+                if (subtree.size() > 1)
+                {
+                    BMCWEB_LOG_DEBUG << "Found more than 1 bmc D-Bus object!";
+                    messages::internalError(asyncResp->res);
+                    return;
+                }
+
+                if (subtree[0].first.empty() || subtree[0].second.size() != 1)
+                {
+                    BMCWEB_LOG_DEBUG << "Error getting bmc D-Bus object!";
+                    messages::internalError(asyncResp->res);
+                    return;
+                }
+
+                const std::string& path = subtree[0].first;
+                const std::string& connectionName = subtree[0].second[0].first;
+
+                crow::connections::systemBus->async_method_call(
+                    [asyncResp](
+                        const boost::system::error_code ec,
+                        const std::vector<
+                            std::pair<std::string, std::variant<std::string>>>&
+                            propertiesList) {
+                        if (ec)
+                        {
+                            BMCWEB_LOG_DEBUG << "Can't get bmc asset!";
+                            return;
+                        }
+                        for (const std::pair<std::string,
+                                             std::variant<std::string>>&
+                                 property : propertiesList)
+                        {
+                            const std::string& propertyName = property.first;
+
+                            if ((propertyName == "PartNumber") ||
+                                (propertyName == "SerialNumber") ||
+                                (propertyName == "Manufacturer"))
+                            {
+                                const std::string* value =
+                                    std::get_if<std::string>(&property.second);
+                                if (value == nullptr)
+                                {
+                                    // illegal property
+                                    messages::internalError(asyncResp->res);
+                                    continue;
+                                }
+                                asyncResp->res.jsonValue[propertyName] = *value;
+                            }
+                        }
+                    },
+                    connectionName, path, "org.freedesktop.DBus.Properties",
+                    "GetAll", "xyz.openbmc_project.Inventory.Decorator.Asset");
+            },
+            "xyz.openbmc_project.ObjectMapper",
+            "/xyz/openbmc_project/object_mapper",
+            "xyz.openbmc_project.ObjectMapper", "GetSubTree",
+            "/xyz/openbmc_project/inventory", int32_t(0),
+            std::array<const char*, 1>{
+                "xyz.openbmc_project.Inventory.Item.Bmc"});
     }
 
     void doPatch(crow::Response& res, const crow::Request& req,