[#1616] fixed cql upgrade script and enabled unittest

diff --git a/src/bin/admin/tests/cql_tests.sh.in b/src/bin/admin/tests/cql_tests.sh.in
index 4f7b1c9bcf39bad2236fd41a7f56ac457f8f8aef..ffb6bfe42e463bcd75fbdf0257cd07516042305b 100644 (file)
--- a/src/bin/admin/tests/cql_tests.sh.in
+++ b/src/bin/admin/tests/cql_tests.sh.in
@@ -504,7 +504,4 @@ cql_upgrade_test
 cql_lease4_dump_test
 cql_lease6_dump_test
 cql_unused_subnet_id_test
-# TODO: cql_upgrade_hosts_test below is commented because `generate_key` in
-# upgrade_3.0_to_4.0.sh generates different keys than the ones in the reference
-# file. To be investigated...
-# cql_upgrade_hosts_test
+cql_upgrade_hosts_test

diff --git a/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in b/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
index d9a5cba81e380574c36c04fa3a1f39c747deb5d2..11f430a86b911c9f8fb7abaeb5d756eca7fa0b21 100644 (file)
--- a/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
+++ b/src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in
@@ -163,6 +163,8 @@ exit_now() {
 fill() {
     string=$1;shift
     count=$1;shift
+    length="${#string}"
+    count=$((count - length));
     fill_char=$1;shift
     value="$(printf "%${count}s" | sed "s/ /${fill_char}/g")${string}"
 }