[65-libyang-database] Renamed models

diff --git a/src/lib/yang/tests/translator_database_unittests.cc b/src/lib/yang/tests/translator_database_unittests.cc
index 9001d4dee28b22abafdbfd963fcb9a852d417892..49bea657b780fae540850017f52272b7760cff8e 100644 (file)
--- a/src/lib/yang/tests/translator_database_unittests.cc
+++ b/src/lib/yang/tests/translator_database_unittests.cc
@@ -26,11 +26,11 @@ TEST(TranslatorDatabaseTest, getEmpty) {
     boost::scoped_ptr<TranslatorDatabase> td_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(td_obj.reset(new TranslatorDatabase(sess, model)));
 
     // Get empty.
-    const string& xpath = "/kea-dhcp4:config/lease-database";
+    const string& xpath = "/kea-dhcp4-server:config/lease-database";
     ConstElementPtr database;
     EXPECT_NO_THROW(database = td_obj->getDatabase(xpath));
     EXPECT_FALSE(database);
@@ -44,11 +44,11 @@ TEST(TranslatorDatabaseTest, get) {
     boost::scoped_ptr<TranslatorDatabase> td_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(td_obj.reset(new TranslatorDatabase(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/lease-database";
+    const string& xpath = "/kea-dhcp4-server:config/lease-database";
     const string& xtype = xpath + "/database-type";
     const string& xinterval = xpath + "/lfc-interval";
     S_Val s_type(new Val("memfile"));
@@ -80,11 +80,11 @@ TEST(TranslatorDatabaseTest, set) {
     boost::scoped_ptr<TranslatorDatabase> td_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(td_obj.reset(new TranslatorDatabase(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/lease-database";
+    const string& xpath = "/kea-dhcp4-server:config/lease-database";
     ElementPtr database = Element::createMap();
     database->set("type", Element::create(string("memfile")));
     database->set("lfc-interval", Element::create(3600));
@@ -114,11 +114,11 @@ TEST(TranslatorDatabaseTest, setEmpty) {
     boost::scoped_ptr<TranslatorDatabase> td_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(td_obj.reset(new TranslatorDatabase(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/lease-database";
+    const string& xpath = "/kea-dhcp4-server:config/lease-database";
     const string& xtype = xpath + "/database-type";
     const string& xinterval = xpath + "/lfc-interval";
     S_Val s_type(new Val("memfile"));
@@ -144,11 +144,11 @@ TEST(TranslatorDatabasesTest, getEmpty) {
     boost::scoped_ptr<TranslatorDatabases> tds_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp6";
+    const string& model = "kea-dhcp6-server";
     EXPECT_NO_THROW(tds_obj.reset(new TranslatorDatabases(sess, model)));
 
     // Get empty.
-    const string& xpath = "/kea-dhcp6:config/hosts-databases";
+    const string& xpath = "/kea-dhcp6-server:config/hosts-databases";
     ConstElementPtr databases;
     EXPECT_NO_THROW(databases = tds_obj->getDatabases(xpath));
     EXPECT_FALSE(databases);
@@ -162,11 +162,11 @@ TEST(TranslatorDatabasesTest, get) {
     boost::scoped_ptr<TranslatorDatabases> tds_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tds_obj.reset(new TranslatorDatabases(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/hosts-databases";
+    const string& xpath = "/kea-dhcp4-server:config/hosts-databases";
     const string& xdatabase =
         xpath + "/hosts-database[database-type='mysql']";
     const string& xname = xdatabase + "/name";
@@ -228,11 +228,11 @@ TEST(TranslatorDatabasesTest, set) {
     boost::scoped_ptr<TranslatorDatabases> tds_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp6";
+    const string& model = "kea-dhcp6-server";
     EXPECT_NO_THROW(tds_obj.reset(new TranslatorDatabases(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp6:config/hosts-databases";
+    const string& xpath = "/kea-dhcp6-server:config/hosts-databases";
     ElementPtr database = Element::createMap();
     database->set("type", Element::create(string("memfile")));
     database->set("lfc-interval", Element::create(3600));
@@ -269,12 +269,12 @@ TEST(TranslatorDatabasesTest, setEmpty) {
     boost::scoped_ptr<TranslatorDatabase> td_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tds_obj.reset(new TranslatorDatabases(sess, model)));
     EXPECT_NO_THROW(td_obj.reset(new TranslatorDatabase(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/hosts-databases";
+    const string& xpath = "/kea-dhcp4-server:config/hosts-databases";
     const string& xdatabase =
         xpath + "/hosts-database[database-type='mysql']";
     const string& xname = xdatabase + "/name";
@@ -311,11 +311,11 @@ TEST(TranslatorDatabasesTest, setEmpties) {
     boost::scoped_ptr<TranslatorDatabases> tds_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(tds_obj.reset(new TranslatorDatabases(sess, model)));
 
     // Set a value.
-    const string& xpath = "/kea-dhcp4:config/hosts-databases";
+    const string& xpath = "/kea-dhcp4-server:config/hosts-databases";
     const string& xdatabase =
         xpath + "/hosts-database[database-type='mysql']";
     const string& xname = xdatabase + "/name";

diff --git a/src/lib/yang/translator_database.cc b/src/lib/yang/translator_database.cc
index 102c328ee2d55c99c89c17878ae4d7fad42c6249..4cc8733416614e0ad0772d9d316d4280451bc3ff 100644 (file)
--- a/src/lib/yang/translator_database.cc
+++ b/src/lib/yang/translator_database.cc
@@ -24,7 +24,8 @@ TranslatorDatabase::~TranslatorDatabase() {
 ElementPtr
 TranslatorDatabase::getDatabase(const string& xpath) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             return (getDatabaseKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -120,7 +121,8 @@ TranslatorDatabase::setDatabase(const string& xpath,
                                 ConstElementPtr elem,
                                 bool skip) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             setDatabaseKea(xpath, elem, skip);
         } else {
             isc_throw(NotImplemented,
@@ -232,7 +234,8 @@ TranslatorDatabases::~TranslatorDatabases() {
 ConstElementPtr
 TranslatorDatabases::getDatabases(const string& xpath) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             return (getDatabasesKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -268,7 +271,8 @@ TranslatorDatabases::getDatabasesKea(const string& xpath) {
 void
 TranslatorDatabases::setDatabases(const string& xpath, ConstElementPtr elem) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             setDatabasesKea(xpath, elem);
         } else {
             isc_throw(NotImplemented,