From: Francis Dupont <fdupont@isc.org>
Date: Mon, 19 Nov 2018 12:41:17 +0000 (+0100)
Subject: [176-update-to-sysrepo-0-7-6-release] Changet HAVE_OLD_SYSREPO into HAVE_PRE_0_7_6_SY... 
X-Git-Tag: 275-config-control-syntax-cleanup_base~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d2b1973ee1708f3817d8da2caedb3a3c8a98e0f;p=thirdparty%2Fkea.git

[176-update-to-sysrepo-0-7-6-release] Changet HAVE_OLD_SYSREPO into HAVE_PRE_0_7_6_SYSREPO
---

diff --git a/configure.ac b/configure.ac
index 8d40afc453..bc4f068ef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -950,7 +950,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
                 [#include <sysrepo-cpp/Session.h>],
                 [Connection("conn-name");])],
             [AC_MSG_RESULT([checking for Sysrepo C++ bindings headers and library... old])
-             AC_DEFINE([HAVE_OLD_SYSREPO], [1], [Using sysrepo < 0.7.6])],
+             AC_DEFINE([HAVE_HAVE_PRE_0_7_6_SYSREPO], [1], [Using sysrepo < 0.7.6])],
              [AC_MSG_RESULT([checking for Sysrepo C++ bindings headers and library... no])
               AC_MSG_ERROR([Needs Sysrepo C++ bindings (unable to find Sysrepo-ccp library. To get it, you need to compile sysrepo with -DGEN_CPP_BINDINGS=ON.)])]
         )]
diff --git a/src/bin/netconf/netconf.cc b/src/bin/netconf/netconf.cc
index 4f2276fa6b..4f60d208f6 100644
--- a/src/bin/netconf/netconf.cc
+++ b/src/bin/netconf/netconf.cc
@@ -22,7 +22,7 @@ using namespace isc::config;
 using namespace isc::data;
 using namespace isc::netconf;
 using namespace isc::yang;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/bin/netconf/netconf.h b/src/bin/netconf/netconf.h
index 9778726b0c..cd02c6c893 100644
--- a/src/bin/netconf/netconf.h
+++ b/src/bin/netconf/netconf.h
@@ -18,7 +18,7 @@
 #include <netconf/http_control_socket.h>
 #include <netconf/stdout_control_socket.h>
 #include <netconf/unix_control_socket.h>
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 #include <sysrepo-cpp/Session.hpp>
 #else
 #include <sysrepo-cpp/Session.h>
@@ -79,7 +79,7 @@ public:
     /// @param sess The sysrepo running datastore session.
     /// @param service_pair The service name and configuration pair.
     /// @return return code for sysrepo.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static int validate(sysrepo::S_Session sess,
                         const CfgServersMapPair& service_pair);
 #else
@@ -93,7 +93,7 @@ public:
     /// @param sess The sysrepo running datastore session.
     /// @param service_pair The service name and configuration pair.
     /// @return return code for sysrepo.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static int update(sysrepo::S_Session sess,
                       const CfgServersMapPair& service_pair);
 #else
@@ -108,7 +108,7 @@ public:
     ///
     /// @param sess The sysrepo running datastore session.
     /// @param model The model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static void logChanges(sysrepo::S_Session sess, const std::string& model);
 #else
     static void logChanges(S_Session sess, const std::string& model);
@@ -146,28 +146,28 @@ protected:
     void subscribeConfig(const CfgServersMapPair& service_pair);
 
     /// @brief Sysrepo connection.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Connection conn_;
 #else
     S_Connection conn_;
 #endif
 
     /// @brief Sysrepo startup datastore session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session startup_sess_;
 #else
     S_Session startup_sess_;
 #endif
 
     /// @brief Sysrepo running datastore session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session running_sess_;
 #else
     S_Session running_sess_;
 #endif
 
     /// @brief Subscription map.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     std::map<const std::string, sysrepo::S_Subscribe> subscriptions_;
 #else
     std::map<const std::string, S_Subscribe> subscriptions_;
diff --git a/src/bin/netconf/tests/netconf_unittests.cc b/src/bin/netconf/tests/netconf_unittests.cc
index 9fc97698fb..0e647c8d19 100644
--- a/src/bin/netconf/tests/netconf_unittests.cc
+++ b/src/bin/netconf/tests/netconf_unittests.cc
@@ -34,7 +34,7 @@ using namespace isc::test;
 using namespace isc::yang;
 using namespace isc::yang::test;
 using namespace isc::util::thread;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/pretests/sysrepo_setup_tests.cc b/src/lib/yang/pretests/sysrepo_setup_tests.cc
