Add confluent support

Author: dhilst

.gitignore

@@ -323,3 +323,5 @@ test/output/**
 CMakePresets.json
 CMakeUserPresets.json
 .aider*
+deploy*.txt
+test/vms/

include/cloysterhpc/diskImage.h

@@ -11,6 +11,7 @@
 
 #include <cloysterhpc/models/os.h>
 
+// @FIXME: Add proper namespace
 /**
  * @class DiskImage
  * @brief Manages disk image paths and validation for known images.
@@ -22,7 +23,7 @@ class DiskImage {
 private:
     std::filesystem::path m_path;
     std::optional<cloyster::models::OS::Distro> m_distro = std::nullopt;
-
+    
     // BUG: This is bad design, and also overrides what's inside the map
     // variable on the class that holds the checksums.
     /**

include/cloysterhpc/functions.h

@@ -33,6 +33,9 @@ constexpr std::unique_ptr<B> makeUniqueDerived(Args... args)
     return static_cast<std::unique_ptr<B>>(std::make_unique<T>(args...));
 }
 
+
+// @FIXME: File utilities functions should live in services::files namespace
+
 using models::OS;
 using services::IRunner;
 
@@ -282,7 +285,7 @@ void moveFilesWithExtension(
 std::string getHttpStatus(const auto& url, const std::size_t maxRetries = 3)
 {
     auto runner = cloyster::Singleton<IRunner>::get();
-    auto opts = cloyster::Singleton<services::Options>::get();
+    auto opts = cloyster::Singleton<const services::Options>::get();
     if (opts->shouldSkip("http-status")) {
         LOG_WARN("Skipping HTTP status check for {}, assuming 200 (reason: "
                  "--skip=http-status in the command line)",
@@ -304,18 +307,32 @@ std::string getHttpStatus(const auto& url, const std::size_t maxRetries = 3)
     for (std::size_t i = 0; i < maxRetries; ++i) {
         header = getHttpStatusInner(url, runner);
         LOG_DEBUG("HTTP status of {}: {}", url, header);
-        if (!header.starts_with("5")) {
-            LOG_DEBUG("HTTP {} error, retry {}", header, i);
+        if (header.starts_with("2")) {
+            return header;
+        } else if (header.starts_with("5")) {
+            LOG_DEBUG("HTTP INTERNAL SERVER ERROR {} error, retring ...{}", header, i);
+            return header;
+        } else  {
+            LOG_DEBUG("HTTP {} error, retrying ...{}", header, i);
             return header;
         }
     }
     return header;
 };
 
-[[noreturn]] void abort(const fmt::string_view& fmt, auto&&... args)
+[[noreturn]]
+void abort(const fmt::string_view& fmt, auto&&... args)
+{
+    throw std::runtime_error(
+        fmt::format(fmt::runtime(fmt), std::forward<decltype(args)>(args)...));
+}
+
+void abortif(const bool cond, const fmt::string_view& fmt, auto&&... args)
 {
+    if (cond) {
     throw std::runtime_error(
         fmt::format(fmt::runtime(fmt), std::forward<decltype(args)>(args)...));
+    }
 }
 
 TEST_SUITE_END();

include/cloysterhpc/models/answerfile.h

@@ -37,6 +37,8 @@ struct AFNode {
     std::optional<std::string> sockets;
     std::optional<std::string> cores_per_socket;
     std::optional<std::string> threads_per_core;
+    std::optional<std::string> cpus_per_node;
+    std::optional<std::string> real_memory;
     std::optional<std::string> bmc_address;
     std::optional<std::string> bmc_username;
     std::optional<std::string> bmc_password;
@@ -122,7 +124,22 @@ class AnswerFile {
         std::filesystem::path disk_image;
         OS::Distro distro;
         std::string version;
-        std::string kernel;
+        std::optional<std::string> kernel;
+        std::string provisioner;
+    };
+
+    struct AFSlurm {
+        std::string mariadb_root_password;
+        std::string slurmdb_password;
+        std::string storage_password;
+        std::string partition_name;
+    };
+
+    struct AFProvisionerConfig {
+        std::string bmcuser;
+        std::string bmcpass;
+        std::string rootpass;
+        std::string grubpass;
     };
 
     /**
@@ -135,6 +152,8 @@ class AnswerFile {
     struct AFNodes {
         std::optional<AFNode> generic;
         std::vector<AFNode> nodes;
+
+        auto nodesNames() const -> std::vector<std::string>;
     };
 
     struct AFPostfix {
@@ -339,6 +358,8 @@ class AnswerFile {
     void dumpNetwork(
         const AFNetwork& network, const std::string& networkSection);
 
+    void loadSlurm();
+
 public:
     AFNetwork external;
     AFNetwork management;
@@ -351,6 +372,7 @@ class AnswerFile {
     AFNodes nodes;
     AFPostfix postfix;
     AFOFED ofed;
+    AFSlurm slurm;
 
     /**
      * @brief Loads the answer file from the specified path.
@@ -360,6 +382,9 @@ class AnswerFile {
     void loadFile(const std::filesystem::path& path);
     void dumpFile(const std::filesystem::path& path);
 
+
+    [[nodiscard]] auto path() const -> const std::filesystem::path&;
+
     AnswerFile();
     explicit AnswerFile(const std::filesystem::path& path);
 };

include/cloysterhpc/models/cluster.h

@@ -6,6 +6,7 @@
 #ifndef CLOYSTERHPC_CLUSTER_H_
 #define CLOYSTERHPC_CLUSTER_H_
 
+#include "answerfile.h"
 #include <filesystem>
 #include <memory>
 #include <optional>
@@ -51,7 +52,7 @@ class Cluster {
      * @enum Provisioner
      * @brief Enumeration for cluster provisioners.
      */
