Consitently use dbus::utility types
This saves about 4k on the binary size
Tested: Redfish service validator passes.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I9546227a19c691b1aecb80e80307889548c0293f
diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
index ca85098..429e992 100644
--- a/redfish-core/lib/systems.hpp
+++ b/redfish-core/lib/systems.hpp
@@ -122,11 +122,10 @@
}
}
-inline void getProcessorProperties(
- const std::shared_ptr<bmcweb::AsyncResp>& aResp, const std::string& service,
- const std::string& path,
- const std::vector<std::pair<std::string, dbus::utility::DbusVariantType>>&
- properties)
+inline void
+ getProcessorProperties(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+ const std::string& service, const std::string& path,
+ const dbus::utility::DBusPropertiesMap& properties)
{
BMCWEB_LOG_DEBUG << "Got " << properties.size() << " Cpu properties.";
@@ -215,8 +214,7 @@
crow::connections::systemBus->async_method_call(
[aResp, service,
path](const boost::system::error_code ec2,
- const std::vector<std::pair<
- std::string, dbus::utility::DbusVariantType>>& properties) {
+ const dbus::utility::DBusPropertiesMap& properties) {
if (ec2)
{
BMCWEB_LOG_ERROR << "DBUS response error " << ec2;
@@ -244,12 +242,9 @@
BMCWEB_LOG_DEBUG << "Get available system components.";
crow::connections::systemBus->async_method_call(
- [aResp, systemHealth](
- const boost::system::error_code ec,
- const std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp,
+ systemHealth](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG << "DBUS response error";
@@ -296,9 +291,7 @@
crow::connections::systemBus->async_method_call(
[aResp, service{connection.first},
path](const boost::system::error_code ec2,
- const std::vector<std::pair<
- std::string,
- dbus::utility::DbusVariantType>>&
+ const dbus::utility::DBusPropertiesMap&
properties) {
if (ec2)
{
@@ -402,9 +395,7 @@
<< "Found UUID, now get its properties.";
crow::connections::systemBus->async_method_call(
[aResp](const boost::system::error_code ec3,
- const std::vector<std::pair<
- std::string,
- dbus::utility::DbusVariantType>>&
+ const dbus::utility::DBusPropertiesMap&
properties) {
if (ec3)
{
@@ -454,9 +445,7 @@
{
crow::connections::systemBus->async_method_call(
[aResp](const boost::system::error_code ec2,
- const std::vector<std::pair<
- std::string,
- dbus::utility::DbusVariantType>>&
+ const dbus::utility::DBusPropertiesMap&
propertiesList) {
if (ec2)
{
@@ -1237,12 +1226,8 @@
BMCWEB_LOG_DEBUG << "Get TPM required to boot.";
crow::connections::systemBus->async_method_call(
- [aResp](
- const boost::system::error_code ec,
- std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG
@@ -1329,12 +1314,8 @@
BMCWEB_LOG_DEBUG << "Set TrustedModuleRequiredToBoot.";
crow::connections::systemBus->async_method_call(
- [aResp, tpmRequired](
- const boost::system::error_code ec,
- std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp, tpmRequired](const boost::system::error_code ec,
+ dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG
@@ -1660,12 +1641,9 @@
const std::string& assetTag)
{
crow::connections::systemBus->async_method_call(
- [aResp, assetTag](
- const boost::system::error_code ec,
- const std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp,
+ assetTag](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG << "D-Bus response error on GetSubTree " << ec;
@@ -1835,9 +1813,7 @@
BMCWEB_LOG_DEBUG << "Get OEM information.";
crow::connections::systemBus->async_method_call(
[aResp](const boost::system::error_code ec,
- const std::vector<
- std::pair<std::string, dbus::utility::DbusVariantType>>&
- propertiesList) {
+ const dbus::utility::DBusPropertiesMap& propertiesList) {
nlohmann::json& oemPFR =
aResp->res.jsonValue["Oem"]["OpenBmc"]["FirmwareProvisioning"];
aResp->res.jsonValue["Oem"]["OpenBmc"]["@odata.type"] =
@@ -1950,12 +1926,8 @@
// Get Power Mode object path:
crow::connections::systemBus->async_method_call(
- [aResp](
- const boost::system::error_code ec,
- const std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG
@@ -2077,12 +2049,9 @@
// Get Power Mode object path:
crow::connections::systemBus->async_method_call(
- [aResp, powerMode](
- const boost::system::error_code ec,
- const std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp,
+ powerMode](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG
@@ -2219,7 +2188,7 @@
BMCWEB_LOG_DEBUG << "Get host watchodg";
crow::connections::systemBus->async_method_call(
[aResp](const boost::system::error_code ec,
- const PropertiesType& properties) {
+ const dbus::utility::DBusPropertiesMap& properties) {
if (ec)
{
// watchdog service is stopped
@@ -2434,12 +2403,8 @@
// Get IdlePowerSaver object path:
crow::connections::systemBus->async_method_call(
- [aResp](
- const boost::system::error_code ec,
- const std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ [aResp](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG
@@ -2539,12 +2504,8 @@
// Get IdlePowerSaver object path:
crow::connections::systemBus->async_method_call(
[aResp, ipsEnable, ipsEnterUtil, ipsEnterTime, ipsExitUtil,
- ipsExitTime](
- const boost::system::error_code ec,
- const std::vector<std::pair<
- std::string,
- std::vector<std::pair<std::string, std::vector<std::string>>>>>&
- subtree) {
+ ipsExitTime](const boost::system::error_code ec,
+ const dbus::utility::MapperGetSubTreeResponse& subtree) {
if (ec)
{
BMCWEB_LOG_DEBUG