From: Francis Dupont <fdupont@isc.org>
Date: Thu, 13 Sep 2018 23:33:19 +0000 (+0200)
Subject: [65-libyang-control-socket] Renamed models
X-Git-Tag: 165-netbsd-8-fixes_base^2~3^2^2~1^2~6^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56992c2412998dfc58b10e9903ffe4be83534fe4;p=thirdparty%2Fkea.git

[65-libyang-control-socket] Renamed models
---

diff --git a/src/lib/yang/tests/translator_control_socket_unittests.cc b/src/lib/yang/tests/translator_control_socket_unittests.cc
index 12f4a56356..8e3da5dd6c 100644
--- a/src/lib/yang/tests/translator_control_socket_unittests.cc
+++ b/src/lib/yang/tests/translator_control_socket_unittests.cc
@@ -26,11 +26,11 @@ TEST(TranslatorControlSocketTest, getEmpty) {
     boost::scoped_ptr<TranslatorControlSocket> tcs_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tcs_obj.reset(new TranslatorControlSocket(sess, model)));
 
     // Get empty.
-    const string& xpath = "/kea-dhcp4:config/control-socket";
+    const string& xpath = "/kea-dhcp4-server:config/control-socket";
     ConstElementPtr sock;
     EXPECT_NO_THROW(sock = tcs_obj->getControlSocket(xpath));
     EXPECT_FALSE(sock);
@@ -44,11 +44,11 @@ TEST(TranslatorControlSocketTest, get) {
     boost::scoped_ptr<TranslatorControlSocket> tcs_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp6";
+    const string& model = "kea-dhcp6-server";
     EXPECT_NO_THROW(tcs_obj.reset(new TranslatorControlSocket(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp6:config/control-socket";
+    const string& xpath = "/kea-dhcp6-server:config/control-socket";
     const string& xname = xpath + "/socket-name";
     const string& xtype = xpath + "/socket-type";
     const string& xcontext = xpath + "/user-context";
@@ -86,12 +86,12 @@ TEST(TranslatorControlSocketTest, set) {
     boost::scoped_ptr<TranslatorControlSocket> tcs_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-control-agent";
+    const string& model = "kea-ctrl-agent";
     EXPECT_NO_THROW(tcs_obj.reset(new TranslatorControlSocket(sess, model)));
 
     // Set a value.
     const string& xpath =
-        "/kea-control-agent:config/control-sockets/socket[server-type='dhcp4']/control-socket";
+        "/kea-ctrl-agent:config/control-sockets/socket[server-type='dhcp4']/control-socket";
     ElementPtr sock = Element::createMap();
     sock->set("socket-name", Element::create(string("/tmp/kea.sock")));
     sock->set("socket-type", Element::create(string("unix")));
@@ -130,11 +130,11 @@ TEST(TranslatorControlSocketTest, setEmpty) {
     boost::scoped_ptr<TranslatorControlSocket> tcs_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tcs_obj.reset(new TranslatorControlSocket(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/control-socket";
+    const string& xpath = "/kea-dhcp4-server:config/control-socket";
     const string& xname = xpath + "/socket-name";
     const string& xtype = xpath + "/socket-type";
     const string& xcontext = xpath + "/user-context";
diff --git a/src/lib/yang/translator_control_socket.cc b/src/lib/yang/translator_control_socket.cc
index 6f7f416a46..84f4bfb7b7 100644
--- a/src/lib/yang/translator_control_socket.cc
+++ b/src/lib/yang/translator_control_socket.cc
@@ -25,8 +25,10 @@ TranslatorControlSocket::~TranslatorControlSocket() {
 ConstElementPtr
 TranslatorControlSocket::getControlSocket(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 (getControlSocketKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -60,8 +62,10 @@ void
 TranslatorControlSocket::setControlSocket(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")) {
             setControlSocketKea(xpath, elem);
         } else {
           isc_throw(NotImplemented,