[#3729] Add netconf

andrei-pavel · andrei-pavel · commit bf3d5aa37ba5 · 2025-02-17T15:35:21.000+02:00
diff --git a/configure.ac b/configure.ac
@@ -1577,8 +1577,6 @@ AC_CONFIG_FILES([src/bin/netconf/tests/Makefile])
 AC_CONFIG_FILES([src/bin/netconf/tests/shtests/Makefile])
 AC_CONFIG_FILES([src/bin/netconf/tests/shtests/netconf_tests.sh],
                 [chmod +x src/bin/netconf/tests/shtests/netconf_tests.sh])
-AC_CONFIG_FILES([src/bin/netconf/tests/test_data_files_config.h])
-AC_CONFIG_FILES([src/bin/netconf/tests/test_libraries.h])
 AC_CONFIG_FILES([src/bin/perfdhcp/Makefile])
 AC_CONFIG_FILES([src/bin/perfdhcp/tests/Makefile])
 AC_CONFIG_FILES([src/bin/perfdhcp/tests/testdata/Makefile])
diff --git a/meson.build b/meson.build
@@ -665,3 +665,5 @@ subdir('fuzz')
 if have_premium
     subdir('premium')
 endif
+
+install_emptydir('var/run/kea')
diff --git a/src/bin/agent/tests/ca_process_tests.sh.in b/src/bin/agent/tests/ca_process_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2025 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/agent/tests/meson-test_basic_auth_libraries.h.in b/src/bin/agent/tests/meson-test_basic_auth_libraries.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2020-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/agent/tests/meson-test_callout_libraries.h.in b/src/bin/agent/tests/meson-test_callout_libraries.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/tests/d2_process_tests.sh.in b/src/bin/d2/tests/d2_process_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/tests/meson-test_callout_libraries.h.in b/src/bin/d2/tests/meson-test_callout_libraries.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/d2/tests/meson-test_configured_libraries.h.in b/src/bin/d2/tests/meson-test_configured_libraries.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2021-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in b/src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/dhcp6/tests/meson-dhcp6_process_tests.sh.in b/src/bin/dhcp6/tests/meson-dhcp6_process_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/dhcp6/tests/meson-test_libraries.h.in b/src/bin/dhcp6/tests/meson-test_libraries.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/bin/meson.build b/src/bin/meson.build
@@ -7,4 +7,4 @@ subdir('admin')
 subdir('keactrl')
 subdir('perfdhcp')
 subdir('shell')
-# subdir('netconf')
+subdir('netconf')
diff --git a/src/bin/netconf/control_socket.h b/src/bin/netconf/control_socket.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -111,7 +111,8 @@ using ControlSocketBasePtr = std::shared_ptr<ControlSocketBase>;
 /// @param ctrl_sock The control socket configuration.
 /// @return A pointer to a control socket communication object.
 /// @throw NotImplemented if no specialization was called.
-template <CfgControlSocket::Type TYPE> ControlSocketBasePtr
+template <CfgControlSocket::Type TYPE>
+ControlSocketBasePtr
 createControlSocket(CfgControlSocketPtr ctrl_sock) {
     isc_throw(NotImplemented, "not specialized createControlSocket");
 }
diff --git a/src/bin/netconf/meson.build b/src/bin/netconf/meson.build
@@ -3,6 +3,7 @@ if not NETCONF_DEPS_FOUND
 endif
 
 netconf_lib = static_library(
+    'netconf',
     'control_socket.cc',
     'http_control_socket.cc',
     'netconf.cc',
@@ -18,16 +19,21 @@ netconf_lib = static_library(
     'simple_parser.cc',
     'stdout_control_socket.cc',
     'unix_control_socket.cc',
+    dependencies: NETCONF_DEPS_ARRAY + [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
+    link_with: [kea_yang_testutils_lib, kea_process_testutils_lib] + LIBS_BUILT_SO_FAR,
     override_options: ['cpp_std=c++20'],
 )
 
 executable(
     'kea-netconf',
     'main.cc',
+    dependencies: NETCONF_DEPS_ARRAY + [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
     link_with: [netconf_lib] + LIBS_BUILT_SO_FAR,
     override_options: ['cpp_std=c++20'],
 )
+
+subdir('tests')
diff --git a/src/bin/netconf/tests/.gitignore b/src/bin/netconf/tests/.gitignore
@@ -1,4 +1,2 @@
 /netconf_tests.sh
 netconf_unittests
-test_data_files_config.h
-test_libraries.h
diff --git a/src/bin/netconf/tests/Makefile.am b/src/bin/netconf/tests/Makefile.am
@@ -9,7 +9,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/netconf\"
 AM_CPPFLAGS += -DKEATEST_MODULE
 AM_CPPFLAGS += -DSYNTAX_FILE=\"$(abs_srcdir)/../netconf_parser.yy\"
+AM_CPPFLAGS += -DTEST_DATA_SOURCEDIR=\"$(abs_top_srcdir)/src/bin/netconf/tests\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
+AM_CPPFLAGS += -DBASIC_CALLOUT_LIBRARY=\"$(abs_top_builddir)/src/bin/netconf/tests/.libs/libbasic.so\"
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
 AM_CPPFLAGS += $(LIBYANG_CPPFLAGS)
 AM_CPPFLAGS += $(LIBYANG_INCLUDEDIR)
@@ -22,8 +24,6 @@ AM_CPPFLAGS += $(SYSREPOCPP_INCLUDEDIR)
 
 CLEANFILES = *.json *.log
 
-DISTCLEANFILES = test_data_files_config.h test_libraries.h
-
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
 if USE_STATIC_LINK
@@ -86,7 +86,6 @@ libbasic_la_LIBADD  += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libbasic_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la
 libbasic_la_LDFLAGS  = -avoid-version -export-dynamic -module -rpath /nowhere
 
-nodist_netconf_unittests_SOURCES = test_data_files_config.h test_libraries.h
 endif
 
 noinst_EXTRA_DIST = configs-list.txt
diff --git a/src/bin/netconf/tests/get_config_unittest.cc b/src/bin/netconf/tests/get_config_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,9 +20,6 @@
 
 #include <gtest/gtest.h>
 
-#include "test_data_files_config.h"
-#include "test_libraries.h"
-
 using namespace isc::netconf;
 using namespace isc::config;
 using namespace isc::data;
@@ -235,8 +232,7 @@ TEST_F(NetconfGetCfgTest, simple) {
     ASSERT_NO_THROW_LOG(config = readFile(simple_file));
 
     // get the expected configuration
-    string expected_file =
-        string(NETCONF_TEST_DATA_DIR) + "/" + "get_config.json";
+    string const expected_file(string(TEST_DATA_SOURCEDIR) + "/testdata/get_config.json");
     string expected;
     ASSERT_NO_THROW_LOG(expected = readFile(expected_file));
 
diff --git a/src/bin/netconf/tests/meson.build b/src/bin/netconf/tests/meson.build
@@ -2,6 +2,9 @@ if not gtest.found() or not NETCONF_DEPS_FOUND
     subdir_done()
 endif
 
+current_build_dir = meson.current_build_dir()
+current_source_dir = meson.current_source_dir()
+
 kea_netconf_tests = executable(
     'kea-netconf-tests',
     'basic_library.cc',
@@ -13,9 +16,31 @@ kea_netconf_tests = executable(
     'netconf_unittests.cc',
     'parser_unittests.cc',
     'run_unittests.cc',
-    dependencies: NETCONF_DEPS_ARRAY + [gtest],
+    cpp_args: [
+        f'-DBASIC_CALLOUT_LIBRARY="@current_build_dir@/libbasic.so"',
+        f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/netconf"',
+        '-DKEATEST_MODULE',
+        f'-DSYNTAX_FILE="@current_source_dir@/../netconf_parser.yy"',
+        f'-DTEST_DATA_SOURCEDIR="@current_source_dir@"',
+        f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
+    ],
+    dependencies: NETCONF_DEPS_ARRAY + [gtest, crypto],
     include_directories: [include_directories('.')] + INCLUDES,
-    link_with: [kea_yang_tests_lib] + LIBS_BUILT_SO_FAR,
+    link_with: [
+        netconf_lib,
+        kea_yang_testutils_lib,
+        kea_process_testutils_lib,
+        kea_testutils_lib,
+    ] + LIBS_BUILT_SO_FAR,
     override_options: ['cpp_std=c++20'],
 )
 test('kea-netconf-tests', kea_netconf_tests, protocol: 'gtest')
+
+shared_library(
+    'basic',
+    'basic_library.cc',
+    include_directories: [include_directories('.')] + INCLUDES,
+    link_with: LIBS_BUILT_SO_FAR,
+    build_rpath: '/nowhere',
+    name_suffix: 'so',
+)
diff --git a/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc b/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,7 +10,6 @@
 #include <exceptions/exceptions.h>
 #include <netconf/netconf_cfg_mgr.h>
 #include <netconf/parser_context.h>
-#include <netconf/tests/test_libraries.h>
 #include <process/d_cfg_mgr.h>
 #include <process/testutils/d_test_stubs.h>
 #include <testutils/gtest_utils.h>
diff --git a/src/bin/netconf/tests/test_data_files_config.h.in b/src/bin/netconf/tests/test_data_files_config.h.in
diff --git a/src/bin/netconf/tests/test_libraries.h.in b/src/bin/netconf/tests/test_libraries.h.in

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-# Copyright (C) 2016-2024 Internet Systems Consortium, Inc. ("ISC")`
	`3`	`+# Copyright (C) 2016-2025 Internet Systems Consortium, Inc. ("ISC")`
`4`	`4`	`#`
`5`	`5`	`# This Source Code Form is subject to the terms of the Mozilla Public`
`6`	`6`	`# License, v. 2.0. If a copy of the MPL was not distributed with this`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (C) 2020 Internet Systems Consortium, Inc. ("ISC")`
	`1`	`+// Copyright (C) 2020-2025 Internet Systems Consortium, Inc. ("ISC")`
`2`	`2`	`//`
`3`	`3`	`// This Source Code Form is subject to the terms of the Mozilla Public`
`4`	`4`	`// License, v. 2.0. If a copy of the MPL was not distributed with this`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (C) 2017-2020 Internet Systems Consortium, Inc. ("ISC")`
	`1`	`+// Copyright (C) 2017-2025 Internet Systems Consortium, Inc. ("ISC")`
`2`	`2`	`//`
`3`	`3`	`// This Source Code Form is subject to the terms of the Mozilla Public`
`4`	`4`	`// License, v. 2.0. If a copy of the MPL was not distributed with this`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")`
	`3`	`+# Copyright (C) 2014-2025 Internet Systems Consortium, Inc. ("ISC")`
`4`	`4`	`#`
`5`	`5`	`# This Source Code Form is subject to the terms of the Mozilla Public`
`6`	`6`	`# License, v. 2.0. If a copy of the MPL was not distributed with this`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (C) 2021 Internet Systems Consortium, Inc. ("ISC")`
	`1`	`+// Copyright (C) 2021-2025 Internet Systems Consortium, Inc. ("ISC")`
`2`	`2`	`//`
`3`	`3`	`// This Source Code Form is subject to the terms of the Mozilla Public`
`4`	`4`	`// License, v. 2.0. If a copy of the MPL was not distributed with this`