commit b331b5547b4bfb647674433398a80b6aa7255083
author Jan Kundrát <jan.kundrat@cesnet.cz> Thu Jan 23 15:25:29 2020 +0100
committer Jan Kundrát <jan.kundrat@cesnet.cz> Fri Jan 24 12:04:58 2020 +0100
tree ddb1714e4d76d88110476723bd68a42274ed6d13
parent 870428652fd7bbf08efb0082bbc37252a3bf2b8e

a typedef for returning "tree of data"

I'm working on adding support for RPCs, and that function requires
passing a tree of input data, and returning another tree of data. Given
that getItems()'s return value is quite similar (and something that's
widely supported through the code), let's requse this type for RPC I/O
as well.

I took care to only use this typedef at places where we have already
been dealing with tree data. This means that tests for, say,
leaf_editing were not changed because it's "something else than a
datastore". Coincidentally, the other use of the same structure is for
defining list keys, see I2c978762d3a78286b4f7fb97e16118772ddeb7bc.

Change-Id: I2a01cc6f8c6624e673eab43bc642c16d2bcfe2d7

src/datastore_access.hpp

diff --git a/src/datastore_access.hpp b/src/datastore_access.hpp
index 72e3553..9e5c317 100644
--- a/src/datastore_access.hpp
+++ b/src/datastore_access.hpp
@@ -38,8 +38,9 @@
 
 class DatastoreAccess {
 public:
+    using Tree = std::map<std::string, leaf_data_>;
     virtual ~DatastoreAccess() = 0;
-    virtual std::map<std::string, leaf_data_> getItems(const std::string& path) = 0;
+    virtual Tree getItems(const std::string& path) = 0;
     virtual void setLeaf(const std::string& path, leaf_data_ value) = 0;
     virtual void createPresenceContainer(const std::string& path) = 0;
     virtual void deletePresenceContainer(const std::string& path) = 0;

src/netconf_access.cpp

diff --git a/src/netconf_access.cpp b/src/netconf_access.cpp
index 5b1ad78..e648a33 100644
--- a/src/netconf_access.cpp
+++ b/src/netconf_access.cpp
@@ -15,10 +15,9 @@
 
 NetconfAccess::~NetconfAccess() = default;
 
-std::map<std::string, leaf_data_> NetconfAccess::getItems(const std::string& path)
+DatastoreAccess::Tree NetconfAccess::getItems(const std::string& path)
 {
-    using namespace std::string_literals;
-    std::map<std::string, leaf_data_> res;
+    Tree res;
 
     // This is very similar to the fillMap lambda in SysrepoAccess, however,
     // Sysrepo returns a weird array-like structure, while libnetconf

src/netconf_access.hpp

diff --git a/src/netconf_access.hpp b/src/netconf_access.hpp
index 29101ed..a5e0485 100644
--- a/src/netconf_access.hpp
+++ b/src/netconf_access.hpp
@@ -33,7 +33,7 @@
     NetconfAccess(const std::string& socketPath);
     NetconfAccess(std::unique_ptr<libnetconf::client::Session>&& session);
     ~NetconfAccess() override;
-    std::map<std::string, leaf_data_> getItems(const std::string& path) override;
+    Tree getItems(const std::string& path) override;
     void setLeaf(const std::string& path, leaf_data_ value) override;
     void createPresenceContainer(const std::string& path) override;
     void deletePresenceContainer(const std::string& path) override;

src/sysrepo_access.cpp

diff --git a/src/sysrepo_access.cpp b/src/sysrepo_access.cpp
index 221f482..499597f 100644
--- a/src/sysrepo_access.cpp
+++ b/src/sysrepo_access.cpp
@@ -111,10 +111,10 @@
     }
 }
 
-std::map<std::string, leaf_data_> SysrepoAccess::getItems(const std::string& path)
+DatastoreAccess::Tree SysrepoAccess::getItems(const std::string& path)
 {
     using namespace std::string_literals;
-    std::map<std::string, leaf_data_> res;
+    Tree res;
 
     auto fillMap = [&res](auto items) {
         if (!items)

src/sysrepo_access.hpp

diff --git a/src/sysrepo_access.hpp b/src/sysrepo_access.hpp
index 9861ab4..ff26e7a 100644
--- a/src/sysrepo_access.hpp
+++ b/src/sysrepo_access.hpp
@@ -28,7 +28,7 @@
 public:
     ~SysrepoAccess() override;
     SysrepoAccess(const std::string& appname);
-    std::map<std::string, leaf_data_> getItems(const std::string& path) override;
+    Tree getItems(const std::string& path) override;
     void setLeaf(const std::string& path, leaf_data_ value) override;
     void createPresenceContainer(const std::string& path) override;
     void deletePresenceContainer(const std::string& path) override;