port to libnetconf2 v3

jktjkt · jktjkt · commit e856d3e1ef91 · 2024-04-10T13:56:38.000+02:00
This is really just a change of logging, nothing else. Unfortunately, the new logging still affects a global state, it was really just a change of the function signature, and the logger callback might well be invoked with a NULL session. This means that mapping from the nc_session* to a libnetconf::client::Session is not possible, so I though that simply providing an opaque pointer is not a bad solution. Change-Id: Iaa10855f4173fdd5e3046efa1827e4931cd05acb Depends-on: https://gerrit.cesnet.cz/c/CzechLight/libyang-cpp/+/7049
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -5,9 +5,9 @@
             pre-run: ci/pre.yaml
             required-projects:
               - name: github/CESNET/libyang
-                override-checkout: cesnet/2024-03--v2-latest
+                override-checkout: devel
               - name: github/CESNET/libnetconf2
-                override-checkout: cesnet/wip-libnetconf-v2
+                override-checkout: devel
               - name: github/onqtam/doctest
                 override-checkout: v2.4.8
               - name: github/rollbear/trompeloeil
@@ -17,9 +17,9 @@
             pre-run: ci/pre.yaml
             required-projects: &projects
               - name: github/CESNET/libyang
-                override-checkout: cesnet/2024-03--v2-latest
+                override-checkout: devel
               - name: github/CESNET/libnetconf2
-                override-checkout: cesnet/wip-libnetconf-v2
+                override-checkout: devel
               - name: github/onqtam/doctest
                 override-checkout: v2.4.11
               - name: github/rollbear/trompeloeil
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,9 +27,9 @@ option(WITH_DOCS "Create and install internal documentation (needs Doxygen)" ${D
 option(BUILD_SHARED_LIBS "By default, shared libs are enabled. Turn off for a static build." ON)
 
 find_package(PkgConfig)
-pkg_check_modules(LIBYANG_CPP REQUIRED libyang-cpp>=1.1.0 IMPORTED_TARGET)
-pkg_check_modules(LIBNETCONF2 REQUIRED libnetconf2>=2.1.40 libnetconf2<3 IMPORTED_TARGET)
-set(LIBNETCONF2_CPP_PKG_VERSION "1.0.0")
+pkg_check_modules(LIBYANG_CPP REQUIRED libyang-cpp>=2 IMPORTED_TARGET)
+pkg_check_modules(LIBNETCONF2 REQUIRED libnetconf2>=3.0.17 IMPORTED_TARGET)
+set(LIBNETCONF2_CPP_PKG_VERSION "2")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include)
 
diff --git a/ci/pre.yaml b/ci/pre.yaml
@@ -3,3 +3,9 @@
     - name: install libssh-debuginfo
       command: 'dnf debuginfo-install -y libssh'
       become: true
+
+    - name: install curl
+      package:
+        name: libcurl-devel
+        state: present
+      become: true
diff --git a/include/libnetconf2-cpp/netconf-client.hpp b/include/libnetconf2-cpp/netconf-client.hpp
@@ -24,7 +24,7 @@ class ReportedError : public std::runtime_error {
     ~ReportedError() override;
 };
 
-using LogCb = std::function<void(LogLevel, const char*)>;
+using LogCb = std::function<void(const nc_session*, LogLevel, const char*)>;
 
 void setLogLevel(LogLevel level);
 void setLogCallback(const LogCb& callback);
diff --git a/src/netconf-client.cpp b/src/netconf-client.cpp
@@ -24,9 +24,9 @@ namespace impl {
 
 static client::LogCb logCallback;
 
-static void logViaCallback(NC_VERB_LEVEL level, const char* message)
+static void logViaCallback(const nc_session* session, NC_VERB_LEVEL level, const char* message)
 {
-    logCallback(libnetconf::utils::toLogLevel(level), message);
+    logCallback(session, libnetconf::utils::toLogLevel(level), message);
 }
 
 
@@ -165,7 +165,7 @@ void setLogLevel(LogLevel level)
 void setLogCallback(const client::LogCb& callback)
 {
     impl::logCallback = callback;
-    nc_set_print_clb(callback ? impl::logViaCallback : NULL);
+    nc_set_print_clb_session(callback ? impl::logViaCallback : NULL);
 }
 
 libyang::Context Session::libyangContext()
diff --git a/tests/client.cpp b/tests/client.cpp
@@ -91,7 +91,7 @@ TEST_CASE("client")
   }
 }
 )";
-            logCb = [&logBuf, &logMtx](const auto, const auto msg) {
+            logCb = [&logBuf, &logMtx](const auto, const auto, const auto msg) {
                 std::unique_lock lck{logMtx};
                 logBuf += "\n";
                 logBuf += msg;

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ namespace impl {`
`24`	`24`
`25`	`25`	`static client::LogCb logCallback;`
`26`	`26`
`27`		`-static void logViaCallback(NC_VERB_LEVEL level, const char* message)`
	`27`	`+static void logViaCallback(const nc_session* session, NC_VERB_LEVEL level, const char* message)`
`28`	`28`	`{`
`29`		`- logCallback(libnetconf::utils::toLogLevel(level), message);`
	`29`	`+ logCallback(session, libnetconf::utils::toLogLevel(level), message);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`@@ -165,7 +165,7 @@ void setLogLevel(LogLevel level)`
`165`	`165`	`void setLogCallback(const client::LogCb& callback)`
`166`	`166`	`{`
`167`	`167`	`impl::logCallback = callback;`
`168`		`- nc_set_print_clb(callback ? impl::logViaCallback : NULL);`
	`168`	`+ nc_set_print_clb_session(callback ? impl::logViaCallback : NULL);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`libyang::Context Session::libyangContext()`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ TEST_CASE("client")`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`)";`
`94`		`- logCb = [&logBuf, &logMtx](const auto, const auto msg) {`
	`94`	`+ logCb = [&logBuf, &logMtx](const auto, const auto, const auto msg) {`
`95`	`95`	`std::unique_lock lck{logMtx};`
`96`	`96`	`logBuf += "\n";`
`97`	`97`	`logBuf += msg;`