commit cfd7fa83d3b5ab7d85eecc4b461df70cccf5ff45
author George Liu <liuxiwei@ieisystem.com> Mon Jan 22 11:38:29 2024 +0800
committer George Liu <liuxiwei@ieisystem.com> Sun Feb 04 00:11:52 2024 +0000
tree 0aa35c1bd6592665c0d5b488845d0ece4c168884
parent a008871d66299801fde39036bef77da8e50dcf74

dcmi: Flexible support for dhcp dbus path

Since dhcp4 and dhcp6 configurations will be added in the future [1],
when calling ipmitool's dcmi get/set conf param command, all dhcp
paths should be flexibly supported instead of hard-coding the dhcp
dbus path.

[1] https://gerrit.openbmc.org/c/openbmc/phosphor-networkd/+/63124

Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: I00662eb5d16d97aad9dd1fc715b17cff57723108

dcmihandler.cpp

diff --git a/dcmihandler.cpp b/dcmihandler.cpp
index 0c0f2bb..e45ea3f 100644
--- a/dcmihandler.cpp
+++ b/dcmihandler.cpp
@@ -295,34 +295,54 @@
 std::optional<bool> getDHCPOption(ipmi::Context::ptr& ctx,
                                   const std::string& prop)
 {
-    std::string service;
-    boost::system::error_code ec = ipmi::getService(ctx, dhcpIntf, dhcpObj,
-                                                    service);
-    if (ec.value())
-    {
-        return std::nullopt;
-    }
-    bool value{};
-    ec = ipmi::getDbusProperty(ctx, service, dhcpObj, dhcpIntf, prop, value);
-    if (ec.value())
+    ipmi::ObjectTree objectTree;
+    if (ipmi::getAllDbusObjects(ctx, networkRoot, dhcpIntf, objectTree))
     {
         return std::nullopt;
     }
 
-    return value;
+    for (const auto& [path, serviceMap] : objectTree)
+    {
+        for (const auto& [service, object] : serviceMap)
+        {
+            bool value{};
+            if (ipmi::getDbusProperty(ctx, service, path, dhcpIntf, prop,
+                                      value))
+            {
+                return std::nullopt;
+            }
+
+            if (value)
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
 }
 
 bool setDHCPOption(ipmi::Context::ptr& ctx, std::string prop, bool value)
 {
-    std::string service;
-    boost::system::error_code ec = ipmi::getService(ctx, dhcpIntf, dhcpObj,
-                                                    service);
-    if (!ec.value())
+    ipmi::ObjectTree objectTree;
+    if (ipmi::getAllDbusObjects(ctx, networkRoot, dhcpIntf, objectTree))
     {
-        ec = ipmi::setDbusProperty(ctx, service, dhcpObj, dhcpIntf, prop,
-                                   value);
+        return false;
     }
-    return (!ec.value());
+
+    for (const auto& [path, serviceMap] : objectTree)
+    {
+        for (const auto& [service, object] : serviceMap)
+        {
+            if (ipmi::setDbusProperty(ctx, service, path, dhcpIntf, prop,
+                                      value))
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
 }
 
 } // namespace dcmi

dcmihandler.hpp

diff --git a/dcmihandler.hpp b/dcmihandler.hpp
index 1f9dad9..8fa5e82 100644
--- a/dcmihandler.hpp
+++ b/dcmihandler.hpp
@@ -29,7 +29,6 @@
     "xyz.openbmc_project.Network.EthernetInterface";
 static constexpr auto ethernetDefaultChannelNum = 0x1;
 static constexpr auto networkRoot = "/xyz/openbmc_project/network";
-static constexpr auto dhcpObj = "/xyz/openbmc_project/network/dhcp";
 static constexpr auto dhcpIntf =
     "xyz.openbmc_project.Network.DHCPConfiguration";
 static constexpr auto systemBusName = "org.freedesktop.systemd1";