commit de03ada04dd973c33eaf08b9354eb2f8ba146e54
author Chaul Ly <chaul@amperecomputing.com> Wed Dec 18 03:16:25 2024 +0000
committer ChauLy-Vietnam <chaul@amperecomputing.com> Tue Aug 19 02:19:18 2025 +0000
tree 61ec27ba7412c908fd159fa83e19159bf38a6b56
parent 6990a6e6a2ba4ab2d19cbf4b885961f1b1e6517a

chassiscommands: Update chassis intrusion retrieval method

This commit updates to use GetSubTree for checking chassis intrusion
service presence on D-Bus. As the object path prefix and name of chassis
intrusion is going to be changed [1], the old hardcoded string can't be
used to look for it anymore.

[1] https://gerrit.openbmc.org/c/openbmc/dbus-sensors/+/76254

Change-Id: I275293786c98512742caeb85189c3613e7fe98e8
Signed-off-by: Chaul Ly <chaul@amperecomputing.com>

src/chassiscommands.cpp

diff --git a/src/chassiscommands.cpp b/src/chassiscommands.cpp
index 017e46b..6ffca5f 100644
--- a/src/chassiscommands.cpp
+++ b/src/chassiscommands.cpp
@@ -21,6 +21,7 @@
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/timer.hpp>
+#include <xyz/openbmc_project/Chassis/Intrusion/client.hpp>
 #include <xyz/openbmc_project/Control/Power/RestorePolicy/server.hpp>
 
 #include <fstream>
@@ -500,22 +501,24 @@
         return ipmi::responseUnspecifiedError();
     }
 
-    bool chassisIntrusionActive = false;
-    constexpr const char* chassisIntrusionObj =
-        "/xyz/openbmc_project/Chassis/Intrusion";
-    constexpr const char* chassisIntrusionInf =
-        "xyz.openbmc_project.Chassis.Intrusion";
+    using Intrusion =
+        sdbusplus::client::xyz::openbmc_project::chassis::Intrusion<>;
 
-    std::string intrusionService;
-    boost::system::error_code ec = ipmi::getService(
-        ctx, chassisIntrusionInf, chassisIntrusionObj, intrusionService);
+    std::vector<std::string> chassisIntrusionIntf = {
+        std::string(Intrusion::interface)};
+    ipmi::ObjectTree chassisIntrusionObjs;
+    bool chassisIntrusionActive = false;
+
+    boost::system::error_code ec = ipmi::getSubTree(
+        ctx, chassisIntrusionIntf, std::string("/"), 0, chassisIntrusionObjs);
+
     if (ec)
     {
-        log<level::ERR>("Failed to get Chassis Intrusion service",
+        log<level::ERR>("Failed to find Chassis Intrusion Interface on D-Bus",
                         entry("ERROR=%s", ec.message().c_str()));
     }
 
-    chassisIntrusionActive = !intrusionService.empty();
+    chassisIntrusionActive = !chassisIntrusionObjs.empty();
 
     // This response has a lot of hard-coded, unsupported fields
     // They are set to false or 0