From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 26 Aug 2016 09:47:33 +0000 (+0200)
Subject: [4562] Updated Postgres upgrade scripts with DHCPv4 fixed fields.
X-Git-Tag: trac4633_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa35e2fe5441425932c8f997c23316f2863c5320;p=thirdparty%2Fkea.git

[4562] Updated Postgres upgrade scripts with DHCPv4 fixed fields.
---

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index ee842b7993..6fe61991a9 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -100,101 +100,101 @@ pgsql_upgrade_1_0_to_2_0() {
     # Added state column to lease4
     output=`pgsql_execute "select state from lease4;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "lease4 is missing state column. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "lease4 is missing state column. (expected status code %d, returned %d)"
 
     # Added state column to lease6
     output=`pgsql_execute "select state from lease6;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "lease6 is missing state column. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "lease6 is missing state column. (expected status code %d, returned %d)"
 
     # Added stored procedures for lease dumps
     output=`pgsql_execute "select lease4DumpHeader from lease4DumpHeader();"`
-    assert_eq 0 $ERRCODE "function lease4DumpHeader() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease4DumpHeader() broken or missing. (expected status code %d, returned %d)"
 
     output=`pgsql_execute "select address from lease4DumpData();"`
-    assert_eq 0 $ERRCODE "function lease4DumpData() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease4DumpData() broken or missing. (expected status code %d, returned %d)"
 
     output=`pgsql_execute "select lease6DumpHeader from lease6DumpHeader();"`
-    assert_eq 0 $ERRCODE "function lease6DumpHeader() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease6DumpHeader() broken or missing. (expected status code %d, returned %d)"
 
     output=`pgsql_execute "select address from lease6DumpData();"`
-    assert_eq 0 $ERRCODE "function lease6DumpData() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease6DumpData() broken or missing. (expected status code %d, returned %d)"
 }
 
 pgsql_upgrade_2_0_to_3_0() {
     # Added hwaddr, hwtype, and hwaddr_source columns to lease6 table
     output=`pgsql_execute "select hwaddr, hwtype, hwaddr_source from lease6;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "lease6 table not upgraded to 3.0 (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "lease6 table not upgraded to 3.0 (expected status code %d, returned %d)"
 
     # Added lease_hwaddr_source table
     output=`pgsql_execute "select hwaddr_source, name from lease_hwaddr_source;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "lease_hwaddr_source table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "lease_hwaddr_source table is missing or broken. (expected status code %d, returned %d)"
 
     # Added hosts table
-    output=`pgsql_execute "select host_id, dhcp_identifier, dhcp_identifier_type, dhcp4_subnet_id, dhcp6_subnet_id, ipv4_address, hostname, dhcp4_client_classes, dhcp6_client_classes from hosts;"`
+    output=`pgsql_execute "select host_id, dhcp_identifier, dhcp_identifier_type, dhcp4_subnet_id, dhcp6_subnet_id, ipv4_address, hostname, dhcp4_client_classes, dhcp6_client_classes, dhcp4_next_server, dhcp4_server_hostname, dhcp4_boot_file_name from hosts;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "hosts table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "hosts table is missing or broken. (expected status code %d, returned %d)"
 
     # Added ipv6_reservations table
     output=`pgsql_execute "select reservation_id, address, prefix_len, type, dhcp6_iaid, host_id from ipv6_reservations;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "ipv6_reservations table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "ipv6_reservations table is missing or broken. (expected status code %d, returned %d)"
 
     # Added dhcp4_options table
     output=`pgsql_execute "select option_id, code, value, formatted_value, space, persistent, dhcp_client_class, dhcp4_subnet_id, host_id, scope_id from dhcp4_options;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "dhcp4_options table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "dhcp4_options table is missing or broken. (expected status code %d, returned %d)"
 
     # Added dhcp6_options table
     output=`pgsql_execute "select option_id, code, value, formatted_value, space, persistent, dhcp_client_class, dhcp6_subnet_id, host_id,scope_id from dhcp6_options;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "dhcp6_options table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "dhcp6_options table is missing or broken. (expected status code %d, returned %d)"
 
     # Added  host_identifier_type table
     output=`pgsql_execute "select type, name from host_identifier_type;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "host_identifier_type table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "host_identifier_type table is missing or broken. (expected status code %d, returned %d)"
 
     # Added dhcp_option_scope table
     output=`pgsql_execute "select scope_id, scope_name from dhcp_option_scope;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "dhcp_option_scope table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "dhcp_option_scope table is missing or broken. (expected status code %d, returned %d)"
 
     # Added dhcp6_options table
     output=`pgsql_execute "select option_id, code, value, formatted_value, space, persistent, dhcp_client_class, dhcp6_subnet_id, host_id,scope_id from dhcp6_options;"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "dhcp6_options table is missing or broken. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "dhcp6_options table is missing or broken. (expected status code %d, returned %d)"
 
     # Added order by clause to lease4DumpData
     output=`pgsql_execute "select address from lease4DumpData();"`
-    assert_eq 0 $ERRCODE "function lease4DumpData() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease4DumpData() broken or missing. (expected status code %d, returned %d)"
     output=`pgsql_execute "\sf lease4DumpData"`
-    assert_eq 0 $ERRCODE "\sf of lease4DumpData failed. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "\sf of lease4DumpData failed. (expected status code %d, returned %d)"
     count=`echo $output | grep -ic "order by l\.address"`
     assert_eq 1 $count "lease4DumpData is missing order by clause"
 
     # Added hwaddr columns to lease6DumpHeader
     output=`pgsql_execute "select lease6DumpHeader from lease6DumpHeader();"`
-    assert_eq 0 $ERRCODE "function lease6DumpHeader() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease6DumpHeader() broken or missing. (expected status code %d, returned %d)"
     count=`echo $output | grep -ic "hwaddr,hwtype,hwaddr_source"`
     assert_eq 1 $count "lease6DumpHeader is missing hwaddr columns"
 
     # Added hwaddr columns to lease6DumpData
     output=`pgsql_execute "select hwaddr,hwttype,hwaddr_source from lease6DumpData();"`
-    assert_eq 0 $ERRCODE "function lease6DumpData() broken or missing. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "function lease6DumpData() broken or missing. (expected status code %d, returned %d)"
 
     # Added order by clause to lease6DumpData
     output=`pgsql_execute "\sf lease4DumpData"`
-    assert_eq 0 $ERRCODE "\sf of lease4DumpData failed. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "\sf of lease4DumpData failed. (expected status code %d, returned %d)"
     count=`echo $output | grep -ic "order by l\.address"`
     assert_eq 1 $count "lease4DumpData is missing order by clause"
 
     # lease_hardware_source should have row for source = 0
     output=`pgsql_execute "select count(hwaddr_source) from lease_hwaddr_source where hwaddr_source = 0 and name='HWADDR_SOURCE_UNKNOWN';"`
     ERRCODE=$?
-    assert_eq 0 $ERRCODE "select from lease_hwaddr_source failed. (returned status code %d, expected %d)"
+    assert_eq 0 $ERRCODE "select from lease_hwaddr_source failed. (expected status code %d, returned %d)"
     assert_eq 1 "$output" "lease_hwaddr_source does not contain entry for HWADDR_SOURCE_UKNOWN. (record count %d, expected %d)"
 
     # Verify upgraded schemd reports version 3.0.