From: Tomek Mrugalski Date: Wed, 5 Nov 2014 19:46:51 +0000 (+0100) Subject: [3599] Remaining unit-tests implemented. X-Git-Tag: kea-eng-20141219~9^2~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81f75cb84a6c698e636abb3190412193ee386ca4;p=thirdparty%2Fkea.git [3599] Remaining unit-tests implemented. --- diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in index e83db89ccf..f49ba1f6ce 100644 --- a/src/bin/admin/kea-admin.in +++ b/src/bin/admin/kea-admin.in @@ -132,7 +132,7 @@ mysql_init() { exit 1 fi - printf "Initializing database." + printf "Initializing database using script %s\n" $scripts_dir/mysql/dhcpdb_create.mysql mysql -B --user=$db_user --password=$db_password $db_name < $scripts_dir/mysql/dhcpdb_create.mysql ERRCODE=$? diff --git a/src/bin/admin/tests/dhcpdb_create_1.0.mysql b/src/bin/admin/tests/dhcpdb_create_1.0.mysql new file mode 100644 index 0000000000..10531e3f1e --- /dev/null +++ b/src/bin/admin/tests/dhcpdb_create_1.0.mysql @@ -0,0 +1,141 @@ +# Copyright (C) 2012-2013 Internet Systems Consortium. +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM +# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL +# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +# This is the BIND 10 DHCP schema specification for MySQL. +# +# The schema is reasonably portable (with the exception of the engine +# specification, which is MySQL-specific). Minor changes might be needed for +# other databases. + +# To create the schema, either type the command: +# +# mysql -u -p < dhcpdb_create.mysql +# +# ... at the command prompt, or log in to the MySQL database and at the "mysql>" +# prompt, issue the command: +# +# source dhcpdb_create.mysql + + +# Holds the IPv4 leases. +CREATE TABLE lease4 ( + address INT UNSIGNED PRIMARY KEY NOT NULL, # IPv4 address + hwaddr VARBINARY(20), # Hardware address + client_id VARBINARY(128), # Client ID + valid_lifetime INT UNSIGNED, # Length of the lease (seconds) + expire TIMESTAMP, # Expiration time of the lease + subnet_id INT UNSIGNED, # Subnet identification + fqdn_fwd BOOL, # Has forward DNS update been performed by a server + fqdn_rev BOOL, # Has reverse DNS update been performed by a server + hostname VARCHAR(255) # The FQDN of the client + ) ENGINE = INNODB; + + +# Create search indexes for lease4 table +# index by hwaddr and subnet_id +CREATE INDEX lease4_by_hwaddr_subnet_id ON lease4 (hwaddr, subnet_id); + +# index by client_id and subnet_id +CREATE INDEX lease4_by_client_id_subnet_id ON lease4 (client_id, subnet_id); + +# Holds the IPv6 leases. +# N.B. The use of a VARCHAR for the address is temporary for development: +# it will eventually be replaced by BINARY(16). +CREATE TABLE lease6 ( + address VARCHAR(39) PRIMARY KEY NOT NULL, # IPv6 address + duid VARBINARY(128), # DUID + valid_lifetime INT UNSIGNED, # Length of the lease (seconds) + expire TIMESTAMP, # Expiration time of the lease + subnet_id INT UNSIGNED, # Subnet identification + pref_lifetime INT UNSIGNED, # Preferred lifetime + lease_type TINYINT, # Lease type (see lease6_types + # table for possible values) + iaid INT UNSIGNED, # See Section 10 of RFC 3315 + prefix_len TINYINT UNSIGNED, # For IA_PD only + fqdn_fwd BOOL, # Has forward DNS update been performed by a server + fqdn_rev BOOL, # Has reverse DNS update been performed by a server + hostname VARCHAR(255) # The FQDN of the client + + ) ENGINE = INNODB; + +# Create search indexes for lease4 table +# index by iaid, subnet_id, and duid +CREATE INDEX lease6_by_iaid_subnet_id_duid ON lease6 (iaid, subnet_id, duid); + +# ... and a definition of lease6 types. This table is a convenience for +# users of the database - if they want to view the lease table and use the +# type names, they can join this table with the lease6 table. +# Make sure those values match Lease6::LeaseType enum (see src/bin/dhcpsrv/ +# lease_mgr.h) +CREATE TABLE lease6_types ( + lease_type TINYINT PRIMARY KEY NOT NULL, # Lease type code. + name VARCHAR(5) # Name of the lease type + ); +START TRANSACTION; +INSERT INTO lease6_types VALUES (0, "IA_NA"); # Non-temporary v6 addresses +INSERT INTO lease6_types VALUES (1, "IA_TA"); # Temporary v6 addresses +INSERT INTO lease6_types VALUES (2, "IA_PD"); # Prefix delegations +COMMIT; + +# Finally, the version of the schema. We start at 0.1 during development. +# This table is only modified during schema upgrades. For historical reasons +# (related to the names of the columns in the BIND 10 DNS database file), the +# first column is called "version" and not "major". +# +# NOTE: this MUST be kept in step with src/lib/dhcpsrv/tests/schema_copy.h, +# which defines the schema for the unit tests. If you are updating +# the version number, the schema has changed: please ensure that +# schema_copy.h has been updated as well. +CREATE TABLE schema_version ( + version INT PRIMARY KEY NOT NULL, # Major version number + minor INT # Minor version number + ); +START TRANSACTION; +INSERT INTO schema_version VALUES (1, 0); +COMMIT; + +# Notes: +# +# Indexes +# ======= +# It is likely that additional indexes will be needed. However, the +# increase in lookup performance from these will come at the expense +# of a decrease in performance during insert operations due to the need +# to update the indexes. For this reason, the need for additional indexes +# will be determined by experiment during performance tests. +# +# The most likely additional indexes will cover the following columns: +# +# expire +# To speed up the deletion of expired leases from the database. +# +# hwaddr and client_id +# For lease stability: if a client requests a new lease, try to find an +# existing or recently expired lease for it so that it can keep using the +# same IP address. +# +# Field Sizes +# =========== +# If any of the VARxxx field sizes are altered, the lengths in the MySQL +# backend source file (mysql_lease_mgr.cc) must be correspondingly changed. +# +# Portability +# =========== +# The "ENGINE = INNODB" on some tables is not portablea to another database +# and will need to be removed. +# +# Some columns contain binary data so are stored as VARBINARY instead of +# VARCHAR. This may be non-portable between databases: in this case, the +# definition should be changed to VARCHAR. diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in index f316284de2..130b439fc9 100644 --- a/src/bin/admin/tests/mysql_tests.sh.in +++ b/src/bin/admin/tests/mysql_tests.sh.in @@ -32,7 +32,7 @@ db_pass="keatest" db_name="keatest" # Set location of the kea-admin. -keactrl=@abs_top_builddir@/src/bin/admin/kea-admin +keaadmin=@abs_top_builddir@/src/bin/admin/kea-admin # Wipe all tables from the DB: mysql_wipe() { @@ -56,20 +56,50 @@ mysql_init_test() { # Let's wipe the whole database mysql_wipe - # Ok, now let's create a version 1.7 + # Ok, now let's initalize the database + ${keaadmin} init mysql -u $db_user -p $db_pass -n $db_name + ERRCODE=$? + + assert_eq 0 $ERRCODE "kea-admin init mysql returned non-zero status code %d, expected %d" + + # Ok, now let's check if the tables are indeed there. + # First table: schema_version. Should have 2 columns: version and minor. mysql -u$db_user -p$db_pass $db_name &>/dev/null </dev/null </dev/null </dev/null </dev/null </dev/null </dev/null </dev/null <