commit 8d1a81e8667a63d0a435edaea97e447ae74d00d5
author Potin Lai <potin.lai@quantatw.com> Tue Dec 20 11:13:45 2022 +0800
committer Potin Lai <potin.lai@quantatw.com> Tue Jan 03 10:59:52 2023 +0800
tree d1033caa4eed8eb854b3d07ee5336274ef0cec93
parent e1ff81fa6ca45da17b0221fe1ba37ac30be66cc5

oemcommands: update getIPObject() search method

The SYS_info frame is broken due to phosphor-network changed the object
path of IP address.
Remove IP type from object path match string, use `Type` property to
identify this address is IPv4 or IPv6.

Tested on Bletchley.

Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: If44ab42fcc86a915c9141bf29780e9e52cb1a01b

src/oemcommands.cpp

diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 50e88b5..3ccfafd 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -105,6 +105,8 @@
 constexpr auto IPV6_PREFIX = "fe80";
 constexpr auto IP_INTERFACE = "xyz.openbmc_project.Network.IP";
 constexpr auto MAC_INTERFACE = "xyz.openbmc_project.Network.MACAddress";
+constexpr auto IPV4_PROTOCOL = "xyz.openbmc_project.Network.IP.Protocol.IPv4";
+constexpr auto IPV6_PROTOCOL = "xyz.openbmc_project.Network.IP.Protocol.IPv6";
 
 bool isLinkLocalIP(const std::string& address)
 {
@@ -113,9 +115,10 @@
 
 DbusObjectInfo getIPObject(sdbusplus::bus_t& bus, const std::string& interface,
                            const std::string& serviceRoot,
-                           const std::string& match)
+                           const std::string& protocol,
+                           const std::string& ethdev)
 {
-    auto objectTree = getAllDbusObjects(bus, serviceRoot, interface, match);
+    auto objectTree = getAllDbusObjects(bus, serviceRoot, interface, ethdev);
 
     if (objectTree.empty())
     {
@@ -129,7 +132,14 @@
     {
         auto variant =
             ipmi::getDbusProperty(bus, object.second.begin()->first,
-                                  object.first, IP_INTERFACE, "Address");
+                                  object.first, IP_INTERFACE, "Type");
+        if (std::get<std::string>(variant) != protocol)
+        {
+            continue;
+        }
+
+        variant = ipmi::getDbusProperty(bus, object.second.begin()->first,
+                                        object.first, IP_INTERFACE, "Address");
 
         objectInfo = std::make_pair(object.first, object.second.begin()->first);
 
@@ -275,10 +285,10 @@
     {
         case LanParam::IP:
         {
-            auto ethIP = ethdevice + "/" + ipmi::network::IPV4_TYPE;
             std::string ipaddress;
             auto ipObjectInfo = ipmi::network::getIPObject(
-                bus, ipmi::network::IP_INTERFACE, ipmi::network::ROOT, ethIP);
+                bus, ipmi::network::IP_INTERFACE, ipmi::network::ROOT,
+                ipmi::network::IPV4_PROTOCOL, ethdevice);
 
             auto properties = ipmi::getAllDbusProperties(
                 bus, ipObjectInfo.second, ipObjectInfo.first,
@@ -292,10 +302,10 @@
 
         case LanParam::IPV6:
         {
-            auto ethIP = ethdevice + "/" + ipmi::network::IPV6_TYPE;
             std::string ipaddress;
             auto ipObjectInfo = ipmi::network::getIPObject(
-                bus, ipmi::network::IP_INTERFACE, ipmi::network::ROOT, ethIP);
+                bus, ipmi::network::IP_INTERFACE, ipmi::network::ROOT,
+                ipmi::network::IPV6_PROTOCOL, ethdevice);
 
             auto properties = ipmi::getAllDbusProperties(
                 bus, ipObjectInfo.second, ipObjectInfo.first,