[github36] Merge branch 'cassandra-host-data-source-stress-test' of https://github...

# Conflicts:
#	src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc

diff --cc configure.ac
Simple merge

diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge

diff --cc src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
index e8b5544da1c18cb2af12c9cda567e1b65ee8aa9e,ec24d550e8f86d749966f0b1680c3b912b02f586..bb551336160ee3ae687fe275e66f681d06df3bae
--- 1/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
--- 2/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
@@@ -511,56 -513,14 +511,66 @@@ TEST_F(CqlHostDataSourceTest, testAddRo
          DbOperationError);
  }
  
 +// This test checks that siaddr, sname, file fields can be retrieved
 +/// from a database for a host.
 +/// @todo: Uncomment this after 5507 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_messageFields) {
 +    testMessageFields4();
 +}
 +
 +// Check that delete(subnet-id, addr4) works.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_deleteByAddr4) {
 +    testDeleteByAddr4();
 +}
 +
 +// Check that delete(subnet4-id, identifier-type, identifier) works.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_deleteById4) {
 +    testDeleteById4();
 +}
 +
 +// Check that delete(subnet4-id, identifier-type, identifier) works,
 +// even when options are present.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_deleteById4Options) {
 +    testDeleteById4Options();
 +}
 +
 +// Check that delete(subnet6-id, identifier-type, identifier) works.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_deleteById6) {
 +    testDeleteById6();
 +}
 +
 +// Check that delete(subnet6-id, identifier-type, identifier) works,
 +// even when options are present.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_deleteById6Options) {
 +    testDeleteById6Options();
 +}
 +
 +// Tests that multiple reservations without IPv4 addresses can be
 +// specified within a subnet.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_testMultipleHostsNoAddress4) {
 +    testMultipleHostsNoAddress4();
 +}
 +
 +// Tests that multiple hosts can be specified within an IPv6 subnet.
 +/// @todo: Uncomment this after #5506 is implemented.
 +TEST_F(CqlHostDataSourceTest, DISABLED_testMultipleHosts6) {
 +    testMultipleHosts6();
 +}
 +
+ TEST_F(CqlHostDataSourceTest, DISABLED_stressTest) {
+     // Run with 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4092, 8192,
+     // 16384 & 32768 hosts.
+     for (unsigned int i = 0X0001U; i < 0xfffdU; i <<= 1) {
+         initializeTest();
+         stressTest(i);
+         destroyTest();
+     }
+ }
+ 
  }  // namespace

diff --cc src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
Simple merge