[65-libyang-option-data] Renamed models

diff --git a/src/lib/yang/tests/translator_option_data_unittests.cc b/src/lib/yang/tests/translator_option_data_unittests.cc
index 1de5dc6b1ac73f0f440b8d99c468ee48d5dfe624..5458bcba22f8a21bdfa1b69c8c55d2c6e34d0324 100644 (file)
--- a/src/lib/yang/tests/translator_option_data_unittests.cc
+++ b/src/lib/yang/tests/translator_option_data_unittests.cc
@@ -27,11 +27,11 @@ TEST(TranslatorOptionDataListTest, getEmpty) {
     boost::scoped_ptr<TranslatorOptionDataList> todl_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(todl_obj.reset(new TranslatorOptionDataList(sess, model)));
 
     // Get the option data list and checks it is empty.
-    const string& xpath = "/kea-dhcp4:config/option-data-list";
+    const string& xpath = "/kea-dhcp4-server:config/option-data-list";
     ConstElementPtr options;
     EXPECT_NO_THROW(options = todl_obj->getOptionDataList(xpath));
     ASSERT_TRUE(options);
@@ -47,11 +47,11 @@ TEST(TranslatorOptionDataListTest, get) {
     boost::scoped_ptr<TranslatorOptionDataList> todl_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp6";
+    const string& model = "kea-dhcp6-server";
     EXPECT_NO_THROW(todl_obj.reset(new TranslatorOptionDataList(sess, model)));
 
     // Create the option code 100.
-    const string& xpath = "/kea-dhcp6:config/option-data-list";
+    const string& xpath = "/kea-dhcp6-server:config/option-data-list";
     const string& xoption = xpath + "/option-data[code='100'][space='dns']";
     const string& xformat = xoption + "/csv-format";
     const string& xdata = xoption + "/data";
@@ -86,11 +86,11 @@ TEST(TranslatorOptionDataListTest, setEmpty) {
     boost::scoped_ptr<TranslatorOptionDataList> todl_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp4";
+    const string& model = "kea-dhcp4-server";
     EXPECT_NO_THROW(todl_obj.reset(new TranslatorOptionDataList(sess, model)));
 
     // Set empty list.
-    const string& xpath = "/kea-dhcp4:config/option-data-list";
+    const string& xpath = "/kea-dhcp4-server:config/option-data-list";
     ConstElementPtr options = Element::createList();
     EXPECT_NO_THROW(todl_obj->setOptionDataList(xpath, options));
 
@@ -109,11 +109,11 @@ TEST(TranslatorOptionDataListTest, set) {
     boost::scoped_ptr<TranslatorOptionDataList> todl_obj;
 
     // Use the ad hoc model.
-    const string& model = "kea-dhcp6";
+    const string& model = "kea-dhcp6-server";
     EXPECT_NO_THROW(todl_obj.reset(new TranslatorOptionDataList(sess, model)));
 
     // Set one option data.
-    const string& xpath = "/kea-dhcp6:config/option-data-list";
+    const string& xpath = "/kea-dhcp6-server:config/option-data-list";
     ElementPtr options = Element::createList();
     ElementPtr option = Element::createMap();
     option->set("code", Element::create(100));
@@ -133,10 +133,10 @@ TEST(TranslatorOptionDataListTest, set) {
 
     // Check the tree representation.
     S_Tree tree;
-    EXPECT_NO_THROW(tree = sess->get_subtree("/kea-dhcp6:config"));
+    EXPECT_NO_THROW(tree = sess->get_subtree("/kea-dhcp6-server:config"));
     ASSERT_TRUE(tree);
     string expected =
-        "kea-dhcp6:config (container)\n"
+        "kea-dhcp6-server:config (container)\n"
         " |\n"
         " -- option-data-list (container)\n"
         "     |\n"

diff --git a/src/lib/yang/translator_option_data.cc b/src/lib/yang/translator_option_data.cc
index 304bd37d848e5cf9a51783a0c018df556edb96e4..2f1e782f4de30875728d0a834412c4e375f7f1a0 100644 (file)
--- a/src/lib/yang/translator_option_data.cc
+++ b/src/lib/yang/translator_option_data.cc
@@ -25,7 +25,8 @@ TranslatorOptionData::~TranslatorOptionData() {
 ElementPtr
 TranslatorOptionData::getOptionData(const string& xpath) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             return (getOptionDataKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -74,7 +75,8 @@ void
 TranslatorOptionData::setOptionData(const string& xpath,
                                     ConstElementPtr elem) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             setOptionDataKea(xpath, elem);
         } else {
             isc_throw(NotImplemented,
@@ -126,7 +128,8 @@ TranslatorOptionDataList::~TranslatorOptionDataList() {
 ConstElementPtr
 TranslatorOptionDataList::getOptionDataList(const string& xpath) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             return (getOptionDataListKea(xpath));
         }
     } catch (const sysrepo_exception& ex) {
@@ -159,7 +162,8 @@ void
 TranslatorOptionDataList::setOptionDataList(const string& xpath,
                                             ConstElementPtr elem) {
     try {
-        if ((model_ == "kea-dhcp4") || (model_ == "kea-dhcp6")) {
+        if ((model_ == "kea-dhcp4-server") ||
+            (model_ == "kea-dhcp6-server")) {
             setOptionDataListKea(xpath, elem);
         } else {
             isc_throw(NotImplemented,