Add getSubTreeRaw dbus function
The getSubTreeRaw function performs a GetSubTree method call and loads
the response into a map similar to the getSubTree function. The
difference is that the map returned in the response is not checked if
it's empty, which is left up to the user. This is needed for when there
may be no dbus object implementing the given interface.
Tested:
Map returned in the response is returned whether empty or not
Change-Id: I9b941521b9c0a27b6d950b66a54d07b564fc006d
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/sdbusplus.hpp b/sdbusplus.hpp
index 8a5b2f4..b441d80 100644
--- a/sdbusplus.hpp
+++ b/sdbusplus.hpp
@@ -223,8 +223,8 @@
std::forward<Args>(args)...);
}
- /** @brief Get subtree from the mapper. */
- static auto getSubTree(
+ /** @brief Get subtree from the mapper without checking response. */
+ static auto getSubTreeRaw(
sdbusplus::bus::bus& bus,
const std::string& path,
const std::string& interface,
@@ -239,7 +239,7 @@
using Objects = std::map<Path, std::map<Serv, Intfs>>;
Intfs intfs = {interface};
- auto mapperResp = callMethodAndRead<Objects>(
+ return callMethodAndRead<Objects>(
bus,
"xyz.openbmc_project.ObjectMapper"s,
"/xyz/openbmc_project/object_mapper"s,
@@ -248,7 +248,16 @@
path,
depth,
intfs);
+ }
+ /** @brief Get subtree from the mapper. */
+ static auto getSubTree(
+ sdbusplus::bus::bus& bus,
+ const std::string& path,
+ const std::string& interface,
+ int32_t depth)
+ {
+ auto mapperResp = getSubTreeRaw(bus, path, interface, depth);
if (mapperResp.empty())
{
phosphor::logging::log<phosphor::logging::level::ERR>(