From: Francis Dupont Date: Thu, 13 Sep 2018 23:33:43 +0000 (+0200) Subject: [65-libyang-database] Renamed models X-Git-Tag: 171-keactrl-tests-not-posix_base~7^2~1^2^2~2^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87f002ba9ef28d44c1e7d9b3c1ccbdd4a77bcbb7;p=thirdparty%2Fkea.git [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 9001d4dee2..49bea657b7 100644 --- 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 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 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 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 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 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 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 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 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 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 102c328ee2..4cc8733416 100644 --- 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,