commit 90f2da3f160e901b0cd9c2dc9fd2e991cfc167a0
author Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> Thu May 23 05:37:50 2019 +0530
committer Jason M. Bills <jason.m.bills@linux.intel.com> Wed Apr 08 13:53:21 2020 -0700
tree 3622b2fc0792c7dd2b0eabec762d9348fc46ca70
parent 754c300b1ad3ff429051be600c7b72fd9cff1afe

srvcfg: Updated for dynamic service/socket mgmt

Fixed srvcfg crash manager issue, by doing the service &
socket unit file queries dynamically and exposing the objects
to be controlled. This takes care of instanced service &
socket files like phosphor-ipmi-net@eth0 or
phosphor-ipmi-net@eth1 dynamically.

Tested:
1. Verified as per the base service name, all the instanced
service & socket names are dynamically queried and exposed
2. Made sure to list the disabled services thorugh this method
3. Made sure new services listed after fw-update are also
exposed as objects
4. Verfied phosphor-ipmi-net@eth0 port change using ipmitool
-p <newport> option
5. Verified permanent disable of the unit.
6. Verified run time enable / disable of the service.
7. Verified phosphor-ipmi-kcs service permanent & run time
enable / disable

Change-Id: Ib933a2fbff73eae4348a5940d350ae7972db03fb
Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>

inc/utils.hpp

diff --git a/inc/utils.hpp b/inc/utils.hpp
index 27e66f3..5f01d44 100644
--- a/inc/utils.hpp
+++ b/inc/utils.hpp
@@ -23,18 +23,41 @@
 #include <experimental/filesystem>

 #include <boost/asio.hpp>

 

-static constexpr const char *sysdActionStartUnit = "StartUnit";

-static constexpr const char *sysdActionStopUnit = "StopUnit";

+static constexpr const char *sysdStartUnit = "StartUnit";

+static constexpr const char *sysdStopUnit = "StopUnit";

+static constexpr const char *sysdRestartUnit = "RestartUnit";

+static constexpr const char *sysdReloadMethod = "Reload";

+static constexpr const char *sysdGetJobMethod = "GetJob";

+static constexpr const char *sysdReplaceMode = "replace";

+static constexpr const char *dBusGetAllMethod = "GetAll";

+static constexpr const char *dBusGetMethod = "Get";

+static constexpr const char *sysdService = "org.freedesktop.systemd1";

+static constexpr const char *sysdObjPath = "/org/freedesktop/systemd1";

+static constexpr const char *sysdMgrIntf = "org.freedesktop.systemd1.Manager";

+static constexpr const char *sysdUnitIntf = "org.freedesktop.systemd1.Unit";

+static constexpr const char *sysdSocketIntf = "org.freedesktop.systemd1.Socket";

+static constexpr const char *dBusPropIntf = "org.freedesktop.DBus.Properties";

+static constexpr const char *stateMasked = "masked";

+static constexpr const char *stateEnabled = "enabled";

+static constexpr const char *stateDisabled = "disabled";

+static constexpr const char *subStateRunning = "running";

+

+static inline std::string addInstanceName(const std::string &instanceName,

+                                          const std::string &suffix)

+{

+    return (instanceName.empty() ? "" : suffix + instanceName);

+}

 

 void systemdDaemonReload(

-    const std::shared_ptr<sdbusplus::asio::connection> &conn);

+    const std::shared_ptr<sdbusplus::asio::connection> &conn,

+    boost::asio::yield_context yield);

 

 void systemdUnitAction(const std::shared_ptr<sdbusplus::asio::connection> &conn,

+                       boost::asio::yield_context yield,

                        const std::string &unitName,

                        const std::string &actionMethod);

 

 void systemdUnitFilesStateChange(

     const std::shared_ptr<sdbusplus::asio::connection> &conn,

-    const std::vector<std::string> &unitFiles, const std::string &unitState);

-

-bool checkSystemdUnitExist(const std::string &unitName);

+    boost::asio::yield_context yield, const std::vector<std::string> &unitFiles,

+    const std::string &unitState, bool maskedState, bool enabledState);