commit 11a1edcd204b87c6258592dc47f3d04e426e66e8
author Alexander Hansen <alexander.hansen@9elements.com> Wed Nov 12 17:31:23 2025 +0100
committer Alexander Hansen <alexander.hansen@9elements.com> Wed Nov 12 17:31:23 2025 +0100
tree 587c412070b1c4eff45b253d116ca31556d2a4bf
parent d112f4938698a1e9d3e13e94e2ea6a74ca355593

State.Decorator.*: use PDI constants

Use PDI constants instead of local definitions.

Tested: Unit Tests Pass

Change-Id: Ifacbc1379d6e1fc55709296178e2fb4b04531eeb
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>

dbus/dbushelper.cpp

diff --git a/dbus/dbushelper.cpp b/dbus/dbushelper.cpp
index 589b368..1d03967 100644
--- a/dbus/dbushelper.cpp
+++ b/dbus/dbushelper.cpp
@@ -132,7 +132,9 @@
     bool available = true;
     try
     {
-        getProperty(service, path, availabilityIntf, "Available", available);
+        getProperty(service, path, StateDecoratorAvailability::interface,
+                    StateDecoratorAvailability::property_names::available,
+                    available);
     }
     catch (const sdbusplus::exception_t& ex)
     {

dbus/dbushelper.hpp

diff --git a/dbus/dbushelper.hpp b/dbus/dbushelper.hpp
index 94cf664..8fac1a2 100644
--- a/dbus/dbushelper.hpp
+++ b/dbus/dbushelper.hpp
@@ -7,6 +7,7 @@
 #include <sdbusplus/exception.hpp>
 #include <xyz/openbmc_project/Sensor/Threshold/Critical/common.hpp>
 #include <xyz/openbmc_project/Sensor/Threshold/Warning/common.hpp>
+#include <xyz/openbmc_project/State/Decorator/Availability/common.hpp>
 
 #include <string>
 #include <variant>
@@ -15,6 +16,8 @@
     sdbusplus::common::xyz::openbmc_project::sensor::threshold::Warning;
 using SensorThresholdCritical =
     sdbusplus::common::xyz::openbmc_project::sensor::threshold::Critical;
+using StateDecoratorAvailability =
+    sdbusplus::common::xyz::openbmc_project::state::decorator::Availability;
 
 namespace pid_control
 {
@@ -23,8 +26,6 @@
 {
   public:
     static constexpr char propertiesintf[] = "org.freedesktop.DBus.Properties";
-    static constexpr char availabilityIntf[] =
-        "xyz.openbmc_project.State.Decorator.Availability";
 
     explicit DbusHelper(sdbusplus::bus_t& bus) : _bus(bus) {}
     DbusHelper() = delete;

dbus/dbuspassive.cpp

diff --git a/dbus/dbuspassive.cpp b/dbus/dbuspassive.cpp
index f346d67..66395ea 100644
--- a/dbus/dbuspassive.cpp
+++ b/dbus/dbuspassive.cpp
@@ -20,6 +20,8 @@
 #include <xyz/openbmc_project/Sensor/Threshold/Critical/common.hpp>
 #include <xyz/openbmc_project/Sensor/Threshold/Warning/common.hpp>
 #include <xyz/openbmc_project/Sensor/Value/client.hpp>
+#include <xyz/openbmc_project/State/Decorator/Availability/common.hpp>
+#include <xyz/openbmc_project/State/Decorator/OperationalStatus/common.hpp>
 
 #include <chrono>
 #include <cmath>
@@ -41,6 +43,10 @@
     sdbusplus::common::xyz::openbmc_project::sensor::threshold::Warning;
 using SensorThresholdCritical =
     sdbusplus::common::xyz::openbmc_project::sensor::threshold::Critical;
+using StateDecoratorAvailability =
+    sdbusplus::common::xyz::openbmc_project::state::decorator::Availability;
+using StateDecoratorOperationalStatus = sdbusplus::common::xyz::
+    openbmc_project::state::decorator::OperationalStatus;
 
 namespace pid_control
 {
@@ -453,9 +459,10 @@
         owner->setFailed(asserted);
     }
 #endif
-    else if (msgSensor == "xyz.openbmc_project.State.Decorator.Availability")
+    else if (msgSensor == StateDecoratorAvailability::interface)
     {
-        auto available = msgData.find("Available");
+        auto available =
+            msgData.find(StateDecoratorAvailability::property_names::available);
         if (available == msgData.end())
         {
             return 0;
@@ -471,10 +478,10 @@
             owner->updateValue(std::numeric_limits<double>::quiet_NaN(), true);
         }
     }
-    else if (msgSensor ==
-             "xyz.openbmc_project.State.Decorator.OperationalStatus")
+    else if (msgSensor == StateDecoratorOperationalStatus::interface)
     {
-        auto functional = msgData.find("Functional");
+        auto functional = msgData.find(
+            StateDecoratorOperationalStatus::property_names::functional);
         if (functional == msgData.end())
         {
             return 0;