Remove package_manager in favor of IOSService interface

Author: dhilst

include/cloysterhpc/models/os.h

@@ -7,7 +7,6 @@
 #define CLOYSTERHPC_OS_H_
 
 #include <cloysterhpc/const.h>
-#include <cloysterhpc/services/package_manager.h>
 #include <fmt/format.h>
 #include <gsl/gsl-lite.hpp>
 #include <memory>
@@ -72,8 +71,6 @@ class OS {
     unsigned m_majorVersion {};
     unsigned m_minorVersion {};
 
-    std::shared_ptr<package_manager> m_packageManager;
-
     void setMajorVersion(unsigned int majorVersion);
 
     void setMinorVersion(unsigned int minorVersion);
@@ -86,9 +83,6 @@ class OS {
      */
     static std::string getValueFromKey(const std::string& line);
 
-    std::shared_ptr<package_manager> factoryPackageManager(
-        OS::Platform platform);
-
 public:
     OS();
 
@@ -117,9 +111,6 @@ class OS {
 
     [[nodiscard]] unsigned int getMajorVersion() const;
     [[nodiscard]] unsigned int getMinorVersion() const;
-
-    gsl::not_null<package_manager*> packageManager() const;
-
     [[nodiscard]] PackageType getPackageType() const;
 
     /**

include/cloysterhpc/services/dnf.h

@@ -2,6 +2,7 @@
 #define CLOYSTER_OSSERVICE_H_
 
 #include <string>
+#include <vector>
 
 #include <cloysterhpc/models/os.h>
 
@@ -24,7 +25,7 @@ using cloyster::models::OS;
  * recipes used by the installer. Also this interface is for getting runtime
  * information from the operating system, for in-memory state use
  * cloyster::models::OS class instead.
- * 
+ *
  * @see See main.cpp for intialization and osservice.cpp for more info.
  */
 class IOSService {
@@ -39,6 +40,17 @@ class IOSService {
     [[nodiscard]] virtual std::string getKernelInstalled() const = 0;
     [[nodiscard]] virtual std::string getKernelRunning() const = 0;
 
+    // These methods are const because the implementation is expected to be stateless
+    // The implementation is expect to be stateless to avoid double source of true,
+    // the internal state vs the OS runtime state
+    virtual bool install(std::string_view package) const = 0;
+    virtual bool remove(std::string_view package) const = 0;
+    virtual bool update(std::string_view package) const = 0;
+    virtual bool update() const = 0;
+    virtual void check() const = 0;
+    virtual void clean() const = 0;
+    virtual std::vector<std::string> repolist() const = 0;
+
     static std::unique_ptr<IOSService> factory(const OS& osinfo);
 };
 

include/cloysterhpc/services/osservice.h

@@ -6,8 +6,6 @@
 #include <cloysterhpc/cloyster.h>
 #include <cloysterhpc/functions.h>
 #include <cloysterhpc/models/os.h>
-#include <cloysterhpc/services/dnf.h>
-#include <cloysterhpc/services/package_manager.h>
 #include <magic_enum/magic_enum.hpp>
 #include <stdexcept>
 #include <variant>
@@ -85,8 +83,6 @@ OS::OS()
                 fmt::format("Error while reading file: {}", filename));
         }
     }
-
-    factoryPackageManager(getPlatform());
 }
 
 OS::Arch OS::getArch() const { return std::get<OS::Arch>(m_arch); }
@@ -262,26 +258,6 @@ std::string OS::getValueFromKey(const std::string& line)
     return value;
 }
 
-std::shared_ptr<package_manager> OS::factoryPackageManager(
-    OS::Platform platform)
-{
-    auto platformName = cloyster::utils::enums::toString(platform);
-    for (const auto& supportedPlatform : cloyster::utils::enums::toStrings<Platform>()) {
-        if (platformName == supportedPlatform) {
-            m_packageManager = std::make_shared<dnf>();
-            return m_packageManager;
-        }
-    }
-
-    throw std::runtime_error(fmt::format(
-        "Unsupported OS platform: {}", cloyster::utils::enums::toString(platform)));
-}
-
-gsl::not_null<package_manager*> OS::packageManager() const
-{
-    return m_packageManager.get();
-}
-
 void OS::printData() const
 {
 #ifndef NDEBUG

include/cloysterhpc/services/package_manager.h

@@ -20,6 +20,38 @@ class ELOSService final : public IOSService {
     {
         return Singleton<IRunner>::get()->checkOutput("uname -r")[0];
     }
+
+    bool install(std::string_view package) const override
+    {
+        return (
+        cloyster::runCommand(fmt::format("dnf -y install {}", package)) != 0);
+    }
+
+    bool remove(std::string_view package) const override
+    {
+        return (
+        cloyster::runCommand(fmt::format("dnf -y remove {}", package)) != 0);
+    }
+
+    bool update(std::string_view package) const override
+    {
+        return (
+        cloyster::runCommand(fmt::format("dnf -y update {}", package)) != 0);
+    }
+
+    bool update() const override
+    {
+        return (cloyster::runCommand("dnf -y update") != 0);
+    }
+
+    void check() const override { cloyster::runCommand("dnf check"); }
+
+    void clean() const override { cloyster::runCommand("dnf clean all"); }
+
+    [[nodiscard]] std::vector<std::string> repolist() const override
+    {
+        return Singleton<IRunner>::get()->checkOutput("dnf repolist");
+    }
 };
 
 std::unique_ptr<IOSService> IOSService::factory(const OS& osinfo)

src/models/os.cpp

@@ -87,9 +87,9 @@ XCAT::Image XCAT::getImage() const
 
 void XCAT::installPackages()
 {
-    auto packageManager = cluster()->getHeadnode().getOS().packageManager();
-    packageManager->install("initscripts");
-    packageManager->install("xCAT");
+    auto osservice = cloyster::Singleton<IOSService>::get();
+    osservice->install("initscripts");
+    osservice->install("xCAT");
 }
 
 void XCAT::patchInstall()