From: Francis Dupont <fdupont@isc.org>
Date: Thu, 13 Sep 2018 23:34:07 +0000 (+0200)
Subject: [65-libyang-logger] Renamed models
X-Git-Tag: 153-netconf-configs_base^2~1^2^2^2^2^2~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=535f4037c8b215126903a7272c29924c59634cf6;p=thirdparty%2Fkea.git

[65-libyang-logger] Renamed models
---

diff --git a/src/lib/yang/tests/translator_logger_unittests.cc b/src/lib/yang/tests/translator_logger_unittests.cc
index 44a6bb3eb5..ab2f7b2708 100644
--- a/src/lib/yang/tests/translator_logger_unittests.cc
+++ b/src/lib/yang/tests/translator_logger_unittests.cc
@@ -26,11 +26,11 @@ TEST(TranslatorLoggersTest, getEmpty) {
     boost::scoped_ptr<TranslatorLoggers> tls_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tls_obj.reset(new TranslatorLoggers(sess, model)));
 
     // Get empty.
-    const string& xpath = "/kea-dhcp4:logging/loggers";
+    const string& xpath = "/kea-dhcp4-server:logging/loggers";
     ConstElementPtr loggers;
     EXPECT_NO_THROW(loggers = tls_obj->getLoggers(xpath));
     ASSERT_TRUE(loggers);
@@ -45,11 +45,11 @@ TEST(TranslatorLoggersTest, get) {
     boost::scoped_ptr<TranslatorLoggers> tls_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp6";
+    const string& model = "kea-dhcp6-server";
     EXPECT_NO_THROW(tls_obj.reset(new TranslatorLoggers(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp6:logging/loggers";
+    const string& xpath = "/kea-dhcp6-server:logging/loggers";
     const string& xlogger = xpath + "/logger[name='foo']";
     const string& xseverity = xlogger + "/severity";
     const string& xoption = xlogger + "/output-options/option[output='/bar']";
@@ -100,11 +100,11 @@ TEST(TranslatorLoggersTest, set) {
     boost::scoped_ptr<TranslatorLoggers> tls_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tls_obj.reset(new TranslatorLoggers(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:logging/loggers";
+    const string& xpath = "/kea-dhcp4-server:logging/loggers";
     ElementPtr option = Element::createMap();
     option->set("output", Element::create(string("/bar")));
     option->set("maxver", Element::create(10));
@@ -151,10 +151,10 @@ TEST(TranslatorLoggersTest, set) {
 
     // Check the tree representation.
     S_Tree tree;
-    EXPECT_NO_THROW(tree = sess->get_subtree("/kea-dhcp4:logging"));
+    EXPECT_NO_THROW(tree = sess->get_subtree("/kea-dhcp4-server:logging"));
     ASSERT_TRUE(tree);
     string expected =
-        "kea-dhcp4:logging (container)\n"
+        "kea-dhcp4-server:logging (container)\n"
         " |\n"
         " -- loggers (container)\n"
         "     |\n"
diff --git a/src/lib/yang/translator_logger.cc b/src/lib/yang/translator_logger.cc
index 496e442cee..34f480c771 100644
--- a/src/lib/yang/translator_logger.cc
+++ b/src/lib/yang/translator_logger.cc
@@ -24,8 +24,10 @@ TranslatorLogger::~TranslatorLogger() {
 ElementPtr
 TranslatorLogger::getLogger(const string& xpath) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6") ||
-            (model_ == "kea-dhcpddns") || (model_ == "kea-control-agent")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server") ||
+            (model_ == "kea-dhcp-ddns") ||
+            (model_ == "kea-ctrl-agent")) {
             return (getLoggerKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -107,8 +109,10 @@ TranslatorLogger::getOutputOptions(const string& xpath) {
 void
 TranslatorLogger::setLogger(const string& xpath, ConstElementPtr elem) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6") ||
-            (model_ == "kea-dhcpddns") || (model_ == "kea-control-agent")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server") ||
+            (model_ == "kea-dhcp-ddns") ||
+            (model_ == "kea-ctrl-agent")) {
             setLoggerKea(xpath, elem);
         } else {
             isc_throw(NotImplemented,
@@ -194,8 +198,10 @@ TranslatorLoggers::~TranslatorLoggers() {
 ConstElementPtr
 TranslatorLoggers::getLoggers(const string& xpath) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6") ||
-            (model_ == "kea-dhcpddns") || (model_ == "kea-control-agent")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server") ||
+            (model_ == "kea-dhcp-ddns") ||
+            (model_ == "kea-ctrl-agent")) {
             return (getLoggersKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -227,8 +233,10 @@ TranslatorLoggers::getLoggersKea(const string& xpath) {
 void
 TranslatorLoggers::setLoggers(const string& xpath, ConstElementPtr elem) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6") ||
-            (model_ == "kea-dhcpddns") || (model_ == "kea-control-agent")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server") ||
+            (model_ == "kea-dhcp-ddns") ||
+            (model_ == "kea-ctrl-agent")) {
             setLoggersKea(xpath, elem);
         } else {
             isc_throw(NotImplemented,