Merge DatastoreAccess executeRpc and executeAction
Sysrepo now uses the same method for rpc and action.
Change-Id: I3a8211b670189c9724d46d6235e5a68b3107c81a
diff --git a/src/proxy_datastore.hpp b/src/proxy_datastore.hpp
index e7650cd..ab7e3a2 100644
--- a/src/proxy_datastore.hpp
+++ b/src/proxy_datastore.hpp
@@ -29,8 +29,7 @@
void copyConfig(const Datastore source, const Datastore destination);
[[nodiscard]] std::string dump(const DataFormat format) const;
- void initiateRpc(const std::string& rpcPath);
- void initiateAction(const std::string& actionPath);
+ void initiate(const std::string& path);
[[nodiscard]] DatastoreAccess::Tree execute();
void cancel();
@@ -48,14 +47,5 @@
std::function<std::shared_ptr<DatastoreAccess>(const std::shared_ptr<DatastoreAccess>&)> m_createTemporaryDatastore;
std::shared_ptr<DatastoreAccess> m_inputDatastore;
- struct RpcInput {
- std::string m_path;
- };
-
- struct ActionInput {
- std::string m_path;
- };
- // This variant is needed, so that I know whether to call executeRpc or executeAction
- // TODO: get rid of this variant with sysrepo2 because the method for RPC/action is the same there
- std::variant<ActionInput, RpcInput> m_inputPath;
+ std::string m_inputPath;
};