entity-manager: fix representation: arrays of bool
This quirk came up during [1] and was fixed in sdbusplus in [2].
Fix the EM code now to drop this quirk.
According to statements in [2] there 'should' not be any effects of the
change, at least in upstream code.
Tested: on Tyan S8030.
entity-manager starts normally
```
Apr 03 20:35:36 s8030 systemd[1]: Started Entity Manager.
Apr 03 20:36:03 s8030 entity-manager[272]: Clearing previous configuration
Apr 03 20:36:15 s8030 entity-manager[272]: Inventory Added: Supermicro PWS 920P SQ 0
Apr 03 20:36:15 s8030 entity-manager[272]: Inventory Added: Supermicro PWS 920P SQ 1
Apr 03 20:36:15 s8030 entity-manager[272]: Inventory Added: Tyan S8030 Baseboard
Apr 03 20:36:15 s8030 entity-manager[272]: Inventory Added: MBX 1.57 Chassis
```
entity-manager `busctl tree` looks same as before the change.
No new warnings or errors found in `journalctl` output.
No new services failures on `systemctl --failed`
References:
[1] https://gerrit.openbmc.org/c/openbmc/entity-manager/+/81474
[2] https://gerrit.openbmc.org/c/openbmc/sdbusplus/+/82035
Change-Id: Ia0788868f5631430b3733f20575c64f3d0411e96
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/src/entity_manager/dbus_interface.hpp b/src/entity_manager/dbus_interface.hpp
index 30423e6..9bf223f 100644
--- a/src/entity_manager/dbus_interface.hpp
+++ b/src/entity_manager/dbus_interface.hpp
@@ -135,7 +135,7 @@
});
}
-template <typename PropertyType, typename SinglePropertyType = PropertyType>
+template <typename PropertyType>
void addValueToDBus(const std::string& key, const nlohmann::json& value,
sdbusplus::asio::dbus_interface& iface,
sdbusplus::asio::PropertyPermission permission,
@@ -149,9 +149,8 @@
}
else
{
- addProperty(key, value.get<SinglePropertyType>(), &iface,
- systemConfiguration, path,
- sdbusplus::asio::PropertyPermission::readOnly);
+ addProperty(key, value.get<PropertyType>(), &iface, systemConfiguration,
+ path, sdbusplus::asio::PropertyPermission::readOnly);
}
}