-    enum class Provisioner { xCAT };
+    enum class Provisioner { xCAT, Confluent };
 
 private:
     std::string m_name;
@@ -177,7 +178,7 @@ class Cluster {
     std::optional<OFED> getOFED() const;
     void setOFED(OFED::Kind kind, std::string version = "latest");
 
-    std::optional<std::unique_ptr<QueueSystem>>& getQueueSystem();
+    [[nodiscard]] const std::optional<std::unique_ptr<QueueSystem>>& getQueueSystem() const;
     void setQueueSystem(QueueSystem::Kind kind);
 
     std::optional<services::Postfix>& getMailSystem();
@@ -230,9 +231,9 @@ class Cluster {
     /**
      * @brief Fills cluster data from the specified answer file.
      *
-     * @param answerfilePath Path to the answer file.
+     * @param answerfile, the AnswerFile instance
      */
-    void fillData(const std::filesystem::path& answerfilePath);
+    void fillData(const AnswerFile& answerfile);
 
     void dumpData(const std::filesystem::path& answerfilePath);
 

include/cloysterhpc/models/os.h

@@ -9,6 +9,7 @@
 #include <cloysterhpc/const.h>
 #include <fmt/format.h>
 #include <gsl/gsl-lite.hpp>
+#include <optional>
 #include <string>
 #include <variant>
 
@@ -66,7 +67,7 @@ class OS {
     std::variant<std::monostate, Family> m_family;
     std::variant<std::monostate, Platform> m_platform;
     std::variant<std::monostate, Distro> m_distro;
-    std::string m_kernel;
+    std::optional<std::string> m_kernel; // kernel version may be uninitialized
     unsigned m_majorVersion {};
     unsigned m_minorVersion {};
 
@@ -108,7 +109,7 @@ class OS {
     void setDistro(Distro distro);
     void setDistro(std::string_view distro);
 
-    [[nodiscard]] std::string_view getKernel() const;
+    [[nodiscard]] std::optional<std::string_view> getKernel() const;
     void setKernel(std::string_view kernel);
 
     [[nodiscard]] std::string getVersion() const;

include/cloysterhpc/network.h

@@ -14,6 +14,7 @@
 
 using boost::asio::ip::address;
 
+// @FIXME: This should be in a namespace
 /* TODO: Refactoring is necessary
  *  m_domainName is also available here since non-default networks may
  *  exist on the entire cluster and they should have their own domain.

include/cloysterhpc/patterns/singleton.h

@@ -5,6 +5,8 @@
 #include <memory>
 #include <mutex>
 
+#include <cloysterhpc/services/log.h>
+
 namespace cloyster {
 
 /**

include/cloysterhpc/patterns/strongtypedef.h

@@ -1,18 +0,0 @@
-#ifndef CLOYSTERHPC_PATTERNS_STRONGTYPEDEF_H_
-#define CLOYSTERHPC_PATTERNS_STRONGTYPEDEF_H_
-
-namespace cloyster {
-
-// NewType template (from your previous context)
-template <typename T, typename Tag> struct Wrapper {
-    T value;
-    explicit Wrapper(const T& v)
-        : value(v)
-    {
-    }
-    explicit operator T() const { return value; }
-};
-
-};
-
-#endif

include/cloysterhpc/patterns/wrapper.h

@@ -1,6 +1,8 @@
 #ifndef CLOYSTERHPC_PATTERNS_WRAPPER_H_
 #define CLOYSTERHPC_PATTERNS_WRAPPER_H_
 
+#include <filesystem>
+
 namespace cloyster {
 /**
  * @class Wrapper
@@ -31,7 +33,8 @@ namespace cloyster {
  * processUser(email); // Error: Email is not User
  * @endcode
  */
-template <typename T, typename Tag> class Wrapper final {
+template <typename T, typename Tag>
+class Wrapper final {
     T value;
 
 public: