renamed parameter

diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll
index de2e0caca6af0bb886fee6a7f6f60f76e2fd4b6e..81c817c36d1cf76d784afc5109d70886a10310ff 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.ll
+++ b/src/bin/dhcp4/dhcp4_lexer.ll
@@ -484,14 +484,14 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
     }
 }
 
-\"cql-consistency\" {
+\"consistency\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::LEASE_DATABASE:
     case isc::dhcp::Parser4Context::HOSTS_DATABASE:
     case isc::dhcp::Parser4Context::CONFIG_DATABASE:
-        return isc::dhcp::Dhcp4Parser::make_CQL_CONSISTENCY(driver.loc_);
+        return isc::dhcp::Dhcp4Parser::make_CONSISTENCY(driver.loc_);
     default:
-        return isc::dhcp::Dhcp4Parser::make_STRING("cql-consistency", driver.loc_);
+        return isc::dhcp::Dhcp4Parser::make_STRING("consistency", driver.loc_);
     }
 }
 

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index e7f41c47fea3e072f00a12c65b0c1f40a2106ab3..8959ba40ce3de8a464cf1cdbef2520eb505519af 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -90,7 +90,7 @@ using namespace std;
   CONNECT_TIMEOUT "connect-timeout"
   CONTACT_POINTS "contact-points"
   KEYSPACE "keyspace"
-  CQL_CONSISTENCY "cql-consistency"
+  CONSISTENCY "consistency"
   MAX_RECONNECT_TRIES "max-reconnect-tries"
   RECONNECT_WAIT_TIME "reconnect-wait-time"
   REQUEST_TIMEOUT "request-timeout"
@@ -713,7 +713,7 @@ database_map_param: database_type
                   | tcp_keepalive
                   | tcp_nodelay
                   | keyspace
-                  | cql_consistency
+                  | consistency
                   | unknown_map_entry
                   ;
 
@@ -818,11 +818,11 @@ keyspace: KEYSPACE {
     ctx.leave();
 };
 
-cql_consistency: CQL_CONSISTENCY {
+consistency: CONSISTENCY {
     ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
     ElementPtr c(new StringElement($4, ctx.loc2pos(@4)));
-    ctx.stack_.back()->set("cql-consistency", c);
+    ctx.stack_.back()->set("consistency", c);
     ctx.leave();
 };
 

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index 781237ce8eeb73c06b0b098b0daec3853c54b25f..be18c28631845aec012d5b5531b31783021949fe 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -670,14 +670,14 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
     }
 }
 
-\"cql-consistency\" {
+\"consistency\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser6Context::LEASE_DATABASE:
     case isc::dhcp::Parser6Context::HOSTS_DATABASE:
     case isc::dhcp::Parser6Context::CONFIG_DATABASE:
-        return isc::dhcp::Dhcp6Parser::make_CQL_CONSISTENCY(driver.loc_);
+        return isc::dhcp::Dhcp6Parser::make_CONSISTENCY(driver.loc_);
     default:
-        return isc::dhcp::Dhcp6Parser::make_STRING("cql-consistency", driver.loc_);
+        return isc::dhcp::Dhcp6Parser::make_STRING("consistency", driver.loc_);
     }
 }
 

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 82aa7014be54ea9f81ed6a29010450cad2dd020d..ffe2d68c5ec96cbb059bd46214d372706514b17d 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -76,7 +76,7 @@ using namespace std;
   MAX_RECONNECT_TRIES "max-reconnect-tries"
   RECONNECT_WAIT_TIME "reconnect-wait-time"
   KEYSPACE "keyspace"
-  CQL_CONSISTENCY "cql-consistency"
+  CONSISTENCY "consistency"
   REQUEST_TIMEOUT "request-timeout"
   TCP_KEEPALIVE "tcp-keepalive"
   TCP_NODELAY "tcp-nodelay"
@@ -623,7 +623,7 @@ database_map_param: database_type
                   | tcp_keepalive
                   | tcp_nodelay
                   | keyspace
-                  | cql_consistency
+                  | consistency
                   | unknown_map_entry
                   ;
 
@@ -738,11 +738,11 @@ keyspace: KEYSPACE {
     ctx.leave();
 };
 
