[#2116] addressed review

diff --git a/configure.ac b/configure.ac
index b0c8389a9e43ed1a81f8715f5e76e1d84af40209..ba898dd2d8521e95fcb110f16411bbf0856d4cba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -831,7 +831,7 @@ AC_ARG_WITH([cql],
   [cql_config="$withval"])
 
 if test "${cql_config}" != "no" ; then
-    AC_MSG_ERROR([$CQL_CONFIG CAssandra is no longer supported])
+    AC_MSG_ERROR([$CQL_CONFIG Cassandra is no longer supported])
 fi
 
 # Check for sysrepo.

diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json
index 6b4a7fad02bb5c8f6aef17a7210df2d8f59a413e..cb69a53039dd91c17da53ffa981ab2c289ef39e0 100644 (file)
--- a/doc/examples/kea4/all-keys-netconf.json
+++ b/doc/examples/kea4/all-keys-netconf.json
@@ -334,19 +334,6 @@
                 // Type of the database, e.g. "mysql", "postgresql".
                 "type": "postgresql",
 
-                // User name to be used to access the database.
-                "user": "kea"
-            },
-            {
-                // Database password.
-                "password": "kea",
-
-                // Port on which the database is available.
-                "port": 9042,
-
-                // Type of the database, e.g. "mysql", "postgresql".
-                "type": "mysql",
-
                 // User name to be used to access the database.
                 "user": "kea",
 
@@ -456,7 +443,7 @@
             // because non stored leases will be lost upon Kea server restart.
             "persist": true,
 
-            // Lease database backend type, i.e. "memfile", "mysql", or
+            // Lease database backend type, i.e. "memfile", "mysql" or
             // "postgresql".
             "type": "memfile"
         },

diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json
index 4eb5d55e20c2fd0e02ba426b696af7a8c25bae8a..a2098225ef08137ff64adbc57e6633bc1b8e0cf5 100644 (file)
--- a/doc/examples/kea6/all-keys-netconf.json
+++ b/doc/examples/kea6/all-keys-netconf.json
@@ -294,19 +294,6 @@
                 // Type of the database, e.g. "mysql", "postgresql".
                 "type": "postgresql",
 
-                // User name to be used to access the database.
-                "user": "kea"
-            },
-            {
-                // Database password.
-                "password": "kea",
-
-                // Port on which the database is available.
-                "port": 9042,
-
-                // Type of the database, e.g. "mysql", "postgresql".
-                "type": "mysql",
-
                 // User name to be used to access the database.
                 "user": "kea",
 
@@ -400,7 +387,7 @@
             // because non stored leases will be lost upon Kea server restart.
             "persist": true,
 
-            // Lease database backend type, i.e. "memfile", "mysql", or
+            // Lease database backend type, i.e. "memfile", "mysql" or
             // "postgresql".
             "type": "memfile"
         },

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 8501d177060eabdd7f8c1397c8619b11be0ea7fe..38b1465b1fc9184067b85ad186461fe57621c282 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -425,7 +425,7 @@ Lease Database Configuration
 
 Lease database configuration is controlled through the
 ``Dhcp4``/``lease-database`` parameters. The database type must be set to
-``memfile``, ``mysql``, or ``postgresql``, e.g.:
+``memfile``, ``mysql`` or ``postgresql``, e.g.:
 
 ::
 

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index ab9891f30136bd607081c3f8074bf437654b6339..fa250596a244c869d0a7c52358b47c77f00f0c1c 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -382,7 +382,7 @@ Lease Database Configuration
 
 Lease database configuration is controlled through the
 ``Dhcp6``/``lease-database`` parameters. The database type must be set to
-``memfile``, ``mysql``, or ``postgresql``, e.g.:
+``memfile``, ``mysql`` or ``postgresql``, e.g.:
 
 ::
 

diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst
index 8c99bdfd398bc2c45908aa1b7e4862b50d75ac07..913825cc521111a3dde8da06fcb3e641ee86dd4b 100644 (file)
--- a/doc/sphinx/arm/hooks.rst
+++ b/doc/sphinx/arm/hooks.rst
@@ -1537,7 +1537,7 @@ table is part of the Kea database schemas.
 
 Configuration parameters are extended by standard lease database
 parameters as defined in :ref:`database-configuration4`. The ``type``
-parameter should be ``mysql``, ``postgresql``, or ``logfile``; when
+parameter should be ``mysql``, ``postgresql`` or ``logfile``; when
 it is absent or set to ``logfile``, files are used.
 
 This database feature is experimental. No specific tools are provided

diff --git a/doc/sphinx/arm/security.rst b/doc/sphinx/arm/security.rst
index 6bb03f596b09bb7650ff2c035421f76ceb4b99ba..ec7baa6db6d4e6c39195f03370b7d1dafd8f25a0 100644 (file)
--- a/doc/sphinx/arm/security.rst
+++ b/doc/sphinx/arm/security.rst
@@ -199,10 +199,9 @@ Limiting user permission to read or write the Kea configuration file is an impor
 Securing Database Connections
 -----------------------------
 
-Kea can use an external MySQL or PostgreSQL database to store configuration,
-host reservations, or leases, or for forensic logging. The use of databases is a
-popular feature, but it is optional; it is also possible to store data in a flat
-file on disk.
+Kea can use an external MySQL or PostgreSQL database to store configuration, host reservations,
+or/and leases, or/and for forensic logging. The use of databases is a popular feature, but it is optional;
+it is also possible to store data in a flat file on disk.
 
 When using a database, Kea stores and uses the following credentials to authenticate with the database:
 username, password, host, port, and database name. **These are stored in clear text

diff --git a/src/lib/yang/tests/config_unittests.cc b/src/lib/yang/tests/config_unittests.cc
index fae646b8b50fa36bd9ea67fc70d6adb2c34131b1..41f024737b116b429f97b0976f540db5f7f25e5e 100644 (file)
--- a/src/lib/yang/tests/config_unittests.cc
+++ b/src/lib/yang/tests/config_unittests.cc
@@ -325,7 +325,7 @@ TEST_F(ConfigTestIetfV6, validateIetf6) {
 TEST_F(ConfigTestKeaV4, examples4) {
     vector<string> examples = {
         "advanced.json",
-        //"all-keys-netconf.json",
+        "all-keys-netconf.json",
         "all-options.json",
         "backends.json",
         "classify.json",
@@ -365,7 +365,7 @@ TEST_F(ConfigTestKeaV4, examples4) {
 TEST_F(ConfigTestKeaV6, examples6) {
     vector<string> examples = {
         "advanced.json",
-        //"all-keys-netconf.json",
+        "all-keys-netconf.json",
         "all-options.json",
         "backends.json",
         "classify.json",