Migrate to libyang2
libnetconf2: getSchema and getConfig were no longer used in netconf-cli,
so I deleted them. They can get readded once the bindings get split into
a separate project.
sysrepo_access: Some sr_val stuff was removed.
YangSchema: type descriptions are not available
availableNodes returns only input nodes for RPC nodes
impl_getSchemaNode: no longer disables error printing
libyang: No longer supports leafrefs without the leaf it points to.
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/dependencies/+/5171
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/dependencies/+/5171
Change-Id: Ie49381a003a61a7bb028be7b2fa1d9d926ac4e58
diff --git a/tests/mock/sysrepo_subscription.hpp b/tests/mock/sysrepo_subscription.hpp
index fc2e499..85d048d 100644
--- a/tests/mock/sysrepo_subscription.hpp
+++ b/tests/mock/sysrepo_subscription.hpp
@@ -10,21 +10,15 @@
#include <memory>
#include <optional>
-#include <sysrepo-cpp/Session.hpp>
+#include <sysrepo-cpp/Connection.hpp>
#include "datastore_access.hpp"
-namespace sysrepo {
-class Callback;
-class Connection;
-class Session;
-class Subscribe;
-}
class YangSchema;
class Recorder {
public:
virtual ~Recorder();
- virtual void write(const std::string& xpath, const std::optional<std::string>& oldValue, const std::optional<std::string>& newValue) = 0;
+ virtual void write(const sysrepo::ChangeOperation operation, const std::string& xpath, const std::optional<std::string>& oldValue, const std::optional<std::string>& newValue, const std::optional<std::string> previousList) = 0;
};
class DataSupplier {
@@ -36,13 +30,10 @@
class SysrepoSubscription {
public:
- SysrepoSubscription(const std::string& moduleName, Recorder* rec = nullptr, sr_datastore_t ds = SR_DS_RUNNING);
+ SysrepoSubscription(const std::string& moduleName, Recorder* rec = nullptr, sysrepo::Datastore ds = sysrepo::Datastore::Running);
private:
- std::shared_ptr<sysrepo::Connection> m_connection;
- std::shared_ptr<sysrepo::Session> m_session;
- std::shared_ptr<YangSchema> m_schema;
- std::shared_ptr<sysrepo::Subscribe> m_subscription;
+ sysrepo::Subscription m_subscription;
};
class OperationalDataSubscription {
@@ -50,8 +41,6 @@
OperationalDataSubscription(const std::string& moduleName, const std::string& path, const DataSupplier& dataSupplier);
private:
- std::shared_ptr<sysrepo::Connection> m_connection;
- std::shared_ptr<sysrepo::Session> m_session;
std::shared_ptr<YangSchema> m_schema;
- std::shared_ptr<sysrepo::Subscribe> m_subscription;
+ sysrepo::Subscription m_subscription;
};