GitLab

Addressed a couple of minor issues and added unit tests for
switching between various lease database backends.

In such case, the server will use a default configuration - memfile
lease database backend.

Jiri Popelka authored Dec 23, 2015 and Tomek Mrugalski committed Dec 23, 2015

fixes:
mysql_host_data_source.cc:236:33: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive]
                 bind_[1].length = &dhcp_identifier_length_;
                                 ^
mysql_host_data_source.cc:243:33: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive]
                 bind_[1].length = &dhcp_identifier_length_;
                                 ^
mysql_host_data_source.cc:344:25: error: invalid conversion from 'size_t* {aka unsigned int*}' to 'long unsigned int*' [-fpermissive]
         bind_[1].length = &dhcp_identifier_length_;

note some misspellings are in the short description but the log ID
itself is not changed (no spelling issue there)

All MySQL text to create tables sets ENGINE to INNODB
MySQL unit tests now reliably drop the "hosts" table

src/bin/admin/scripts/mysql/dhcpdb_create.mysql
    Added "ENGINE = INNODB" table creates where needed

src/bin/admin/scripts/mysql/upgrade_1.0_to_2.0.sh.in
src/bin/admin/scripts/mysql/upgrade_2.0_to_3.0.sh.in
    Added "ENGINE = INNODB" table creates where needed

src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
    Reversed order of reference file to match INNODB result

src/bin/admin/tests/dhcpdb_create_1.0.mysql
    Added "ENGINE = INNODB" table creates where needed

src/bin/admin/tests/mysql_tests.sh.in
    Removed unnecessary explicit drop of ipv6_reservations

src/lib/dhcpsrv/tests/mysql_schema.cc
    Added MySQL error output on statement failures

src/lib/dhcpsrv/tests/schema_mysql_copy.h
    const char* destroy_statement[]
        Added statement to turn off referential integrity checks, so all
        tables will get dropped.  "hosts" table was being left behind.

    const char* create_statement[]
        Added "ENGINE = INNODB" table creates where needed

    Added mention of hosts db to message text for DHCPSRV_MYSQL_HOST_DB_GET_VERSION

src/lib/dhcpsrv/host_data_source_factory.cc
    HostDataSourceFactory::create(const std::string& dbaccess)
        - Removed logging from exception throwing conditions
        - Minor clean up of the method itself

src/lib/dhcpsrv/dhcpsrv_messages.mes
    Removed obsoleted error messages:
        DHCPSRV_HOSTDB_NOTYPE
        DHCPSRV_UNKNOWN_HOST_DB

This reverts commit 8f2a1f8a, reversing
changes made to ed7edadc.

This  merge introduced regressions in our build farm and revealed
issues in the DHCP4o6 IPC code. It also revealed some differences
in sockets handling under Linux and BSD. Rather than continue
patching this here, we should work on the branch to resolve all
issues and then merge 1.1.

Added missing fctnl.h include. Okayed on jabber.

Removed debug leftover and changed 'responds' to 'answers'.

src/lib/dhcpsrv/dhcpsrv_messages.mes
    Added hosts database specific messages

src/lib/dhcpsrv/host_data_source_factory.cc
src/lib/dhcpsrv/mysql_host_data_source.cc
    Updated log statements with hosts database messages

 - Includes fix in AllocEngine6Test ctor, provided by Thomas

This prevents compilation failure on OS-X. Reviewed and approved
on jabber.

# Conflicts:
#	src/lib/dhcpsrv/mysql_lease_mgr.cc
#	src/lib/dhcpsrv/mysql_lease_mgr.h