src/lib/dhcpsrv/cfg_option.*
CfgOption::replace() - new method to update an OptionDescriptor
CfgOption::createDescriptorOption() - new returns a bool indicating
whether or not the option_ instance was replaced
src/lib/dhcpsrv/cfg_subnets4.*
CfgSubnets4::merge() - added cfg_def, now
creates options for each subnet and their pools.
src/lib/dhcpsrv/srv_config.cc
SrvConfig::merge4() - passes merged option defs
into subnets merge.
src/lib/dhcpsrv/subnet.h
Subnet::getPoolsWritable() - changed to public.
src/lib/dhcpsrv/cfg_option.*
CfgOption::createOptions(CfgOptionDefPtr cfg_def) -
new function which creates options for all of a cfg's
descriptors
CfgOption::merge() - calls createOptions()
src/lib/dhcpsrv/cfg_shared_networks.*
CfgSharedNetworks4::merge() - added cfg_def parameter and
call to populate the "other" networks' options
src/lib/dhcpsrv/srv_config.cc
SrvConfig::merge4() - passes merged option definitions
into shared network merge.
src/share/database/scripts/pgsql
wipe_data.sh.in - new file
doc/devel/unit-tests.dox
Removed MySQL/CQL only comment
several files:
Added commentary and removed superflous calls to destroyPgSQLSchema
src/lib/pgsql/testutils/pgsql_schema.*
destroyPgSQLSchema()
createPgSQLSchema() - modified to support data wiping
wipePgSQLData() - new function
src/lib/pgsql/tests
pgsql_schema.cc
pgsql_schema.h - deleted these. They appear to have
been added by mistake.
src/share/database/scripts/pgsql
wipe_data.sh.in - new file
doc/devel/unit-tests.dox
Removed MySQL/CQL only comment
several files:
Added commentary and removed superflous calls to destroyPgSQLSchema
src/lib/pgsql/testutils/pgsql_schema.*
destroyPgSQLSchema()
createPgSQLSchema() - modified to support data wiping
wipePgSQLData() - new function
src/lib/pgsql/tests
pgsql_schema.cc
pgsql_schema.h - deleted these. They appear to have
been added by mistake.
Data wiping is on by default, for both MySQL and CQL
(not yet implemented for Postgresql) and but can be
overridden by KEA_TEST_DB_WIPE_DATA_ONLY.
src/lib/mysql/testutils/mysql_schema.*
destroyMySQLSchema()
createMySQLSchema() - added check of softWipeEnabled() to
see if env var has turned it OFF.
Changed CQL to work the same way as MySQL:
src/share/database/scripts/cql
wipe_data.sh.in - new file, replaces soft_wipe.cql
src/lib/cql/testutils/cql_schema.*
destroyCqlSchema() - now destroys the schema
if data wipe fails or is disabled
createCqlSchema() - now drops/creates the schema
if data wipe fails or is disabled.
runCqlScript(() - added request-timeout to prevent
timeout errors in slow environments
wipeCqlData(bool show_err) - new function that
attempts to run the wipe shell script
src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
Removed now superflous destroyCqlSchema calls
src/lib/cql/testutils/cql_schema.*
Modified to use common softWipeEnabled(), which
defaults to true
src/lib/database/testutils/schema.*
bool softWipeEnabled() - new function that checks
env varible to determine if DB data wiping is enabled
(default is true/enabled)
src/lib/mysql/testutils/mysql_schema.*
createMySQLSchema()
destroyMySQLSchema()- now softWipeEnabled() to allow
data wiping to be turned on/off
src/share/database/scripts/mysql/wipe_data.sh.in
Added better error messaging
several files:
Removed extraneous calls to destroyMySQLSchema, added
comments
