commit 9a286db223cecd88ecdcf29e6a1e713fdd1bf115
author Patrick Williams <patrick@stwcx.xyz> Wed Jan 17 06:29:47 2024 -0600
committer Patrick Williams <patrick@stwcx.xyz> Wed Jan 17 16:34:34 2024 -0600
tree f64118099d54783ec19f32127c53344f4596739c
parent 471208419db593ea8e343e29008e6ff136bc3160

reduce dbus string constants

There are a large number of dbus constants scattered throughout the
code that could/should be obtained from phosphor-dbus-interface values.
Perform minor refactoring to greatly reduce the number of string
constants.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ie8700bc90611d21eee7160f4686bc978fe0a0eb4

host_reset_recovery.cpp

diff --git a/host_reset_recovery.cpp b/host_reset_recovery.cpp
index 9579f30..a8d3842 100644
--- a/host_reset_recovery.cpp
+++ b/host_reset_recovery.cpp
@@ -6,9 +6,9 @@
 #include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/exception.hpp>
-#include <xyz/openbmc_project/Logging/Create/server.hpp>
-#include <xyz/openbmc_project/Logging/Entry/server.hpp>
-#include <xyz/openbmc_project/State/Boot/Progress/server.hpp>
+#include <xyz/openbmc_project/Logging/Create/client.hpp>
+#include <xyz/openbmc_project/Logging/Entry/client.hpp>
+#include <xyz/openbmc_project/State/Boot/Progress/client.hpp>
 
 #include <cstdlib>
 #include <fstream>
@@ -23,16 +23,17 @@
 
 PHOSPHOR_LOG2_USING;
 
+using BootProgress =
+    sdbusplus::client::xyz::openbmc_project::state::boot::Progress<>;
+using LoggingCreate =
+    sdbusplus::client::xyz::openbmc_project::logging::Create<>;
+using LoggingEntry = sdbusplus::client::xyz::openbmc_project::logging::Entry<>;
+
 constexpr auto HOST_STATE_SVC = "xyz.openbmc_project.State.Host";
 constexpr auto HOST_STATE_PATH = "/xyz/openbmc_project/state/host0";
 constexpr auto PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties";
-constexpr auto BOOT_STATE_INTF = "xyz.openbmc_project.State.Boot.Progress";
 constexpr auto BOOT_PROGRESS_PROP = "BootProgress";
 
-constexpr auto LOGGING_SVC = "xyz.openbmc_project.Logging";
-constexpr auto LOGGING_PATH = "/xyz/openbmc_project/logging";
-constexpr auto LOGGING_CREATE_INTF = "xyz.openbmc_project.Logging.Create";
-
 constexpr auto SYSTEMD_SERVICE = "org.freedesktop.systemd1";
 constexpr auto SYSTEMD_OBJ_PATH = "/org/freedesktop/systemd1";
 constexpr auto SYSTEMD_INTERFACE = "org.freedesktop.systemd1.Manager";
@@ -42,12 +43,11 @@
 {
     try
     {
-        using ProgressStages = sdbusplus::xyz::openbmc_project::State::Boot::
-            server::Progress::ProgressStages;
+        using ProgressStages = BootProgress::ProgressStages;
 
         auto method = bus.new_method_call(HOST_STATE_SVC, HOST_STATE_PATH,
                                           PROPERTY_INTERFACE, "Get");
-        method.append(BOOT_STATE_INTF, BOOT_PROGRESS_PROP);
+        method.append(BootProgress::interface, BOOT_PROGRESS_PROP);
 
         auto response = bus.call(method);
 
@@ -86,12 +86,10 @@
 
         static constexpr auto errorMessage =
             "xyz.openbmc_project.State.Error.HostNotRunning";
-        auto method = bus.new_method_call(LOGGING_SVC, LOGGING_PATH,
-                                          LOGGING_CREATE_INTF, "Create");
-        method.append(errorMessage,
-                      sdbusplus::server::xyz::openbmc_project::logging::Entry::
-                          Level::Error,
-                      additionalData);
+        auto method = bus.new_method_call(LoggingCreate::default_service,
+                                          LoggingCreate::instance_path,
+                                          LoggingCreate::interface, "Create");
+        method.append(errorMessage, LoggingEntry::Level::Error, additionalData);
         auto resp = bus.call(method);
     }
     catch (const sdbusplus::exception_t& e)
@@ -99,8 +97,8 @@
         error(
             "sdbusplus D-Bus call exception, error {ERROR}, objpath {OBJPATH}, "
             "interface {INTERFACE}",
-            "ERROR", e, "OBJPATH", LOGGING_PATH, "INTERFACE",
-            LOGGING_CREATE_INTF);
+            "ERROR", e, "OBJPATH", LoggingCreate::instance_path, "INTERFACE",
+            LoggingCreate::interface);
 
         throw std::runtime_error(
             "Error in invoking D-Bus logging create interface");