Improve answerfile code and add unit tests (#50)

* Improve answerfile code and add unit tests

Signed-off-by: lbgracioso <[email protected]>

* Clean code

Signed-off-by: lbgracioso <[email protected]>

* Fix One Defition Rule (ODR) violation on

Signed-off-by: lbgracioso <[email protected]>

* Fix One Definition Rule (ODR) violation on tests.h

Signed-off-by: lbgracioso <[email protected]>

* AnswerFile::loadFile was missing m_path declaration

Signed-off-by: lbgracioso <[email protected]>

---------

Signed-off-by: lbgracioso <[email protected]>

Author: lbgracioso

include/cloysterhpc/answerfile.h

@@ -6,6 +6,7 @@
 #ifndef CLOYSTERHPC_ANSWERFILE_H_
 #define CLOYSTERHPC_ANSWERFILE_H_
 
+#include "os.h"
 #include <boost/asio.hpp>
 #include <cloysterhpc/inifile.h>
 #include <optional>
@@ -14,8 +15,11 @@
 using boost::asio::ip::address;
 
 class AnswerFile {
-
+#ifdef BUILD_TESTING
+public:
+#else
 private:
+#endif
     struct AFNetwork {
         std::optional<address> subnet_mask;
         std::optional<address> gateway;
@@ -45,7 +49,7 @@ class AnswerFile {
 
     struct AFSystem {
         std::filesystem::path disk_image;
-        std::string distro;
+        OS::Distro distro;
         std::string version;
         std::string kernel;
     };
@@ -88,6 +92,18 @@ class AnswerFile {
     AFNode loadNode(const std::string& section);
     AFNode validateNode(AFNode node);
 
+    template <typename T>
+    void validateAttribute(const std::string& sectionName,
+        const std::string& attributeName, T& objectAttr, const T& genericAttr);
+
+    template <typename T>
+    void convertNetworkAddressAndValidate(const std::string& section,
+        const std::string& fieldName, T& destination, bool isOptional = true);
+
+    template <typename NetworkType>
+    void loadNetwork(const std::string& networkSection, NetworkType& network,
+        bool optionalNameservers = true);
+
 public:
     AFNetwork external;
     AFNetwork management;
@@ -98,6 +114,9 @@ class AnswerFile {
     AFSystem system;
     AFNodes nodes;
 
+    void loadFile(const std::filesystem::path& path);
+
+    AnswerFile();
     explicit AnswerFile(const std::filesystem::path& path);
 };
 

include/cloysterhpc/inifile.h

@@ -18,7 +18,7 @@ class inifile {
     void loadFile(std::string_view filepath);
     void loadFile(const std::filesystem::path& filepath);
     std::string getValue(const std::string& section, const std::string& key,
-        const bool optional = true);
+        const bool optional = true, const bool canBeNull = true);
     void setValue(const std::string& section, const std::string& key,
         const std::string& newValue);
     bool deleteValue(const std::string& section, const std::string& key);

include/cloysterhpc/tests.h

@@ -0,0 +1,18 @@
+/*
+ * Created by Lucas Gracioso <[email protected]>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef CLOYSTERHPC_TESTS_H_
+#define CLOYSTERHPC_TESTS_H_
+
+#include <doctest/doctest.h>
+#include <filesystem>
+
+namespace tests {
+inline std::filesystem::path sampleDirectory {
+    std::filesystem::current_path().parent_path().parent_path() / "test/sample"
+}; // current_path corresponds to '<cloyster_main_dir>/<build_dir>/test'
+}
+
+#endif // CLOYSTERHPC_TESTS_H_