[master] Merge branch 'github37' (Cassandra host reservations)

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

diff --cc configure.ac
Simple merge

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge

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

diff --cc src/lib/dhcpsrv/host.h
Simple merge

diff --cc src/lib/dhcpsrv/mysql_host_data_source.cc
Simple merge

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
index bdf606652fafdfb4bdd7b884e77c7ba2a91cbf24,52ffe3a588db29d90fcb140a5ccfba6da62fd21d..adcec08d21b358dfef39153b8939d96845c01345
--- 1/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
--- 2/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
@@@ -381,24 -399,13 +410,26 @@@ GenericHostDataSourceTest::compareOptio
              OptionDescriptor desc2 = cfg2->get(space, desc1.option_->getType());
              // Compare persistent flag.
              EXPECT_EQ(desc1.persistent_, desc2.persistent_)
-                 << "failed for option " << space << "." << desc1.option_->getType();
+                 << "failed for option " << space << "."
+                 << desc1.option_->getType();
              // Compare formatted value.
              EXPECT_EQ(desc1.formatted_value_, desc2.formatted_value_)
-                 << "failed for option " << space << "." << desc1.option_->getType();
+                 << "failed for option " << space << "."
+                 << desc1.option_->getType();
  
 +            // Compare user context.
 +            ConstElementPtr ctx1 = desc1.getContext();
 +            ConstElementPtr ctx2 = desc2.getContext();
 +            if (ctx1) {
 +                EXPECT_TRUE(ctx2);
 +                if (ctx2) {
 +                    EXPECT_EQ(*ctx1, *ctx2)
 +                        << "failed for option " << space << "." << desc1.option_->getType();
 +                }
 +            } else {
 +                EXPECT_FALSE(ctx2);
 +            }
 +
              // Retrieve options.
              Option* option1 = desc1.option_.get();
              Option* option2 = desc2.option_.get();
@@@ -1247,15 -1213,15 +1281,15 @@@ GenericHostDataSourceTest::testMultiple
      host2->addReservation(resv1);
  
      // Check if reservations are the same
-     compareReservations6(host1->getIPv6Reservations(), host2->getIPv6Reservations());
- 
+     compareReservations6(host1->getIPv6Reservations(),
+                          host2->getIPv6Reservations());
  }
  
 -void
 -GenericHostDataSourceTest::testOptionsReservations4(const bool formatted) {
 +void GenericHostDataSourceTest::testOptionsReservations4(const bool formatted,
 +                                                         ConstElementPtr user_context) {
      HostPtr host = initializeHost4("192.0.2.5", Host::IDENT_HWADDR);
      // Add a bunch of DHCPv4 and DHCPv6 options for the host.
 -    ASSERT_NO_THROW(addTestOptions(host, formatted, DHCP4_ONLY));
 +    ASSERT_NO_THROW(addTestOptions(host, formatted, DHCP4_ONLY, user_context));
      // Insert host and the options into respective tables.
      ASSERT_NO_THROW(hdsptr_->add(host));
      // Subnet id will be used in queries to the database.

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

diff --cc src/share/database/scripts/mysql/Makefile.am
index cf2e4b2eaada2ffb2ab46346b89f43acbceb9d97,d5eb5d474a6cea3fc149e014b14dbf1dcbda5d10..cfc8134d96307a99d4012e50045cc13d5b1aef54
--- 1/src/share/database/scripts/mysql/Makefile.am
--- 2/src/share/database/scripts/mysql/Makefile.am
+++ b/src/share/database/scripts/mysql/Makefile.am
@@@ -9,9 -9,7 +9,8 @@@ sqlscripts_DATA += upgrade_3.0_to_4.0.s
  sqlscripts_DATA += upgrade_4.0_to_4.1.sh
  sqlscripts_DATA += upgrade_4.1_to_5.0.sh
  sqlscripts_DATA += upgrade_5.0_to_5.1.sh
 +sqlscripts_DATA += upgrade_5.1_to_6.0.sh
  
- 
  DISTCLEANFILES = upgrade_1.0_to_2.0.sh
  DISTCLEANFILES += upgrade_2.0_to_3.0.sh
  DISTCLEANFILES += upgrade_3.0_to_4.0.sh