index 98b7aa87f3..d1ea676622 100644
--- a/src/lib/yang/pretests/sysrepo_setup_tests.cc
+++ b/src/lib/yang/pretests/sysrepo_setup_tests.cc
@@ -6,7 +6,7 @@
 
 #include <config.h>
 
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 #include <sysrepo-cpp/Session.hpp>
 #else
 #include <sysrepo-cpp/Session.h>
@@ -15,7 +15,7 @@
 #include <sstream>
 
 using namespace std;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc
index cb4b083a32..0987987223 100644
--- a/src/lib/yang/tests/config_unittests.cc
+++ b/src/lib/yang/tests/config_unittests.cc
@@ -21,7 +21,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/sysrepo_setup.h b/src/lib/yang/tests/sysrepo_setup.h
index c9e270ebeb..855431f411 100644
--- a/src/lib/yang/tests/sysrepo_setup.h
+++ b/src/lib/yang/tests/sysrepo_setup.h
@@ -36,7 +36,7 @@ public:
     void useModel(std::string model) {
         std::string full_name =
             "translator " + std::string(Name) + " unittests";
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
         conn_.reset(new sysrepo::Connection(full_name.c_str()));
         sess_.reset(new sysrepo::Session(conn_, SR_DS_CANDIDATE));
 #else
@@ -56,14 +56,14 @@ public:
     }
 
     /// @brief Sysrepo connection.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Connection conn_;
 #else
     S_Connection conn_;
 #endif
 
     /// @brief Sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session sess_;
 #else
     S_Session sess_;
diff --git a/src/lib/yang/tests/translator_class_unittests.cc b/src/lib/yang/tests/translator_class_unittests.cc
index 1eefe0138f..e299835b57 100644
--- a/src/lib/yang/tests/translator_class_unittests.cc
+++ b/src/lib/yang/tests/translator_class_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_control_socket_unittests.cc b/src/lib/yang/tests/translator_control_socket_unittests.cc
index c6a3e69cfb..5ceef861b4 100644
--- a/src/lib/yang/tests/translator_control_socket_unittests.cc
+++ b/src/lib/yang/tests/translator_control_socket_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_database_unittests.cc b/src/lib/yang/tests/translator_database_unittests.cc
index d891b54417..6c5e552da5 100644
--- a/src/lib/yang/tests/translator_database_unittests.cc
+++ b/src/lib/yang/tests/translator_database_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_host_unittests.cc b/src/lib/yang/tests/translator_host_unittests.cc
index e387587550..4abc8dd7fe 100644
--- a/src/lib/yang/tests/translator_host_unittests.cc
+++ b/src/lib/yang/tests/translator_host_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_logger_unittests.cc b/src/lib/yang/tests/translator_logger_unittests.cc
index 6dce09b576..a8bc744137 100644
--- a/src/lib/yang/tests/translator_logger_unittests.cc
+++ b/src/lib/yang/tests/translator_logger_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_option_data_unittests.cc b/src/lib/yang/tests/translator_option_data_unittests.cc
index 5aa0d3216e..7067b0fbb0 100644
--- a/src/lib/yang/tests/translator_option_data_unittests.cc
+++ b/src/lib/yang/tests/translator_option_data_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_option_def_unittests.cc b/src/lib/yang/tests/translator_option_def_unittests.cc
index 2baec9ae36..6daab74493 100644
--- a/src/lib/yang/tests/translator_option_def_unittests.cc
+++ b/src/lib/yang/tests/translator_option_def_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_pd_pool_unittests.cc b/src/lib/yang/tests/translator_pd_pool_unittests.cc
index f9e30b63d5..cb9ad3e030 100644
--- a/src/lib/yang/tests/translator_pd_pool_unittests.cc
+++ b/src/lib/yang/tests/translator_pd_pool_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_pool_unittests.cc b/src/lib/yang/tests/translator_pool_unittests.cc
index c8ed80c1aa..998bf50657 100644
--- a/src/lib/yang/tests/translator_pool_unittests.cc
+++ b/src/lib/yang/tests/translator_pool_unittests.cc
@@ -18,7 +18,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_shared_network_unittests.cc b/src/lib/yang/tests/translator_shared_network_unittests.cc
index b18510d08a..58b44562bf 100644
--- a/src/lib/yang/tests/translator_shared_network_unittests.cc
+++ b/src/lib/yang/tests/translator_shared_network_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_subnet_unittests.cc b/src/lib/yang/tests/translator_subnet_unittests.cc
index 5b33d28ad6..d3adf2f3db 100644
--- a/src/lib/yang/tests/translator_subnet_unittests.cc
+++ b/src/lib/yang/tests/translator_subnet_unittests.cc
@@ -17,7 +17,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_unittests.cc b/src/lib/yang/tests/translator_unittests.cc
index 515c28c94c..a93e963e71 100644
--- a/src/lib/yang/tests/translator_unittests.cc
+++ b/src/lib/yang/tests/translator_unittests.cc
@@ -15,7 +15,7 @@ using namespace std;
 using namespace isc;
 using namespace isc::data;
 using namespace isc::yang;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/tests/translator_utils_unittests.cc b/src/lib/yang/tests/translator_utils_unittests.cc
