From: Francis Dupont <fdupont@isc.org>
Date: Thu, 9 Jul 2020 10:51:13 +0000 (+0200)
Subject: [#1196] Renamed new command
X-Git-Tag: Kea-1.7.10~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e4a569f227305811b3afa21ee6b4331b87eae6;p=thirdparty%2Fkea.git

[#1196] Renamed new command
---

diff --git a/ChangeLog b/ChangeLog
index 45db194a0e..81e4533dc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1771.	[func]		fdupont
+	Added a stats-recount command to kea-admin tool, which recounts
+	cached statistics in MySQL and PostgreSQL lease databases.
+
 1770.	[func]		fdupont
 	Added kea-admin lease-stat-recount command which recounts cached
 	statistics in MySQL and PostgreSQL lease databases.
diff --git a/doc/sphinx/man/kea-admin.8.rst b/doc/sphinx/man/kea-admin.8.rst
index 35617c9030..f93b4ee7f9 100644
--- a/doc/sphinx/man/kea-admin.8.rst
+++ b/doc/sphinx/man/kea-admin.8.rst
@@ -50,7 +50,7 @@ Arguments
       to be used as a diagnostic tool, so it provides a portable,
       human-readable form of the lease data.
 
-   **lease-stat-recount**
+   **stats-recount**
       Recounts lease statistics for MySQL or PostgreSQL database.
 
 ``backend``
diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 1e4b5a74c2..98dd5eae30 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -60,7 +60,7 @@ usage() {
     printf " -             for checking databaseB version when preparing for an upgrade.\n"
     printf " - db-upgrade: Upgrades your database scheme\n"
     printf " - lease-dump: Dumps current leases to a CSV file\n"
-    printf " - lease-stat-recount: Recounts lease statistics\n"
+    printf " - stats-recount: Recounts lease statistics\n"
     printf "\n"
     printf "BACKEND - one of the supported backends: memfile|mysql|pgsql|cql\n"
     printf "\n"
@@ -681,7 +681,7 @@ if test "${command}" = "-v" || test "${command}" = "--version" ; then
     exit 0
 fi
 
-is_in_list "${command}" "db-init db-version db-upgrade lease-dump lease-stat-recount"
+is_in_list "${command}" "db-init db-version db-upgrade lease-dump stats-recount"
 if [ ${_inlist} -eq 0 ]; then
     log_error "invalid command: ${command}"
     usage
@@ -860,7 +860,7 @@ case ${command} in
                 ;;
             esac
         ;;
-    lease-stat-recount)
+    stats-recount)
         case ${backend} in
             memfile)
                 log_info "memfile does not keep lease statistics"
diff --git a/src/bin/admin/kea-admin.rst b/src/bin/admin/kea-admin.rst
index b1e7065e03..6abd175699 100644
--- a/src/bin/admin/kea-admin.rst
+++ b/src/bin/admin/kea-admin.rst
@@ -54,7 +54,7 @@ OPTIONS
         meant to be used as a diagnostic tool, so it provides a portable,
         human-readable form of the lease data.
 
-   lease-stat-recount
+   stats-recount
         Recounts lease statistics for MySQL or PostgreSQL database.
 
 ``backend``
diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index e2e627ae00..e325f166c0 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -1194,10 +1194,10 @@ mysql_lease_stat_recount_test() {
     run_statement "change v6 stats" "$qry"
 
     # Recount all statistics from scratch.
-    ${keaadmin} lease-stat-recount mysql -u $db_user -p $db_password -n $db_name
+    ${keaadmin} stats-recount mysql -u $db_user -p $db_password -n $db_name
     ERRCODE=$?
 
-    assert_eq 0 $ERRCODE "kea-admin lease-stat-recount mysql returned non-zero status code %d, expected %d"
+    assert_eq 0 $ERRCODE "kea-admin stats-recount mysql returned non-zero status code %d, expected %d"
 
     #
     # First we'll verify lease4_stats are correct after recount.
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index bd443deec5..1e13765618 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -835,10 +835,10 @@ pgsql_lease_stat_recount_test() {
     run_statement "change v6 stats" "$qry"
 
     # Recount all statistics from scratch.
-    ${keaadmin} lease-stat-recount pgsql -u $db_user -p $db_password -n $db_name
+    ${keaadmin} stats-recount pgsql -u $db_user -p $db_password -n $db_name
     ERRCODE=$?
 
-    assert_eq 0 $ERRCODE "kea-admin lease-stat-recount pgsql returned non-zero status code %d, expected %d"
+    assert_eq 0 $ERRCODE "kea-admin stats-recount pgsql returned non-zero status code %d, expected %d"
 
     #
     # First we'll verify lease4_stats are correct after recount.