[#1621] updated unittests

diff --git a/src/lib/database/database_connection.cc b/src/lib/database/database_connection.cc
index 840a7d8a1319ea77f0c5be8ce15fd45b134fd9c0..d15cace5a67c038c8e28589b3badaa3d4ac582c5 100644 (file)
--- a/src/lib/database/database_connection.cc
+++ b/src/lib/database/database_connection.cc
@@ -257,7 +257,8 @@ DatabaseConnection::toElement(const ParameterMap& params) {
         } else if ((keyword == "persist") ||
                    (keyword == "tcp-nodelay") ||
                    (keyword == "readonly") ||
-                   (keyword == "disable-dhcp-on-db-loss")) {
+                   (keyword == "disable-dhcp-on-db-loss") ||
+                   (keyword == "enable-connection-recovery")) {
             if (value == "true") {
                 result->set(keyword, isc::data::Element::create(true));
             } else if (value == "false") {

diff --git a/src/lib/database/dbaccess_parser.cc b/src/lib/database/dbaccess_parser.cc
index c4b442a16e9a773a1798e87bdfeac0a42f10752d..c37156af972d318bd7f59a353eca0b36423bd9e8 100644 (file)
--- a/src/lib/database/dbaccess_parser.cc
+++ b/src/lib/database/dbaccess_parser.cc
@@ -62,7 +62,8 @@ DbAccessParser::parse(std::string& access_string,
             if ((param.first == "persist") ||
                 (param.first == "tcp-nodelay") ||
                 (param.first == "readonly") ||
-                (param.first == "disable-dhcp-on-db-loss")) {
+                (param.first == "disable-dhcp-on-db-loss") ||
+                (param.first == "enable-connection-recovery")) {
                 values_copy[param.first] = (param.second->boolValue() ?
                                             "true" : "false");
 

diff --git a/src/lib/database/tests/database_connection_unittest.cc b/src/lib/database/tests/database_connection_unittest.cc
index b47395001f02b4c2bee297bc8b36293f40628c38..ec6d7360e2fbbf638ce1532e832d4b6c184a92da 100644 (file)
--- a/src/lib/database/tests/database_connection_unittest.cc
+++ b/src/lib/database/tests/database_connection_unittest.cc
@@ -528,6 +528,7 @@ TEST(DatabaseConnection, toElementDbAccessStringValid) {
         "\"contact-points\": \"contact_str\", \n"
         "\"consistency\": \"quorum\", \n"
         "\"disable-dhcp-on-db-loss\": true, \n"
+        "\"enable-connection-recovery\": true, \n"
         "\"serial-consistency\": \"serial\", \n"
         "\"host\": \"host_str\", \n"
         "\"keyspace\": \"keyspace_str\", \n"