index 79845c29ce..d99dc1e385 100644
--- a/src/lib/yang/tests/translator_utils_unittests.cc
+++ b/src/lib/yang/tests/translator_utils_unittests.cc
@@ -15,7 +15,7 @@ using namespace std;
 using namespace isc;
 using namespace isc::yang;
 using namespace isc::yang::test;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/testutils/translator_test.cc b/src/lib/yang/testutils/translator_test.cc
index f21146bbaf..bf542ccb6b 100644
--- a/src/lib/yang/testutils/translator_test.cc
+++ b/src/lib/yang/testutils/translator_test.cc
@@ -12,7 +12,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/testutils/translator_test.h b/src/lib/yang/testutils/translator_test.h
index 1ead1da05b..4fc8299620 100644
--- a/src/lib/yang/testutils/translator_test.h
+++ b/src/lib/yang/testutils/translator_test.h
@@ -46,7 +46,7 @@ public:
         /// @param xpath The xpath of an element to be retrieved.
         /// @param session Sysrepo session.
         /// @return YangReprItem instance representing configuration parameter.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
         static YangReprItem get(const std::string& xpath,
                                 sysrepo::S_Session session);
 #else
@@ -90,7 +90,7 @@ public:
     /// @brief Get tree from session.
     ///
     /// @param session Sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     Tree get(sysrepo::S_Session session) const;
 #else
     Tree get(S_Session session) const;
@@ -103,7 +103,7 @@ public:
     /// @param errs Error stream.
     /// @return true if verification succeeds, false with errors displayed.
     /// on errs if it fails.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     bool verify(const Tree& expected, sysrepo::S_Session session,
                 std::ostream& errs) const;
 #else
@@ -117,7 +117,7 @@ public:
     ///
     /// @param tree The tree to install.
     /// @param session Sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     void set(const Tree& tree, sysrepo::S_Session session) const;
 #else
     void set(const Tree& tree, S_Session session) const;
@@ -129,7 +129,7 @@ public:
     /// @param errs Error stream.
     /// @return True if validation succeeds, false with errors displayed
     /// on errs if it fails.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     bool validate(sysrepo::S_Session session, std::ostream& errs) const;
 #else
     bool validate(S_Session session, std::ostream& errs) const;
diff --git a/src/lib/yang/translator.cc b/src/lib/yang/translator.cc
index 783b47daae..834218b915 100644
--- a/src/lib/yang/translator.cc
+++ b/src/lib/yang/translator.cc
@@ -13,7 +13,7 @@
 using namespace std;
 using namespace isc::data;
 using namespace isc::util::encode;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator.h b/src/lib/yang/translator.h
index 227939a3e1..5c3313e424 100644
--- a/src/lib/yang/translator.h
+++ b/src/lib/yang/translator.h
@@ -14,7 +14,7 @@
 #error "config.h must be included before translator.h"
 #endif
 
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 #include <sysrepo-cpp/Session.hpp>
 #else
 #include <sysrepo-cpp/Session.h>
@@ -31,7 +31,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name (used and shared by derived classes).
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorBasic(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorBasic(S_Session session, const std::string& model);
@@ -47,7 +47,7 @@ public:
     /// @param s_val The value.
     /// @return The Element representing the sysrepo value.
     /// @throw NotImplemented when the value type is not supported.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static isc::data::ElementPtr value(sysrepo::S_Val s_val);
 #else
     static isc::data::ElementPtr value(S_Val s_val);
@@ -77,7 +77,7 @@ public:
     ///
     /// @param elem The JSON element.
     /// @param type The sysrepo type.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     static sysrepo::S_Val value(isc::data::ConstElementPtr elem,
                                 sr_type_t type);
 #else
