commit 72f540e67a2e36c38349d45309804adb02da9bf8
author Tomáš Pecka <tomas.pecka@cesnet.cz> Mon Jul 08 13:45:22 2024 +0200
committer Tomáš Pecka <tomas.pecka@cesnet.cz> Thu Jul 11 12:37:25 2024 +0200
tree ecb09443dc2af66871cd72f1d60d9e2153761b93
parent 4a10d0a1205b69dc9c3dc40d8bb722075c4777ca

Use date utilities from libyang-cpp

Unfortunately, our CI still does not have std::chrono implementation
we need in order to not require the date lib.

Also change date timezones from -00:00 to local timezone.

Depends-on: https://gerrit.cesnet.cz/c/CzechLight/dependencies/+/7234
Change-Id: If0ca8fc049a9a3b41853144f5c3b81532b0e349d

src/system/Authentication.cpp

diff --git a/src/system/Authentication.cpp b/src/system/Authentication.cpp
index 544a5d2..460e53c 100644
--- a/src/system/Authentication.cpp
+++ b/src/system/Authentication.cpp
@@ -7,6 +7,7 @@
 
 #include <fmt/core.h>
 #include <fstream>
+#include <libyang-cpp/Time.hpp>
 #include <pwd.h>
 #include <shadow.h>
 #include <spdlog/spdlog.h>
@@ -17,7 +18,6 @@
 #include "utils/io.h"
 #include "utils/libyang.h"
 #include "utils/sysrepo.h"
-#include "utils/time.h"
 
 using namespace std::string_literals;
 namespace {
@@ -131,8 +131,8 @@
         assert(entry);
 
         using namespace std::chrono_literals;
-        using TimeType = std::chrono::time_point<std::chrono::system_clock>;
-        res.emplace(entry->sp_namp, velia::utils::yangTimeFormat(TimeType(24h * entry->sp_lstchg)));
+        using TimeType = std::chrono::time_point<std::chrono::system_clock, std::chrono::seconds>;
+        res.emplace(entry->sp_namp, libyang::yangTimeFormat(TimeType(24h * entry->sp_lstchg), libyang::TimezoneInterpretation::Local));
     }
 
     return res;

src/system/IETFSystem.cpp

diff --git a/src/system/IETFSystem.cpp b/src/system/IETFSystem.cpp
index 5439d09..3175b50 100644
--- a/src/system/IETFSystem.cpp
+++ b/src/system/IETFSystem.cpp
@@ -8,6 +8,7 @@
 #include <arpa/inet.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <fstream>
+#include <libyang-cpp/Time.hpp>
 #include <optional>
 #include "IETFSystem.h"
 #include "system_vars.h"
@@ -15,7 +16,6 @@
 #include "utils/io.h"
 #include "utils/log.h"
 #include "utils/sysrepo.h"
-#include "utils/time.h"
 
 using namespace std::literals;
 
@@ -203,7 +203,7 @@
 void IETFSystem::initClock()
 {
     sysrepo::OperGetCb cb = [] (auto, auto, auto, auto, auto, auto, auto& parent) {
-        parent->newPath(IETF_SYSTEM_STATE_CLOCK_PATH + "/current-datetime"s, utils::yangTimeFormat(std::chrono::system_clock::now()));
+        parent->newPath(IETF_SYSTEM_STATE_CLOCK_PATH + "/current-datetime"s, libyang::yangTimeFormat(std::chrono::system_clock::now(), libyang::TimezoneInterpretation::Local));
         return sysrepo::ErrorCode::Ok;
     };