Merge changes I823773f4,If63415b5,Ic5a92c8b,I1f713427,I2a6c9f46, ...
* changes:
StaticSchema: Remove unused method
Change struct to a function
Simplify listInstancePath_class
Prefer std::variant in dataNode_/schemaNode_
Get rid of useless variant in get
Complete slash after lists when inputting "any" path
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abbe97b..99262a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,7 @@
set_tests_properties(setup_netopeer PROPERTIES FIXTURES_SETUP netopeer_configured)
set_tests_properties(start_daemons PROPERTIES FIXTURES_REQUIRED netopeer_configured FIXTURES_SETUP netopeer_running)
set_property(TEST kill_daemons APPEND PROPERTY DEPENDS example-schema_cleanup)
+ set_property(TEST kill_daemons APPEND PROPERTY FIXTURES_CLEANUP netopeer_running)
endfunction()
function(cli_test name)
@@ -298,8 +299,9 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/python_netconfaccess.py
${CMAKE_CURRENT_BINARY_DIR}/tests_python_netconfaccess.py @ONLY)
add_test(NAME test_netconf_cli_py COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/tests_python_netconfaccess.py)
- set_tests_properties(test_netconf_cli_py PROPERTIES FIXTURES_REQUIRED netopeer_running RESOURCE_LOCK sysrepo DEPENDS example-schema_cleanup)
- set_property(TEST kill_daemons APPEND PROPERTY DEPENDS test_netconf_cli_py)
+ set_tests_properties(test_netconf_cli_py PROPERTIES RESOURCE_LOCK sysrepo)
+ set_property(TEST test_netconf_cli_py APPEND PROPERTY FIXTURES_REQUIRED netopeer_running)
+ set_property(TEST test_netconf_cli_py APPEND PROPERTY FIXTURES_REQUIRED example-schema_setup)
set(sanitizer_active OFF)
# FIXME: this just sucks. The detection is very unreliable (one could use something like
diff --git a/src/python_netconf.cpp b/src/python_netconf.cpp
index 49a4339..76dc559 100644
--- a/src/python_netconf.cpp
+++ b/src/python_netconf.cpp
@@ -68,11 +68,11 @@
"server"_a, "port"_a=830, "username"_a, "interactive_auth"_a)
.def("getItems", &NetconfAccess::getItems, "xpath"_a)
.def("setLeaf", &NetconfAccess::setLeaf, "xpath"_a, "value"_a)
- .def("commitChanges", &NetconfAccess::commitChanges)
- .def("executeRpc", &NetconfAccess::executeRpc, "rpc"_a, "input"_a=DatastoreAccess::Tree{})
- .def("createListInstance", &NetconfAccess::createListInstance, "xpath"_a)
- .def("deleteListInstance", &NetconfAccess::deleteListInstance, "xpath"_a)
.def("createPresenceContainer", &NetconfAccess::createPresenceContainer, "xpath"_a)
.def("deletePresenceContainer", &NetconfAccess::deletePresenceContainer, "xpath"_a)
+ .def("createListInstance", &NetconfAccess::createListInstance, "xpath"_a)
+ .def("deleteListInstance", &NetconfAccess::deleteListInstance, "xpath"_a)
+ .def("executeRpc", &NetconfAccess::executeRpc, "rpc"_a, "input"_a=DatastoreAccess::Tree{})
+ .def("commitChanges", &NetconfAccess::commitChanges)
;
}
diff --git a/submodules/dependencies b/submodules/dependencies
index 676f63b..ab68d53 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit 676f63bcbf2a14140bf303a51b1fa73d9b8f27d2
+Subproject commit ab68d53de22d1ce6ead243a612538e6244522ff6