@@ -103,7 +103,7 @@ public:
     ///
     /// @param xpath The xpath of the list.
     /// @return An S_Iter_Value pointer. Null is the list does not exist.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Iter_Value getIter(const std::string& xpath);
 #else
     S_Iter_Value getIter(const std::string& xpath);
@@ -114,7 +114,7 @@ public:
     /// @param iter The iterator pointing to the previous element
     /// @return The xpath of the next element. Empty string when at
     /// the end of the list.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     std::string getNext(sysrepo::S_Iter_Value iter);
 #else
     std::string getNext(S_Iter_Value iter);
@@ -122,7 +122,7 @@ public:
 
 protected:
     /// @brief The sysrepo session.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     sysrepo::S_Session session_;
 #else
     S_Session session_;
diff --git a/src/lib/yang/translator_class.cc b/src/lib/yang/translator_class.cc
index 199e23b889..5774a794b4 100644
--- a/src/lib/yang/translator_class.cc
+++ b/src/lib/yang/translator_class.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_class.h b/src/lib/yang/translator_class.h
index 545420fdb8..15de324531 100644
--- a/src/lib/yang/translator_class.h
+++ b/src/lib/yang/translator_class.h
@@ -82,7 +82,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorClass(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorClass(S_Session session, const std::string& model);
@@ -132,7 +132,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorClasses(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorClasses(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_config.cc b/src/lib/yang/translator_config.cc
index 969a312046..1818287d11 100644
--- a/src/lib/yang/translator_config.cc
+++ b/src/lib/yang/translator_config.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_config.h b/src/lib/yang/translator_config.h
index fd9bf33a53..ead115f006 100644
--- a/src/lib/yang/translator_config.h
+++ b/src/lib/yang/translator_config.h
@@ -394,7 +394,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorConfig(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorConfig(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_control_socket.cc b/src/lib/yang/translator_control_socket.cc
index 64e72a0b12..65757e583e 100644
--- a/src/lib/yang/translator_control_socket.cc
+++ b/src/lib/yang/translator_control_socket.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_control_socket.h b/src/lib/yang/translator_control_socket.h
index 3254869470..0ee964af65 100644
--- a/src/lib/yang/translator_control_socket.h
+++ b/src/lib/yang/translator_control_socket.h
@@ -74,7 +74,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorControlSocket(sysrepo::S_Session session,
                             const std::string& model);
 #else
diff --git a/src/lib/yang/translator_database.cc b/src/lib/yang/translator_database.cc
index d103ccdf2c..5d30503f9d 100644
--- a/src/lib/yang/translator_database.cc
+++ b/src/lib/yang/translator_database.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_database.h b/src/lib/yang/translator_database.h
index dfcc5293b7..fd6573f320 100644
--- a/src/lib/yang/translator_database.h
+++ b/src/lib/yang/translator_database.h
@@ -109,7 +109,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorDatabase(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorDatabase(S_Session session, const std::string& model);
@@ -166,7 +166,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorDatabases(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorDatabases(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_host.cc b/src/lib/yang/translator_host.cc
index db3e42ce3d..4c4a0ad34f 100644
--- a/src/lib/yang/translator_host.cc
+++ b/src/lib/yang/translator_host.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_host.h b/src/lib/yang/translator_host.h
index f193723082..e1f6115465 100644
--- a/src/lib/yang/translator_host.h
+++ b/src/lib/yang/translator_host.h
@@ -119,7 +119,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorHost(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorHost(S_Session session, const std::string& model);
@@ -170,7 +170,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorHosts(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorHosts(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_logger.cc b/src/lib/yang/translator_logger.cc
index f00d20ecf9..c61d55fc01 100644
--- a/src/lib/yang/translator_logger.cc
+++ b/src/lib/yang/translator_logger.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_logger.h b/src/lib/yang/translator_logger.h
index 2b5bc2d34d..1b33e5e596 100644
--- a/src/lib/yang/translator_logger.h
+++ b/src/lib/yang/translator_logger.h
@@ -101,7 +101,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorLogger(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorLogger(S_Session session, const std::string& model);
@@ -179,7 +179,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorLoggers(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorLoggers(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_option_data.cc b/src/lib/yang/translator_option_data.cc
index f05fe28a94..0fb64f445a 100644
--- a/src/lib/yang/translator_option_data.cc
+++ b/src/lib/yang/translator_option_data.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_option_data.h b/src/lib/yang/translator_option_data.h
index 74a9439403..eeb104d3cc 100644
--- a/src/lib/yang/translator_option_data.h
+++ b/src/lib/yang/translator_option_data.h
@@ -80,7 +80,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionData(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorOptionData(S_Session session, const std::string& model);
@@ -131,7 +131,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionDataList(sysrepo::S_Session session,
                              const std::string& model);
 #else
diff --git a/src/lib/yang/translator_option_def.cc b/src/lib/yang/translator_option_def.cc
index 88a784ef1a..83a62febb0 100644
--- a/src/lib/yang/translator_option_def.cc
+++ b/src/lib/yang/translator_option_def.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_option_def.h b/src/lib/yang/translator_option_def.h
index 4987be325f..73eb0229cf 100644
--- a/src/lib/yang/translator_option_def.h
+++ b/src/lib/yang/translator_option_def.h
@@ -83,7 +83,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionDef(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorOptionDef(S_Session session, const std::string& model);
@@ -136,7 +136,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorOptionDefList(sysrepo::S_Session session,
                             const std::string& model);
 #else
diff --git a/src/lib/yang/translator_pd_pool.cc b/src/lib/yang/translator_pd_pool.cc
index 7638b51898..a93568a324 100644
--- a/src/lib/yang/translator_pd_pool.cc
+++ b/src/lib/yang/translator_pd_pool.cc
@@ -14,7 +14,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_pd_pool.h b/src/lib/yang/translator_pd_pool.h
index 05e2019ab5..353049e3e6 100644
--- a/src/lib/yang/translator_pd_pool.h
+++ b/src/lib/yang/translator_pd_pool.h
@@ -122,7 +122,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPdPool(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPdPool(S_Session session, const std::string& model);
@@ -189,7 +189,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPdPools(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPdPools(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_pool.cc b/src/lib/yang/translator_pool.cc
index a5b6c0dc70..199487a153 100644
--- a/src/lib/yang/translator_pool.cc
+++ b/src/lib/yang/translator_pool.cc
@@ -18,7 +18,7 @@ using namespace std;
 using namespace isc::data;
 using namespace isc::asiolink;
 using namespace isc::dhcp;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_pool.h b/src/lib/yang/translator_pool.h
index aa92e73bb6..85ce580ebe 100644
--- a/src/lib/yang/translator_pool.h
+++ b/src/lib/yang/translator_pool.h
@@ -130,7 +130,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPool(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPool(S_Session session, const std::string& model);
@@ -204,7 +204,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorPools(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorPools(S_Session session, const std::string& model);
diff --git a/src/lib/yang/translator_shared_network.cc b/src/lib/yang/translator_shared_network.cc
index fa152ce30d..0774b8a9ab 100644
--- a/src/lib/yang/translator_shared_network.cc
+++ b/src/lib/yang/translator_shared_network.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_shared_network.h b/src/lib/yang/translator_shared_network.h
index 60628f2787..f9141125cb 100644
--- a/src/lib/yang/translator_shared_network.h
+++ b/src/lib/yang/translator_shared_network.h
@@ -132,7 +132,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSharedNetwork(sysrepo::S_Session session,
                             const std::string& model);
 #else
@@ -190,7 +190,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSharedNetworks(sysrepo::S_Session session,
                              const std::string& model);
 #else
diff --git a/src/lib/yang/translator_subnet.cc b/src/lib/yang/translator_subnet.cc
index 9881e041c2..c7849edf18 100644
--- a/src/lib/yang/translator_subnet.cc
+++ b/src/lib/yang/translator_subnet.cc
@@ -13,7 +13,7 @@
 
 using namespace std;
 using namespace isc::data;
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
 using namespace sysrepo;
 #endif
 
diff --git a/src/lib/yang/translator_subnet.h b/src/lib/yang/translator_subnet.h
index a44b155a9e..f1d5f83540 100644
--- a/src/lib/yang/translator_subnet.h
+++ b/src/lib/yang/translator_subnet.h
@@ -240,7 +240,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSubnet(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorSubnet(S_Session session, const std::string& model);
@@ -303,7 +303,7 @@ public:
     ///
     /// @param session Sysrepo session.
     /// @param model Model name.
-#ifndef HAVE_OLD_SYSREPO
+#ifndef HAVE_PRE_0_7_6_SYSREPO
     TranslatorSubnets(sysrepo::S_Session session, const std::string& model);
 #else
     TranslatorSubnets(S_Session session, const std::string& model);