commit 8e7566454c31fb22ae7692dd7c0e66bc0a435189
author Václav Kubernát <kubernat@cesnet.cz> Fri Nov 05 00:04:54 2021 +0100
committer Jan Kundrát <jan.kundrat@cesnet.cz> Wed Nov 10 11:59:52 2021 +0100
tree 972eb8566c017bbf9663ed8baf0e3e2dc973facb
parent a53ea9188529e88a7cd9cc230a1c7e1c1ac2ba2f

SysrepoAccess: Fix overwriting leafs without commit

Bug: https://tree.taiga.io/project/jktjkt-netconf-cli/issue/229
Change-Id: Ia63b2ba5b91020108d8d1c64aa5db7cafa969f69

src/sysrepo_access.cpp

diff --git a/src/sysrepo_access.cpp b/src/sysrepo_access.cpp
index 30a3e25..bbdf6d1 100644
--- a/src/sysrepo_access.cpp
+++ b/src/sysrepo_access.cpp
@@ -140,7 +140,7 @@
 {
     try {
         m_session->session_switch_ds(targetToDs_set(m_target));
-        m_session->set_item(path.c_str(), boost::apply_visitor(valFromValue(), value));
+        m_session->set_item(path.c_str(), boost::apply_visitor(valFromValue(), value), SR_EDIT_ISOLATE);
     } catch (sysrepo::sysrepo_exception& ex) {
         reportErrors();
     }

tests/datastore_access.cpp

diff --git a/tests/datastore_access.cpp b/tests/datastore_access.cpp
index 76e4f7f..bbcae25 100644
--- a/tests/datastore_access.cpp
+++ b/tests/datastore_access.cpp
@@ -222,6 +222,17 @@
         REQUIRE(datastore.getItems("/example-schema:leafString") == expected);
     }
 
+    SECTION("set a string, then set it to something else without commiting")
+    {
+        REQUIRE_CALL(mockRunning, write("/example-schema:leafString", std::nullopt, "oops"s));
+        datastore.setLeaf("/example-schema:leafString", "blah"s);
+        datastore.setLeaf("/example-schema:leafString", "oops"s);
+        datastore.commitChanges();
+        DatastoreAccess::Tree expected{{"/example-schema:leafString", "oops"s}};
+        REQUIRE(datastore.getItems("/example-schema:leafString") == expected);
+
+    }
+
     SECTION("set a non-existing leaf")
     {
         catching<OnInvalidSchemaPathCreate>([&] {