-cql_consistency: CQL_CONSISTENCY {
+consistency: CONSISTENCY {
     ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
     ElementPtr c(new StringElement($4, ctx.loc2pos(@4)));
-    ctx.stack_.back()->set("cql-consistency", c);
+    ctx.stack_.back()->set("consistency", c);
     ctx.leave();
 };
 

diff --git a/src/lib/cql/cql_connection.cc b/src/lib/cql/cql_connection.cc
index fa4cd8dbe97dda95d2215583d0365d9c28ee02ed..a54f643c35e19426724442c86e351c1f65a188ef 100644 (file)
--- a/src/lib/cql/cql_connection.cc
+++ b/src/lib/cql/cql_connection.cc
@@ -76,17 +76,17 @@ CqlConnection::~CqlConnection() {
 
 CassConsistency CqlConnection::parseConsistency(std::string value) {
     static std::map<std::string, CassConsistency> consistency_map {
-        {"consistency-any", CASS_CONSISTENCY_ANY},
-        {"consistency-one", CASS_CONSISTENCY_ONE},
-        {"consistency-two", CASS_CONSISTENCY_TWO},
-        {"consistency-three", CASS_CONSISTENCY_THREE},
-        {"consistency-quorum", CASS_CONSISTENCY_QUORUM},
-        {"consistency-all", CASS_CONSISTENCY_ALL},
-        {"consistency-local-quorum", CASS_CONSISTENCY_LOCAL_QUORUM},
-        {"consistency-each-quorum", CASS_CONSISTENCY_EACH_QUORUM},
-        {"consistency-serial", CASS_CONSISTENCY_SERIAL},
-        {"consistency-local-serial", CASS_CONSISTENCY_LOCAL_SERIAL},
-        {"consistency-local-one", CASS_CONSISTENCY_LOCAL_ONE}
+        {"any", CASS_CONSISTENCY_ANY},
+        {"one", CASS_CONSISTENCY_ONE},
+        {"two", CASS_CONSISTENCY_TWO},
+        {"three", CASS_CONSISTENCY_THREE},
+        {"quorum", CASS_CONSISTENCY_QUORUM},
+        {"all", CASS_CONSISTENCY_ALL},
+        {"local-quorum", CASS_CONSISTENCY_LOCAL_QUORUM},
+        {"each-quorum", CASS_CONSISTENCY_EACH_QUORUM},
+        {"serial", CASS_CONSISTENCY_SERIAL},
+        {"local-serial", CASS_CONSISTENCY_LOCAL_SERIAL},
+        {"local-one", CASS_CONSISTENCY_LOCAL_ONE}
     };
     if (consistency_map.find(value) == consistency_map.end()) {
         return CASS_CONSISTENCY_UNKNOWN;
@@ -146,7 +146,7 @@ CqlConnection::openDatabase() {
     const char* consistency = NULL;
     std::string sconsistency;
     try {
-        sconsistency = getParameter("cql-consistency");
+        sconsistency = getParameter("consistency");
         consistency = sconsistency.c_str();
     } catch (...) {
         // No user. Fine, we'll use NULL.

diff --git a/src/lib/cql/cql_connection.h b/src/lib/cql/cql_connection.h
index f0fe4ec1e91eecafebe91b5ff8177ab29cfcb2a7..bc066f8620fa6d07584682ad7645eec3addaef19 100644 (file)
--- a/src/lib/cql/cql_connection.h
+++ b/src/lib/cql/cql_connection.h
@@ -149,7 +149,7 @@ public:
     /// - contact-points: IP addresses of the nodes to connect to (127.0.0.1)
     /// - port: The TCP port to use (9042)
     /// - user - credentials to use when connecting (no username)
-    /// - password - credentails to use when connecting (no password)
+    /// - password - credentials to use when connecting (no password)
     /// - reconnect-wait-time 2000
     /// - connect-timeout 5000
     /// - request-timeout 12000

diff --git a/src/lib/database/database_connection.cc b/src/lib/database/database_connection.cc
index ba7ff4301929992f64622058602b4b31ab9aad98..1922421e685431dbf786550bc3e2e6b5f4435cf9 100644 (file)
--- a/src/lib/database/database_connection.cc
+++ b/src/lib/database/database_connection.cc
@@ -194,7 +194,7 @@ DatabaseConnection::toElement(const ParameterMap& params) {
                    (keyword == "host") ||
                    (keyword == "name") ||
                    (keyword == "contact-points") ||
-                   (keyword == "cql-consistency") ||
+                   (keyword == "consistency") ||
                    (keyword == "keyspace")) {
             result->set(keyword, isc::data::Element::create(value));
         } else {

diff --git a/src/lib/database/dbaccess_parser.cc b/src/lib/database/dbaccess_parser.cc
index 23080fa06971f71d24c4f07d2389db42cd680b37..607e6d0a05065704b1b35798b3f4409731ac7c43 100644 (file)
--- a/src/lib/database/dbaccess_parser.cc
+++ b/src/lib/database/dbaccess_parser.cc
@@ -109,7 +109,7 @@ DbAccessParser::parse(std::string& access_string,
                 // name
                 // contact-points
                 // keyspace
-                // cql-consistency
+                // consistency
                 values_copy[param.first] = param.second->stringValue();
             }
         } catch (const isc::data::TypeError& ex) {

diff --git a/src/lib/database/tests/database_connection_unittest.cc b/src/lib/database/tests/database_connection_unittest.cc
index 1effe43e5667758f92d758a9f32d35084b9326c5..11e5ff4231b98291cb7b314114e528f812dcc08a 100644 (file)
--- a/src/lib/database/tests/database_connection_unittest.cc
+++ b/src/lib/database/tests/database_connection_unittest.cc
@@ -95,8 +95,8 @@ TEST_F(DatabaseConnectionCallbackTest, dbLostCallback) {
     /// Create the connection..
     DatabaseConnection datasrc(pmap);
 
-    /// We should be able to invoke the callback and glean
-    /// the correct reconnect contorl parameters from it.
+    /// We should be able to invoke the callback and get
+    /// the correct reconnect control parameters from it.
     bool ret = false;
     ASSERT_NO_THROW(ret = datasrc.invokeDbLostCallback());
     EXPECT_TRUE(ret);
@@ -260,6 +260,7 @@ TEST(DatabaseConnection, toElementDbAccessStringValid) {
         "{\n"
         "\"connect-timeout\" : 200, \n"
         "\"contact-points\": \"contact_str\", \n"
+        "\"consistency\": \"quorum\", \n"
         "\"host\": \"host_str\", \n"
         "\"keyspace\": \"keyspace_str\", \n"
         "\"lfc-interval\" : 100, \n"