]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#2275] Refactored MySQL CB DHCPv4 unit tests
authorThomas Markwalder <tmark@isc.org>
Thu, 20 Jan 2022 12:15:52 +0000 (07:15 -0500)
committerThomas Markwalder <tmark@isc.org>
Wed, 26 Jan 2022 19:54:39 +0000 (14:54 -0500)
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
    Refactored to use GenericConfigBackendDHCPv4Test,
    moved individual tests into functions in GenericConfigBackendDHCPv4Test

src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc

src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.*
    Added functions for individual tests taken from
    mysql_cb_dhcp4_unittest.cc

src/lib/dhcpsrv/testutils/mysql_generic_backend_unittest.*
    MySqlGenericBackendTest::countRows() - chagned to static

src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp4_unittest.cc
src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.cc
src/lib/dhcpsrv/testutils/generic_cb_dhcp4_unittest.h
src/lib/dhcpsrv/testutils/mysql_generic_backend_unittest.cc
src/lib/dhcpsrv/testutils/mysql_generic_backend_unittest.h

index 26805eee2a2cee32be8b4bfa68fdf76a35f5a904..06fd83ddc0ce99cb67d7f855c9a71f0431f52642 100644 (file)
@@ -5,27 +5,18 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
-#include <mysql_cb_dhcp4.h>
-#include <mysql_cb_impl.h>
-#include <database/database_connection.h>
 #include <database/db_exceptions.h>
 #include <database/server.h>
-#include <database/testutils/schema.h>
-#include <dhcp/dhcp6.h>
-#include <dhcp/libdhcp++.h>
-#include <dhcp/option4_addrlst.h>
-#include <dhcp/option_int.h>
-#include <dhcp/option_space.h>
-#include <dhcp/option_string.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/client_class_def.h>
 #include <dhcpsrv/config_backend_dhcp4_mgr.h>
-#include <dhcpsrv/pool.h>
-#include <dhcpsrv/subnet.h>
+#include <dhcpsrv/testutils/generic_cb_dhcp4_unittest.h>
+#include <dhcpsrv/testutils/generic_cb_recovery_unittest.h>
 #include <dhcpsrv/testutils/mysql_generic_backend_unittest.h>
 #include <dhcpsrv/testutils/test_utils.h>
+#include <mysql_cb_dhcp4.h>
 #include <mysql/testutils/mysql_schema.h>
 #include <testutils/multi_threading_utils.h>
+#include <testutils/gtest_utils.h>
 
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
@@ -67,47 +58,40 @@ public:
 };
 
 /// @brief Test fixture class for @c MySqlConfigBackendDHCPv4.
-class MySqlConfigBackendDHCPv4Test : public MySqlGenericBackendTest {
+class MySqlConfigBackendDHCPv4Test : public GenericConfigBackendDHCPv4Test {
 public:
 
     /// @brief Constructor.
-    MySqlConfigBackendDHCPv4Test()
-        : test_subnets_(), test_networks_(), test_option_defs_(),
-          test_options_(), test_client_classes_(), test_servers_(), timestamps_(),
-          cbptr_(), audit_entries_() {
-        // Ensure we have the proper schema with no transient data.
-        createMySQLSchema();
+    MySqlConfigBackendDHCPv4Test() {}
 
-        try {
-            // Create MySQL connection and use it to start the backend.
-            DatabaseConnection::ParameterMap params =
-                DatabaseConnection::parse(validMySQLConnectionString());
-            cbptr_.reset(new TestMySqlConfigBackendDHCPv4(params));
+    /// @brief Destructor.
+    virtual ~MySqlConfigBackendDHCPv4Test() {}
+    /// @brief Creates the MySQL back end schema
+    virtual void createSchema() {
+        createMySQLSchema();
+    }
 
-        } catch (...) {
-            std::cerr << "*** ERROR: unable to open database. The test\n"
-                         "*** environment is broken and must be fixed before\n"
-                         "*** the MySQL tests will run correctly.\n"
-                         "*** The reason for the problem is described in the\n"
-                         "*** accompanying exception output.\n";
-            throw;
-        }
+    /// @brief Destroys the MySQL back end schema
+    virtual void destroySchema() {
+        destroyMySQLSchema();
+    }
 
-        // Create test data.
-        initTestServers();
-        initTestOptions();
-        initTestSubnets();
-        initTestSharedNetworks();
-        initTestOptionDefs();
-        initTestClientClasses();
-        initTimestamps();
+    /// @brief Returns a valid PostgreSQL back end specific connection
+    /// string
+    std::string validConnectionString() {
+        return (validMySQLConnectionString());
     }
 
-    /// @brief Destructor.
-    virtual ~MySqlConfigBackendDHCPv4Test() {
-        cbptr_.reset();
-        // If data wipe enabled, delete transient data otherwise destroy the schema.
-        destroyMySQLSchema();
+    /// @brief Instantiates an instance of a MySQL DHCPv4 configuration
+    /// back end.
+    ///
+    /// @params Connection parameters describing the back end to create.
+    ///
+    /// @return Pointer to the newly created back end instance.
+    ConfigBackendDHCPv4Ptr backendFactory(db::DatabaseConnection::ParameterMap&
+                                          params) {
+
+        return (ConfigBackendDHCPv4Ptr(new TestMySqlConfigBackendDHCPv4(params)));
     }
 
     /// @brief Counts rows in a selected table in MySQL database.
@@ -133,5157 +117,397 @@ public:
 
         return (MySqlGenericBackendTest::countRows(conn, table));
     }
-
-    /// @brief Creates several servers used in tests.
-    void initTestServers() {
-        test_servers_.push_back(Server::create(ServerTag("server1"), "this is server 1"));
-        test_servers_.push_back(Server::create(ServerTag("server1"), "this is server 1 bis"));
-        test_servers_.push_back(Server::create(ServerTag("server2"), "this is server 2"));
-        test_servers_.push_back(Server::create(ServerTag("server3"), "this is server 3"));
-    }
-
-    /// @brief Creates several subnets used in tests.
-    void initTestSubnets() {
-        // First subnet includes all parameters.
-        std::string interface_id_text = "whale";
-        OptionBuffer interface_id(interface_id_text.begin(), interface_id_text.end());
-        ElementPtr user_context = Element::createMap();
-        user_context->set("foo", Element::create("bar"));
-
-        Subnet4Ptr subnet(new Subnet4(IOAddress("192.0.2.0"), 24, 30, 40, 60, 1024));
-        subnet->get4o6().setIface4o6("eth0");
-        subnet->get4o6().setInterfaceId(OptionPtr(new Option(Option::V6, D6O_INTERFACE_ID,
-                                                         interface_id)));
-        subnet->get4o6().setSubnet4o6(IOAddress("2001:db8:1::"), 64);
-        subnet->setFilename("/tmp/filename");
-        subnet->allowClientClass("home");
-        subnet->setIface("eth1");
-        subnet->setMatchClientId(false);
-        subnet->setSiaddr(IOAddress("10.1.2.3"));
-        subnet->setT2(323212);
-        subnet->addRelayAddress(IOAddress("10.2.3.4"));
-        subnet->addRelayAddress(IOAddress("10.5.6.7"));
-        subnet->setT1(1234);
-        subnet->requireClientClass("required-class1");
-        subnet->requireClientClass("required-class2");
-        subnet->setReservationsGlobal(false);
-        subnet->setReservationsInSubnet(false);
-        subnet->setSname("server-hostname");
-        subnet->setContext(user_context);
-        subnet->setValid(555555);
-        subnet->setAuthoritative(true);
-        subnet->setCalculateTeeTimes(true);
-        subnet->setT1Percent(0.345);
-        subnet->setT2Percent(0.444);
-        subnet->setDdnsSendUpdates(false);
-
-        Pool4Ptr pool1(new Pool4(IOAddress("192.0.2.10"), IOAddress("192.0.2.20")));
-        subnet->addPool(pool1);
-
-        Pool4Ptr pool2(new Pool4(IOAddress("192.0.2.50"), IOAddress("192.0.2.60")));
-        subnet->addPool(pool2);
-
-        // Add several options to the subnet.
-        subnet->getCfgOption()->add(test_options_[0]->option_,
-                                    test_options_[0]->persistent_,
-                                    test_options_[0]->space_name_);
-
-        subnet->getCfgOption()->add(test_options_[1]->option_,
-                                    test_options_[1]->persistent_,
-                                    test_options_[1]->space_name_);
-
-        subnet->getCfgOption()->add(test_options_[2]->option_,
-                                    test_options_[2]->persistent_,
-                                    test_options_[2]->space_name_);
-
-        test_subnets_.push_back(subnet);
-
-        // Adding another subnet with the same subnet id to test
-        // cases that this second instance can override existing
-        // subnet instance.
-        subnet.reset(new Subnet4(IOAddress("10.0.0.0"), 8, 20, 30, 40, 1024));
-
-        pool1.reset(new Pool4(IOAddress("10.0.0.10"), IOAddress("10.0.0.20")));
-        subnet->addPool(pool1);
-
-        pool1->getCfgOption()->add(test_options_[3]->option_,
-                                   test_options_[3]->persistent_,
-                                   test_options_[3]->space_name_);
-
-        pool1->getCfgOption()->add(test_options_[4]->option_,
-                                   test_options_[4]->persistent_,
-                                   test_options_[4]->space_name_);
-
-        pool2.reset(new Pool4(IOAddress("10.0.0.50"), IOAddress("10.0.0.60")));
-
-        pool2->allowClientClass("work");
-        pool2->requireClientClass("required-class3");
-        pool2->requireClientClass("required-class4");
-        user_context = Element::createMap();
-        user_context->set("bar", Element::create("foo"));
-        pool2->setContext(user_context);
-
-        subnet->addPool(pool2);
-
-        test_subnets_.push_back(subnet);
-
-        subnet.reset(new Subnet4(IOAddress("192.0.3.0"), 24, 20, 30, 40, 2048));
-        Triplet<uint32_t> null_timer;
-        subnet->setT1(null_timer);
-        subnet->setT2(null_timer);
-        subnet->setValid(null_timer);
-        subnet->setDdnsSendUpdates(true);
-        subnet->setDdnsOverrideNoUpdate(true);
-        subnet->setDdnsOverrideClientUpdate(false);
-        subnet->setDdnsReplaceClientNameMode(D2ClientConfig::ReplaceClientNameMode::RCM_WHEN_PRESENT);
-        subnet->setDdnsGeneratedPrefix("myhost");
-        subnet->setDdnsQualifyingSuffix("example.org");
-
-        subnet->getCfgOption()->add(test_options_[0]->option_,
-                                    test_options_[0]->persistent_,
-                                    test_options_[0]->space_name_);
-
-        test_subnets_.push_back(subnet);
-
-        // Add a subnet with all defaults.
-        subnet.reset(new Subnet4(IOAddress("192.0.4.0"), 24, Triplet<uint32_t>(),
-                                 Triplet<uint32_t>(), Triplet<uint32_t>(), 4096));
-        test_subnets_.push_back(subnet);
-    }
-
-    /// @brief Creates several subnets used in tests.
-    void initTestSharedNetworks() {
-        ElementPtr user_context = Element::createMap();
-        user_context->set("foo", Element::create("bar"));
-
-        SharedNetwork4Ptr shared_network(new SharedNetwork4("level1"));
-        shared_network->allowClientClass("foo");
-        shared_network->setIface("eth1");
-        shared_network->setMatchClientId(false);
-        shared_network->setT2(323212);
-        shared_network->addRelayAddress(IOAddress("10.2.3.4"));
-        shared_network->addRelayAddress(IOAddress("10.5.6.7"));
-        shared_network->setT1(1234);
-        shared_network->requireClientClass("required-class1");
-        shared_network->requireClientClass("required-class2");
-        shared_network->setReservationsGlobal(false);
-        shared_network->setReservationsInSubnet(false);
-        shared_network->setContext(user_context);
-        shared_network->setValid(5555);
-        shared_network->setCalculateTeeTimes(true);
-        shared_network->setT1Percent(0.345);
-        shared_network->setT2Percent(0.444);
-        shared_network->setSiaddr(IOAddress("192.0.1.2"));
-        shared_network->setSname("frog");
-        shared_network->setFilename("/dev/null");
-        shared_network->setAuthoritative(true);
-        shared_network->setDdnsSendUpdates(false);
-
-        // Add several options to the shared network.
-        shared_network->getCfgOption()->add(test_options_[2]->option_,
-                                            test_options_[2]->persistent_,
-                                            test_options_[2]->space_name_);
-
-        shared_network->getCfgOption()->add(test_options_[3]->option_,
-                                            test_options_[3]->persistent_,
-                                            test_options_[3]->space_name_);
-
-        shared_network->getCfgOption()->add(test_options_[4]->option_,
-                                            test_options_[4]->persistent_,
-                                            test_options_[4]->space_name_);
-
-        test_networks_.push_back(shared_network);
-
-        // Adding another shared network called "level1" to test
-        // cases that this second instance can override existing
-        // "level1" instance.
-        shared_network.reset(new SharedNetwork4("level1"));
-        test_networks_.push_back(shared_network);
-
-        // Add more shared networks.
-        shared_network.reset(new SharedNetwork4("level2"));
-        Triplet<uint32_t> null_timer;
-        shared_network->setT1(null_timer);
-        shared_network->setT2(null_timer);
-        shared_network->setValid(null_timer);
-        shared_network->setDdnsSendUpdates(true);
-        shared_network->setDdnsOverrideNoUpdate(true);
-        shared_network->setDdnsOverrideClientUpdate(false);
-        shared_network->setDdnsReplaceClientNameMode(D2ClientConfig::ReplaceClientNameMode::RCM_WHEN_PRESENT);
-        shared_network->setDdnsGeneratedPrefix("myhost");
-        shared_network->setDdnsQualifyingSuffix("example.org");
-
-        shared_network->getCfgOption()->add(test_options_[0]->option_,
-                                            test_options_[0]->persistent_,
-                                            test_options_[0]->space_name_);
-        test_networks_.push_back(shared_network);
-
-        shared_network.reset(new SharedNetwork4("level3"));
-        test_networks_.push_back(shared_network);
-    }
-
-    /// @brief Creates several option definitions used in tests.
-    void initTestOptionDefs() {
-        ElementPtr user_context = Element::createMap();
-        user_context->set("foo", Element::create("bar"));
-
-        OptionDefinitionPtr option_def(new OptionDefinition("foo", 234,
-                                                            DHCP4_OPTION_SPACE,
-                                                            "string",
-                                                            "espace"));
-        test_option_defs_.push_back(option_def);
-
-        option_def.reset(new OptionDefinition("bar", 234, DHCP4_OPTION_SPACE,
-                                              "uint32", true));
-        test_option_defs_.push_back(option_def);
-
-        option_def.reset(new OptionDefinition("fish", 235, DHCP4_OPTION_SPACE,
-                                              "record", true));
-        option_def->addRecordField("uint32");
-        option_def->addRecordField("string");
-        test_option_defs_.push_back(option_def);
-
-        option_def.reset(new OptionDefinition("whale", 236, "xyz", "string"));
-        test_option_defs_.push_back(option_def);
-
-        option_def.reset(new OptionDefinition("foobar", 234, DHCP4_OPTION_SPACE,
-                                              "uint64", true));
-        test_option_defs_.push_back(option_def);
-    }
-
-    /// @brief Creates several DHCP options used in tests.
-    void initTestOptions() {
-        ElementPtr user_context = Element::createMap();
-        user_context->set("foo", Element::create("bar"));
-
-        OptionDefSpaceContainer defs;
-
-        OptionDescriptor desc =
-            createOption<OptionString>(Option::V4, DHO_BOOT_FILE_NAME,
-                                       true, false, "my-boot-file");
-        desc.space_name_ = DHCP4_OPTION_SPACE;
-        desc.setContext(user_context);
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createOption<OptionUint8>(Option::V4, DHO_DEFAULT_IP_TTL,
-                                         false, true, 64);
-        desc.space_name_ = DHCP4_OPTION_SPACE;
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createOption<OptionUint32>(Option::V4, 1, false, false, 312131),
-        desc.space_name_ = "vendor-encapsulated-options";
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createAddressOption<Option4AddrLst>(254, true, true,
-                                                   "192.0.2.3");
-        desc.space_name_ = DHCP4_OPTION_SPACE;
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createEmptyOption(Option::V4, 1, true);
-        desc.space_name_ = "isc";
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createAddressOption<Option4AddrLst>(2, false, true, "10.0.0.5",
-                                                   "10.0.0.3", "10.0.3.4");
-        desc.space_name_ = "isc";
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createOption<OptionString>(Option::V4, DHO_BOOT_FILE_NAME,
-                                          true, false, "my-boot-file-2");
-        desc.space_name_ = DHCP4_OPTION_SPACE;
-        desc.setContext(user_context);
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        desc = createOption<OptionString>(Option::V4, DHO_BOOT_FILE_NAME,
-                                          true, false, "my-boot-file-3");
-        desc.space_name_ = DHCP4_OPTION_SPACE;
-        desc.setContext(user_context);
-        test_options_.push_back(OptionDescriptorPtr(new OptionDescriptor(desc)));
-
-        // Add definitions for DHCPv4 non-standard options in case we need to
-        // compare subnets, networks and pools in JSON format. In that case,
-        // the @c toElement functions require option definitions to generate the
-        // proper output.
-        defs.addItem(OptionDefinitionPtr(new OptionDefinition(
-                         "vendor-encapsulated-1", 1,
-                         "vendor-encapsulated-options", "uint32")));
-        defs.addItem(OptionDefinitionPtr(new OptionDefinition(
-                         "option-254", 254, DHCP4_OPTION_SPACE,
-                         "ipv4-address", true)));
-        defs.addItem(OptionDefinitionPtr(new OptionDefinition("isc-1", 1, "isc", "empty")));
-        defs.addItem(OptionDefinitionPtr(new OptionDefinition("isc-2", 2, "isc", "ipv4-address", true)));
-
-        // Register option definitions.
-        LibDHCP::setRuntimeOptionDefs(defs);
-    }
-
-    /// @brief Creates several client classes used in tests.
-    void initTestClientClasses() {
-        ExpressionPtr match_expr = boost::make_shared<Expression>();
-        CfgOptionPtr cfg_option = boost::make_shared<CfgOption>();
-        auto class1 = boost::make_shared<ClientClassDef>("foo", match_expr, cfg_option);
-        class1->setRequired(true);
-        class1->setNextServer(IOAddress("1.2.3.4"));
-        class1->setSname("cool");
-        class1->setFilename("epc.cfg");
-        class1->setValid(Triplet<uint32_t>(30, 60, 90));
-        test_client_classes_.push_back(class1);
-
-        auto class2 = boost::make_shared<ClientClassDef>("bar", match_expr, cfg_option);
-        class2->setTest("member('foo')");
-        test_client_classes_.push_back(class2);
-
-        auto class3 = boost::make_shared<ClientClassDef>("foobar", match_expr, cfg_option);
-        class3->setTest("member('foo') and member('bar')");
-        test_client_classes_.push_back(class3);
-    }
-
-    /// @brief Initialize posix time values used in tests.
-    void initTimestamps() {
-        // Current time minus 1 hour to make sure it is in the past.
-        timestamps_["today"] = boost::posix_time::second_clock::local_time()
-            - boost::posix_time::hours(1);
-        // One second after today.
-        timestamps_["after today"] = timestamps_["today"] + boost::posix_time::seconds(1);
-        // Yesterday.
-        timestamps_["yesterday"] = timestamps_["today"] - boost::posix_time::hours(24);
-        // One second after yesterday.
-        timestamps_["after yesterday"] = timestamps_["yesterday"] + boost::posix_time::seconds(1);
-        // Two days ago.
-        timestamps_["two days ago"] = timestamps_["today"] - boost::posix_time::hours(48);
-        // Tomorrow.
-        timestamps_["tomorrow"] = timestamps_["today"] + boost::posix_time::hours(24);
-        // One second after tomorrow.
-        timestamps_["after tomorrow"] = timestamps_["tomorrow"] + boost::posix_time::seconds(1);
-    }
-
-    /// @brief Logs audit entries in the @c audit_entries_ member.
-    ///
-    /// This function is called in case of an error.
-    ///
-    /// @param server_tag Server tag for which the audit entries should be logged.
-    std::string logExistingAuditEntries(const std::string& server_tag) {
-        std::ostringstream s;
-
-        auto& mod_time_idx = audit_entries_[server_tag].get<AuditEntryModificationTimeIdTag>();
-
-        for (auto audit_entry_it = mod_time_idx.begin();
-             audit_entry_it != mod_time_idx.end();
-             ++audit_entry_it) {
-            auto audit_entry = *audit_entry_it;
-            s << audit_entry->getObjectType() << ", "
-              << audit_entry->getObjectId() << ", "
-              << static_cast<int>(audit_entry->getModificationType()) << ", "
-              << audit_entry->getModificationTime() << ", "
-              << audit_entry->getRevisionId() << ", "
-              << audit_entry->getLogMessage()
-              << std::endl;
-        }
-
-        return (s.str());
-    }
-
-    /// @brief Tests that the new audit entry is added.
-    ///
-    /// This method retrieves a collection of the existing audit entries and
-    /// checks that the new one has been added at the end of this collection.
-    /// It then verifies the values of the audit entry against the values
-    /// specified by the caller.
-    ///
-    /// @param exp_object_type Expected object type.
-    /// @param exp_modification_type Expected modification type.
-    /// @param exp_log_message Expected log message.
-    /// @param server_selector Server selector to be used for next query.
-    /// @param new_entries_num Number of the new entries expected to be inserted.
-    /// @param max_tested_entries Maximum number of entries tested.
-    void testNewAuditEntry(const std::string& exp_object_type,
-                           const AuditEntry::ModificationType& exp_modification_type,
-                           const std::string& exp_log_message,
-                           const ServerSelector& server_selector = ServerSelector::ALL(),
-                           const size_t new_entries_num = 1,
-                           const size_t max_tested_entries = 65535) {
-
-        // Get the server tag for which the entries are fetched.
-        std::string tag;
-        if (server_selector.getType() == ServerSelector::Type::ALL) {
-            // Server tag is 'all'.
-            tag = "all";
-
-        } else {
-            auto tags = server_selector.getTags();
-            // This test is not meant to handle multiple server tags all at once.
-            if (tags.size() > 1) {
-                ADD_FAILURE() << "Test error: do not use multiple server tags";
-
-            } else if (tags.size() == 1) {
-                // Get the server tag for which we run the current test.
-                tag = tags.begin()->get();
-            }
-        }
-
-        auto audit_entries_size_save = audit_entries_[tag].size();
-
-        // Audit entries for different server tags are stored in separate
-        // containers.
-        audit_entries_[tag] = cbptr_->getRecentAuditEntries(server_selector,
-                                                            timestamps_["two days ago"], 0);
-        ASSERT_EQ(audit_entries_size_save + new_entries_num, audit_entries_[tag].size())
-            << logExistingAuditEntries(tag);
-
-        auto& mod_time_idx = audit_entries_[tag].get<AuditEntryModificationTimeIdTag>();
-
-        // Iterate over specified number of entries starting from the most recent
-        // one and check they have correct values.
-        for (auto audit_entry_it = mod_time_idx.rbegin();
-             ((std::distance(mod_time_idx.rbegin(), audit_entry_it) < new_entries_num) &&
-              (std::distance(mod_time_idx.rbegin(), audit_entry_it) < max_tested_entries));
-             ++audit_entry_it) {
-            auto audit_entry = *audit_entry_it;
-            EXPECT_EQ(exp_object_type, audit_entry->getObjectType())
-                << logExistingAuditEntries(tag);
-            EXPECT_EQ(exp_modification_type, audit_entry->getModificationType())
-                << logExistingAuditEntries(tag);
-            EXPECT_EQ(exp_log_message, audit_entry->getLogMessage())
-                << logExistingAuditEntries(tag);
-        }
-    }
-
-    /// @brief Holds pointers to subnets used in tests.
-    std::vector<Subnet4Ptr> test_subnets_;
-
-    /// @brief Holds pointers to shared networks used in tests.
-    std::vector<SharedNetwork4Ptr> test_networks_;
-
-    /// @brief Holds pointers to option definitions used in tests.
-    std::vector<OptionDefinitionPtr> test_option_defs_;
-
-    /// @brief Holds pointers to options used in tests.
-    std::vector<OptionDescriptorPtr> test_options_;
-
-    /// @brief Holds pointers to classes used in tests.
-    std::vector<ClientClassDefPtr> test_client_classes_;
-
-    /// @brief Holds pointers to the servers used in tests.
-    std::vector<ServerPtr> test_servers_;
-
-    /// @brief Holds timestamp values used in tests.
-    std::map<std::string, boost::posix_time::ptime> timestamps_;
-
-    /// @brief Holds pointer to the backend.
-    boost::shared_ptr<ConfigBackendDHCPv4> cbptr_;
-
-    /// @brief Holds the most recent audit entries.
-    std::map<std::string, AuditEntryCollection> audit_entries_;
 };
 
-// This test verifies that the expected backend type is returned.
 TEST_F(MySqlConfigBackendDHCPv4Test, getType) {
-    DatabaseConnection::ParameterMap params;
-    params["name"] = "keatest";
-    params["password"] = "keatest";
-    params["user"] = "keatest";
-    ASSERT_NO_THROW(cbptr_.reset(new MySqlConfigBackendDHCPv4(params)));
-    ASSERT_NE(cbptr_->getParameters(), DatabaseConnection::ParameterMap());
-    EXPECT_EQ("mysql", cbptr_->getType());
+    getTypeTest("mysql");
 }
 
-// This test verifies that by default localhost is returned as MySQL connection
-// host.
 TEST_F(MySqlConfigBackendDHCPv4Test, getHost) {
-    DatabaseConnection::ParameterMap params;
-    params["name"] = "keatest";
-    params["password"] = "keatest";
-    params["user"] = "keatest";
-    ASSERT_NO_THROW(cbptr_.reset(new MySqlConfigBackendDHCPv4(params)));
-    ASSERT_NE(cbptr_->getParameters(), DatabaseConnection::ParameterMap());
-    EXPECT_EQ("localhost", cbptr_->getHost());
+    getHostTest();
 }
 
-// This test verifies that by default port of 0 is returned as MySQL connection
-// port.
 TEST_F(MySqlConfigBackendDHCPv4Test, getPort) {
-    DatabaseConnection::ParameterMap params;
-    params["name"] = "keatest";
-    params["password"] = "keatest";
-    params["user"] = "keatest";
-    ASSERT_NE(cbptr_->getParameters(), DatabaseConnection::ParameterMap());
-    ASSERT_NO_THROW(cbptr_.reset(new MySqlConfigBackendDHCPv4(params)));
-    EXPECT_EQ(0, cbptr_->getPort());
+    getPortTest();
 }
 
-// This test verifies that the server can be added, updated and deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteServer) {
-    // Explicitly set modification time to make sure that the time
-    // returned from the database is correct.
-    test_servers_[0]->setModificationTime(timestamps_["yesterday"]);
-    test_servers_[1]->setModificationTime(timestamps_["today"]);
-
-    // Insert the server1 into the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    // It should not be possible to create a duplicate of the logical
-    // server 'all'.
-    auto all_server = Server::create(ServerTag("all"), "this is logical server all");
-    EXPECT_THROW(cbptr_->createUpdateServer4(all_server), isc::InvalidOperation);
-
-    ServerPtr returned_server;
-
-    // An attempt to fetch the server that hasn't been inserted should return
-    // a null pointer.
-    EXPECT_NO_THROW(returned_server = cbptr_->getServer4(ServerTag("server2")));
-    EXPECT_FALSE(returned_server);
-
-    // Try to fetch the server which we expect to exist.
-    EXPECT_NO_THROW(returned_server = cbptr_->getServer4(ServerTag("server1")));
-    ASSERT_TRUE(returned_server);
-    EXPECT_EQ("server1", returned_server->getServerTag().get());
-    EXPECT_EQ("this is server 1", returned_server->getDescription());
-    EXPECT_EQ(timestamps_["yesterday"], returned_server->getModificationTime());
-
-    // This call is expected to update the existing server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::UPDATE,
-                          "server set");
-    }
-
-    // Verify that the server has been updated.
-    EXPECT_NO_THROW(returned_server = cbptr_->getServer4(ServerTag("server1")));
-    ASSERT_TRUE(returned_server);
-    EXPECT_EQ("server1", returned_server->getServerTag().get());
-    EXPECT_EQ("this is server 1 bis", returned_server->getDescription());
-    EXPECT_EQ(timestamps_["today"], returned_server->getModificationTime());
-
-
-    uint64_t servers_deleted = 0;
-
-    // Try to delete non-existing server.
-    EXPECT_NO_THROW(servers_deleted = cbptr_->deleteServer4(ServerTag("server2")));
-    EXPECT_EQ(0, servers_deleted);
-
-    // Make sure that the server1 wasn't deleted.
-    EXPECT_NO_THROW(returned_server = cbptr_->getServer4(ServerTag("server1")));
-    EXPECT_TRUE(returned_server);
-
-    // Deleting logical server 'all' is not allowed.
-    EXPECT_THROW(cbptr_->deleteServer4(ServerTag()), isc::InvalidOperation);
-
-    // Delete the existing server.
-    EXPECT_NO_THROW(servers_deleted = cbptr_->deleteServer4(ServerTag("server1")));
-    EXPECT_EQ(1, servers_deleted);
-
-    {
-        SCOPED_TRACE("DELETE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting a server");
-    }
-
-    // Make sure that the server is gone.
-    EXPECT_NO_THROW(returned_server = cbptr_->getServer4(ServerTag("server1")));
-    EXPECT_FALSE(returned_server);
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteServerTest) {
+    createUpdateDeleteServerTest();
 }
 
-// This test verifies that it is possible to retrieve all servers from the
-// database and then delete all of them.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAndDeleteAllServers) {
-    for (auto i = 1; i < test_servers_.size(); ++i) {
-        EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[i]));
-    }
-
-    ServerCollection servers;
-    EXPECT_NO_THROW(servers = cbptr_->getAllServers4());
-    ASSERT_EQ(test_servers_.size() - 1, servers.size());
-
-    // All servers should have been returned.
-    EXPECT_TRUE(ServerFetcher::get(servers, ServerTag("server1")));
-    EXPECT_TRUE(ServerFetcher::get(servers, ServerTag("server2")));
-    EXPECT_TRUE(ServerFetcher::get(servers, ServerTag("server3")));
-
-    // The logical server all should not be returned. We merely return the
-    // user configured servers.
-    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag()));
-
-    // Delete all servers and make sure they are gone.
-    uint64_t deleted_servers = 0;
-    EXPECT_NO_THROW(deleted_servers = cbptr_->deleteAllServers4());
+TEST_F(MySqlConfigBackendDHCPv4Test, getAndDeleteAllServersTest) {
+    getAndDeleteAllServersTest();
+}
 
-    EXPECT_NO_THROW(servers = cbptr_->getAllServers4());
-    EXPECT_TRUE(servers.empty());
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteGlobalParameter4Test) {
+    createUpdateDeleteGlobalParameter4Test();
+}
 
-    // All servers should be gone.
-    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag("server1")));
-    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag("server2")));
-    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag("server3")));
+TEST_F(MySqlConfigBackendDHCPv4Test, globalParameters4WithServerTagsTest) {
+    globalParameters4WithServerTagsTest();
+}
 
-    // The number of deleted server should be equal to the number of
-    // inserted servers. The logical 'all' server should be excluded.
-    EXPECT_EQ(test_servers_.size() - 1, deleted_servers);
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllGlobalParameters4Test) {
+    getAllGlobalParameters4Test();
+}
 
-    EXPECT_EQ(1, countRows("dhcp4_server"));
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedGlobalParameters4Test) {
+    getModifiedGlobalParameters4Test();
 }
 
-// This test verifies that the global parameter can be added, updated and
-// deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteGlobalParameter4) {
-    StampedValuePtr global_parameter = StampedValue::create("global", "whale");
+TEST_F(MySqlConfigBackendDHCPv4Test, nullKeyErrorTest) {
+    nullKeyErrorTest();
+}
 
-    // Explicitly set modification time to make sure that the time
-    // returned from the database is correct.
-    global_parameter->setModificationTime(timestamps_["yesterday"]);
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-                                         global_parameter);
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSubnet4SelectorsTest) {
+    createUpdateSubnet4SelectorsTest();
+}
 
-    {
-        SCOPED_TRACE("CREATE audit entry for global parameter");
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::CREATE,
-                          "global parameter set");
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4Test) {
+    getSubnet4Test();
+}
 
-    // Verify returned parameter and the modification time.
-    StampedValuePtr returned_global_parameter =
-        cbptr_->getGlobalParameter4(ServerSelector::ALL(), "global");
-    ASSERT_TRUE(returned_global_parameter);
-    EXPECT_EQ("global", returned_global_parameter->getName());
-    EXPECT_EQ("whale", returned_global_parameter->getValue());
-    EXPECT_TRUE(returned_global_parameter->getModificationTime() ==
-                global_parameter->getModificationTime());
-    ASSERT_EQ(1, returned_global_parameter->getServerTags().size());
-    EXPECT_EQ("all", returned_global_parameter->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4byIdSelectorsTest) {
+    getSubnet4byIdSelectorsTest();
+}
 
-    // Because we have added the global parameter for all servers, it
-    // should be also returned for the explicitly specified server.
-    returned_global_parameter = cbptr_->getGlobalParameter4(ServerSelector::ONE("server1"),
-                                                            "global");
-    ASSERT_TRUE(returned_global_parameter);
-    EXPECT_EQ("global", returned_global_parameter->getName());
-    EXPECT_EQ("whale", returned_global_parameter->getValue());
-    EXPECT_TRUE(returned_global_parameter->getModificationTime() ==
-                global_parameter->getModificationTime());
-    ASSERT_EQ(1, returned_global_parameter->getServerTags().size());
-    EXPECT_EQ("all", returned_global_parameter->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4WithOptionalUnspecifiedTest) {
+    getSubnet4WithOptionalUnspecifiedTest();
+}
 
-    // Check that the parameter is updated when selector is specified correctly.
-    global_parameter = StampedValue::create("global", "fish");
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-                                         global_parameter);
-    returned_global_parameter = cbptr_->getGlobalParameter4(ServerSelector::ALL(),
-                                                            "global");
-    ASSERT_TRUE(returned_global_parameter);
-    EXPECT_EQ("global", returned_global_parameter->getName());
-    EXPECT_EQ("fish", returned_global_parameter->getValue());
-    EXPECT_TRUE(returned_global_parameter->getModificationTime() ==
-                global_parameter->getModificationTime());
-    ASSERT_EQ(1, returned_global_parameter->getServerTags().size());
-    EXPECT_EQ("all", returned_global_parameter->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4SharedNetworkTest) {
+    getSubnet4SharedNetworkTest();
+}
 
-    {
-        SCOPED_TRACE("UPDATE audit entry for the global parameter");
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::UPDATE,
-                          "global parameter set");
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4ByPrefixTest) {
+    getSubnet4ByPrefixTest();
+}
 
-    // Should not delete parameter specified for all servers if explicit
-    // server name is provided.
-    EXPECT_EQ(0, cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server1"),
-                                                "global"));
+TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4byPrefixSelectorsTest) {
+    getSubnet4byPrefixSelectorsTest();
+}
 
-    // Delete parameter and make sure it is gone.
-    cbptr_->deleteGlobalParameter4(ServerSelector::ALL(), "global");
-    returned_global_parameter = cbptr_->getGlobalParameter4(ServerSelector::ALL(),
-                                                            "global");
-    EXPECT_FALSE(returned_global_parameter);
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllSubnets4Test) {
+    getAllSubnets4Test();
+}
 
-    {
-        SCOPED_TRACE("DELETE audit entry for the global parameter");
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::DELETE,
-                          "global parameter deleted");
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllSubnets4SelectorsTest) {
+    getAllSubnets4SelectorsTest();
 }
 
-// This test verifies that it is possible to differentiate between the
-// global parameters by server tag and that the value specified for the
-// particular server overrides the value specified for all servers.
-TEST_F(MySqlConfigBackendDHCPv4Test, globalParameters4WithServerTags) {
-    // Create three global parameters having the same name.
-    StampedValuePtr global_parameter1 = StampedValue::create("global", "value1");
-    StampedValuePtr global_parameter2 = StampedValue::create("global", "value2");
-    StampedValuePtr global_parameter3 = StampedValue::create("global", "value3");
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllSubnets4WithServerTagsTest) {
+    getAllSubnets4WithServerTagsTest();
+}
 
-    // Try to insert one of them and associate with non-existing server.
-    // This should fail because the server must be inserted first.
-    EXPECT_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server1"),
-                                                      global_parameter1),
-                 NullKeyError);
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSubnets4SelectorsTest) {
+    getModifiedSubnets4SelectorsTest();
+}
 
-    // Create two servers.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteSubnet4Test) {
+    deleteSubnet4Test();
+}
 
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("server2 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteSubnet4ByIdSelectorsTest) {
+    deleteSubnet4ByIdSelectorsTest();
+}
 
-    // This time inserting the global parameters for the server1 and server2 should
-    // be successful.
-    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server1"),
-                                                         global_parameter1));
-    {
-        SCOPED_TRACE("Global parameter for server1 is set");
-        // The value of 3 means there should be 3 audit entries available for the
-        // server1, two that indicate creation of the servers and one that we
-        // validate, which sets the global value.
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::CREATE,
-                          "global parameter set",
-                          ServerSelector::ONE("server1"),
-                          3, 1);
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteSubnet4ByPrefixSelectorsTest) {
+    deleteSubnet4ByPrefixSelectorsTest();
+}
 
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteAllSubnets4SelectorsTest) {
+    deleteAllSubnets4SelectorsTest();
+}
 
-    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server2"),
-                                                         global_parameter2));
-    {
-        SCOPED_TRACE("Global parameter for server2 is set");
-        // Same as in case of the server2, there should be 3 audit entries of
-        // which one we validate.
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::CREATE,
-                          "global parameter set",
-                          ServerSelector::ONE("server2"),
-                          3, 1);
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, unassignedSubnet4Test) {
+    unassignedSubnet4Test();
+}
 
-    // The last parameter is associated with all servers.
-    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-                                                         global_parameter3));
-    {
-        SCOPED_TRACE("Global parameter for all servers is set");
-        // There should be one new audit entry for all servers. It indicates
-        // the insertion of the global value.
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::CREATE,
-                          "global parameter set",
-                          ServerSelector::ALL(),
-                          1, 1);
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSubnets4Test) {
+    getModifiedSubnets4Test();
+}
 
-    StampedValuePtr returned_global;
+TEST_F(MySqlConfigBackendDHCPv4Test, subnetLifetimeTest) {
+    subnetLifetimeTest();
+}
 
-    // Try to fetch the value specified for all servers.
-    EXPECT_NO_THROW(
-        returned_global = cbptr_->getGlobalParameter4(ServerSelector::ALL(),
-                                                      "global")
-    );
-    ASSERT_TRUE(returned_global);
-    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
-    ASSERT_EQ(1, returned_global->getServerTags().size());
-    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetworkSubnets4Test) {
+    getSharedNetworkSubnets4Test();
+}
 
-    // Try to fetch the value specified for the server1. This should override the
-    // value specified for all servers.
-    EXPECT_NO_THROW(
-        returned_global = cbptr_->getGlobalParameter4(ServerSelector::ONE("server1"),
-                                                      "global")
-    );
-    ASSERT_TRUE(returned_global);
-    EXPECT_EQ(global_parameter1->getValue(), returned_global->getValue());
+TEST_F(MySqlConfigBackendDHCPv4Test, subnetUpdatePoolsTest) {
+    subnetUpdatePoolsTest();
+}
 
-    ASSERT_EQ(1, returned_global->getServerTags().size());
-    EXPECT_EQ("server1", returned_global->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, subnetOptionsTest) {
+    subnetOptionsTest();
+}
 
-    // The same in case of the server2.
-    EXPECT_NO_THROW(
-        returned_global = cbptr_->getGlobalParameter4(ServerSelector::ONE("server2"),
-                                                      "global")
-    );
-    ASSERT_TRUE(returned_global);
-    EXPECT_EQ(global_parameter2->getValue(), returned_global->getValue());
-    ASSERT_EQ(1, returned_global->getServerTags().size());
-    EXPECT_EQ("server2", returned_global->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4Test) {
+    getSharedNetwork4Test();
+}
 
-    StampedValueCollection returned_globals;
+TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4SelectorsTest) {
+    getSharedNetwork4SelectorsTest();
+}
 
-    // Try to fetch the collection of globals for the server1, server2 and server3.
-    // The server3 does not have an explicit value so for this server we should get
-    /// the value for 'all'.
-    EXPECT_NO_THROW(
-        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::
-                                                           MULTIPLE({ "server1", "server2",
-                                                                      "server3" }));
-    );
-    ASSERT_EQ(3, returned_globals.size());
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSharedNetwork4Test) {
+    createUpdateSharedNetwork4Test();
+}
 
-    // Capture the returned values into the map so as we can check the
-    // values against the servers.
-    std::map<std::string, std::string> values;
-    for (auto g = returned_globals.begin(); g != returned_globals.end(); ++g) {
-        ASSERT_EQ(1, (*g)->getServerTags().size());
-        values[(*g)->getServerTags().begin()->get()] = ((*g)->getValue());
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSharedNetwork4SelectorsTest) {
+    createUpdateSharedNetwork4SelectorsTest();
+}
 
-    ASSERT_EQ(3, values.size());
-    EXPECT_EQ(global_parameter1->getValue(), values["server1"]);
-    EXPECT_EQ(global_parameter2->getValue(), values["server2"]);
-    EXPECT_EQ(global_parameter3->getValue(), values["all"]);
+TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4WithOptionalUnspecifiedTest) {
+    getSharedNetwork4WithOptionalUnspecifiedTest();
+}
 
-    // Try to fetch the collection of global parameters specified for all servers.
-    // This excludes the values specific to server1 and server2. It returns only the
-    // common ones.
-    EXPECT_NO_THROW(
-        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ALL())
-    );
-    ASSERT_EQ(1, returned_globals.size());
-    returned_global = *returned_globals.begin();
-    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
-    ASSERT_EQ(1, returned_global->getServerTags().size());
-    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteSharedNetworkSubnets4Test) {
+    deleteSharedNetworkSubnets4Test();
+}
 
-    // Delete the server1. It should remove associations of this server with the
-    // global parameter and the global parameter itself.
-    EXPECT_NO_THROW(cbptr_->deleteServer4(ServerTag("server1")));
-    EXPECT_NO_THROW(
-        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ONE("server1"))
-    );
-    ASSERT_EQ(1, returned_globals.size());
-    returned_global = *returned_globals.begin();
-    // As a result, the value fetched for the server1 should be the one available for
-    // all servers, rather than the one dedicated for server1. The association of
-    // the server1 specific value with the server1 should be gone.
-    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
-    ASSERT_EQ(1, returned_global->getServerTags().size());
-    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4Test) {
+    getAllSharedNetworks4Test();
+}
 
-    {
-        SCOPED_TRACE("DELETE audit entry for the global parameter after server deletion");
-        // We expect two new audit entries for the server1, one indicating that the
-        // server has been deleted and another one indicating that the corresponding
-        // global value has been deleted. We check the latter entry.
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting a server", ServerSelector::ONE("server1"),
-                          2, 1);
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4SelectorsTest) {
+    getAllSharedNetworks4SelectorsTest();
+}
 
-    // Attempt to delete global parameter for server1.
-    uint64_t deleted_num = 0;
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server1"),
-                                                                 "global"));
-    // No parameters should be deleted. In particular, the parameter for the logical
-    // server 'all' should not be deleted.
-    EXPECT_EQ(0, deleted_num);
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4WithServerTagsTest) {
+    getAllSharedNetworks4WithServerTagsTest();
+}
 
-    // Deleting the existing value for server2 should succeed.
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server2"),
-                                                                 "global"));
-    EXPECT_EQ(1, deleted_num);
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSharedNetworks4Test) {
+    getModifiedSharedNetworks4Test();
+}
 
-    // Create it again to test that deletion of all server removes this too.
-    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server2"),
-                                                         global_parameter2));
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSharedNetworks4SelectorsTest) {
+    getModifiedSharedNetworks4SelectorsTest();
+}
 
-    // Delete all servers, except 'all'.
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
-    EXPECT_NO_THROW(
-        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ALL())
-    );
-    EXPECT_EQ(1, deleted_num);
-    ASSERT_EQ(1, returned_globals.size());
-    returned_global = *returned_globals.begin();
-    // The common value for all servers should still be available because 'all'
-    // logical server should not be deleted.
-    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
-    ASSERT_EQ(1, returned_global->getServerTags().size());
-    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteSharedNetwork4Test) {
+    deleteSharedNetwork4Test();
+}
 
-    {
-        SCOPED_TRACE("DELETE audit entry for the global parameter after deletion of"
-                     " all servers");
-        // There should be 4 new audit entries. One for deleting the global, one for
-        // re-creating it, one for deleting the server2 and one for deleting the
-        // global again as a result of deleting the server2.
-        testNewAuditEntry("dhcp4_global_parameter",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting all servers", ServerSelector::ONE("server2"),
-                          4, 1);
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteSharedNetwork4SelectorsTest) {
+    deleteSharedNetwork4SelectorsTest();
 }
 
-// This test verifies that all global parameters can be retrieved and deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllGlobalParameters4) {
-    // Create 3 parameters and put them into the database.
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-        StampedValue::create("name1", "value1"));
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-        StampedValue::create("name2", Element::create(static_cast<int64_t>(65))));
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-        StampedValue::create("name3", "value3"));
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-        StampedValue::create("name4", Element::create(static_cast<bool>(true))));
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-        StampedValue::create("name5", Element::create(static_cast<double>(1.65))));
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteAllSharedNetworks4SelectorsTest) {
+    deleteAllSharedNetworks4SelectorsTest();
+}
 
-    // Fetch all parameters.
-    auto parameters = cbptr_->getAllGlobalParameters4(ServerSelector::ALL());
-    ASSERT_EQ(5, parameters.size());
+TEST_F(MySqlConfigBackendDHCPv4Test, unassignedSharedNetworkTest) {
+    unassignedSharedNetworkTest();
+}
 
-    const auto& parameters_index = parameters.get<StampedValueNameIndexTag>();
+TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkLifetimeTest) {
+    sharedNetworkLifetimeTest();
+}
 
-    // Verify their values.
-    EXPECT_EQ("value1", (*parameters_index.find("name1"))->getValue());
-    EXPECT_EQ(65, (*parameters_index.find("name2"))->getIntegerValue());
-    EXPECT_EQ("value3", (*parameters_index.find("name3"))->getValue());
-    EXPECT_TRUE((*parameters_index.find("name4"))->getBoolValue());
-    EXPECT_EQ(1.65, (*parameters_index.find("name5"))->getDoubleValue());
+TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkOptionsTest) {
+    sharedNetworkOptionsTest();
+}
 
-    for (auto param = parameters_index.begin(); param != parameters_index.end();
-         ++param) {
-        ASSERT_EQ(1, (*param)->getServerTags().size());
-        EXPECT_EQ("all", (*param)->getServerTags().begin()->get());
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, getOptionDef4Test) {
+    getOptionDef4Test();
+}
 
-    // Should be able to fetch these parameters when explicitly providing
-    // the server tag.
-    parameters = cbptr_->getAllGlobalParameters4(ServerSelector::ONE("server1"));
-    EXPECT_EQ(5, parameters.size());
+TEST_F(MySqlConfigBackendDHCPv4Test, optionDefs4WithServerTagsTest) {
+    optionDefs4WithServerTagsTest();
+}
 
-    // Deleting global parameters with non-matching server selector
-    // should fail.
-    EXPECT_EQ(0, cbptr_->deleteAllGlobalParameters4(ServerSelector::ONE("server1")));
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptionDefs4Test) {
+    getAllOptionDefs4Test();
+}
 
-    // Delete all parameters and make sure they are gone.
-    EXPECT_EQ(5, cbptr_->deleteAllGlobalParameters4(ServerSelector::ALL()));
-    parameters = cbptr_->getAllGlobalParameters4(ServerSelector::ALL());
-    EXPECT_TRUE(parameters.empty());
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedOptionDefs4Test) {
+    getModifiedOptionDefs4Test();
 }
 
-// This test verifies that modified global parameters can be retrieved.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedGlobalParameters4) {
-    // Create 3 global parameters and assign modification times:
-    // "yesterday", "today" and "tomorrow" respectively.
-    StampedValuePtr value = StampedValue::create("name1", "value1");
-    value->setModificationTime(timestamps_["yesterday"]);
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-                                         value);
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteOption4Test) {
+    createUpdateDeleteOption4Test();
+}
 
-    value = StampedValue::create("name2", Element::create(static_cast<int64_t>(65)));
-    value->setModificationTime(timestamps_["today"]);
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-                                         value);
+TEST_F(MySqlConfigBackendDHCPv4Test, globalOptions4WithServerTagsTest) {
+    globalOptions4WithServerTagsTest();
+}
 
-    value = StampedValue::create("name3", "value3");
-    value->setModificationTime(timestamps_["tomorrow"]);
-    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
-                                         value);
+TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptions4Test) {
+    getAllOptions4Test();
+}
 
-    // Get parameters modified after "today".
-    auto parameters = cbptr_->getModifiedGlobalParameters4(ServerSelector::ALL(),
-                                                           timestamps_["after today"]);
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedOptions4Test) {
+    getModifiedOptions4Test();
+}
 
-    const auto& parameters_index = parameters.get<StampedValueNameIndexTag>();
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteSubnetOption4Test) {
+    createUpdateDeleteSubnetOption4Test();
+}
 
-    // It should be the one modified "tomorrow".
-    ASSERT_EQ(1, parameters_index.size());
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeletePoolOption4Test) {
+    createUpdateDeletePoolOption4Test();
+}
 
-    auto parameter = parameters_index.find("name3");
-    ASSERT_FALSE(parameter == parameters_index.end());
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteSharedNetworkOption4Test) {
+    createUpdateDeleteSharedNetworkOption4Test();
+}
 
-    ASSERT_TRUE(*parameter);
-    EXPECT_EQ("value3", (*parameter)->getValue());
+TEST_F(MySqlConfigBackendDHCPv4Test, subnetOptionIdOrderTest) {
+    subnetOptionIdOrderTest();
+}
 
-    // Should be able to fetct these parameters when explicitly providing
-    // the server tag.
-    parameters = cbptr_->getModifiedGlobalParameters4(ServerSelector::ONE("server1"),
-                                                      timestamps_["after today"]);
-    EXPECT_EQ(1, parameters.size());
+TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkOptionIdOrderTest) {
+    sharedNetworkOptionIdOrderTest();
 }
 
-// Test that the NullKeyError message is correctly updated.
-TEST_F(MySqlConfigBackendDHCPv4Test, nullKeyError) {
-    // Create a global parameter (it should work with any object type).
-    StampedValuePtr global_parameter = StampedValue::create("global", "value");
+TEST_F(MySqlConfigBackendDHCPv4Test, setAndGetAllClientClasses4Test) {
+    setAndGetAllClientClasses4Test();
+}
 
-    // Try to insert it and associate with non-existing server.
-    std::string msg;
-    try {
-        cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server1"),
-                                             global_parameter);
-        msg = "got no exception";
-    } catch (const NullKeyError& ex) {
-        msg = ex.what();
-    } catch (const std::exception&) {
-        msg = "got another exception";
-    }
-    EXPECT_EQ("server 'server1' does not exist", msg);
+TEST_F(MySqlConfigBackendDHCPv4Test, getClientClass4Test) {
+    getClientClass4Test();
 }
 
-// Test that ceateUpdateSubnet4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSubnet4Selectors) {
-    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateClientClass4OptionsTest) {
+    createUpdateClientClass4OptionsTest();
+}
 
-    // Supported selectors.
-    Subnet4Ptr subnet = test_subnets_[0];
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
-                                                subnet));
-    subnet = test_subnets_[2];
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"),
-                                                subnet));
-    subnet = test_subnets_[3];
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                subnet));
+TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedClientClasses4Test) {
+    getModifiedClientClasses4Test();
+}
 
-    // Not supported server selectors.
-    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ANY(), subnet),
-                 isc::InvalidOperation);
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteClientClass4Test) {
+    deleteClientClass4Test();
+}
 
-    // Not implemented server selectors.
-    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::UNASSIGNED(),
-                                             subnet),
-                 isc::NotImplemented);
+TEST_F(MySqlConfigBackendDHCPv4Test, deleteAllClientClasses4Test) {
+    deleteAllClientClasses4Test();
 }
 
-// Test that subnet can be inserted, fetched, updated and then fetched again.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4) {
-    // Insert the server2 into the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
+TEST_F(MySqlConfigBackendDHCPv4Test, clientClassDependencies4Test) {
+    clientClassDependencies4Test();
+}
 
-    auto subnet = test_subnets_[0];
-    auto subnet2 = test_subnets_[2];
+TEST_F(MySqlConfigBackendDHCPv4Test, multipleAuditEntriesTest) {
+    multipleAuditEntriesTest();
+}
 
-    // An attempt to add a subnet to a non-existing server (server1) should fail.
-    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                             subnet2),
-                 NullKeyError);
+/// @brief Test fixture for verifying database connection loss-recovery
+/// behavior.
+class MySqlConfigBackendDHCPv4DbLostCallbackTest : public GenericConfigBackendDbLostCallbackTest {
+public:
+    /// @brief Constructor
+    MySqlConfigBackendDHCPv4DbLostCallbackTest() {};
 
-    // The subnet shouldn't have been added, even though one of the servers exists.
-    Subnet4Ptr returned_subnet;
-    ASSERT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server2"),
-                                                                             subnet2->getID()));
-    EXPECT_FALSE(returned_subnet);
+    /// @brief Destructor
+    virtual ~MySqlConfigBackendDHCPv4DbLostCallbackTest() {};
 
-    // Insert two subnets, one for all servers and one for server2.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet));
-    {
-        SCOPED_TRACE("CREATE audit entry for the subnet");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::CREATE,
-                          "subnet set");
+    /// @brief Creates the MySQL CB schema.
+    virtual void createSchema() {
+        createMySQLSchema();
     }
 
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"), subnet2));
-    {
-        SCOPED_TRACE("CREATE audit entry for the subnet");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::CREATE,
-                          "subnet set", ServerSelector::ONE("subnet2"),
-                          2, 1);
+    /// @brief Destroys the MySQL CB schema.
+    virtual void destroySchema() {
+        destroyMySQLSchema();
     }
 
-    // We are not going to support selection of a single entry for multiple servers.
-    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                    subnet->getID()),
-                 isc::InvalidOperation);
-
-    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                    subnet->toText()),
-                 isc::InvalidOperation);
-
-    // Test that this subnet will be fetched for various server selectors.
-    auto test_get_subnet = [this, &subnet] (const std::string& test_case_name,
-                                            const ServerSelector& server_selector,
-                                            const std::string& expected_tag = ServerTag::ALL) {
-        SCOPED_TRACE(test_case_name);
-
-        // Test fetching subnet by id.
-        Subnet4Ptr returned_subnet;
-        ASSERT_NO_THROW(returned_subnet = cbptr_->getSubnet4(server_selector, subnet->getID()));
-        ASSERT_TRUE(returned_subnet);
-
-        ASSERT_EQ(1, returned_subnet->getServerTags().size());
-        EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag(expected_tag)));
-
-        EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-
-        // Test fetching subnet by prefix.
-        ASSERT_NO_THROW(returned_subnet = cbptr_->getSubnet4(server_selector,
-                                                             subnet->toText()));
-        ASSERT_TRUE(returned_subnet);
-
-        ASSERT_EQ(1, returned_subnet->getServerTags().size());
-        EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag(expected_tag)));
-
-        EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-    };
+    /// @brief Method which returns a valid, back end specific connection
+    /// string
+    virtual std::string validConnectionString() {
+        return (validMySQLConnectionString());
+    }
 
-    {
-        SCOPED_TRACE("testing various server selectors before update");
-        test_get_subnet("all servers", ServerSelector::ALL());
-        test_get_subnet("one server", ServerSelector::ONE("server1"));
-        test_get_subnet("any server", ServerSelector::ANY());
+    /// @brief Method which returns an invalid,back end specific connection
+    /// string.
+    virtual std::string invalidConnectionString() {
+        return (connectionString(MYSQL_VALID_TYPE, INVALID_NAME, VALID_HOST,
+                                 VALID_USER, VALID_PASSWORD));
     }
 
-    subnet = subnet2;
-    {
-        SCOPED_TRACE("testing server selectors for another server");
-        test_get_subnet("one server", ServerSelector::ONE("server2"), "server2");
-        test_get_subnet("any server", ServerSelector::ANY(), "server2");
+    /// @brief Registers MySQL as a CB backend type.
+    virtual void registerBackendType() {
+        isc::dhcp::MySqlConfigBackendDHCPv4::registerBackendType();
     }
 
-    // Update the subnet in the database (both use the same ID).
-    subnet = test_subnets_[1];
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet));
-    {
-        SCOPED_TRACE("CREATE audit entry for the subnet");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "subnet set");
+    /// @brief Unregisters MySQL as a CB backend type.
+    virtual void unregisterBackendType() {
+        isc::dhcp::MySqlConfigBackendDHCPv4::unregisterBackendType();
     }
 
-    {
-        SCOPED_TRACE("testing various server selectors after update");
-        test_get_subnet("all servers", ServerSelector::ALL());
-        test_get_subnet("one server", ServerSelector::ONE("server1"));
-        test_get_subnet("any server", ServerSelector::ANY());
+    /// @brief Sets the IOService instance in the CB implementation object.
+    ///
+    /// @param io_service pointer to the IOService instance to use. It may be
+    /// an empty pointer.
+    virtual void setConfigBackendImplIOService(isc::asiolink::IOServicePtr io_service) {
+        isc::dhcp::MySqlConfigBackendImpl::setIOService(io_service);
     }
 
-    // The server2 specific subnet should not be returned if the server selector
-    // is not matching.
-    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ALL(), subnet2->getID()));
-    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ALL(), subnet2->toText()));
-    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ONE("server1"), subnet2->getID()));
-    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ONE("server1"), subnet2->toText()));
+    /// @brief  Attempts to add a backend instance to the CB manager.
+    ///
+    /// @param access Connection access string containing the database
+    /// connetion parameters.
+    virtual void addBackend(const std::string& access) {
+        ConfigBackendDHCPv4Mgr::instance().addBackend(access);
+    }
 
-    // Update the subnet in the database (both use the same prefix).
-    subnet2.reset(new Subnet4(IOAddress("192.0.3.0"), 24, 30, 40, 60, 8192));
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"),  subnet2));
+    /// @brief Fetches a collection of all the servers currently in
+    /// the CB database.  This function is used to check the operability
+    /// of the CB backend.
+    ServerCollection getAllServers() {
+        return (ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()));
+    }
+};
 
-    // Fetch again and verify.
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server2"), subnet2->toText());
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_EQ(subnet2->toElement()->str(), returned_subnet->toElement()->str());
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testNoCallbackOnOpenFailure) {
+    MultiThreadingTest mt(false);
+    testNoCallbackOnOpenFailure();
+}
 
-    // Update the subnet when it conflicts same id and same prefix both
-    // with different subnets. This should throw.
-    // Subnets are 10.0.0.0/8 id 1024 and 192.0.3.0/24 id 8192
-    subnet2.reset(new Subnet4(IOAddress("10.0.0.0"), 8, 30, 40, 60, 8192));
-    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"),  subnet2),
-                 DuplicateEntry);
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testNoCallbackOnOpenFailureMultiThreading) {
+    MultiThreadingTest mt(true);
+    testNoCallbackOnOpenFailure();
 }
 
-// Test that getSubnet4 by ID throws appropriate exceptions for various server
-// selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4byIdSelectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ANY(), SubnetID(1)));
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::UNASSIGNED(), SubnetID(1)));
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ALL(), SubnetID(1)));
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ONE("server1"), SubnetID(1)));
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredCallback) {
+    MultiThreadingTest mt(false);
+    testDbLostAndRecoveredCallback();
+}
 
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                    SubnetID(1)),
-                 isc::InvalidOperation);
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredCallbackMultiThreading) {
+    MultiThreadingTest mt(true);
+    testDbLostAndRecoveredCallback();
 }
 
-// Test that the information about unspecified optional parameters gets
-// propagated to the database.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4WithOptionalUnspecified) {
-    // Create a subnet and wrap it within a shared network. It is important
-    // to have the shared network to verify that the subnet doesn't inherit
-    // the values of the shared network but stores the NULL values in the
-    // for those parameters that are unspecified on the subnet level.
-    Subnet4Ptr subnet = test_subnets_[2];
-    SharedNetwork4Ptr shared_network = test_networks_[0];
-    shared_network->add(subnet);
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedCallback) {
+    MultiThreadingTest mt(false);
+    testDbLostAndFailedCallback();
+}
 
-    // Need to add the shared network to the database because otherwise
-    // the subnet foreign key would fail.
-    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), shared_network);
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedCallbackMultiThreading) {
+    MultiThreadingTest mt(true);
+    testDbLostAndFailedCallback();
+}
 
-    // Fetch this subnet by subnet identifier.
-    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                                    subnet->getID());
-    ASSERT_TRUE(returned_subnet);
+TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredAfterTimeoutCallback) {
+    MultiThreadingTest mt(false);
+    testDbLostAndRecoveredAfterTimeoutCallback();
+}
 
-    EXPECT_TRUE(returned_subnet->getIface().unspecified());
-    EXPECT_TRUE(returned_subnet->getIface().empty());
-
-    EXPECT_TRUE(returned_subnet->getClientClass().unspecified());
-    EXPECT_TRUE(returned_subnet->getClientClass().empty());
-
-    EXPECT_TRUE(returned_subnet->getValid().unspecified());
-    EXPECT_EQ(0, returned_subnet->getValid().get());
-
-    EXPECT_TRUE(returned_subnet->getT1().unspecified());
-    EXPECT_EQ(0, returned_subnet->getT1().get());
-
-    EXPECT_TRUE(returned_subnet->getT2().unspecified());
-    EXPECT_EQ(0, returned_subnet->getT2().get());
-
-    EXPECT_TRUE(returned_subnet->getReservationsGlobal().unspecified());
-    EXPECT_FALSE(returned_subnet->getReservationsGlobal().get());
-
-    EXPECT_TRUE(returned_subnet->getReservationsInSubnet().unspecified());
-    EXPECT_TRUE(returned_subnet->getReservationsInSubnet().get());
-
-    EXPECT_TRUE(returned_subnet->getReservationsOutOfPool().unspecified());
-    EXPECT_FALSE(returned_subnet->getReservationsOutOfPool().get());
-
-    EXPECT_TRUE(returned_subnet->getCalculateTeeTimes().unspecified());
-    EXPECT_FALSE(returned_subnet->getCalculateTeeTimes().get());
-
-    EXPECT_TRUE(returned_subnet->getT1Percent().unspecified());
-    EXPECT_EQ(0.0, returned_subnet->getT1Percent().get());
-
-    EXPECT_TRUE(returned_subnet->getT2Percent().unspecified());
-    EXPECT_EQ(0.0, returned_subnet->getT2Percent().get());
-
-    EXPECT_TRUE(returned_subnet->getMatchClientId().unspecified());
-    EXPECT_TRUE(returned_subnet->getMatchClientId().get());
-
-    EXPECT_TRUE(returned_subnet->getAuthoritative().unspecified());
-    EXPECT_FALSE(returned_subnet->getAuthoritative().get());
-
-    EXPECT_TRUE(returned_subnet->getSiaddr().unspecified());
-    EXPECT_TRUE(returned_subnet->getSiaddr().get().isV4Zero());
-
-    EXPECT_TRUE(returned_subnet->getSname().unspecified());
-    EXPECT_TRUE(returned_subnet->getSname().empty());
-
-    EXPECT_TRUE(returned_subnet->getFilename().unspecified());
-    EXPECT_TRUE(returned_subnet->getFilename().empty());
-
-    EXPECT_FALSE(returned_subnet->get4o6().enabled());
-
-    EXPECT_TRUE(returned_subnet->get4o6().getIface4o6().unspecified());
-    EXPECT_TRUE(returned_subnet->get4o6().getIface4o6().empty());
-
-    EXPECT_TRUE(returned_subnet->get4o6().getSubnet4o6().unspecified());
-    EXPECT_TRUE(returned_subnet->get4o6().getSubnet4o6().get().first.isV6Zero());
-    EXPECT_EQ(128, returned_subnet->get4o6().getSubnet4o6().get().second);
-
-    EXPECT_FALSE(returned_subnet->getDdnsSendUpdates().unspecified());
-    EXPECT_TRUE(returned_subnet->getDdnsSendUpdates().get());
-
-    EXPECT_FALSE(returned_subnet->getDdnsOverrideNoUpdate().unspecified());
-    EXPECT_TRUE(returned_subnet->getDdnsOverrideNoUpdate().get());
-
-    EXPECT_FALSE(returned_subnet->getDdnsOverrideClientUpdate().unspecified());
-    EXPECT_FALSE(returned_subnet->getDdnsOverrideClientUpdate().get());
-
-    EXPECT_FALSE(returned_subnet->getDdnsReplaceClientNameMode().unspecified());
-    EXPECT_EQ(D2ClientConfig::ReplaceClientNameMode::RCM_WHEN_PRESENT,
-              returned_subnet->getDdnsReplaceClientNameMode().get());
-
-    EXPECT_FALSE(returned_subnet->getDdnsGeneratedPrefix().unspecified());
-    EXPECT_EQ("myhost", returned_subnet->getDdnsGeneratedPrefix().get());
-
-    EXPECT_FALSE(returned_subnet->getDdnsQualifyingSuffix().unspecified());
-    EXPECT_EQ("example.org", returned_subnet->getDdnsQualifyingSuffix().get());
-
-    // The easiest way to verify whether the returned subnet matches the inserted
-    // subnet is to convert both to text.
-    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-}
-
-
-// Test that subnet can be associated with a shared network.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4SharedNetwork) {
-    Subnet4Ptr subnet = test_subnets_[0];
-    SharedNetwork4Ptr shared_network = test_networks_[0];
-
-    // Add subnet to a shared network.
-    shared_network->add(subnet);
-
-    // Store shared network in the database.
-    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                       shared_network);
-
-    // Store subnet associated with the shared network in the database.
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-    // Fetch this subnet by subnet identifier.
-    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                                    test_subnets_[0]->getID());
-    ASSERT_TRUE(returned_subnet);
-
-    // The easiest way to verify whether the returned subnet matches the inserted
-    // subnet is to convert both to text.
-    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-
-    // However, the check above doesn't verify whether shared network name was
-    // correctly returned from the database.
-    EXPECT_EQ(shared_network->getName(), returned_subnet->getSharedNetworkName());
-}
-
-// Test that subnet can be fetched by prefix.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4ByPrefix) {
-    // Insert subnet to the database.
-    Subnet4Ptr subnet = test_subnets_[0];
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-    // Fetch the subnet by prefix.
-    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                                    "192.0.2.0/24");
-    ASSERT_TRUE(returned_subnet);
-    ASSERT_EQ(1, returned_subnet->getServerTags().size());
-    EXPECT_EQ("all", returned_subnet->getServerTags().begin()->get());
-
-    // Verify subnet contents.
-    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-
-    // Fetching the subnet for an explicitly specified server tag should
-    // succeed too.
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"),
-                                         "192.0.2.0/24");
-    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-}
-
-// Test that getSubnet4 by prefix throws appropriate exceptions for various server
-// selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSubnet4byPrefixSelectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ANY(), "192.0.2.0/24"));
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::UNASSIGNED(), "192.0.2.0/24"));
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ALL(), "192.0.2.0/24"));
-    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ONE("server1"), "192.0.2.0/24"));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                    "192.0.2.0/24"),
-                 isc::InvalidOperation);
-}
-
-// Test that all subnets can be fetched and then deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllSubnets4) {
-    // Insert test subnets into the database. Note that the second subnet will
-    // overwrite the first subnet as they use the same ID.
-    for (auto subnet : test_subnets_) {
-        cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-        // That subnet overrides the first subnet so the audit entry should
-        // indicate an update.
-        if (subnet->toText() == "10.0.0.0/8") {
-            SCOPED_TRACE("UPDATE audit entry for the subnet " + subnet->toText());
-            testNewAuditEntry("dhcp4_subnet",
-                              AuditEntry::ModificationType::UPDATE,
-                              "subnet set");
-
-        } else {
-            SCOPED_TRACE("CREATE audit entry for the subnet " + subnet->toText());
-            testNewAuditEntry("dhcp4_subnet",
-                              AuditEntry::ModificationType::CREATE,
-                              "subnet set");
-        }
-    }
-
-    // Fetch all subnets.
-    Subnet4Collection subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
-    ASSERT_EQ(test_subnets_.size() - 1, subnets.size());
-
-    // All subnets should also be returned for explicitly specified server tag.
-    subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server1"));
-    ASSERT_EQ(test_subnets_.size() - 1, subnets.size());
-
-    // See if the subnets are returned ok.
-    auto subnet_it = subnets.begin();
-    for (auto i = 0; i < subnets.size(); ++i, ++subnet_it) {
-        ASSERT_EQ(1, (*subnet_it)->getServerTags().size());
-        EXPECT_EQ("all", (*subnet_it)->getServerTags().begin()->get());
-        EXPECT_EQ(test_subnets_[i + 1]->toElement()->str(),
-                  (*subnet_it)->toElement()->str());
-    }
-
-    // Attempt to remove the non existing subnet should  return 0.
-    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ALL(), 22));
-    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ALL(),
-                                       "155.0.3.0/24"));
-    // All subnets should be still there.
-    ASSERT_EQ(test_subnets_.size() - 1, subnets.size());
-
-    // Should not delete the subnet for explicit server tag because
-    // our subnet is for all servers.
-    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ONE("server1"),
-                                       test_subnets_[1]->getID()));
-
-    // Also, verify that behavior when deleting by prefix.
-    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ONE("server1"),
-                                       test_subnets_[2]->toText()));
-
-    // Same for all subnets.
-    EXPECT_EQ(0, cbptr_->deleteAllSubnets4(ServerSelector::ONE("server1")));
-
-    // Delete first subnet by id and verify that it is gone.
-    EXPECT_EQ(1, cbptr_->deleteSubnet4(ServerSelector::ALL(),
-                                       test_subnets_[1]->getID()));
-
-    {
-        SCOPED_TRACE("DELETE first subnet audit entry");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::DELETE,
-                          "subnet deleted");
-    }
-
-    subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
-    ASSERT_EQ(test_subnets_.size() - 2, subnets.size());
-
-    // Delete second subnet by prefix and verify it is gone.
-    EXPECT_EQ(1, cbptr_->deleteSubnet4(ServerSelector::ALL(),
-                                       test_subnets_[2]->toText()));
-    subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
-    ASSERT_EQ(test_subnets_.size() - 3, subnets.size());
-
-    {
-        SCOPED_TRACE("DELETE second subnet audit entry");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::DELETE,
-                          "subnet deleted");
-    }
-
-    // Delete all.
-    EXPECT_EQ(1, cbptr_->deleteAllSubnets4(ServerSelector::ALL()));
-    subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
-    ASSERT_TRUE(subnets.empty());
-
-    {
-        SCOPED_TRACE("DELETE all subnets audit entry");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all subnets");
-    }
-}
-
-// Test that getAllSubnets4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllSubnets4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::UNASSIGNED()));
-    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::ALL()));
-    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::ONE("server1")));
-    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" })));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getAllSubnets4(ServerSelector::ANY()), isc::InvalidOperation);
-}
-
-// Test that subnets with different server associations are returned.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllSubnets4WithServerTags) {
-    auto subnet1 = test_subnets_[0];
-    auto subnet2 = test_subnets_[2];
-    auto subnet3 = test_subnets_[3];
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
-                                                subnet1));
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"),
-                                                subnet2));
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                subnet3));
-
-    Subnet4Collection subnets;
-
-    // All three subnets are associated with the server1.
-    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server1")));
-    EXPECT_EQ(3, subnets.size());
-
-    // First subnet is associated with all servers.
-    auto returned_subnet = SubnetFetcher4::get(subnets, SubnetID(1024));
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_TRUE(returned_subnet->hasAllServerTag());
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
-
-    // Second subnet is only associated with the server1.
-    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(2048));
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_FALSE(returned_subnet->hasAllServerTag());
-    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
-
-    // Third subnet is associated with both server1 and server2.
-    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(4096));
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_FALSE(returned_subnet->hasAllServerTag());
-    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server1")));
-    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server2")));
-
-    // For server2 we should only get two subnets, i.e. first and last.
-    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server2")));
-    EXPECT_EQ(2, subnets.size());
-
-    // First subnet is associated with all servers.
-    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(1024));
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_TRUE(returned_subnet->hasAllServerTag());
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
-
-    // Last subnet is associated with server1 and server2.
-    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(4096));
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_FALSE(returned_subnet->hasAllServerTag());
-    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server1")));
-    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server2")));
-
-    // Only the first subnet is associated with all servers.
-    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ALL()));
-    EXPECT_EQ(1, subnets.size());
-
-    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(1024));
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_TRUE(returned_subnet->hasAllServerTag());
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
-}
-
-// Test that getModifiedSubnets4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSubnets4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::UNASSIGNED(),
-                                                timestamps_["yesterday"]));
-    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
-                                                timestamps_["yesterday"]));
-    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::ONE("server1"),
-                                                timestamps_["yesterday"]));
-    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                timestamps_["yesterday"]));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getModifiedSubnets4(ServerSelector::ANY(),
-                                             timestamps_["yesterday"]),
-                 isc::InvalidOperation);
-}
-
-// Test that selected subnet can be deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteSubnet4) {
-    // Create two servers in the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    auto subnet1 = test_subnets_[0];
-    auto subnet2 = test_subnets_[2];
-    auto subnet3 = test_subnets_[3];
-
-    auto create_test_subnets = [&] () {
-        // Insert three subnets, one for all servers, one for server2 and one for two
-        // servers: server1 and server2.
-        EXPECT_NO_THROW(
-            cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet1)
-        );
-        EXPECT_NO_THROW(
-            cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"), subnet2)
-        );
-        EXPECT_NO_THROW(
-            cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                        subnet3)
-        );
-    };
-
-    create_test_subnets();
-
-    // Test that subnet is not deleted for a specified server selector.
-    auto test_no_delete = [this] (const std::string& test_case_name,
-                                  const ServerSelector& server_selector,
-                                  const Subnet4Ptr& subnet) {
-        SCOPED_TRACE(test_case_name);
-        uint64_t deleted_count = 0;
-        EXPECT_NO_THROW(
-            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->getID())
-        );
-        EXPECT_EQ(0, deleted_count);
-
-        deleted_count = 0;
-        EXPECT_NO_THROW(
-            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->toText())
-        );
-        EXPECT_EQ(0, deleted_count);
-    };
-
-    {
-        SCOPED_TRACE("Test valid but non matching server selectors");
-        test_no_delete("selector: one, actual: all", ServerSelector::ONE("server2"),
-                       subnet1);
-        test_no_delete("selector: all, actual: one", ServerSelector::ALL(),
-                       subnet2);
-        test_no_delete("selector: all, actual: multiple", ServerSelector::ALL(),
-                       subnet3);
-    }
-
-    // Test successful deletion of a subnet by ID.
-    auto test_delete_by_id = [this] (const std::string& test_case_name,
-                                     const ServerSelector& server_selector,
-                                     const Subnet4Ptr& subnet) {
-        SCOPED_TRACE(test_case_name);
-        uint64_t deleted_count = 0;
-        EXPECT_NO_THROW(
-            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->getID())
-        );
-        EXPECT_EQ(1, deleted_count);
-
-        EXPECT_FALSE(cbptr_->getSubnet4(server_selector, subnet->getID()));
-    };
-
-    test_delete_by_id("all servers", ServerSelector::ALL(), subnet1);
-    test_delete_by_id("any server", ServerSelector::ANY(), subnet2);
-    test_delete_by_id("one server", ServerSelector::ONE("server1"), subnet3);
-
-    // Re-create deleted subnets.
-    create_test_subnets();
-
-    // Test successful deletion of a subnet by prefix.
-    auto test_delete_by_prefix = [this] (const std::string& test_case_name,
-                                         const ServerSelector& server_selector,
-                                         const Subnet4Ptr& subnet) {
-        SCOPED_TRACE(test_case_name);
-        uint64_t deleted_count = 0;
-        EXPECT_NO_THROW(
-            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->toText())
-        );
-        EXPECT_EQ(1, deleted_count);
-
-        EXPECT_FALSE(cbptr_->getSubnet4(server_selector, subnet->toText()));
-    };
-
-    test_delete_by_prefix("all servers", ServerSelector::ALL(), subnet1);
-    test_delete_by_prefix("any server", ServerSelector::ANY(), subnet2);
-    test_delete_by_prefix("one server", ServerSelector::ONE("server1"), subnet3);
-}
-
-// Test that deleteSubnet4 by ID throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteSubnet4ByIdSelectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ANY(), SubnetID(1)));
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), SubnetID(1)));
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ONE("server1"), SubnetID(1)));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                           SubnetID(1)),
-                 isc::InvalidOperation);
-
-    // Not implemented selectors.
-    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::UNASSIGNED(), SubnetID(1)),
-                 isc::NotImplemented);
-}
-
-// Test that deleteSubnet4 by prefix throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteSubnet4ByPrefixSelectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ANY(), "192.0.2.0/24"));
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), "192.0.2.0/24"));
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ONE("server1"), "192.0.2.0/24"));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                           "192.0.2.0/24"),
-                 isc::InvalidOperation);
-
-    // Not implemented selectors.
-    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::UNASSIGNED(), "192.0.2.0/24"),
-                 isc::NotImplemented);
-}
-
-// Test that deleteAllSubnets4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteAllSubnets4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->deleteAllSubnets4(ServerSelector::UNASSIGNED()));
-    EXPECT_NO_THROW(cbptr_->deleteAllSubnets4(ServerSelector::ALL()));
-    EXPECT_NO_THROW(cbptr_->deleteAllSubnets4(ServerSelector::ONE("server1")));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->deleteAllSubnets4(ServerSelector::ANY()),
-                 isc::InvalidOperation);
-    EXPECT_THROW(cbptr_->deleteAllSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" })),
-                 isc::InvalidOperation);
-}
-
-// Test that it is possible to retrieve and delete orphaned subnet.
-TEST_F(MySqlConfigBackendDHCPv4Test, unassignedSubnet4) {
-    // Create the server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-
-    // Create the subnets and associate them with the server1.
-    auto subnet = test_subnets_[0];
-    auto subnet2 = test_subnets_[2];
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"), subnet)
-    );
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"), subnet2)
-    );
-
-    // Delete the server. The subnets should be preserved but are considered orphaned,
-    // i.e. do not belong to any server.
-    uint64_t deleted_count = 0;
-    EXPECT_NO_THROW(deleted_count = cbptr_->deleteServer4(ServerTag("server1")));
-    EXPECT_EQ(1, deleted_count);
-
-    // Trying to fetch the subnet by server tag should return no result.
-    Subnet4Ptr returned_subnet;
-    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"),
-                                                         subnet->getID()));
-    EXPECT_FALSE(returned_subnet);
-
-    // The same if we use other calls.
-    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"),
-                                                         subnet->toText()));
-    EXPECT_FALSE(returned_subnet);
-
-    Subnet4Collection returned_subnets;
-    EXPECT_NO_THROW(returned_subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server1")));
-    EXPECT_TRUE(returned_subnets.empty());
-
-    EXPECT_NO_THROW(
-        returned_subnets = cbptr_->getModifiedSubnets4(ServerSelector::ONE("server1"),
-                                                       timestamps_["two days ago"])
-    );
-    EXPECT_TRUE(returned_subnets.empty());
-
-    // We should get the subnet if we ask for unassigned.
-    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::UNASSIGNED(),
-                                                         subnet->getID()));
-    ASSERT_TRUE(returned_subnet);
-
-    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::UNASSIGNED(),
-                                                         subnet->toText()));
-    ASSERT_TRUE(returned_subnet);
-
-    // Also if we ask for all unassigned subnets it should be returned.
-    EXPECT_NO_THROW(returned_subnets = cbptr_->getAllSubnets4(ServerSelector::UNASSIGNED()));
-    ASSERT_EQ(2, returned_subnets.size());
-
-    // Same for modified subnets.
-    EXPECT_NO_THROW(
-        returned_subnets = cbptr_->getModifiedSubnets4(ServerSelector::UNASSIGNED(),
-                                                       timestamps_["two days ago"])
-    );
-    ASSERT_EQ(2, returned_subnets.size());
-
-    // If we ask for any subnet by subnet id, it should be returned too.
-    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ANY(),
-                                                         subnet->getID()));
-    ASSERT_TRUE(returned_subnet);
-
-    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ANY(),
-                                                         subnet->toText()));
-    ASSERT_TRUE(returned_subnet);
-
-    // Deleting the subnet with the mismatched server tag should not affect our
-    // subnet.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteSubnet4(ServerSelector::ONE("server1"),
-                                              subnet->getID())
-    );
-    EXPECT_EQ(0, deleted_count);
-
-    // Also, if we delete all subnets for server1.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteAllSubnets4(ServerSelector::ONE("server1"))
-    );
-    EXPECT_EQ(0, deleted_count);
-
-    // We can delete this subnet when we specify ANY and the matching id.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteSubnet4(ServerSelector::ANY(), subnet->getID())
-    );
-    EXPECT_EQ(1, deleted_count);
-
-    // We can delete all subnets using UNASSIGNED selector.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteAllSubnets4(ServerSelector::UNASSIGNED());
-    );
-    EXPECT_EQ(1, deleted_count);
-}
-
-// Test that subnets modified after given time can be fetched.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSubnets4) {
-    // Explicitly set timestamps of subnets. First subnet has a timestamp
-    // pointing to the future. Second subnet has timestamp pointing to the
-    // past (yesterday). Third subnet has a timestamp pointing to the
-    // past (an hour ago).
-    test_subnets_[1]->setModificationTime(timestamps_["tomorrow"]);
-    test_subnets_[2]->setModificationTime(timestamps_["yesterday"]);
-    test_subnets_[3]->setModificationTime(timestamps_["today"]);
-
-    // Insert subnets into the database.
-    for (int i = 1; i < test_subnets_.size(); ++i) {
-        cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
-                                    test_subnets_[i]);
-    }
-
-    // Fetch subnets with timestamp later than today. Only one subnet
-    // should be returned.
-    Subnet4Collection
-        subnets = cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
-                                              timestamps_["after today"]);
-    ASSERT_EQ(1, subnets.size());
-
-    // All subnets should also be returned for explicitly specified server tag.
-    subnets = cbptr_->getModifiedSubnets4(ServerSelector::ONE("server1"),
-                                          timestamps_["after today"]);
-    ASSERT_EQ(1, subnets.size());
-
-    // Fetch subnets with timestamp later than yesterday. We should get
-    // two subnets.
-    subnets = cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
-                                          timestamps_["after yesterday"]);
-    ASSERT_EQ(2, subnets.size());
-
-    // Fetch subnets with timestamp later than tomorrow. Nothing should
-    // be returned.
-    subnets = cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
-                                          timestamps_["after tomorrow"]);
-    ASSERT_TRUE(subnets.empty());
-}
-
-// Test that lifetimes in subnets are handled as expected.
-TEST_F(MySqlConfigBackendDHCPv4Test, subnetLifetime) {
-    // Insert new subnet with unspecified valid lifetime
-    Triplet<uint32_t> unspecified;
-    Subnet4Ptr subnet(new Subnet4(IOAddress("192.0.2.0"), 24, 30, 40,
-                                  unspecified, 1111));
-    subnet->setIface("eth1");
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-    // Fetch this subnet by subnet identifier
-    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                                    subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-
-    // Verified returned and original subnets match.
-    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-
-    // Update the valid lifetime.
-    subnet->setValid( Triplet<uint32_t>(100, 200, 300));
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-    // Fetch and verify again.
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(), subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
-}
-
-// Test that subnets belonging to a shared network can be retrieved.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetworkSubnets4) {
-    // Assign test subnets to shared networks level1 and level2.
-    test_subnets_[1]->setSharedNetworkName("level1");
-    test_subnets_[2]->setSharedNetworkName("level2");
-    test_subnets_[3]->setSharedNetworkName("level2");
-
-    // Store shared networks in the database.
-    for (auto network : test_networks_) {
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
-    }
-
-    // Store subnets in the database.
-    for (auto subnet : test_subnets_) {
-        cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-    }
-
-    // Fetch all subnets belonging to shared network level1.
-    Subnet4Collection subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ALL(),
-                                                                 "level1");
-    ASSERT_EQ(1, subnets.size());
-
-    // Returned subnet should match test subnet #1.
-    EXPECT_TRUE(isEquivalent(test_subnets_[1]->toElement(),
-                             (*subnets.begin())->toElement()));
-
-    // All subnets should also be returned for ANY server.
-    subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ANY(), "level1");
-    ASSERT_EQ(1, subnets.size());
-
-    // Returned subnet should match test subnet #1.
-    EXPECT_TRUE(isEquivalent(test_subnets_[1]->toElement(),
-                             (*subnets.begin())->toElement()));
-
-    // Check server tag
-    ASSERT_EQ(1, (*subnets.begin())->getServerTags().size());
-    EXPECT_EQ("all", (*subnets.begin())->getServerTags().begin()->get());
-
-    // Fetch all subnets belonging to shared network level2.
-    subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ALL(), "level2");
-    ASSERT_EQ(2, subnets.size());
-
-    ElementPtr test_list = Element::createList();
-    test_list->add(test_subnets_[2]->toElement());
-    test_list->add(test_subnets_[3]->toElement());
-
-    ElementPtr returned_list = Element::createList();
-    auto subnet = subnets.begin();
-    returned_list->add((*subnet)->toElement());
-    returned_list->add((*++subnet)->toElement());
-
-    EXPECT_TRUE(isEquivalent(returned_list, test_list));
-
-    // All subnets should also be returned for explicitly specified server tag.
-    subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ONE("server1"), "level2");
-    ASSERT_EQ(2, subnets.size());
-
-    returned_list = Element::createList();
-    subnet = subnets.begin();
-    returned_list->add((*subnet)->toElement());
-    returned_list->add((*++subnet)->toElement());
-
-    EXPECT_TRUE(isEquivalent(returned_list, test_list));
-}
-
-// Test that pools are properly updated as a result a subnet update.
-TEST_F(MySqlConfigBackendDHCPv4Test, subnetUpdatePools) {
-
-    auto test_subnet_update = [this](const std::string& subnet_prefix,
-                                     const SubnetID& subnet_id) {
-        // Add the subnet with two pools.
-        EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
-                                                    test_subnets_[0]));
-        // Make sure that the pools have been added to the database.
-        EXPECT_EQ(2, countRows("dhcp4_pool"));
-
-        // Create the subnet without options which updates the existing
-        // subnet.
-        Subnet4Ptr subnet(new Subnet4(IOAddress(subnet_prefix), 24, 30, 40, 60,
-                                      subnet_id));
-        EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet));
-        // Check that options are gone.
-        EXPECT_EQ(0, countRows("dhcp4_pool"));
-    };
-
-    {
-        SCOPED_TRACE("update subnet, modify subnet id");
-        // Create another subnet with the same prefix as the original subnet but
-        // different id. This is legal to update the subnet id if the prefix is
-        // stable. However, the new subnet has no address pools, so we need to
-        // check of the pools associated with the existing subnet instance are
-        // gone after the update.
-        test_subnet_update("192.0.2.0", 2048);
-    }
-
-    {
-        SCOPED_TRACE("update subnet, modify prefix");
-        // Create a subnet with the same subnet id but different prefix.
-        // The prefix should be updated.
-        test_subnet_update("192.0.3.0", 1024);
-    }
-}
-
-// Test that deleting a subnet triggers deletion of the options associated
-// with the subnet and pools.
-TEST_F(MySqlConfigBackendDHCPv4Test, subnetOptions) {
-    // Add the subnet with two pools and three options.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-    EXPECT_EQ(3, countRows("dhcp4_options"));
-
-    // The second subnet uses the same subnet id, so this operation should replace
-    // the existing subnet and its options. The new instance has two pools, each
-    // including one option, so we should end up with two options.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[1]));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-    EXPECT_EQ(2, countRows("dhcp4_options"));
-
-    // Add third subnet with a single option. The number of options in the database
-    // should now be 3.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[2]));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-    EXPECT_EQ(3, countRows("dhcp4_options"));
-
-    // Delete the subnet. All options and pools it contains should also be removed, leaving
-    // the last added subnet and its sole option.
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), test_subnets_[1]->getID()));
-    EXPECT_EQ(1, countRows("dhcp4_subnet"));
-    EXPECT_EQ(0, countRows("dhcp4_pool"));
-    EXPECT_EQ(1, countRows("dhcp4_options"));
-
-    // Add the first subnet again. We should now have 4 options: 3 options from the
-    // newly added subnet and one option from the existing subnet.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]));
-    EXPECT_EQ(4, countRows("dhcp4_options"));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-
-    // Delete the subnet including 3 options. The option from the other subnet should not
-    // be affected.
-    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), test_subnets_[0]->getID()));
-    EXPECT_EQ(1, countRows("dhcp4_subnet"));
-    EXPECT_EQ(0, countRows("dhcp4_pool"));
-    EXPECT_EQ(1, countRows("dhcp4_options"));
-}
-
-// Test that shared network can be inserted, fetched, updated and then
-// fetched again.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4) {
-    // Insert the server2 into the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    auto shared_network = test_networks_[0];
-    auto shared_network2 = test_networks_[2];
-
-    // Insert two shared networks, one for all servers, and one for server2.
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       shared_network));
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server2"),
-                                                       shared_network2));
-
-    // We are not going to support selection of a single entry for multiple servers.
-    EXPECT_THROW(cbptr_->getSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                           test_networks_[0]->getName()),
-                 isc::InvalidOperation);
-
-    // Test that this shared network will be fetched for various server selectors.
-    auto test_get_network = [this, &shared_network] (const std::string& test_case_name,
-                                                     const ServerSelector& server_selector,
-                                                     const std::string& expected_tag = ServerTag::ALL) {
-        SCOPED_TRACE(test_case_name);
-        SharedNetwork4Ptr network;
-        ASSERT_NO_THROW(network = cbptr_->getSharedNetwork4(server_selector,
-                                                            shared_network->getName()));
-        ASSERT_TRUE(network);
-
-        EXPECT_GT(network->getId(), 0);
-        ASSERT_EQ(1, network->getServerTags().size());
-        EXPECT_EQ(expected_tag, network->getServerTags().begin()->get());
-
-        // The easiest way to verify whether the returned shared network matches the
-        // inserted shared network is to convert both to text.
-        EXPECT_EQ(shared_network->toElement()->str(), network->toElement()->str());
-    };
-
-    {
-        SCOPED_TRACE("testing various server selectors before update");
-        test_get_network("all servers", ServerSelector::ALL());
-        test_get_network("one server", ServerSelector::ONE("server1"));
-        test_get_network("any server", ServerSelector::ANY());
-    }
-
-    {
-        SCOPED_TRACE("CREATE audit entry for a shared network");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::CREATE,
-                          "shared network set");
-    }
-
-    // Update shared network in the database.
-    shared_network = test_networks_[1];
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       shared_network));
-
-    {
-        SCOPED_TRACE("testing various server selectors after update");
-        test_get_network("all servers after update", ServerSelector::ALL());
-        test_get_network("one server after update", ServerSelector::ONE("server1"));
-        test_get_network("any server after update", ServerSelector::ANY());
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for a shared network");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::UPDATE,
-                          "shared network set");
-    }
-
-    // The server2 specific shared network should not be returned if the
-    // server selector is not matching.
-    EXPECT_FALSE(cbptr_->getSharedNetwork4(ServerSelector::ALL(),
-                                           shared_network2->getName()));
-    EXPECT_FALSE(cbptr_->getSharedNetwork4(ServerSelector::ONE("server1"),
-                                           shared_network2->getName()));
-
-    {
-        SCOPED_TRACE("testing selectors for server2 specific shared network");
-        shared_network = shared_network2;
-        test_get_network("one server", ServerSelector::ONE("server2"), "server2");
-        test_get_network("any server", ServerSelector::ANY(), "server2");
-    }
-}
-
-// Test that getSharedNetwork4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::ANY(), "level1"));
-    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::UNASSIGNED(), "level1"));
-    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::ALL(), "level1"));
-    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::ONE("server1"), "level1"));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                           "level1"),
-                 isc::InvalidOperation);
-}
-
-// Test that shared network may be created and updated and the server tags
-// are properly assigned to it.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSharedNetwork4) {
-    auto shared_network = test_networks_[0];
-
-    // An attempt to insert the shared network for non-existing server should fail.
-    EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"),
-                                                    shared_network),
-                 NullKeyError);
-
-    // Insert the server1 into the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    // Insert the server2 into the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       shared_network));
-    {
-        SCOPED_TRACE("CREATE audit entry for shared network and ALL servers");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::CREATE,
-                          "shared network set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                       shared_network));
-    {
-        SCOPED_TRACE("CREATE audit entry for shared network and MULTIPLE servers");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::UPDATE,
-                          "shared network set");
-    }
-
-    SharedNetwork4Ptr network;
-    ASSERT_NO_THROW(network = cbptr_->getSharedNetwork4(ServerSelector::ANY(),
-                                                        shared_network->getName()));
-    ASSERT_TRUE(network);
-    EXPECT_TRUE(network->hasServerTag(ServerTag("server1")));
-    EXPECT_TRUE(network->hasServerTag(ServerTag("server2")));
-    EXPECT_FALSE(network->hasServerTag(ServerTag()));
-}
-
-// Test that createUpdateSharedNetwork4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateSharedNetwork4Selectors) {
-    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-
-    // Supported selectors.
-    SharedNetwork4Ptr shared_network(new SharedNetwork4("all"));
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       shared_network));
-    shared_network.reset(new SharedNetwork4("one"));
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"),
-                                                       shared_network));
-    shared_network.reset(new SharedNetwork4("multiple"));
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                       shared_network));
-
-    // Not supported server selectors.
-    EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ANY(), shared_network),
-                 isc::InvalidOperation);
-
-    // Not implemented server selectors.
-    EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::UNASSIGNED(),
-                                                    shared_network),
-                 isc::NotImplemented);
-}
-
-// Test that the information about unspecified optional parameters gets
-// propagated to the database.
-TEST_F(MySqlConfigBackendDHCPv4Test, getSharedNetwork4WithOptionalUnspecified) {
-    // Insert new shared network.
-    SharedNetwork4Ptr shared_network = test_networks_[2];
-    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), shared_network);
-
-    // Fetch this shared network by name.
-    SharedNetwork4Ptr
-        returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
-                                                     test_networks_[2]->getName());
-    ASSERT_TRUE(returned_network);
-
-    EXPECT_TRUE(returned_network->getIface().unspecified());
-    EXPECT_TRUE(returned_network->getIface().empty());
-
-    EXPECT_TRUE(returned_network->getClientClass().unspecified());
-    EXPECT_TRUE(returned_network->getClientClass().empty());
-
-    EXPECT_TRUE(returned_network->getValid().unspecified());
-    EXPECT_EQ(0, returned_network->getValid().get());
-
-    EXPECT_TRUE(returned_network->getT1().unspecified());
-    EXPECT_EQ(0, returned_network->getT1().get());
-
-    EXPECT_TRUE(returned_network->getT2().unspecified());
-    EXPECT_EQ(0, returned_network->getT2().get());
-
-    EXPECT_TRUE(returned_network->getReservationsGlobal().unspecified());
-    EXPECT_FALSE(returned_network->getReservationsGlobal().get());
-
-    EXPECT_TRUE(returned_network->getReservationsInSubnet().unspecified());
-    EXPECT_TRUE(returned_network->getReservationsInSubnet().get());
-
-    EXPECT_TRUE(returned_network->getReservationsOutOfPool().unspecified());
-    EXPECT_FALSE(returned_network->getReservationsOutOfPool().get());
-
-    EXPECT_TRUE(returned_network->getCalculateTeeTimes().unspecified());
-    EXPECT_FALSE(returned_network->getCalculateTeeTimes().get());
-
-    EXPECT_TRUE(returned_network->getT1Percent().unspecified());
-    EXPECT_EQ(0.0, returned_network->getT1Percent().get());
-
-    EXPECT_TRUE(returned_network->getT2Percent().unspecified());
-    EXPECT_EQ(0.0, returned_network->getT2Percent().get());
-
-    EXPECT_TRUE(returned_network->getMatchClientId().unspecified());
-    EXPECT_TRUE(returned_network->getMatchClientId().get());
-
-    EXPECT_TRUE(returned_network->getAuthoritative().unspecified());
-    EXPECT_FALSE(returned_network->getAuthoritative().get());
-
-    EXPECT_FALSE(returned_network->getDdnsSendUpdates().unspecified());
-    EXPECT_TRUE(returned_network->getDdnsSendUpdates().get());
-
-    EXPECT_FALSE(returned_network->getDdnsOverrideNoUpdate().unspecified());
-    EXPECT_TRUE(returned_network->getDdnsOverrideNoUpdate().get());
-
-    EXPECT_FALSE(returned_network->getDdnsOverrideClientUpdate().unspecified());
-    EXPECT_FALSE(returned_network->getDdnsOverrideClientUpdate().get());
-
-    EXPECT_FALSE(returned_network->getDdnsReplaceClientNameMode().unspecified());
-    EXPECT_EQ(D2ClientConfig::ReplaceClientNameMode::RCM_WHEN_PRESENT,
-              returned_network->getDdnsReplaceClientNameMode().get());
-
-    EXPECT_FALSE(returned_network->getDdnsGeneratedPrefix().unspecified());
-    EXPECT_EQ("myhost", returned_network->getDdnsGeneratedPrefix().get());
-
-    EXPECT_FALSE(returned_network->getDdnsQualifyingSuffix().unspecified());
-    EXPECT_EQ("example.org", returned_network->getDdnsQualifyingSuffix().get());
-}
-
-// Test that deleteSharedNetworkSubnets4 with not ANY selector throw.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteSharedNetworkSubnets4) {
-    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::UNASSIGNED(),
-                                                     test_networks_[1]->getName()),
-                 isc::InvalidOperation);
-    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ALL(),
-                                                     test_networks_[1]->getName()),
-                 isc::InvalidOperation);
-    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ONE("server1"),
-                                                     test_networks_[1]->getName()),
-                 isc::InvalidOperation);
-    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                     test_networks_[1]->getName()),
-                 isc::InvalidOperation);
-}
-
-// Test that all shared networks can be fetched.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4) {
-    // Insert test shared networks into the database. Note that the second shared
-    // network will overwrite the first shared network as they use the same name.
-    for (auto network : test_networks_) {
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
-
-        // That shared network overrides the first one so the audit entry should
-        // indicate an update.
-        if ((network->getName() == "level1") && (!audit_entries_["all"].empty())) {
-            SCOPED_TRACE("UPDATE audit entry for the shared network " +
-                         network->getName());
-            testNewAuditEntry("dhcp4_shared_network",
-                              AuditEntry::ModificationType::UPDATE,
-                              "shared network set");
-
-        } else {
-            SCOPED_TRACE("CREATE audit entry for the shared network " +
-                         network->getName());
-            testNewAuditEntry("dhcp4_shared_network",
-                              AuditEntry::ModificationType::CREATE,
-                              "shared network set");
-        }
-    }
-
-    // Fetch all shared networks.
-    SharedNetwork4Collection networks =
-        cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
-    ASSERT_EQ(test_networks_.size() - 1, networks.size());
-
-    // All shared networks should also be returned for explicitly specified
-    // server tag.
-    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1"));
-    ASSERT_EQ(test_networks_.size() - 1, networks.size());
-
-    // See if shared networks are returned ok.
-    for (auto i = 0; i < networks.size(); ++i) {
-        EXPECT_EQ(test_networks_[i + 1]->toElement()->str(),
-                  networks[i]->toElement()->str());
-        ASSERT_EQ(1, networks[i]->getServerTags().size());
-        EXPECT_EQ("all", networks[i]->getServerTags().begin()->get());
-    }
-
-    // Add some subnets.
-    test_networks_[1]->add(test_subnets_[0]);
-    test_subnets_[2]->setSharedNetworkName("level2");
-    test_networks_[2]->add(test_subnets_[3]);
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]);
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[2]);
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[3]);
-
-    // Both ways to attach a subnet are equivalent.
-    Subnet4Ptr subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                           test_subnets_[0]->getID());
-    ASSERT_TRUE(subnet);
-    EXPECT_EQ("level1", subnet->getSharedNetworkName());
-
-    {
-        SCOPED_TRACE("CREATE audit entry for subnets");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::CREATE,
-                          "subnet set", ServerSelector::ALL(), 3);
-    }
-
-    // Deleting non-existing shared network should return 0.
-    EXPECT_EQ(0, cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
-                                              "big-fish"));
-    // All shared networks should be still there.
-    ASSERT_EQ(test_networks_.size() - 1, networks.size());
-
-    // Should not delete the shared network for explicit server tag
-    // because our shared network is for all servers.
-    EXPECT_EQ(0, cbptr_->deleteSharedNetwork4(ServerSelector::ONE("server1"),
-                                              test_networks_[1]->getName()));
-
-    // Same for all shared networks.
-    EXPECT_EQ(0, cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1")));
-
-    // Delete first shared network with it subnets and verify it is gone.
-    // Begin by its subnet.
-    EXPECT_EQ(1, cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ANY(),
-                                                     test_networks_[1]->getName()));
-
-    {
-        SCOPED_TRACE("DELETE audit entry for subnets of the first shared network");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all subnets for a shared network");
-    }
-
-    // Check that the subnet is gone..
-    subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                test_subnets_[0]->getID());
-    EXPECT_FALSE(subnet);
-
-    // And after the shared network itself.
-    EXPECT_EQ(1, cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
-                                              test_networks_[1]->getName()));
-    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
-    ASSERT_EQ(test_networks_.size() - 2, networks.size());
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the first shared network");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::DELETE,
-                          "shared network deleted");
-    }
-
-    // Delete all.
-    EXPECT_EQ(2, cbptr_->deleteAllSharedNetworks4(ServerSelector::ALL()));
-    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
-    ASSERT_TRUE(networks.empty());
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the remaining two shared networks");
-        // The last parameter indicates that we expect two new audit entries.
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all shared networks", ServerSelector::ALL(), 2);
-    }
-
-    // Check that subnets are still there but detached.
-    subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                test_subnets_[2]->getID());
-    ASSERT_TRUE(subnet);
-    EXPECT_TRUE(subnet->getSharedNetworkName().empty());
-    subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                test_subnets_[3]->getID());
-    ASSERT_TRUE(subnet);
-    EXPECT_TRUE(subnet->getSharedNetworkName().empty());
-}
-
-// Test that getAllSharedNetworks4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::UNASSIGNED()));
-    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::ALL()));
-    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1")));
-    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::MULTIPLE({ "server1", "server2" })));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::ANY()),
-                 isc::InvalidOperation);
-}
-
-// Test that shared networks with different server associations are returned.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllSharedNetworks4WithServerTags) {
-    auto shared_network1 = test_networks_[0];
-    auto shared_network2 = test_networks_[2];
-    auto shared_network3 = test_networks_[3];
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       shared_network1));
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"),
-                                                       shared_network2));
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                       shared_network3));
-
-    SharedNetwork4Collection networks;
-
-    // All three networks are associated with the server1.
-    EXPECT_NO_THROW(networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1")));
-    EXPECT_EQ(3, networks.size());
-
-    // First network is associated with all servers.
-    auto returned_network = SharedNetworkFetcher4::get(networks, "level1");
-    ASSERT_TRUE(returned_network);
-    EXPECT_TRUE(returned_network->hasAllServerTag());
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
-
-    // Second network is only associated with the server1.
-    returned_network = SharedNetworkFetcher4::get(networks, "level2");
-    ASSERT_TRUE(returned_network);
-    EXPECT_FALSE(returned_network->hasAllServerTag());
-    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
-
-    // Third network is associated with both server1 and server2.
-    returned_network = SharedNetworkFetcher4::get(networks, "level3");
-    ASSERT_TRUE(returned_network);
-    EXPECT_FALSE(returned_network->hasAllServerTag());
-    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server1")));
-    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server2")));
-
-    // For server2 we should only get two shared networks, i.e. first and last.
-    EXPECT_NO_THROW(networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server2")));
-    EXPECT_EQ(2, networks.size());
-
-    // First shared network is associated with all servers.
-    returned_network = SharedNetworkFetcher4::get(networks, "level1");
-    ASSERT_TRUE(returned_network);
-    EXPECT_TRUE(returned_network->hasAllServerTag());
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
-
-    // Last shared network is associated with server1 and server2.
-    returned_network = SharedNetworkFetcher4::get(networks, "level3");
-    ASSERT_TRUE(returned_network);
-    EXPECT_FALSE(returned_network->hasAllServerTag());
-    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server1")));
-    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server2")));
-
-    // Only the first shared network is associated with all servers.
-    EXPECT_NO_THROW(networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL()));
-    EXPECT_EQ(1, networks.size());
-
-    returned_network = SharedNetworkFetcher4::get(networks, "level1");
-    ASSERT_TRUE(returned_network);
-    EXPECT_TRUE(returned_network->hasAllServerTag());
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server1")));
-    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
-}
-
-// Test that shared networks modified after given time can be fetched.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSharedNetworks4) {
-    // Explicitly set timestamps of shared networks. First shared
-    // network has a timestamp pointing to the future. Second shared
-    // network has timestamp pointing to the past (yesterday).
-    // Third shared network has a timestamp pointing to the
-    // past (an hour ago).
-    test_networks_[1]->setModificationTime(timestamps_["tomorrow"]);
-    test_networks_[2]->setModificationTime(timestamps_["yesterday"]);
-    test_networks_[3]->setModificationTime(timestamps_["today"]);
-
-    // Insert shared networks into the database.
-    for (int i = 1; i < test_networks_.size(); ++i) {
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                           test_networks_[i]);
-    }
-
-    // Fetch shared networks with timestamp later than today. Only one
-    // shared network  should be returned.
-    SharedNetwork4Collection
-        networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
-                                                      timestamps_["after today"]);
-    ASSERT_EQ(1, networks.size());
-
-    // Fetch shared networks with timestamp later than yesterday. We
-    // should get two shared networks.
-    networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
-                                                 timestamps_["after yesterday"]);
-    ASSERT_EQ(2, networks.size());
-
-    // Fetch shared networks with timestamp later than tomorrow. Nothing
-    // should be returned.
-    networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
-                                                  timestamps_["after tomorrow"]);
-    ASSERT_TRUE(networks.empty());
-}
-
-// Test that getModifiedSharedNetworks4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedSharedNetworks4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::UNASSIGNED(),
-                                                       timestamps_["yesterday"]));
-    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
-                                                       timestamps_["yesterday"]));
-    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::ONE("server1"),
-                                                       timestamps_["yesterday"]));
-    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                                       timestamps_["yesterday"]));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::ANY(),
-                                                    timestamps_["yesterday"]),
-                 isc::InvalidOperation);
-}
-
-// Test that selected shared network can be deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteSharedNetwork4) {
-    // Create two servers in the database.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("CREATE audit entry for server");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    auto shared_network1 = test_networks_[0];
-    auto shared_network2 = test_networks_[2];
-    auto shared_network3 = test_networks_[3];
-
-    // Insert three shared networks, one for all servers, one for server2 and
-    // one for two servers: server1 and server2.
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), shared_network1)
-    );
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server2"), shared_network2)
-    );
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                           shared_network3)
-    );
-
-    auto test_no_delete = [this] (const std::string& test_case_name,
-                                  const ServerSelector& server_selector,
-                                  const SharedNetwork4Ptr& shared_network) {
-        SCOPED_TRACE(test_case_name);
-        uint64_t deleted_count = 0;
-        EXPECT_NO_THROW(
-            deleted_count = cbptr_->deleteSharedNetwork4(server_selector,
-                                                         shared_network->getName())
-        );
-        EXPECT_EQ(0, deleted_count);
-    };
-
-    {
-        SCOPED_TRACE("Test valid but non matching server selectors");
-        test_no_delete("selector: one, actual: all", ServerSelector::ONE("server2"),
-                       shared_network1);
-        test_no_delete("selector: all, actual: one", ServerSelector::ALL(),
-                       shared_network2);
-        test_no_delete("selector: all, actual: multiple", ServerSelector::ALL(),
-                       shared_network3);
-    }
-
-    // We are not going to support deletion of a single entry for multiple servers.
-    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                              shared_network3->getName()),
-                 isc::InvalidOperation);
-
-    // We currently don't support deleting a shared network with specifying
-    // an unassigned server tag. Use ANY to delete any subnet instead.
-    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::UNASSIGNED(),
-                                              shared_network1->getName()),
-                 isc::NotImplemented);
-
-    // Test successful deletion of a shared network.
-    auto test_delete = [this] (const std::string& test_case_name,
-                               const ServerSelector& server_selector,
-                               const SharedNetwork4Ptr& shared_network) {
-        SCOPED_TRACE(test_case_name);
-        uint64_t deleted_count = 0;
-        EXPECT_NO_THROW(
-            deleted_count = cbptr_->deleteSharedNetwork4(server_selector,
-                                                         shared_network->getName())
-        );
-        EXPECT_EQ(1, deleted_count);
-
-        EXPECT_FALSE(cbptr_->getSharedNetwork4(server_selector,
-                                               shared_network->getName()));
-    };
-
-    test_delete("all servers", ServerSelector::ALL(), shared_network1);
-    test_delete("any server", ServerSelector::ANY(), shared_network2);
-    test_delete("one server", ServerSelector::ONE("server1"), shared_network3);
-}
-
-// Test that deleteSharedNetwork4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteSharedNetwork4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ANY(), "level1"));
-    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(), "level1"));
-    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ONE("server1"), "level1"));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
-                                           "level1"),
-                 isc::InvalidOperation);
-
-    // Not implemented selectors.
-    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::UNASSIGNED(), "level1"),
-                 isc::NotImplemented);
-}
-
-// Test that deleteAllSharedNetworks4 throws appropriate exceptions for various
-// server selectors.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteAllSharedNetworks4Selectors) {
-    // Supported selectors.
-    EXPECT_NO_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::UNASSIGNED()));
-    EXPECT_NO_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::ALL()));
-    EXPECT_NO_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1")));
-
-    // Not supported selectors.
-    EXPECT_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::ANY()),
-                 isc::InvalidOperation);
-    EXPECT_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::MULTIPLE({ "server1", "server2" })),
-                 isc::InvalidOperation);
-}
-
-// Test that it is possible to retrieve and delete orphaned shared network.
-TEST_F(MySqlConfigBackendDHCPv4Test, unassignedSharedNetwork) {
-    // Create the server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-
-    // Create the shared networks and associate them with the server1.
-    auto shared_network = test_networks_[0];
-    auto shared_network2 = test_networks_[2];
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"), shared_network)
-    );
-    EXPECT_NO_THROW(
-        cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"), shared_network2)
-    );
-
-    // Delete the server. The shared networks should be preserved but are
-    // considered orphaned, i.e. do not belong to any server.
-    uint64_t deleted_count = 0;
-    EXPECT_NO_THROW(deleted_count = cbptr_->deleteServer4(ServerTag("server1")));
-    EXPECT_EQ(1, deleted_count);
-
-    // Trying to fetch this shared network by server tag should return no result.
-    SharedNetwork4Ptr returned_network;
-    EXPECT_NO_THROW(returned_network = cbptr_->getSharedNetwork4(ServerSelector::ONE("server1"),
-                                                                 "level1"));
-    EXPECT_FALSE(returned_network);
-
-    // The same if we use other calls.
-    SharedNetwork4Collection returned_networks;
-    EXPECT_NO_THROW(
-        returned_networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1"))
-    );
-    EXPECT_TRUE(returned_networks.empty());
-
-    EXPECT_NO_THROW(
-        returned_networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ONE("server1"),
-                                                               timestamps_["two days ago"])
-    );
-    EXPECT_TRUE(returned_networks.empty());
-
-    // We should get the shared network if we ask for unassigned.
-    EXPECT_NO_THROW(returned_network = cbptr_->getSharedNetwork4(ServerSelector::UNASSIGNED(),
-                                                                 "level1"));
-    ASSERT_TRUE(returned_network);
-
-    // Also if we ask for all unassigned networks it should be returned.
-    EXPECT_NO_THROW(returned_networks = cbptr_->getAllSharedNetworks4(ServerSelector::UNASSIGNED()));
-    ASSERT_EQ(2, returned_networks.size());
-
-    // And all modified.
-    EXPECT_NO_THROW(
-        returned_networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::UNASSIGNED(),
-                                                               timestamps_["two days ago"])
-    );
-    ASSERT_EQ(2, returned_networks.size());
-
-    // If we ask for any network by name, it should be returned too.
-    EXPECT_NO_THROW(returned_network = cbptr_->getSharedNetwork4(ServerSelector::ANY(),
-                                                                 "level1"));
-    ASSERT_TRUE(returned_network);
-
-    // Deleting a shared network with the mismatched server tag should not affect
-    // our shared network.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteSharedNetwork4(ServerSelector::ONE("server1"),
-                                                     "level1")
-    );
-    EXPECT_EQ(0, deleted_count);
-
-    // Also, if we delete all shared networks for server1.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1"))
-    );
-    EXPECT_EQ(0, deleted_count);
-
-    // We can delete this shared network when we specify ANY and the matching name.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteSharedNetwork4(ServerSelector::ANY(), "level1")
-    );
-    EXPECT_EQ(1, deleted_count);
-
-    // We can delete all networks using UNASSIGNED selector.
-    EXPECT_NO_THROW(
-        deleted_count = cbptr_->deleteAllSharedNetworks4(ServerSelector::UNASSIGNED());
-    );
-    EXPECT_EQ(1, deleted_count);
-}
-
-// Test that lifetimes in shared networks are handled as expected.
-TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkLifetime) {
-    // Insert new shared network with unspecified valid lifetime
-    SharedNetwork4Ptr network(new SharedNetwork4("foo"));
-    Triplet<uint32_t> unspecified;
-    network->setValid(unspecified);
-    network->setIface("eth1");
-    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
-
-    // Fetch this shared network.
-    SharedNetwork4Ptr returned_network =
-        cbptr_->getSharedNetwork4(ServerSelector::ALL(), "foo");
-    ASSERT_TRUE(returned_network);
-
-    // Verified returned and original shared networks match.
-    EXPECT_EQ(network->toElement()->str(),
-              returned_network->toElement()->str());
-
-    // Update the preferred and valid lifetime.
-    network->setValid( Triplet<uint32_t>(100, 200, 300));
-    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
-
-    // Fetch and verify again.
-    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(), "foo");
-    ASSERT_TRUE(returned_network);
-    EXPECT_EQ(network->toElement()->str(),
-              returned_network->toElement()->str());
-}
-
-// Test that deleting a shared network triggers deletion of the options
-// associated with the shared network.
-TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkOptions) {
-    // Add shared network with three options.
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[0]));
-    EXPECT_EQ(3, countRows("dhcp4_options"));
-
-    // Add another shared network with a single option. The numnber of options in the
-    // database should now be 4.
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[2]));
-    EXPECT_EQ(4, countRows("dhcp4_options"));
-
-    // The second shared network uses the same name as the first shared network, so
-    // this operation should replace the existing shared network and its options.
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[1]));
-    EXPECT_EQ(1, countRows("dhcp4_options"));
-
-    // Remove the shared network. This should not affect options assigned to the
-    // other shared network.
-    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
-                                                 test_networks_[1]->getName()));
-    EXPECT_EQ(1, countRows("dhcp4_shared_network"));
-    EXPECT_EQ(1, countRows("dhcp4_options"));
-
-    // Create the first option again. The number of options should be equal to the
-    // sum of options associated with both shared networks.
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[0]));
-    EXPECT_EQ(4, countRows("dhcp4_options"));
-
-    // Delete this shared network. This should not affect the option associated
-    // with the remaining shared network.
-    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
-                                                 test_networks_[0]->getName()));
-    EXPECT_EQ(1, countRows("dhcp4_shared_network"));
-    EXPECT_EQ(1, countRows("dhcp4_options"));
-}
-
-// Test that option definition can be inserted, fetched, updated and then
-// fetched again.
-TEST_F(MySqlConfigBackendDHCPv4Test, getOptionDef4) {
-    // Insert new option definition.
-    OptionDefinitionPtr option_def = test_option_defs_[0];
-    cbptr_->createUpdateOptionDef4(ServerSelector::ALL(), option_def);
-
-    // Fetch this option_definition by subnet identifier.
-    OptionDefinitionPtr returned_option_def =
-        cbptr_->getOptionDef4(ServerSelector::ALL(),
-                              test_option_defs_[0]->getCode(),
-                              test_option_defs_[0]->getOptionSpaceName());
-    ASSERT_TRUE(returned_option_def);
-    EXPECT_GT(returned_option_def->getId(), 0);
-    ASSERT_EQ(1, returned_option_def->getServerTags().size());
-    EXPECT_EQ("all", returned_option_def->getServerTags().begin()->get());
-
-    EXPECT_TRUE(returned_option_def->equals(*option_def));
-
-    {
-        SCOPED_TRACE("CREATE audit entry for an option definition");
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::CREATE,
-                          "option definition set");
-    }
-
-    // Update the option definition in the database.
-    OptionDefinitionPtr option_def2 = test_option_defs_[1];
-    cbptr_->createUpdateOptionDef4(ServerSelector::ALL(), option_def2);
-
-    // Fetch updated option definition and see if it matches.
-    returned_option_def = cbptr_->getOptionDef4(ServerSelector::ALL(),
-                                                test_option_defs_[1]->getCode(),
-                                                test_option_defs_[1]->getOptionSpaceName());
-    EXPECT_TRUE(returned_option_def->equals(*option_def2));
-
-    // Fetching option definition for an explicitly specified server tag
-    // should succeed too.
-    returned_option_def = cbptr_->getOptionDef4(ServerSelector::ONE("server1"),
-                                                test_option_defs_[1]->getCode(),
-                                                test_option_defs_[1]->getOptionSpaceName());
-    EXPECT_TRUE(returned_option_def->equals(*option_def2));
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for an option definition");
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::UPDATE,
-                          "option definition set");
-    }
-}
-
-// This test verifies that it is possible to differentiate between the
-// option definitions by server tag and that the option definition
-// specified for the particular server overrides the definition for
-// all servers.
-TEST_F(MySqlConfigBackendDHCPv4Test, optionDefs4WithServerTags) {
-    OptionDefinitionPtr option1 = test_option_defs_[0];
-    OptionDefinitionPtr option2 = test_option_defs_[1];
-    OptionDefinitionPtr option3 = test_option_defs_[4];
-
-    // An attempt to create option definition for non-existing server should
-    // fail.
-    EXPECT_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server1"),
-                                                option1),
-                 NullKeyError);
-
-    // Create two servers.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("server2 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    // This time creation of the option definition for the server1 should pass.
-    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server1"),
-                                                   option1));
-    {
-        SCOPED_TRACE("option definition for server1 is set");
-        // The value of 3 means there should be 3 audit entries available for the
-        // server1, two that indicate creation of the servers and one that we
-        // validate, which sets the option definition.
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::CREATE,
-                          "option definition set",
-                          ServerSelector::ONE("server1"),
-                          3, 1);
-    }
-
-    // Creation of the option definition for the server2 should also pass.
-    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server2"),
-                                                   option2));
-    {
-        SCOPED_TRACE("option definition for server2 is set");
-        // Same as in case of the server1, there should be 3 audit entries and
-        // we validate one of them.
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::CREATE,
-                          "option definition set",
-                          ServerSelector::ONE("server2"),
-                          3, 1);
-    }
-
-    // Finally, creation of the option definition for all servers should
-    // also pass.
-    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ALL(),
-                                                   option3));
-    {
-        SCOPED_TRACE("option definition for server2 is set");
-        // There should be one new audit entry for all servers. It logs
-        // the insertion of the option definition.
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::CREATE,
-                          "option definition set",
-                          ServerSelector::ALL(),
-                          1, 1);
-    }
-
-    OptionDefinitionPtr returned_option_def;
-
-    // Try to fetch the option definition specified for all servers. It should
-    // return the third one.
-    EXPECT_NO_THROW(
-        returned_option_def = cbptr_->getOptionDef4(ServerSelector::ALL(),
-                                                    option3->getCode(),
-                                                    option3->getOptionSpaceName())
-    );
-    ASSERT_TRUE(returned_option_def);
-    EXPECT_TRUE(returned_option_def->equals(*option3));
-
-    // Try to fetch the option definition specified for server1. It should
-    // override the definition for all servers.
-    EXPECT_NO_THROW(
-        returned_option_def = cbptr_->getOptionDef4(ServerSelector::ONE("server1"),
-                                                    option1->getCode(),
-                                                    option1->getOptionSpaceName())
-    );
-    ASSERT_TRUE(returned_option_def);
-    EXPECT_TRUE(returned_option_def->equals(*option1));
-
-    // The same in case of the server2.
-    EXPECT_NO_THROW(
-        returned_option_def = cbptr_->getOptionDef4(ServerSelector::ONE("server2"),
-                                                    option2->getCode(),
-                                                    option2->getOptionSpaceName())
-    );
-    ASSERT_TRUE(returned_option_def);
-    EXPECT_TRUE(returned_option_def->equals(*option2));
-
-    OptionDefContainer returned_option_defs;
-
-    // Try to fetch the collection of the option definitions for server1, server2
-    // and server3. The server3 does not have an explicit option definition, so
-    // for this server we should get the definition associated with "all" servers.
-    EXPECT_NO_THROW(
-        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::
-                                                         MULTIPLE({ "server1", "server2",
-                                                                    "server3" }));
-    );
-    ASSERT_EQ(3, returned_option_defs.size());
-
-    // Check that expected option definitions have been returned.
-    auto current_option = returned_option_defs.begin();
-    EXPECT_TRUE((*current_option)->equals(*option1));
-    EXPECT_TRUE((*(++current_option))->equals(*option2));
-    EXPECT_TRUE((*(++current_option))->equals(*option3));
-
-    // Try to fetch the collection of options specified for all servers.
-    // This excludes the options specific to server1 and server2. It returns
-    // only the common ones.
-    EXPECT_NO_THROW(
-        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
-
-    );
-    ASSERT_EQ(1, returned_option_defs.size());
-    EXPECT_TRUE((*returned_option_defs.begin())->equals(*option3));
-
-    // Delete the server1. It should remove associations of this server with the
-    // option definitions and the option definition itself.
-    EXPECT_NO_THROW(cbptr_->deleteServer4(ServerTag("server1")));
-    EXPECT_NO_THROW(
-        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ONE("server1"));
-
-    );
-    ASSERT_EQ(1, returned_option_defs.size());
-    EXPECT_TRUE((*returned_option_defs.begin())->equals(*option3));
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the option definition after server deletion");
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting a server", ServerSelector::ONE("server1"),
-                          2, 1);
-    }
-
-    // Attempt to delete option definition for server1.
-    uint64_t deleted_num = 0;
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOptionDef4(ServerSelector::ONE("server1"),
-                                                           option1->getCode(),
-                                                           option1->getOptionSpaceName()));
-    EXPECT_EQ(0, deleted_num);
-
-    // Deleting the existing option definition for server2 should succeed.
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOptionDef4(ServerSelector::ONE("server2"),
-                                                           option2->getCode(),
-                                                           option2->getOptionSpaceName()));
-    EXPECT_EQ(1, deleted_num);
-
-    // Create this option definition again to test that deletion of all servers
-    // removes it too.
-    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server2"),
-                                                   option2));
-
-    // Delete all servers, except 'all'.
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
-    EXPECT_NO_THROW(
-        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
-    );
-    EXPECT_EQ(1, deleted_num);
-    EXPECT_EQ(1, returned_option_defs.size());
-    EXPECT_TRUE((*returned_option_defs.begin())->equals(*option3));
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the option definition after deletion of"
-                     " all servers");
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting all servers", ServerSelector::ONE("server2"),
-                          4, 1);
-    }
-}
-
-// Test that all option definitions can be fetched.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptionDefs4) {
-    // Insert test option definitions into the database. Note that the second
-    // option definition will overwrite the first option definition as they use
-    // the same code and space.
-    size_t updates_num = 0;
-    for (auto option_def : test_option_defs_) {
-        cbptr_->createUpdateOptionDef4(ServerSelector::ALL(), option_def);
-
-        // That option definition overrides the first one so the audit entry should
-        // indicate an update.
-        auto name = option_def->getName();
-        if (name.find("bar") != std::string::npos) {
-            SCOPED_TRACE("UPDATE audit entry for the option definition " + name);
-            testNewAuditEntry("dhcp4_option_def",
-                              AuditEntry::ModificationType::UPDATE,
-                              "option definition set");
-            ++updates_num;
-
-        } else {
-            SCOPED_TRACE("CREATE audit entry for the option definition " + name);
-            testNewAuditEntry("dhcp4_option_def",
-                              AuditEntry::ModificationType::CREATE,
-                              "option definition set");
-        }
-    }
-
-    // Fetch all option_definitions.
-    OptionDefContainer option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
-    ASSERT_EQ(test_option_defs_.size() - updates_num, option_defs.size());
-
-    // All option definitions should also be returned for explicitly specified
-    // server tag.
-    option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ONE("server1"));
-    ASSERT_EQ(test_option_defs_.size() - updates_num, option_defs.size());
-
-    // See if option definitions are returned ok.
-    for (auto def = option_defs.begin(); def != option_defs.end(); ++def) {
-        ASSERT_EQ(1, (*def)->getServerTags().size());
-        EXPECT_EQ("all", (*def)->getServerTags().begin()->get());
-        bool success = false;
-        for (auto i = 1; i < test_option_defs_.size(); ++i) {
-            if ((*def)->equals(*test_option_defs_[i])) {
-                success = true;
-            }
-        }
-        ASSERT_TRUE(success) << "failed for option definition " << (*def)->getCode()
-            << ", option space " << (*def)->getOptionSpaceName();
-    }
-
-    // Deleting non-existing option definition should return 0.
-    EXPECT_EQ(0, cbptr_->deleteOptionDef4(ServerSelector::ALL(),
-                                          99, "non-exiting-space"));
-    // All option definitions should be still there.
-    ASSERT_EQ(test_option_defs_.size() - updates_num, option_defs.size());
-
-    // Should not delete option definition for explicit server tag
-    // because our option definition is for all servers.
-    EXPECT_EQ(0, cbptr_->deleteOptionDef4(ServerSelector::ONE("server1"),
-                                          test_option_defs_[1]->getCode(),
-                                          test_option_defs_[1]->getOptionSpaceName()));
-
-    // Same for all option definitions.
-    EXPECT_EQ(0, cbptr_->deleteAllOptionDefs4(ServerSelector::ONE("server1")));
-
-    // Delete one of the option definitions and see if it is gone.
-    EXPECT_EQ(1, cbptr_->deleteOptionDef4(ServerSelector::ALL(),
-                                          test_option_defs_[2]->getCode(),
-                                          test_option_defs_[2]->getOptionSpaceName()));
-    ASSERT_FALSE(cbptr_->getOptionDef4(ServerSelector::ALL(),
-                                       test_option_defs_[2]->getCode(),
-                                       test_option_defs_[2]->getOptionSpaceName()));
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the first option definition");
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::DELETE,
-                          "option definition deleted");
-    }
-
-    // Delete all remaining option definitions.
-    EXPECT_EQ(2, cbptr_->deleteAllOptionDefs4(ServerSelector::ALL()));
-    option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
-    ASSERT_TRUE(option_defs.empty());
-
-    {
-        SCOPED_TRACE("DELETE audit entries for the remaining option definitions");
-        // The last parameter indicates that we expect two new audit entries.
-        testNewAuditEntry("dhcp4_option_def",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all option definitions", ServerSelector::ALL(), 2);
-    }
-}
-
-// Test that option definitions modified after given time can be fetched.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedOptionDefs4) {
-    // Explicitly set timestamps of option definitions. First option
-    // definition has a timestamp pointing to the future. Second option
-    // definition has timestamp pointing to the past (yesterday).
-    // Third option definitions has a timestamp pointing to the
-    // past (an hour ago).
-    test_option_defs_[1]->setModificationTime(timestamps_["tomorrow"]);
-    test_option_defs_[2]->setModificationTime(timestamps_["yesterday"]);
-    test_option_defs_[3]->setModificationTime(timestamps_["today"]);
-
-    // Insert option definitions into the database.
-    for (int i = 1; i < test_networks_.size(); ++i) {
-        cbptr_->createUpdateOptionDef4(ServerSelector::ALL(),
-                                       test_option_defs_[i]);
-    }
-
-    // Fetch option definitions with timestamp later than today. Only one
-    // option definition should be returned.
-    OptionDefContainer
-        option_defs = cbptr_->getModifiedOptionDefs4(ServerSelector::ALL(),
-                                                     timestamps_["after today"]);
-    ASSERT_EQ(1, option_defs.size());
-
-    // Fetch option definitions with timestamp later than yesterday. We
-    // should get two option definitions.
-    option_defs = cbptr_->getModifiedOptionDefs4(ServerSelector::ALL(),
-                                                 timestamps_["after yesterday"]);
-    ASSERT_EQ(2, option_defs.size());
-
-    // Fetch option definitions with timestamp later than tomorrow. Nothing
-    // should be returned.
-    option_defs = cbptr_->getModifiedOptionDefs4(ServerSelector::ALL(),
-                                              timestamps_["after tomorrow"]);
-    ASSERT_TRUE(option_defs.empty());
-}
-
-// This test verifies that global option can be added, updated and deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteOption4) {
-    // Add option to the database.
-    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                opt_boot_file_name);
-
-    // Make sure we can retrieve this option and that it is equal to the
-    // option we have inserted into the database.
-    OptionDescriptorPtr returned_opt_boot_file_name =
-        cbptr_->getOption4(ServerSelector::ALL(),
-                           opt_boot_file_name->option_->getType(),
-                           opt_boot_file_name->space_name_);
-    ASSERT_TRUE(returned_opt_boot_file_name);
-
-    {
-        SCOPED_TRACE("verify created option");
-        testOptionsEquivalent(*test_options_[0], *returned_opt_boot_file_name);
-    }
-
-    {
-        SCOPED_TRACE("CREATE audit entry for an option");
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::CREATE,
-                          "global option set");
-    }
-
-    // Modify option and update it in the database.
-    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                opt_boot_file_name);
-
-    // Retrieve the option again and make sure that updates were
-    // properly propagated to the database. Use explicit server selector
-    // which should also return this option.
-    returned_opt_boot_file_name = cbptr_->getOption4(ServerSelector::ONE("server1"),
-                                                     opt_boot_file_name->option_->getType(),
-                                                     opt_boot_file_name->space_name_);
-    ASSERT_TRUE(returned_opt_boot_file_name);
-
-    {
-        SCOPED_TRACE("verify updated option");
-        testOptionsEquivalent(*opt_boot_file_name, *returned_opt_boot_file_name);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for an option");
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::UPDATE,
-                          "global option set");
-    }
-
-    // Deleting an option with explicitly specified server tag should fail.
-    EXPECT_EQ(0, cbptr_->deleteOption4(ServerSelector::ONE("server1"),
-                                       opt_boot_file_name->option_->getType(),
-                                       opt_boot_file_name->space_name_));
-
-    // Deleting option for all servers should succeed.
-    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ALL(),
-                                       opt_boot_file_name->option_->getType(),
-                                       opt_boot_file_name->space_name_));
-
-    EXPECT_FALSE(cbptr_->getOption4(ServerSelector::ALL(),
-                                    opt_boot_file_name->option_->getType(),
-                                    opt_boot_file_name->space_name_));
-
-    {
-        SCOPED_TRACE("DELETE audit entry for an option");
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::DELETE,
-                          "global option deleted");
-    }
-}
-
-// This test verifies that it is possible to differentiate between the
-// global options by server tag and that the option specified for the
-// particular server overrides the value specified for all servers.
-TEST_F(MySqlConfigBackendDHCPv4Test, globalOptions4WithServerTags) {
-    OptionDescriptorPtr opt_boot_file_name1 = test_options_[0];
-    OptionDescriptorPtr opt_boot_file_name2 = test_options_[6];
-    OptionDescriptorPtr opt_boot_file_name3 = test_options_[7];
-
-    EXPECT_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server1"),
-                                             opt_boot_file_name1),
-                 NullKeyError);
-
-    // Create two servers.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("server2 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set");
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server1"),
-                                                opt_boot_file_name1));
-    {
-        SCOPED_TRACE("global option for server1 is set");
-        // The value of 3 means there should be 3 audit entries available for the
-        // server1, two that indicate creation of the servers and one that we
-        // validate, which sets the global option.
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::CREATE,
-                          "global option set",
-                          ServerSelector::ONE("server1"),
-                          3, 1);
-
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server2"),
-                                                opt_boot_file_name2));
-    {
-        SCOPED_TRACE("global option for server2 is set");
-        // Same as in case of the server1, there should be 3 audit entries and
-        // we validate one of them.
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::CREATE,
-                          "global option set",
-                          ServerSelector::ONE("server2"),
-                          3, 1);
-
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                                opt_boot_file_name3));
-    {
-        SCOPED_TRACE("global option for all servers is set");
-        // There should be one new audit entry for all servers. It logs
-        // the insertion of the global option.
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::CREATE,
-                          "global option set",
-                          ServerSelector::ALL(),
-                          1, 1);
-
-    }
-
-    OptionDescriptorPtr returned_option;
-
-    // Try to fetch the option specified for all servers. It should return
-    // the third option.
-    EXPECT_NO_THROW(
-        returned_option = cbptr_->getOption4(ServerSelector::ALL(),
-                                             opt_boot_file_name3->option_->getType(),
-                                             opt_boot_file_name3->space_name_);
-    );
-    ASSERT_TRUE(returned_option);
-    testOptionsEquivalent(*opt_boot_file_name3, *returned_option);
-
-    // Try to fetch the option specified for the server1. It should override the
-    // option specified for all servers.
-    EXPECT_NO_THROW(
-        returned_option = cbptr_->getOption4(ServerSelector::ONE("server1"),
-                                             opt_boot_file_name1->option_->getType(),
-                                             opt_boot_file_name1->space_name_);
-    );
-    ASSERT_TRUE(returned_option);
-    testOptionsEquivalent(*opt_boot_file_name1, *returned_option);
-
-    // The same in case of the server2.
-    EXPECT_NO_THROW(
-        returned_option = cbptr_->getOption4(ServerSelector::ONE("server2"),
-                                             opt_boot_file_name2->option_->getType(),
-                                             opt_boot_file_name2->space_name_);
-    );
-    ASSERT_TRUE(returned_option);
-    testOptionsEquivalent(*opt_boot_file_name2, *returned_option);
-
-    OptionContainer returned_options;
-
-    // Try to fetch the collection of global options for the server1, server2
-    // and server3. The server3 does not have an explicit value so for this server
-    // we should get the option associated with "all" servers.
-    EXPECT_NO_THROW(
-        returned_options = cbptr_->getAllOptions4(ServerSelector::
-                                                  MULTIPLE({ "server1", "server2",
-                                                             "server3" }));
-    );
-    ASSERT_EQ(3, returned_options.size());
-
-    // Check that expected options have been returned.
-    auto current_option = returned_options.begin();
-    testOptionsEquivalent(*opt_boot_file_name1, *current_option);
-    testOptionsEquivalent(*opt_boot_file_name2, *(++current_option));
-    testOptionsEquivalent(*opt_boot_file_name3, *(++current_option));
-
-    // Try to fetch the collection of options specified for all servers.
-    // This excludes the options specific to server1 and server2. It returns
-    // only the common ones.
-    EXPECT_NO_THROW(
-        returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
-    );
-    ASSERT_EQ(1, returned_options.size());
-    testOptionsEquivalent(*opt_boot_file_name3, *returned_options.begin());
-
-    // Delete the server1. It should remove associations of this server with the
-    // option and the option itself.
-    EXPECT_NO_THROW(cbptr_->deleteServer4(ServerTag("server1")));
-    EXPECT_NO_THROW(
-        returned_options = cbptr_->getAllOptions4(ServerSelector::ONE("server1"));
-    );
-    ASSERT_EQ(1, returned_options.size());
-    testOptionsEquivalent(*opt_boot_file_name3, *returned_options.begin());
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the global option after server deletion");
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting a server", ServerSelector::ONE("server1"),
-                          2, 1);
-    }
-
-    // Attempt to delete global option for server1.
-    uint64_t deleted_num = 0;
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOption4(ServerSelector::ONE("server1"),
-                                                        opt_boot_file_name1->option_->getType(),
-                                                        opt_boot_file_name1->space_name_));
-    EXPECT_EQ(0, deleted_num);
-
-    // Deleting the existing option for server2 should succeed.
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOption4(ServerSelector::ONE("server2"),
-                                                        opt_boot_file_name2->option_->getType(),
-                                                        opt_boot_file_name2->space_name_));
-    EXPECT_EQ(1, deleted_num);
-
-    // Create this option again to test that deletion of all servers removes it too.
-    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server2"),
-                                                opt_boot_file_name2));
-
-    // Delete all servers, except 'all'.
-    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
-    EXPECT_NO_THROW(
-        returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
-    );
-    EXPECT_EQ(1, deleted_num);
-    ASSERT_EQ(1, returned_options.size());
-    testOptionsEquivalent(*opt_boot_file_name3, *returned_options.begin());
-
-    {
-        SCOPED_TRACE("DELETE audit entry for the global option after deletion of"
-                     " all servers");
-        testNewAuditEntry("dhcp4_options",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleting all servers", ServerSelector::ONE("server2"),
-                          4, 1);
-    }
-}
-
-// This test verifies that all global options can be retrieved.
-TEST_F(MySqlConfigBackendDHCPv4Test, getAllOptions4) {
-    // Add three global options to the database.
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                test_options_[0]);
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                test_options_[1]);
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                test_options_[5]);
-
-    // Retrieve all these options.
-    OptionContainer returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
-    ASSERT_EQ(3, returned_options.size());
-
-    // Fetching global options with explicitly specified server tag should return
-    // the same result.
-    returned_options = cbptr_->getAllOptions4(ServerSelector::ONE("server1"));
-    ASSERT_EQ(3, returned_options.size());
-
-    // Get the container index used to search options by option code.
-    const OptionContainerTypeIndex& index = returned_options.get<1>();
-
-    // Verify that all options we put into the database were
-    // returned.
-    {
-        SCOPED_TRACE("verify test_options_[0]");
-        auto option0 = index.find(test_options_[0]->option_->getType());
-        ASSERT_FALSE(option0 == index.end());
-        testOptionsEquivalent(*test_options_[0], *option0);
-        EXPECT_GT(option0->getId(), 0);
-        ASSERT_EQ(1, option0->getServerTags().size());
-        EXPECT_EQ("all", option0->getServerTags().begin()->get());
-    }
-
-    {
-        SCOPED_TRACE("verify test_options_[1]");
-        auto option1 = index.find(test_options_[1]->option_->getType());
-        ASSERT_FALSE(option1 == index.end());
-        testOptionsEquivalent(*test_options_[1], *option1);
-        EXPECT_GT(option1->getId(), 0);
-        ASSERT_EQ(1, option1->getServerTags().size());
-        EXPECT_EQ("all", option1->getServerTags().begin()->get());
-    }
-
-    {
-        SCOPED_TRACE("verify test_options_[5]");
-        auto option5 = index.find(test_options_[5]->option_->getType());
-        ASSERT_FALSE(option5 == index.end());
-        testOptionsEquivalent(*test_options_[5], *option5);
-        EXPECT_GT(option5->getId(), 0);
-        ASSERT_EQ(1, option5->getServerTags().size());
-        EXPECT_EQ("all", option5->getServerTags().begin()->get());
-    }
-}
-
-// This test verifies that modified global options can be retrieved.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedOptions4) {
-    // Assign timestamps to the options we're going to store in the
-    // database.
-    test_options_[0]->setModificationTime(timestamps_["tomorrow"]);
-    test_options_[1]->setModificationTime(timestamps_["yesterday"]);
-    test_options_[5]->setModificationTime(timestamps_["today"]);
-
-    // Put options into the database.
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                test_options_[0]);
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                test_options_[1]);
-    cbptr_->createUpdateOption4(ServerSelector::ALL(),
-                                test_options_[5]);
-
-    // Get options with the timestamp later than today. Only
-    // one option should be returned.
-    OptionContainer returned_options =
-        cbptr_->getModifiedOptions4(ServerSelector::ALL(),
-                                    timestamps_["after today"]);
-    ASSERT_EQ(1, returned_options.size());
-
-    // Fetching modified options with explicitly specified server selector
-    // should return the same result.
-    returned_options = cbptr_->getModifiedOptions4(ServerSelector::ONE("server1"),
-                                                   timestamps_["after today"]);
-    ASSERT_EQ(1, returned_options.size());
-
-    // The returned option should be the one with the timestamp
-    // set to tomorrow.
-    const OptionContainerTypeIndex& index = returned_options.get<1>();
-    auto option0 = index.find(test_options_[0]->option_->getType());
-    ASSERT_FALSE(option0 == index.end());
-    {
-        SCOPED_TRACE("verify returned option");
-        testOptionsEquivalent(*test_options_[0], *option0);
-    }
-}
-
-// This test verifies that subnet level option can be added, updated and
-// deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteSubnetOption4) {
-    // Insert new subnet.
-    Subnet4Ptr subnet = test_subnets_[1];
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-    // Fetch this subnet by subnet identifier.
-    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                                    subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-
-    {
-        SCOPED_TRACE("CREATE audit entry for a new subnet");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::CREATE,
-                          "subnet set");
-    }
-
-    // The inserted subnet contains two options.
-    ASSERT_EQ(2, countRows("dhcp4_options"));
-
-    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
-    cbptr_->createUpdateOption4(ServerSelector::ANY(), subnet->getID(),
-                                opt_boot_file_name);
-
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                         subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-
-    OptionDescriptor returned_opt_boot_file_name =
-        returned_subnet->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    {
-        SCOPED_TRACE("verify returned option");
-        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
-        EXPECT_GT(returned_opt_boot_file_name.getId(), 0);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for an added subnet option");
-        // Instead of adding an audit entry for an option we add an audit
-        // entry for the entire subnet so as the server refreshes the
-        // subnet with the new option. Note that the server doesn't
-        // have means to retrieve only the newly added option.
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "subnet specific option set");
-    }
-
-    // We have added one option to the existing subnet. We should now have
-    // three options.
-    ASSERT_EQ(3, countRows("dhcp4_options"));
-
-    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
-    cbptr_->createUpdateOption4(ServerSelector::ANY(), subnet->getID(),
-                                opt_boot_file_name);
-
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ANY(),
-                                         subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-    returned_opt_boot_file_name =
-        returned_subnet->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    {
-        SCOPED_TRACE("verify returned option with modified persistence");
-        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for an updated subnet option");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "subnet specific option set");
-    }
-
-    // Updating the option should replace the existing instance with the new
-    // instance. Therefore, we should still have three options.
-    ASSERT_EQ(3, countRows("dhcp4_options"));
-
-    // It should succeed for any server.
-    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ANY(), subnet->getID(),
-                                       opt_boot_file_name->option_->getType(),
-                                       opt_boot_file_name->space_name_));
-
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                         subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-
-    EXPECT_FALSE(returned_subnet->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME).option_);
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for a deleted subnet option");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "subnet specific option deleted");
-    }
-
-    // We should have only two options after deleting one of them.
-    ASSERT_EQ(2, countRows("dhcp4_options"));
-}
-
-// This test verifies that option can be inserted, updated and deleted
-// from the pool.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeletePoolOption4) {
-    // Insert new subnet.
-    Subnet4Ptr subnet = test_subnets_[1];
-    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
-
-    {
-        SCOPED_TRACE("CREATE audit entry for a subnet");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::CREATE,
-                          "subnet set");
-    }
-
-    // Inserted subnet has two options.
-    ASSERT_EQ(2, countRows("dhcp4_options"));
-
-    // Add an option into the pool.
-    const PoolPtr pool = subnet->getPool(Lease::TYPE_V4, IOAddress("192.0.2.10"));
-    ASSERT_TRUE(pool);
-    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
-    cbptr_->createUpdateOption4(ServerSelector::ANY(),
-                                pool->getFirstAddress(),
-                                pool->getLastAddress(),
-                                opt_boot_file_name);
-
-    // Query for a subnet.
-    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                                    subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-
-    // The returned subnet should include our pool.
-    const PoolPtr returned_pool = returned_subnet->getPool(Lease::TYPE_V4,
-                                                           IOAddress("192.0.2.10"));
-    ASSERT_TRUE(returned_pool);
-
-    // The pool should contain option we added earlier.
-    OptionDescriptor returned_opt_boot_file_name =
-        returned_pool->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    {
-        SCOPED_TRACE("verify returned pool option");
-        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
-        EXPECT_GT(returned_opt_boot_file_name.getId(), 0);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for a subnet after adding an option "
-                     "to the pool");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "pool specific option set");
-    }
-
-    // With the newly inserted option we should now have three options.
-    ASSERT_EQ(3, countRows("dhcp4_options"));
-
-    // Modify the option and update it in the database.
-    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
-    cbptr_->createUpdateOption4(ServerSelector::ANY(),
-                                pool->getFirstAddress(),
-                                pool->getLastAddress(),
-                                opt_boot_file_name);
-
-    // Fetch the subnet and the corresponding pool.
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                         subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-    const PoolPtr returned_pool1 = returned_subnet->getPool(Lease::TYPE_V4,
-                                                            IOAddress("192.0.2.10"));
-    ASSERT_TRUE(returned_pool1);
-
-    // Test that the option has been correctly updated in the database.
-    returned_opt_boot_file_name =
-        returned_pool1->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    {
-        SCOPED_TRACE("verify updated option with modified persistence");
-        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for a subnet when updating pool "
-                     "specific option");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "pool specific option set");
-    }
-
-    // The new option instance should replace the existing one, so we should
-    // still have three options.
-    ASSERT_EQ(3, countRows("dhcp4_options"));
-
-    // Delete option for any server should succeed.
-    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ANY(),
-                                       pool->getFirstAddress(),
-                                       pool->getLastAddress(),
-                                       opt_boot_file_name->option_->getType(),
-                                       opt_boot_file_name->space_name_));
-
-    // Fetch the subnet and the pool from the database again to make sure
-    // that the option is really gone.
-    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
-                                         subnet->getID());
-    ASSERT_TRUE(returned_subnet);
-    const PoolPtr returned_pool2 = returned_subnet->getPool(Lease::TYPE_V4,
-                                                            IOAddress("192.0.2.10"));
-    ASSERT_TRUE(returned_pool2);
-
-    // Option should be gone.
-    EXPECT_FALSE(returned_pool2->getCfgOption()->get(DHCP4_OPTION_SPACE,
-                                                     DHO_BOOT_FILE_NAME).option_);
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for a subnet when deleting pool "
-                     "specific option");
-        testNewAuditEntry("dhcp4_subnet",
-                          AuditEntry::ModificationType::UPDATE,
-                          "pool specific option deleted");
-    }
-
-    // The option has been deleted so the number of options should now
-    // be down to 2.
-    EXPECT_EQ(2, countRows("dhcp4_options"));
-}
-
-// This test verifies that shared network level option can be added,
-// updated and deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateDeleteSharedNetworkOption4) {
-    // Insert new shared network.
-    SharedNetwork4Ptr shared_network = test_networks_[1];
-    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                       shared_network);
-
-    // Fetch this shared network by name.
-    SharedNetwork4Ptr returned_network =
-        cbptr_->getSharedNetwork4(ServerSelector::ALL(),
-                                  shared_network->getName());
-    ASSERT_TRUE(returned_network);
-
-    {
-        SCOPED_TRACE("CREATE audit entry for the new shared network");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::CREATE,
-                          "shared network set");
-    }
-
-    // The inserted shared network has no options.
-    ASSERT_EQ(0, countRows("dhcp4_options"));
-
-    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
-    cbptr_->createUpdateOption4(ServerSelector::ANY(),
-                                shared_network->getName(),
-                                opt_boot_file_name);
-
-    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
-                                                shared_network->getName());
-    ASSERT_TRUE(returned_network);
-
-    OptionDescriptor returned_opt_boot_file_name =
-        returned_network->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    {
-        SCOPED_TRACE("verify returned option");
-        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
-        EXPECT_GT(returned_opt_boot_file_name.getId(), 0);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for the added shared network option");
-        // Instead of adding an audit entry for an option we add an audit
-        // entry for the entire shared network so as the server refreshes the
-        // shared network with the new option. Note that the server doesn't
-        // have means to retrieve only the newly added option.
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::UPDATE,
-                          "shared network specific option set");
-    }
-
-    // One option should now be stored in the database.
-    ASSERT_EQ(1, countRows("dhcp4_options"));
-
-    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
-    cbptr_->createUpdateOption4(ServerSelector::ANY(),
-                                shared_network->getName(),
-                                opt_boot_file_name);
-
-    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
-                                                 shared_network->getName());
-    ASSERT_TRUE(returned_network);
-    returned_opt_boot_file_name =
-        returned_network->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    {
-        SCOPED_TRACE("verify updated option with modified persistence");
-        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
-    }
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for the updated shared network option");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::UPDATE,
-                          "shared network specific option set");
-    }
-
-    // The new option instance should replace the existing option instance,
-    // so we should still have one option.
-    ASSERT_EQ(1, countRows("dhcp4_options"));
-
-    // Deleting an option for any server should succeed.
-    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ANY(),
-                                       shared_network->getName(),
-                                       opt_boot_file_name->option_->getType(),
-                                       opt_boot_file_name->space_name_));
-    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
-                                                 shared_network->getName());
-    ASSERT_TRUE(returned_network);
-    EXPECT_FALSE(returned_network->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME).option_);
-
-    {
-        SCOPED_TRACE("UPDATE audit entry for the deleted shared network option");
-        testNewAuditEntry("dhcp4_shared_network",
-                          AuditEntry::ModificationType::UPDATE,
-                          "shared network specific option deleted");
-    }
-
-    // After deleting the option we should be back to 0.
-    EXPECT_EQ(0, countRows("dhcp4_options"));
-}
-
-// This test verifies that option id values in one subnet do
-// not impact options returned in subsequent subnets when
-// fetching subnets from the backend.
-TEST_F(MySqlConfigBackendDHCPv4Test, subnetOptionIdOrder) {
-
-    // Add a subnet with two pools with one option each.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[1]));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-    EXPECT_EQ(2, countRows("dhcp4_options"));
-
-    // Add a second subnet with a single option. The number of options in the database
-    // should now be 3.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[2]));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-    EXPECT_EQ(3, countRows("dhcp4_options"));
-
-    // Now replace the first subnet with three options and two pools.  This will cause
-    // the option id values for this subnet to be larger than those in the second
-    // subnet.
-    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]));
-    EXPECT_EQ(2, countRows("dhcp4_pool"));
-    EXPECT_EQ(4, countRows("dhcp4_options"));
-
-    // Now fetch all subnets.
-    Subnet4Collection subnets;
-    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ALL()));
-    ASSERT_EQ(2, subnets.size());
-
-    // Verify that the subnets returned are as expected.
-    for (auto subnet : subnets) {
-        ASSERT_EQ(1, subnet->getServerTags().size());
-        EXPECT_EQ("all", subnet->getServerTags().begin()->get());
-        if (subnet->getID() == 1024) {
-            EXPECT_EQ(test_subnets_[0]->toElement()->str(), subnet->toElement()->str());
-        } else if (subnet->getID() == 2048) {
-            EXPECT_EQ(test_subnets_[2]->toElement()->str(), subnet->toElement()->str());
-        } else {
-            ADD_FAILURE() << "unexpected subnet id:" << subnet->getID();
-        }
-    }
-}
-
-// This test verifies that option id values in one shared network do
-// not impact options returned in subsequent shared networks when
-// fetching shared networks from the backend.
-TEST_F(MySqlConfigBackendDHCPv4Test, sharedNetworkOptionIdOrder) {
-    auto level1_options = test_networks_[0];
-    auto level1_no_options = test_networks_[1];
-    auto level2 = test_networks_[2];
-
-    // Insert two shared networks. We insert level1 without options first,
-    // then level2.
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       level1_no_options));
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       level2));
-    // Fetch all shared networks.
-    SharedNetwork4Collection networks =
-        cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
-
-    ASSERT_EQ(2, networks.size());
-
-    // See if shared networks are returned ok.
-    for (auto i = 0; i < networks.size(); ++i) {
-        if (i == 0) {
-            // level1_no_options
-            EXPECT_EQ(level1_no_options->toElement()->str(),
-                  networks[i]->toElement()->str());
-        } else {
-            // bar
-            EXPECT_EQ(level2->toElement()->str(),
-                  networks[i]->toElement()->str());
-        }
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
-                                                       level1_options));
-
-    // Fetch all shared networks.
-    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
-    ASSERT_EQ(2, networks.size());
-
-    // See if shared networks are returned ok.
-    for (auto i = 0; i < networks.size(); ++i) {
-        if (i == 0) {
-            // level1_no_options
-            EXPECT_EQ(level1_options->toElement()->str(),
-                  networks[i]->toElement()->str());
-        } else {
-            // bar
-            EXPECT_EQ(level2->toElement()->str(),
-                  networks[i]->toElement()->str());
-        }
-    }
-}
-
-// This test verifies that it is possible to create client classes, update them
-// and retrieve all classes for a given server.
-TEST_F(MySqlConfigBackendDHCPv4Test, setAndGetAllClientClasses4) {
-    // Create a server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server1"));
-    }
-    // Create first class.
-    auto class1 = test_client_classes_[0];
-    class1->setTest("pkt4.msgtype == 1");
-    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-    {
-        SCOPED_TRACE("client class foo is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-    // Create second class.
-    auto class2 = test_client_classes_[1];
-    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
-    {
-        SCOPED_TRACE("client class bar is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-    // Create third class.
-    auto class3 = test_client_classes_[2];
-    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
-    {
-        SCOPED_TRACE("client class foobar is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-    // Update the third class to depend on the second class.
-    class3->setTest("member('foo')");
-    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
-    {
-        SCOPED_TRACE("client class bar is updated");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::UPDATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-    // Only the first class should be returned for the server selector ALL.
-    auto client_classes = cbptr_->getAllClientClasses4(ServerSelector::ALL());
-    ASSERT_EQ(1, client_classes.getClasses()->size());
-    // All three classes should be returned for the server1.
-    client_classes = cbptr_->getAllClientClasses4(ServerSelector::ONE("server1"));
-    auto classes_list = client_classes.getClasses();
-    ASSERT_EQ(3, classes_list->size());
-    EXPECT_EQ("foo", (*classes_list->begin())->getName());
-    EXPECT_EQ("bar", (*(classes_list->begin() + 1))->getName());
-    EXPECT_EQ("foobar", (*(classes_list->begin() + 2))->getName());
-
-
-    // Move the third class between the first and second class.
-    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, "foo"));
-
-    // Ensure that the classes order has changed.
-    client_classes = cbptr_->getAllClientClasses4(ServerSelector::ONE("server1"));
-    classes_list = client_classes.getClasses();
-    ASSERT_EQ(3, classes_list->size());
-    EXPECT_EQ("foo", (*classes_list->begin())->getName());
-    EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
-    EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
-
-    // Update the foobar class without specifying its position. It should not
-    // be moved.
-    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
-
-    client_classes = cbptr_->getAllClientClasses4(ServerSelector::ONE("server1"));
-    classes_list = client_classes.getClasses();
-    ASSERT_EQ(3, classes_list->size());
-    EXPECT_EQ("foo", (*classes_list->begin())->getName());
-    EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
-    EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
-}
-
-// This test verifies that a single class can be retrieved from the database.
-TEST_F(MySqlConfigBackendDHCPv4Test, getClientClass4) {
-    // Create a server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-
-    // Add classes.
-    auto class1 = test_client_classes_[0];
-    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[0]->option_,
-                                                test_options_[0]->persistent_,
-                                                test_options_[0]->space_name_));
-    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[1]->option_,
-                                                test_options_[1]->persistent_,
-                                                test_options_[1]->space_name_));
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-
-    auto class2 = test_client_classes_[1];
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
-
-    // Get the first client class and validate its contents.
-    ClientClassDefPtr client_class;
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(), class1->getName()));
-    ASSERT_TRUE(client_class);
-    EXPECT_EQ("foo", client_class->getName());
-    EXPECT_TRUE(client_class->getRequired());
-    EXPECT_EQ("1.2.3.4", client_class->getNextServer().toText());
-    EXPECT_EQ("cool", client_class->getSname());
-    EXPECT_EQ("epc.cfg", client_class->getFilename());
-    EXPECT_EQ(30, client_class->getValid().getMin());
-    EXPECT_EQ(60, client_class->getValid().get());
-    EXPECT_EQ(90, client_class->getValid().getMax());
-
-    // Validate options belonging to this class.
-    ASSERT_TRUE(client_class->getCfgOption());
-    OptionDescriptor returned_opt_boot_file_name =
-        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    OptionDescriptor returned_opt_ip_ttl =
-        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_DEFAULT_IP_TTL);
-    ASSERT_TRUE(returned_opt_ip_ttl.option_);
-
-    // Fetch the same class using different server selectors.
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ANY(),
-                                                           class1->getName()));
-    EXPECT_TRUE(client_class);
-
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ONE("server1"),
-                                                           class1->getName()));
-    EXPECT_TRUE(client_class);
-
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::UNASSIGNED(),
-                                                           class1->getName()));
-    EXPECT_FALSE(client_class);
-
-    // Fetch the second client class using different selectors. This time the
-    // class should not be returned for the ALL server selector because it is
-    // associated with the server1.
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(),
-                                                           class2->getName()));
-    EXPECT_FALSE(client_class);
-
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ANY(),
-                                                           class2->getName()));
-    EXPECT_TRUE(client_class);
-
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ONE("server1"),
-                                                           class2->getName()));
-    EXPECT_TRUE(client_class);
-
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::UNASSIGNED(),
-                                                           class2->getName()));
-    EXPECT_FALSE(client_class);
-}
-
-// This test verifies that client class specific DHCP options can be
-// modified during the class update.
-TEST_F(MySqlConfigBackendDHCPv4Test, createUpdateClientClass4Options) {
-    // Add class with two options and two option definitions.
-    auto class1 = test_client_classes_[0];
-    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[0]->option_,
-                                                test_options_[0]->persistent_,
-                                                test_options_[0]->space_name_));
-    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[1]->option_,
-                                                test_options_[1]->persistent_,
-                                                test_options_[1]->space_name_));
-    auto cfg_option_def = boost::make_shared<CfgOptionDef>();
-    class1->setCfgOptionDef(cfg_option_def);
-    EXPECT_NO_THROW(class1->getCfgOptionDef()->add(test_option_defs_[0]));
-    EXPECT_NO_THROW(class1->getCfgOptionDef()->add(test_option_defs_[2]));
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-
-    // Fetch the class and the options from the database.
-    ClientClassDefPtr client_class;
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(), class1->getName()));
-    ASSERT_TRUE(client_class);
-
-    // Validate options belonging to the class.
-    ASSERT_TRUE(client_class->getCfgOption());
-    OptionDescriptor returned_opt_boot_file_name =
-        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
-    ASSERT_TRUE(returned_opt_boot_file_name.option_);
-
-    OptionDescriptor returned_opt_ip_ttl =
-        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_DEFAULT_IP_TTL);
-    ASSERT_TRUE(returned_opt_ip_ttl.option_);
-
-    // Validate option definitions belonging to the class.
-    ASSERT_TRUE(client_class->getCfgOptionDef());
-    auto returned_def_foo = client_class->getCfgOptionDef()->get(test_option_defs_[0]->getOptionSpaceName(),
-                                                                 test_option_defs_[0]->getCode());
-    ASSERT_TRUE(returned_def_foo);
-    EXPECT_EQ(234, returned_def_foo->getCode());
-    EXPECT_EQ("foo", returned_def_foo->getName());
-    EXPECT_EQ(DHCP4_OPTION_SPACE, returned_def_foo->getOptionSpaceName());
-    EXPECT_EQ("espace", returned_def_foo->getEncapsulatedSpace());
-    EXPECT_EQ(OPT_STRING_TYPE, returned_def_foo->getType());
-    EXPECT_FALSE(returned_def_foo->getArrayType());
-
-    auto returned_def_fish = client_class->getCfgOptionDef()->get(test_option_defs_[2]->getOptionSpaceName(),
-                                                                  test_option_defs_[2]->getCode());
-    ASSERT_TRUE(returned_def_fish);
-    EXPECT_EQ(235, returned_def_fish->getCode());
-    EXPECT_EQ("fish", returned_def_fish->getName());
-    EXPECT_EQ(DHCP4_OPTION_SPACE, returned_def_fish->getOptionSpaceName());
-    EXPECT_TRUE(returned_def_fish->getEncapsulatedSpace().empty());
-    EXPECT_EQ(OPT_RECORD_TYPE, returned_def_fish->getType());
-    EXPECT_TRUE(returned_def_fish->getArrayType());
-
-    // Replace client class specific option definitions. Leave only one option
-    // definition.
-    cfg_option_def = boost::make_shared<CfgOptionDef>();
-    class1->setCfgOptionDef(cfg_option_def);
-    EXPECT_NO_THROW(class1->getCfgOptionDef()->add(test_option_defs_[2]));
-
-    // Delete one of the options and update the class.
-    class1->getCfgOption()->del(test_options_[0]->space_name_,
-                                test_options_[0]->option_->getType());
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(), class1->getName()));
-    ASSERT_TRUE(client_class);
-
-    // Ensure that the first option definition is gone.
-    ASSERT_TRUE(client_class->getCfgOptionDef());
-    returned_def_foo = client_class->getCfgOptionDef()->get(test_option_defs_[0]->getOptionSpaceName(),
-                                                            test_option_defs_[0]->getCode());
-    EXPECT_FALSE(returned_def_foo);
-
-    // The second option definition should be present.
-    returned_def_fish = client_class->getCfgOptionDef()->get(test_option_defs_[2]->getOptionSpaceName(),
-                                                             test_option_defs_[2]->getCode());
-    EXPECT_TRUE(returned_def_fish);
-
-    // Make sure that the first option is gone.
-    ASSERT_TRUE(client_class->getCfgOption());
-    returned_opt_boot_file_name = client_class->getCfgOption()->get(DHCP4_OPTION_SPACE,
-                                                                    DHO_BOOT_FILE_NAME);
-    EXPECT_FALSE(returned_opt_boot_file_name.option_);
-
-    // The second option should be there.
-    returned_opt_ip_ttl = client_class->getCfgOption()->get(DHCP4_OPTION_SPACE,
-                                                            DHO_DEFAULT_IP_TTL);
-    ASSERT_TRUE(returned_opt_ip_ttl.option_);
-}
-
-// This test verifies that modified client classes can be retrieved from the database.
-TEST_F(MySqlConfigBackendDHCPv4Test, getModifiedClientClasses4) {
-    // Create server1.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-
-    // Add three classes to the database with different timestamps.
-    auto class1 = test_client_classes_[0];
-    class1->setModificationTime(timestamps_["yesterday"]);
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-
-    auto class2 = test_client_classes_[1];
-    class2->setModificationTime(timestamps_["today"]);
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class2, ""));
-
-    auto class3 = test_client_classes_[2];
-    class3->setModificationTime(timestamps_["tomorrow"]);
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
-
-    // Get modified client classes configured for all servers.
-    auto client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ALL(),
-                                                            timestamps_["two days ago"]);
-    EXPECT_EQ(2, client_classes.getClasses()->size());
-
-    // Get modified client classes appropriate for server1. It includes classes
-    // for all servers and for the server1.
-    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
-                                                       timestamps_["two days ago"]);
-    EXPECT_EQ(3, client_classes.getClasses()->size());
-
-    // Get the classes again but use the timestamp equal to the modification
-    // time of the first class.
-    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
-                                                       timestamps_["yesterday"]);
-    EXPECT_EQ(3, client_classes.getClasses()->size());
-
-    // Get modified classes starting from today. It should return only two.
-    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
-                                                       timestamps_["today"]);
-    EXPECT_EQ(2, client_classes.getClasses()->size());
-
-    // Get client classes modified in the future. It should return none.
-    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
-                                                       timestamps_["after tomorrow"]);
-    EXPECT_EQ(0, client_classes.getClasses()->size());
-
-    // Getting modified client classes for any server is unsupported.
-    EXPECT_THROW(cbptr_->getModifiedClientClasses4(ServerSelector::ANY(),
-                                                   timestamps_["two days ago"]),
-                 InvalidOperation);
-}
-
-// This test verifies that a specified client class can be deleted.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteClientClass4) {
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("server1 is created and available for server1");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("server1 is created and available for server2");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    auto class1 = test_client_classes_[0];
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-    {
-        SCOPED_TRACE("client class foo is created and available for server1");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("client class foo is created and available for server 2");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    auto class2 = test_client_classes_[1];
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
-    {
-        SCOPED_TRACE("client class bar is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-
-    auto class3 = test_client_classes_[2];
-    class3->setTest("member('foo')");
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server2"), class3, ""));
-    {
-        SCOPED_TRACE("client class foobar is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    uint64_t result;
-    EXPECT_NO_THROW(result = cbptr_->deleteClientClass4(ServerSelector::ONE("server1"),
-                                                        class2->getName()));
-    EXPECT_EQ(1, result);
-    {
-        SCOPED_TRACE("client class bar is deleted");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "client class deleted",
-                          ServerSelector::ONE("server1"));
-    }
-
-    EXPECT_NO_THROW(result = cbptr_->deleteClientClass4(ServerSelector::ONE("server2"),
-                                                        class3->getName()));
-    EXPECT_EQ(1, result);
-    {
-        SCOPED_TRACE("client class foobar is deleted");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "client class deleted",
-                          ServerSelector::ONE("server2"));
-    }
-
-    EXPECT_NO_THROW(result = cbptr_->deleteClientClass4(ServerSelector::ANY(),
-                                                        class1->getName()));
-    EXPECT_EQ(1, result);
-    {
-        SCOPED_TRACE("client class foo is deleted and no longer available for the server1");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "client class deleted",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("client class foo is deleted and no longer available for the server2");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "client class deleted",
-                          ServerSelector::ONE("server2"));
-    }
-}
-
-// This test verifies that all client classes can be deleted using
-// a specified server selector.
-TEST_F(MySqlConfigBackendDHCPv4Test, deleteAllClientClasses4) {
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("server1 is created");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
-    {
-        SCOPED_TRACE("server1 is created and available for server1");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("server1 is created and available for server2");
-        testNewAuditEntry("dhcp4_server",
-                          AuditEntry::ModificationType::CREATE,
-                          "server set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    auto class1 = test_client_classes_[0];
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-    {
-        SCOPED_TRACE("client class foo is created and available for server1");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-    {
-        SCOPED_TRACE("client class foo is created and available for server 2");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    auto class2 = test_client_classes_[1];
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
-    {
-        SCOPED_TRACE("client class bar is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server1"));
-    }
-
-    auto class3 = test_client_classes_[2];
-    class3->setTest("member('foo')");
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server2"), class3, ""));
-    {
-        SCOPED_TRACE("client class foobar is created");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::CREATE,
-                          "client class set",
-                          ServerSelector::ONE("server2"));
-    }
-
-    uint64_t result;
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::UNASSIGNED()));
-    EXPECT_EQ(0, result);
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server2")));
-    EXPECT_EQ(1, result);
-    {
-        SCOPED_TRACE("client classes for server2 deleted");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all client classes",
-                          ServerSelector::ONE("server2"));
-    }
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server2")));
-    EXPECT_EQ(0, result);
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server1")));
-    EXPECT_EQ(1, result);
-    {
-        SCOPED_TRACE("client classes for server1 deleted");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all client classes",
-                          ServerSelector::ONE("server1"));
-    }
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server1")));
-    EXPECT_EQ(0, result);
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ALL()));
-    EXPECT_EQ(1, result);
-    {
-        SCOPED_TRACE("client classes for all deleted");
-        testNewAuditEntry("dhcp4_client_class",
-                          AuditEntry::ModificationType::DELETE,
-                          "deleted all client classes",
-                          ServerSelector::ONE("server1"));
-    }
-
-    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ALL()));
-    EXPECT_EQ(0, result);
-
-    // Deleting multiple objects using ANY server tag is unsupported.
-    EXPECT_THROW(cbptr_->deleteAllClientClasses4(ServerSelector::ANY()), InvalidOperation);
-}
-
-// This test verifies that client class dependencies are tracked when the
-// classes are added to the database. It verifies that an attempt to update
-// a class violating the dependencies results in an error.
-TEST_F(MySqlConfigBackendDHCPv4Test, clientClassDependencies4) {
-    // Create a server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
-
-    // Create first class. It depends on KNOWN built-in class.
-    auto class1 = test_client_classes_[0];
-    class1->setTest("member('KNOWN')");
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
-
-    // Create second class which depends on the first class. This yelds indirect
-    // dependency on KNOWN class.
-    auto class2 = test_client_classes_[1];
-    class2->setTest("member('foo')");
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class2, ""));
-
-    // Create third class depending on the second class. This also yelds indirect
-    // dependency on KNOWN class.
-    auto class3 = test_client_classes_[2];
-    class3->setTest("member('bar')");
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class3, ""));
-
-    // An attempt to move the first class to the end of the class hierarchy should
-    // fail because other classes depend on it.
-    EXPECT_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, "bar"),
-                 DbOperationError);
-
-    // Try to change the dependency of the first class. There are other classes
-    // having indirect dependency on KNOWN class via this class. Therefore, the
-    // update should be unsuccessful.
-    class1->setTest("member('HA_server1')");
-    EXPECT_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""),
-                 DbOperationError);
-
-    // Try to change the dependency of the second class. This should result in
-    // an error because the third class depends on it.
-    class2->setTest("member('HA_server1')");
-    EXPECT_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class2, ""),
-                 DbOperationError);
-
-    // Changing the indirect dependency of the third class should succeed, because
-    // no other classes depend on this class.
-    class3->setTest("member('HA_server1')");
-    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class3, ""));
-}
-
-/// This test verifies that audit entries can be retrieved from a given
-/// timestamp and id including when two entries can get the same timestamp.
-/// (either it is a common even and this should catch it, or it is a rare
-/// event and it does not matter).
-TEST_F(MySqlConfigBackendDHCPv4Test, multipleAuditEntries) {
-    // Get current time.
-    boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
-
-    // Create a server.
-    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
-
-    // Create a global parameter and update it many times.
-    const ServerSelector& server_selector = ServerSelector::ALL();
-    StampedValuePtr param;
-    ElementPtr value;
-    for (int i = 0; i < 100; ++i) {
-        value = Element::create(i);
-        param = StampedValue::create("my-parameter", value);
-        cbptr_->createUpdateGlobalParameter4(server_selector, param);
-    }
-
-    // Get all audit entries from now.
-    AuditEntryCollection audit_entries =
-        cbptr_->getRecentAuditEntries(server_selector, now, 0);
-
-    // Check that partial retrieves return the right count.
-    auto& mod_time_idx = audit_entries.get<AuditEntryModificationTimeIdTag>();
-    for (auto it = mod_time_idx.begin(); it != mod_time_idx.end(); ++it) {
-        size_t partial_size =
-            cbptr_->getRecentAuditEntries(server_selector,
-                                          (*it)->getModificationTime(),
-                                          (*it)->getRevisionId()).size();
-        EXPECT_EQ(partial_size + 1,
-                  std::distance(it, mod_time_idx.end()));
-    }
-}
-
-/// @brief Test fixture for verifying database connection loss-recovery
-/// behavior.
-class MySqlConfigBackendDHCPv4DbLostCallbackTest : public ::testing::Test {
-public:
-    MySqlConfigBackendDHCPv4DbLostCallbackTest()
-        : db_lost_callback_called_(0), db_recovered_callback_called_(0),
-          db_failed_callback_called_(0),
-          io_service_(boost::make_shared<isc::asiolink::IOService>()) {
-        isc::db::DatabaseConnection::db_lost_callback_ = 0;
-        isc::db::DatabaseConnection::db_recovered_callback_ = 0;
-        isc::db::DatabaseConnection::db_failed_callback_ = 0;
-        isc::dhcp::MySqlConfigBackendImpl::setIOService(io_service_);
-        isc::dhcp::TimerMgr::instance()->setIOService(io_service_);
-        isc::dhcp::CfgMgr::instance().clear();
-    }
-
-    virtual ~MySqlConfigBackendDHCPv4DbLostCallbackTest() {
-        isc::db::DatabaseConnection::db_lost_callback_ = 0;
-        isc::db::DatabaseConnection::db_recovered_callback_ = 0;
-        isc::db::DatabaseConnection::db_failed_callback_ = 0;
-        isc::dhcp::MySqlConfigBackendImpl::setIOService(isc::asiolink::IOServicePtr());
-        isc::dhcp::TimerMgr::instance()->unregisterTimers();
-        isc::dhcp::CfgMgr::instance().clear();
-    }
-
-    /// @brief Prepares the class for a test.
-    ///
-    /// Invoked by gtest prior test entry, we create the
-    /// appropriate schema and create a basic DB manager to
-    /// wipe out any prior instance
-    virtual void SetUp() {
-        // Ensure we have the proper schema with no transient data.
-        createMySQLSchema();
-        isc::dhcp::CfgMgr::instance().clear();
-        isc::dhcp::MySqlConfigBackendDHCPv4::registerBackendType();
-    }
-
-    /// @brief Pre-text exit clean up
-    ///
-    /// Invoked by gtest upon test exit, we destroy the schema
-    /// we created.
-    virtual void TearDown() {
-        // If data wipe enabled, delete transient data otherwise destroy the schema
-        destroyMySQLSchema();
-        isc::dhcp::CfgMgr::instance().clear();
-        isc::dhcp::MySqlConfigBackendDHCPv4::unregisterBackendType();
-    }
-
-    /// @brief Method which returns the back end specific connection
-    /// string
-    virtual std::string validConnectString() {
-        return (validMySQLConnectionString());
-    }
-
-    /// @brief Method which returns invalid back end specific connection
-    /// string
-    virtual std::string invalidConnectString() {
-        return (connectionString(MYSQL_VALID_TYPE, INVALID_NAME, VALID_HOST,
-                                 VALID_USER, VALID_PASSWORD));
-    }
-
-    /// @brief Verifies open failures do NOT invoke db lost callback
-    ///
-    /// The db lost callback should only be invoked after successfully
-    /// opening the DB and then subsequently losing it. Failing to
-    /// open should be handled directly by the application layer.
-    void testNoCallbackOnOpenFailure();
-
-    /// @brief Verifies the CB manager's behavior if DB connection is lost
-    ///
-    /// This function creates a CB manager with a back end that supports
-    /// connectivity lost callback. It verifies connectivity by issuing a known
-    /// valid query. Next it simulates connectivity lost by identifying and
-    /// closing the socket connection to the CB backend. It then reissues the
-    /// query and verifies that:
-    /// -# The Query throws  DbOperationError (rather than exiting)
-    /// -# The registered DbLostCallback was invoked
-    /// -# The registered DbRecoveredCallback was invoked
-    void testDbLostAndRecoveredCallback();
-
-    /// @brief Verifies the CB manager's behavior if DB connection is lost
-    ///
-    /// This function creates a CB manager with a back end that supports
-    /// connectivity lost callback. It verifies connectivity by issuing a known
-    /// valid query. Next it simulates connectivity lost by identifying and
-    /// closing the socket connection to the CB backend. It then reissues the
-    /// query and verifies that:
-    /// -# The Query throws  DbOperationError (rather than exiting)
-    /// -# The registered DbLostCallback was invoked
-    /// -# The registered DbFailedCallback was invoked
-    void testDbLostAndFailedCallback();
-
-    /// @brief Verifies the CB manager's behavior if DB connection is lost
-    ///
-    /// This function creates a CB manager with a back end that supports
-    /// connectivity lost callback. It verifies connectivity by issuing a known
-    /// valid query. Next it simulates connectivity lost by identifying and
-    /// closing the socket connection to the CB backend. It then reissues the
-    /// query and verifies that:
-    /// -# The Query throws  DbOperationError (rather than exiting)
-    /// -# The registered DbLostCallback was invoked
-    /// -# The registered DbRecoveredCallback was invoked after two reconnect
-    /// attempts (once failing and second triggered by timer)
-    void testDbLostAndRecoveredAfterTimeoutCallback();
-
-    /// @brief Verifies the CB manager's behavior if DB connection is lost
-    ///
-    /// This function creates a CB manager with a back end that supports
-    /// connectivity lost callback. It verifies connectivity by issuing a known
-    /// valid query. Next it simulates connectivity lost by identifying and
-    /// closing the socket connection to the CB backend. It then reissues the
-    /// query and verifies that:
-    /// -# The Query throws  DbOperationError (rather than exiting)
-    /// -# The registered DbLostCallback was invoked
-    /// -# The registered DbFailedCallback was invoked after two reconnect
-    /// attempts (once failing and second triggered by timer)
-    void testDbLostAndFailedAfterTimeoutCallback();
-
-    /// @brief Callback function registered with the CB manager
-    bool db_lost_callback(db::ReconnectCtlPtr /* not_used */) {
-        return (++db_lost_callback_called_);
-    }
-
-    /// @brief Flag used to detect calls to db_lost_callback function
-    uint32_t db_lost_callback_called_;
-
-    /// @brief Callback function registered with the CB manager
-    bool db_recovered_callback(db::ReconnectCtlPtr /* not_used */) {
-        return (++db_recovered_callback_called_);
-    }
-
-    /// @brief Flag used to detect calls to db_recovered_callback function
-    uint32_t db_recovered_callback_called_;
-
-    /// @brief Callback function registered with the CB manager
-    bool db_failed_callback(db::ReconnectCtlPtr /* not_used */) {
-        return (++db_failed_callback_called_);
-    }
-
-    /// @brief Flag used to detect calls to db_failed_callback function
-    uint32_t db_failed_callback_called_;
-
-    /// The IOService object, used for all ASIO operations.
-    isc::asiolink::IOServicePtr io_service_;
-};
-
-void
-MySqlConfigBackendDHCPv4DbLostCallbackTest::testNoCallbackOnOpenFailure() {
-    isc::db::DatabaseConnection::db_lost_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_lost_callback, this, ph::_1);
-
-    // Set the connectivity recovered callback.
-    isc::db::DatabaseConnection::db_recovered_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_recovered_callback, this, ph::_1);
-
-    // Set the connectivity failed callback.
-    isc::db::DatabaseConnection::db_failed_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_failed_callback, this, ph::_1);
-
-    std::string access = invalidConnectString();
-
-    // Connect to the CB backend.
-    ASSERT_THROW(ConfigBackendDHCPv4Mgr::instance().addBackend(access), DbOpenError);
-
-    io_service_->poll();
-
-    EXPECT_EQ(0, db_lost_callback_called_);
-    EXPECT_EQ(0, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-}
-
-void
-MySqlConfigBackendDHCPv4DbLostCallbackTest::testDbLostAndRecoveredCallback() {
-    // Set the connectivity lost callback.
-    isc::db::DatabaseConnection::db_lost_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_lost_callback, this, ph::_1);
-
-    // Set the connectivity recovered callback.
-    isc::db::DatabaseConnection::db_recovered_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_recovered_callback, this, ph::_1);
-
-    // Set the connectivity failed callback.
-    isc::db::DatabaseConnection::db_failed_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_failed_callback, this, ph::_1);
-
-    std::string access = validConnectString();
-
-    ConfigControlInfoPtr config_ctl_info(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-
-    // Find the most recently opened socket. Our SQL client's socket should
-    // be the next one.
-    int last_open_socket = findLastSocketFd();
-
-    // Fill holes.
-    FillFdHoles holes(last_open_socket);
-
-    // Connect to the CB backend.
-    ASSERT_NO_THROW(ConfigBackendDHCPv4Mgr::instance().addBackend(access));
-
-    // Find the SQL client socket.
-    int sql_socket = findLastSocketFd();
-    ASSERT_TRUE(sql_socket > last_open_socket);
-
-    // Verify we can execute a query.  We don't care about the answer.
-    ServerCollection servers;
-    ASSERT_NO_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()));
-
-    // Now close the sql socket out from under backend client
-    ASSERT_EQ(0, close(sql_socket));
-
-    // A query should fail with DbConnectionUnusable.
-    ASSERT_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()),
-                 DbConnectionUnusable);
-
-    io_service_->poll();
-
-    // Our lost and recovered connectivity callback should have been invoked.
-    EXPECT_EQ(1, db_lost_callback_called_);
-    EXPECT_EQ(1, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-}
-
-void
-MySqlConfigBackendDHCPv4DbLostCallbackTest::testDbLostAndFailedCallback() {
-    // Set the connectivity lost callback.
-    isc::db::DatabaseConnection::db_lost_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_lost_callback, this, ph::_1);
-
-    // Set the connectivity recovered callback.
-    isc::db::DatabaseConnection::db_recovered_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_recovered_callback, this, ph::_1);
-
-    // Set the connectivity failed callback.
-    isc::db::DatabaseConnection::db_failed_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_failed_callback, this, ph::_1);
-
-    std::string access = validConnectString();
-    ConfigControlInfoPtr config_ctl_info(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-
-    // Find the most recently opened socket. Our SQL client's socket should
-    // be the next one.
-    int last_open_socket = findLastSocketFd();
-
-    // Fill holes.
-    FillFdHoles holes(last_open_socket);
-
-    // Connect to the CB backend.
-    ASSERT_NO_THROW(ConfigBackendDHCPv4Mgr::instance().addBackend(access));
-
-    // Find the SQL client socket.
-    int sql_socket = findLastSocketFd();
-    ASSERT_TRUE(sql_socket > last_open_socket);
-
-    // Verify we can execute a query.  We don't care about the answer.
-    ServerCollection servers;
-    ASSERT_NO_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()));
-
-    access = invalidConnectString();
-    CfgMgr::instance().clear();
-    // by adding an invalid access will cause the manager factory to throw
-    // resulting in failure to recreate the manager
-    config_ctl_info.reset(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-    const ConfigDbInfoList& cfg = CfgMgr::instance().getCurrentCfg()->getConfigControlInfo()->getConfigDatabases();
-    (const_cast<ConfigDbInfoList&>(cfg))[0].setAccessString(access, true);
-
-    // Now close the sql socket out from under backend client
-    ASSERT_EQ(0, close(sql_socket));
-
-    // A query should fail with DbConnectionUnusable.
-    ASSERT_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()),
-                 DbConnectionUnusable);
-
-    io_service_->poll();
-
-    // Our lost and failed connectivity callback should have been invoked.
-    EXPECT_EQ(1, db_lost_callback_called_);
-    EXPECT_EQ(0, db_recovered_callback_called_);
-    EXPECT_EQ(1, db_failed_callback_called_);
-}
-
-void
-MySqlConfigBackendDHCPv4DbLostCallbackTest::testDbLostAndRecoveredAfterTimeoutCallback() {
-    // Set the connectivity lost callback.
-    isc::db::DatabaseConnection::db_lost_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_lost_callback, this, ph::_1);
-
-    // Set the connectivity recovered callback.
-    isc::db::DatabaseConnection::db_recovered_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_recovered_callback, this, ph::_1);
-
-    // Set the connectivity failed callback.
-    isc::db::DatabaseConnection::db_failed_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_failed_callback, this, ph::_1);
-
-    std::string access = validConnectString();
-    std::string extra = " max-reconnect-tries=3 reconnect-wait-time=1";
-    access += extra;
-    ConfigControlInfoPtr config_ctl_info(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-
-    // Find the most recently opened socket. Our SQL client's socket should
-    // be the next one.
-    int last_open_socket = findLastSocketFd();
-
-    // Fill holes.
-    FillFdHoles holes(last_open_socket);
-
-    // Connect to the CB backend.
-    ASSERT_NO_THROW(ConfigBackendDHCPv4Mgr::instance().addBackend(access));
-
-    // Find the SQL client socket.
-    int sql_socket = findLastSocketFd();
-    ASSERT_TRUE(sql_socket > last_open_socket);
-
-    // Verify we can execute a query.  We don't care about the answer.
-    ServerCollection servers;
-    ASSERT_NO_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()));
-
-    access = invalidConnectString();
-    access += extra;
-    CfgMgr::instance().clear();
-    // by adding an invalid access will cause the manager factory to throw
-    // resulting in failure to recreate the manager
-    config_ctl_info.reset(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-    const ConfigDbInfoList& cfg = CfgMgr::instance().getCurrentCfg()->getConfigControlInfo()->getConfigDatabases();
-    (const_cast<ConfigDbInfoList&>(cfg))[0].setAccessString(access, true);
-
-    // Now close the sql socket out from under backend client
-    ASSERT_EQ(0, close(sql_socket));
-
-    // A query should fail with DbConnectionUnusable.
-    ASSERT_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()),
-                 DbConnectionUnusable);
-
-    io_service_->poll();
-
-    // Our lost connectivity callback should have been invoked.
-    EXPECT_EQ(1, db_lost_callback_called_);
-    EXPECT_EQ(0, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-
-    access = validConnectString();
-    access += extra;
-    CfgMgr::instance().clear();
-    config_ctl_info.reset(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-
-    sleep(1);
-
-    io_service_->poll();
-
-    // Our lost and recovered connectivity callback should have been invoked.
-    EXPECT_EQ(2, db_lost_callback_called_);
-    EXPECT_EQ(1, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-
-    sleep(1);
-
-    io_service_->poll();
-
-    // No callback should have been invoked.
-    EXPECT_EQ(2, db_lost_callback_called_);
-    EXPECT_EQ(1, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-}
-
-void
-MySqlConfigBackendDHCPv4DbLostCallbackTest::testDbLostAndFailedAfterTimeoutCallback() {
-    // Set the connectivity lost callback.
-    isc::db::DatabaseConnection::db_lost_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_lost_callback, this, ph::_1);
-
-    // Set the connectivity recovered callback.
-    isc::db::DatabaseConnection::db_recovered_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_recovered_callback, this, ph::_1);
-
-    // Set the connectivity failed callback.
-    isc::db::DatabaseConnection::db_failed_callback_ =
-        std::bind(&MySqlConfigBackendDHCPv4DbLostCallbackTest::db_failed_callback, this, ph::_1);
-
-    std::string access = validConnectString();
-    std::string extra = " max-reconnect-tries=3 reconnect-wait-time=1";
-    access += extra;
-    ConfigControlInfoPtr config_ctl_info(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-
-    // Find the most recently opened socket. Our SQL client's socket should
-    // be the next one.
-    int last_open_socket = findLastSocketFd();
-
-    // Fill holes.
-    FillFdHoles holes(last_open_socket);
-
-    // Connect to the CB backend.
-    ASSERT_NO_THROW(ConfigBackendDHCPv4Mgr::instance().addBackend(access));
-
-    // Find the SQL client socket.
-    int sql_socket = findLastSocketFd();
-    ASSERT_TRUE(sql_socket > last_open_socket);
-
-    // Verify we can execute a query.  We don't care about the answer.
-    ServerCollection servers;
-    ASSERT_NO_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()));
-
-    access = invalidConnectString();
-    access += extra;
-    CfgMgr::instance().clear();
-    // by adding an invalid access will cause the manager factory to throw
-    // resulting in failure to recreate the manager
-    config_ctl_info.reset(new ConfigControlInfo());
-    config_ctl_info->addConfigDatabase(access);
-    CfgMgr::instance().getCurrentCfg()->setConfigControlInfo(config_ctl_info);
-    const ConfigDbInfoList& cfg = CfgMgr::instance().getCurrentCfg()->getConfigControlInfo()->getConfigDatabases();
-    (const_cast<ConfigDbInfoList&>(cfg))[0].setAccessString(access, true);
-
-    // Now close the sql socket out from under backend client
-    ASSERT_EQ(0, close(sql_socket));
-
-    // A query should fail with DbConnectionUnusable.
-    ASSERT_THROW(servers = ConfigBackendDHCPv4Mgr::instance().getPool()->getAllServers4(BackendSelector()),
-                 DbConnectionUnusable);
-
-    io_service_->poll();
-
-    // Our lost connectivity callback should have been invoked.
-    EXPECT_EQ(1, db_lost_callback_called_);
-    EXPECT_EQ(0, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-
-    sleep(1);
-
-    io_service_->poll();
-
-    // Our lost connectivity callback should have been invoked.
-    EXPECT_EQ(2, db_lost_callback_called_);
-    EXPECT_EQ(0, db_recovered_callback_called_);
-    EXPECT_EQ(0, db_failed_callback_called_);
-
-    sleep(1);
-
-    io_service_->poll();
-
-    // Our lost and failed connectivity callback should have been invoked.
-    EXPECT_EQ(3, db_lost_callback_called_);
-    EXPECT_EQ(0, db_recovered_callback_called_);
-    EXPECT_EQ(1, db_failed_callback_called_);
-}
-
-/// @brief Verifies that db lost callback is not invoked on an open failure
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testNoCallbackOnOpenFailure) {
-    MultiThreadingTest mt(false);
-    testNoCallbackOnOpenFailure();
-}
-
-/// @brief Verifies that db lost callback is not invoked on an open failure
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testNoCallbackOnOpenFailureMultiThreading) {
-    MultiThreadingTest mt(true);
-    testNoCallbackOnOpenFailure();
-}
-
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredCallback) {
-    MultiThreadingTest mt(false);
-    testDbLostAndRecoveredCallback();
-}
-
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredCallbackMultiThreading) {
-    MultiThreadingTest mt(true);
-    testDbLostAndRecoveredCallback();
-}
-
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedCallback) {
-    MultiThreadingTest mt(false);
-    testDbLostAndFailedCallback();
-}
-
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedCallbackMultiThreading) {
-    MultiThreadingTest mt(true);
-    testDbLostAndFailedCallback();
-}
-
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
-TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredAfterTimeoutCallback) {
-    MultiThreadingTest mt(false);
-    testDbLostAndRecoveredAfterTimeoutCallback();
-}
-
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
 TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredAfterTimeoutCallbackMultiThreading) {
     MultiThreadingTest mt(true);
     testDbLostAndRecoveredAfterTimeoutCallback();
 }
 
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
 TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedAfterTimeoutCallback) {
     MultiThreadingTest mt(false);
     testDbLostAndFailedAfterTimeoutCallback();
 }
 
-/// @brief Verifies that loss of connectivity to MySQL is handled correctly.
 TEST_F(MySqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedAfterTimeoutCallbackMultiThreading) {
     MultiThreadingTest mt(true);
     testDbLostAndFailedAfterTimeoutCallback();
index 966016eb64a3f68f572f815f78019eec5eaddddd..a59ada14e20b673a682c4b907d20eb2967d3c87e 100644 (file)
@@ -64,18 +64,28 @@ public:
     /// @brief Destructor.
     virtual ~PgSqlConfigBackendDHCPv4Test(){};
 
+    /// @brief Creates the PostgreSQL back end schema
     virtual void createSchema() {
         createPgSQLSchema();
     }
 
+    /// @brief Destroys the PostgreSQL back end schema
     virtual void destroySchema() {
         destroyPgSQLSchema();
     }
 
+    /// @brief Returns a valid PostgreSQL back end specific connection
+    /// string
     std::string validConnectionString() {
         return (validPgSQLConnectionString());
     }
 
+    /// @brief Instantiates an instance of a PostgreSQL DHCPv4 configuration
+    /// back end.
+    ///
+    /// @params Connection parameters describing the back end to create.
+    ///
+    /// @return Pointer to the newly created back end instance.
     ConfigBackendDHCPv4Ptr backendFactory(db::DatabaseConnection::ParameterMap&
                                           params) {
 
@@ -107,24 +117,18 @@ public:
     }
 };
 
-// This test verifies that the expected backend type is returned.
 TEST_F(PgSqlConfigBackendDHCPv4Test, getType) {
     getTypeTest("postgresql");
 }
 
-// This test verifies that by default localhost is returned as PgSQL connection
-// host.
 TEST_F(PgSqlConfigBackendDHCPv4Test, getHost) {
     getHostTest();
 }
 
-// This test verifies that by default port of 0 is returned as PgSQL connection
-// port.
 TEST_F(PgSqlConfigBackendDHCPv4Test, getPort) {
     getPortTest();
 }
 
-// This test verifies that the server can be added, updated and deleted.
 TEST_F(PgSqlConfigBackendDHCPv4Test, createUpdateDeleteServer) {
     createUpdateDeleteServerTest();
 }
@@ -197,26 +201,21 @@ public:
     }
 };
 
-
-/// @brief Verifies that db lost callback is not invoked on an open failure
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testNoCallbackOnOpenFailure) {
     MultiThreadingTest mt(false);
     testNoCallbackOnOpenFailure();
 }
 
-/// @brief Verifies that db lost callback is not invoked on an open failure
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testNoCallbackOnOpenFailureMultiThreading) {
     MultiThreadingTest mt(true);
     testNoCallbackOnOpenFailure();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredCallback) {
     MultiThreadingTest mt(false);
     testDbLostAndRecoveredCallback();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredCallbackMultiThreading) {
     MultiThreadingTest mt(true);
     testDbLostAndRecoveredCallback();
@@ -228,31 +227,26 @@ TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedCallback)
     testDbLostAndFailedCallback();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedCallbackMultiThreading) {
     MultiThreadingTest mt(true);
     testDbLostAndFailedCallback();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredAfterTimeoutCallback) {
     MultiThreadingTest mt(false);
     testDbLostAndRecoveredAfterTimeoutCallback();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndRecoveredAfterTimeoutCallbackMultiThreading) {
     MultiThreadingTest mt(true);
     testDbLostAndRecoveredAfterTimeoutCallback();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedAfterTimeoutCallback) {
     MultiThreadingTest mt(false);
     testDbLostAndFailedAfterTimeoutCallback();
 }
 
-/// @brief Verifies that loss of connectivity to PgSQL is handled correctly.
 TEST_F(PgSqlConfigBackendDHCPv4DbLostCallbackTest, testDbLostAndFailedAfterTimeoutCallbackMultiThreading) {
     MultiThreadingTest mt(true);
     testDbLostAndFailedAfterTimeoutCallback();
index bb159776389485b5ace6cca3e7ede416b5d7de5f..5bbf316191fe0d74aa64cef68c6ced105f1cf1af 100644 (file)
@@ -454,7 +454,7 @@ GenericConfigBackendDHCPv4Test::getPortTest() {
 }
 
 void
-GenericConfigBackendDHCPv4Test::newAuditEntryTest(const std::string& exp_object_type,
+GenericConfigBackendDHCPv4Test::testNewAuditEntry(const std::string& exp_object_type,
                                                   const AuditEntry::ModificationType&
                                                         exp_modification_type,
                                                   const std::string& exp_log_message,
@@ -506,8 +506,8 @@ GenericConfigBackendDHCPv4Test::newAuditEntryTest(const std::string& exp_object_
     }
 }
 
-// This test verifies that the server can be added, updated and deleted.
-void GenericConfigBackendDHCPv4Test::createUpdateDeleteServerTest() {
+void
+GenericConfigBackendDHCPv4Test::createUpdateDeleteServerTest() {
     // Explicitly set modification time to make sure that the time
     // returned from the database is correct.
     test_servers_[0]->setModificationTime(timestamps_["yesterday"]);
@@ -518,7 +518,7 @@ void GenericConfigBackendDHCPv4Test::createUpdateDeleteServerTest() {
 
     {
         SCOPED_TRACE("CREATE audit entry for server");
-        newAuditEntryTest("dhcp4_server",
+        testNewAuditEntry("dhcp4_server",
                           AuditEntry::ModificationType::CREATE,
                           "server set");
     }
@@ -547,7 +547,7 @@ void GenericConfigBackendDHCPv4Test::createUpdateDeleteServerTest() {
 
     {
         SCOPED_TRACE("UPDATE audit entry for server");
-        newAuditEntryTest("dhcp4_server",
+        testNewAuditEntry("dhcp4_server",
                           AuditEntry::ModificationType::UPDATE,
                           "server set");
     }
@@ -578,7 +578,7 @@ void GenericConfigBackendDHCPv4Test::createUpdateDeleteServerTest() {
 
     {
         SCOPED_TRACE("DELETE audit entry for server");
-        newAuditEntryTest("dhcp4_server",
+        testNewAuditEntry("dhcp4_server",
                           AuditEntry::ModificationType::DELETE,
                           "deleting a server");
     }
@@ -587,3 +587,4034 @@ void GenericConfigBackendDHCPv4Test::createUpdateDeleteServerTest() {
     ASSERT_NO_THROW_LOG(returned_server = cbptr_->getServer4(ServerTag("server1")));
     EXPECT_FALSE(returned_server);
 }
+
+void
+GenericConfigBackendDHCPv4Test::getAndDeleteAllServersTest() {
+    for (auto i = 1; i < test_servers_.size(); ++i) {
+        EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[i]));
+    }
+
+    ServerCollection servers;
+    EXPECT_NO_THROW(servers = cbptr_->getAllServers4());
+    ASSERT_EQ(test_servers_.size() - 1, servers.size());
+
+    // All servers should have been returned.
+    EXPECT_TRUE(ServerFetcher::get(servers, ServerTag("server1")));
+    EXPECT_TRUE(ServerFetcher::get(servers, ServerTag("server2")));
+    EXPECT_TRUE(ServerFetcher::get(servers, ServerTag("server3")));
+
+    // The logical server all should not be returned. We merely return the
+    // user configured servers.
+    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag()));
+
+    // Delete all servers and make sure they are gone.
+    uint64_t deleted_servers = 0;
+    EXPECT_NO_THROW(deleted_servers = cbptr_->deleteAllServers4());
+
+    EXPECT_NO_THROW(servers = cbptr_->getAllServers4());
+    EXPECT_TRUE(servers.empty());
+
+    // All servers should be gone.
+    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag("server1")));
+    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag("server2")));
+    EXPECT_FALSE(ServerFetcher::get(servers, ServerTag("server3")));
+
+    // The number of deleted server should be equal to the number of
+    // inserted servers. The logical 'all' server should be excluded.
+    EXPECT_EQ(test_servers_.size() - 1, deleted_servers);
+
+    EXPECT_EQ(1, countRows("dhcp4_server"));
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateDeleteGlobalParameter4Test() {
+    StampedValuePtr global_parameter = StampedValue::create("global", "whale");
+
+    // Explicitly set modification time to make sure that the time
+    // returned from the database is correct.
+    global_parameter->setModificationTime(timestamps_["yesterday"]);
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+                                         global_parameter);
+
+    {
+        SCOPED_TRACE("CREATE audit entry for global parameter");
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::CREATE,
+                          "global parameter set");
+    }
+
+    // Verify returned parameter and the modification time.
+    StampedValuePtr returned_global_parameter =
+        cbptr_->getGlobalParameter4(ServerSelector::ALL(), "global");
+    ASSERT_TRUE(returned_global_parameter);
+    EXPECT_EQ("global", returned_global_parameter->getName());
+    EXPECT_EQ("whale", returned_global_parameter->getValue());
+    EXPECT_TRUE(returned_global_parameter->getModificationTime() ==
+                global_parameter->getModificationTime());
+    ASSERT_EQ(1, returned_global_parameter->getServerTags().size());
+    EXPECT_EQ("all", returned_global_parameter->getServerTags().begin()->get());
+
+    // Because we have added the global parameter for all servers, it
+    // should be also returned for the explicitly specified server.
+    returned_global_parameter = cbptr_->getGlobalParameter4(ServerSelector::ONE("server1"),
+                                                            "global");
+    ASSERT_TRUE(returned_global_parameter);
+    EXPECT_EQ("global", returned_global_parameter->getName());
+    EXPECT_EQ("whale", returned_global_parameter->getValue());
+    EXPECT_TRUE(returned_global_parameter->getModificationTime() ==
+                global_parameter->getModificationTime());
+    ASSERT_EQ(1, returned_global_parameter->getServerTags().size());
+    EXPECT_EQ("all", returned_global_parameter->getServerTags().begin()->get());
+
+    // Check that the parameter is updated when selector is specified correctly.
+    global_parameter = StampedValue::create("global", "fish");
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+                                         global_parameter);
+    returned_global_parameter = cbptr_->getGlobalParameter4(ServerSelector::ALL(),
+                                                            "global");
+    ASSERT_TRUE(returned_global_parameter);
+    EXPECT_EQ("global", returned_global_parameter->getName());
+    EXPECT_EQ("fish", returned_global_parameter->getValue());
+    EXPECT_TRUE(returned_global_parameter->getModificationTime() ==
+                global_parameter->getModificationTime());
+    ASSERT_EQ(1, returned_global_parameter->getServerTags().size());
+    EXPECT_EQ("all", returned_global_parameter->getServerTags().begin()->get());
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for the global parameter");
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::UPDATE,
+                          "global parameter set");
+    }
+
+    // Should not delete parameter specified for all servers if explicit
+    // server name is provided.
+    EXPECT_EQ(0, cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server1"),
+                                                "global"));
+
+    // Delete parameter and make sure it is gone.
+    cbptr_->deleteGlobalParameter4(ServerSelector::ALL(), "global");
+    returned_global_parameter = cbptr_->getGlobalParameter4(ServerSelector::ALL(),
+                                                            "global");
+    EXPECT_FALSE(returned_global_parameter);
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the global parameter");
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::DELETE,
+                          "global parameter deleted");
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::globalParameters4WithServerTagsTest() {
+    // Create three global parameters having the same name.
+    StampedValuePtr global_parameter1 = StampedValue::create("global", "value1");
+    StampedValuePtr global_parameter2 = StampedValue::create("global", "value2");
+    StampedValuePtr global_parameter3 = StampedValue::create("global", "value3");
+
+    // Try to insert one of them and associate with non-existing server.
+    // This should fail because the server must be inserted first.
+    EXPECT_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server1"),
+                                                      global_parameter1),
+                 NullKeyError);
+
+    // Create two servers.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("server2 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    // This time inserting the global parameters for the server1 and server2 should
+    // be successful.
+    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server1"),
+                                                         global_parameter1));
+    {
+        SCOPED_TRACE("Global parameter for server1 is set");
+        // The value of 3 means there should be 3 audit entries available for the
+        // server1, two that indicate creation of the servers and one that we
+        // validate, which sets the global value.
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::CREATE,
+                          "global parameter set",
+                          ServerSelector::ONE("server1"),
+                          3, 1);
+    }
+
+
+    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server2"),
+                                                         global_parameter2));
+    {
+        SCOPED_TRACE("Global parameter for server2 is set");
+        // Same as in case of the server2, there should be 3 audit entries of
+        // which one we validate.
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::CREATE,
+                          "global parameter set",
+                          ServerSelector::ONE("server2"),
+                          3, 1);
+    }
+
+    // The last parameter is associated with all servers.
+    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+                                                         global_parameter3));
+    {
+        SCOPED_TRACE("Global parameter for all servers is set");
+        // There should be one new audit entry for all servers. It indicates
+        // the insertion of the global value.
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::CREATE,
+                          "global parameter set",
+                          ServerSelector::ALL(),
+                          1, 1);
+    }
+
+    StampedValuePtr returned_global;
+
+    // Try to fetch the value specified for all servers.
+    EXPECT_NO_THROW(
+        returned_global = cbptr_->getGlobalParameter4(ServerSelector::ALL(),
+                                                      "global")
+    );
+    ASSERT_TRUE(returned_global);
+    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
+    ASSERT_EQ(1, returned_global->getServerTags().size());
+    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+
+    // Try to fetch the value specified for the server1. This should override the
+    // value specified for all servers.
+    EXPECT_NO_THROW(
+        returned_global = cbptr_->getGlobalParameter4(ServerSelector::ONE("server1"),
+                                                      "global")
+    );
+    ASSERT_TRUE(returned_global);
+    EXPECT_EQ(global_parameter1->getValue(), returned_global->getValue());
+
+    ASSERT_EQ(1, returned_global->getServerTags().size());
+    EXPECT_EQ("server1", returned_global->getServerTags().begin()->get());
+
+    // The same in case of the server2.
+    EXPECT_NO_THROW(
+        returned_global = cbptr_->getGlobalParameter4(ServerSelector::ONE("server2"),
+                                                      "global")
+    );
+    ASSERT_TRUE(returned_global);
+    EXPECT_EQ(global_parameter2->getValue(), returned_global->getValue());
+    ASSERT_EQ(1, returned_global->getServerTags().size());
+    EXPECT_EQ("server2", returned_global->getServerTags().begin()->get());
+
+    StampedValueCollection returned_globals;
+
+    // Try to fetch the collection of globals for the server1, server2 and server3.
+    // The server3 does not have an explicit value so for this server we should get
+    /// the value for 'all'.
+    EXPECT_NO_THROW(
+        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::
+                                                           MULTIPLE({ "server1", "server2",
+                                                                      "server3" }));
+    );
+    ASSERT_EQ(3, returned_globals.size());
+
+    // Capture the returned values into the map so as we can check the
+    // values against the servers.
+    std::map<std::string, std::string> values;
+    for (auto g = returned_globals.begin(); g != returned_globals.end(); ++g) {
+        ASSERT_EQ(1, (*g)->getServerTags().size());
+        values[(*g)->getServerTags().begin()->get()] = ((*g)->getValue());
+    }
+
+    ASSERT_EQ(3, values.size());
+    EXPECT_EQ(global_parameter1->getValue(), values["server1"]);
+    EXPECT_EQ(global_parameter2->getValue(), values["server2"]);
+    EXPECT_EQ(global_parameter3->getValue(), values["all"]);
+
+    // Try to fetch the collection of global parameters specified for all servers.
+    // This excludes the values specific to server1 and server2. It returns only the
+    // common ones.
+    EXPECT_NO_THROW(
+        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ALL())
+    );
+    ASSERT_EQ(1, returned_globals.size());
+    returned_global = *returned_globals.begin();
+    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
+    ASSERT_EQ(1, returned_global->getServerTags().size());
+    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+
+    // Delete the server1. It should remove associations of this server with the
+    // global parameter and the global parameter itself.
+    EXPECT_NO_THROW(cbptr_->deleteServer4(ServerTag("server1")));
+    EXPECT_NO_THROW(
+        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ONE("server1"))
+    );
+    ASSERT_EQ(1, returned_globals.size());
+    returned_global = *returned_globals.begin();
+    // As a result, the value fetched for the server1 should be the one available for
+    // all servers, rather than the one dedicated for server1. The association of
+    // the server1 specific value with the server1 should be gone.
+    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
+    ASSERT_EQ(1, returned_global->getServerTags().size());
+    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the global parameter after server deletion");
+        // We expect two new audit entries for the server1, one indicating that the
+        // server has been deleted and another one indicating that the corresponding
+        // global value has been deleted. We check the latter entry.
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleting a server", ServerSelector::ONE("server1"),
+                          2, 1);
+    }
+
+    // Attempt to delete global parameter for server1.
+    uint64_t deleted_num = 0;
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server1"),
+                                                                 "global"));
+    // No parameters should be deleted. In particular, the parameter for the logical
+    // server 'all' should not be deleted.
+    EXPECT_EQ(0, deleted_num);
+
+    // Deleting the existing value for server2 should succeed.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteGlobalParameter4(ServerSelector::ONE("server2"),
+                                                                 "global"));
+    EXPECT_EQ(1, deleted_num);
+
+    // Create it again to test that deletion of all server removes this too.
+    EXPECT_NO_THROW(cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server2"),
+                                                         global_parameter2));
+
+    // Delete all servers, except 'all'.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
+    EXPECT_NO_THROW(
+        returned_globals = cbptr_->getAllGlobalParameters4(ServerSelector::ALL())
+    );
+    EXPECT_EQ(1, deleted_num);
+    ASSERT_EQ(1, returned_globals.size());
+    returned_global = *returned_globals.begin();
+    // The common value for all servers should still be available because 'all'
+    // logical server should not be deleted.
+    EXPECT_EQ(global_parameter3->getValue(), returned_global->getValue());
+    ASSERT_EQ(1, returned_global->getServerTags().size());
+    EXPECT_EQ("all", returned_global->getServerTags().begin()->get());
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the global parameter after deletion of"
+                     " all servers");
+        // There should be 4 new audit entries. One for deleting the global, one for
+        // re-creating it, one for deleting the server2 and one for deleting the
+        // global again as a result of deleting the server2.
+        testNewAuditEntry("dhcp4_global_parameter",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleting all servers", ServerSelector::ONE("server2"),
+                          4, 1);
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllGlobalParameters4Test() {
+    // Create 3 parameters and put them into the database.
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+        StampedValue::create("name1", "value1"));
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+        StampedValue::create("name2", Element::create(static_cast<int64_t>(65))));
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+        StampedValue::create("name3", "value3"));
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+        StampedValue::create("name4", Element::create(static_cast<bool>(true))));
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+        StampedValue::create("name5", Element::create(static_cast<double>(1.65))));
+
+    // Fetch all parameters.
+    auto parameters = cbptr_->getAllGlobalParameters4(ServerSelector::ALL());
+    ASSERT_EQ(5, parameters.size());
+
+    const auto& parameters_index = parameters.get<StampedValueNameIndexTag>();
+
+    // Verify their values.
+    EXPECT_EQ("value1", (*parameters_index.find("name1"))->getValue());
+    EXPECT_EQ(65, (*parameters_index.find("name2"))->getIntegerValue());
+    EXPECT_EQ("value3", (*parameters_index.find("name3"))->getValue());
+    EXPECT_TRUE((*parameters_index.find("name4"))->getBoolValue());
+    EXPECT_EQ(1.65, (*parameters_index.find("name5"))->getDoubleValue());
+
+    for (auto param = parameters_index.begin(); param != parameters_index.end();
+         ++param) {
+        ASSERT_EQ(1, (*param)->getServerTags().size());
+        EXPECT_EQ("all", (*param)->getServerTags().begin()->get());
+    }
+
+    // Should be able to fetch these parameters when explicitly providing
+    // the server tag.
+    parameters = cbptr_->getAllGlobalParameters4(ServerSelector::ONE("server1"));
+    EXPECT_EQ(5, parameters.size());
+
+    // Deleting global parameters with non-matching server selector
+    // should fail.
+    EXPECT_EQ(0, cbptr_->deleteAllGlobalParameters4(ServerSelector::ONE("server1")));
+
+    // Delete all parameters and make sure they are gone.
+    EXPECT_EQ(5, cbptr_->deleteAllGlobalParameters4(ServerSelector::ALL()));
+    parameters = cbptr_->getAllGlobalParameters4(ServerSelector::ALL());
+    EXPECT_TRUE(parameters.empty());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedGlobalParameters4Test() {
+    // Create 3 global parameters and assign modification times:
+    // "yesterday", "today" and "tomorrow" respectively.
+    StampedValuePtr value = StampedValue::create("name1", "value1");
+    value->setModificationTime(timestamps_["yesterday"]);
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+                                         value);
+
+    value = StampedValue::create("name2", Element::create(static_cast<int64_t>(65)));
+    value->setModificationTime(timestamps_["today"]);
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+                                         value);
+
+    value = StampedValue::create("name3", "value3");
+    value->setModificationTime(timestamps_["tomorrow"]);
+    cbptr_->createUpdateGlobalParameter4(ServerSelector::ALL(),
+                                         value);
+
+    // Get parameters modified after "today".
+    auto parameters = cbptr_->getModifiedGlobalParameters4(ServerSelector::ALL(),
+                                                           timestamps_["after today"]);
+
+    const auto& parameters_index = parameters.get<StampedValueNameIndexTag>();
+
+    // It should be the one modified "tomorrow".
+    ASSERT_EQ(1, parameters_index.size());
+
+    auto parameter = parameters_index.find("name3");
+    ASSERT_FALSE(parameter == parameters_index.end());
+
+    ASSERT_TRUE(*parameter);
+    EXPECT_EQ("value3", (*parameter)->getValue());
+
+    // Should be able to fetct these parameters when explicitly providing
+    // the server tag.
+    parameters = cbptr_->getModifiedGlobalParameters4(ServerSelector::ONE("server1"),
+                                                      timestamps_["after today"]);
+    EXPECT_EQ(1, parameters.size());
+}
+
+void
+GenericConfigBackendDHCPv4Test::nullKeyErrorTest() {
+    // Create a global parameter (it should work with any object type).
+    StampedValuePtr global_parameter = StampedValue::create("global", "value");
+
+    // Try to insert it and associate with non-existing server.
+    std::string msg;
+    try {
+        cbptr_->createUpdateGlobalParameter4(ServerSelector::ONE("server1"),
+                                             global_parameter);
+        msg = "got no exception";
+    } catch (const NullKeyError& ex) {
+        msg = ex.what();
+    } catch (const std::exception&) {
+        msg = "got another exception";
+    }
+    EXPECT_EQ("server 'server1' does not exist", msg);
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateSubnet4SelectorsTest() {
+    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+
+    // Supported selectors.
+    Subnet4Ptr subnet = test_subnets_[0];
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
+                                                subnet));
+    subnet = test_subnets_[2];
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"),
+                                                subnet));
+    subnet = test_subnets_[3];
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                subnet));
+
+    // Not supported server selectors.
+    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ANY(), subnet),
+                 isc::InvalidOperation);
+
+    // Not implemented server selectors.
+    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::UNASSIGNED(),
+                                             subnet),
+                 isc::NotImplemented);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSubnet4Test() {
+    // Insert the server2 into the database.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    auto subnet = test_subnets_[0];
+    auto subnet2 = test_subnets_[2];
+
+    // An attempt to add a subnet to a non-existing server (server1) should fail.
+    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                             subnet2),
+                 NullKeyError);
+
+    // The subnet shouldn't have been added, even though one of the servers exists.
+    Subnet4Ptr returned_subnet;
+    ASSERT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server2"),
+                                                                             subnet2->getID()));
+    EXPECT_FALSE(returned_subnet);
+
+    // Insert two subnets, one for all servers and one for server2.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet));
+    {
+        SCOPED_TRACE("CREATE audit entry for the subnet");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::CREATE,
+                          "subnet set");
+    }
+
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"), subnet2));
+    {
+        SCOPED_TRACE("CREATE audit entry for the subnet");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::CREATE,
+                          "subnet set", ServerSelector::ONE("subnet2"),
+                          2, 1);
+    }
+
+    // We are not going to support selection of a single entry for multiple servers.
+    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                    subnet->getID()),
+                 isc::InvalidOperation);
+
+    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                    subnet->toText()),
+                 isc::InvalidOperation);
+
+    // Test that this subnet will be fetched for various server selectors.
+    auto test_get_subnet = [this, &subnet] (const std::string& test_case_name,
+                                            const ServerSelector& server_selector,
+                                            const std::string& expected_tag = ServerTag::ALL) {
+        SCOPED_TRACE(test_case_name);
+
+        // Test fetching subnet by id.
+        Subnet4Ptr returned_subnet;
+        ASSERT_NO_THROW(returned_subnet = cbptr_->getSubnet4(server_selector, subnet->getID()));
+        ASSERT_TRUE(returned_subnet);
+
+        ASSERT_EQ(1, returned_subnet->getServerTags().size());
+        EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag(expected_tag)));
+
+        EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+
+        // Test fetching subnet by prefix.
+        ASSERT_NO_THROW(returned_subnet = cbptr_->getSubnet4(server_selector,
+                                                             subnet->toText()));
+        ASSERT_TRUE(returned_subnet);
+
+        ASSERT_EQ(1, returned_subnet->getServerTags().size());
+        EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag(expected_tag)));
+
+        EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+    };
+
+    {
+        SCOPED_TRACE("testing various server selectors before update");
+        test_get_subnet("all servers", ServerSelector::ALL());
+        test_get_subnet("one server", ServerSelector::ONE("server1"));
+        test_get_subnet("any server", ServerSelector::ANY());
+    }
+
+    subnet = subnet2;
+    {
+        SCOPED_TRACE("testing server selectors for another server");
+        test_get_subnet("one server", ServerSelector::ONE("server2"), "server2");
+        test_get_subnet("any server", ServerSelector::ANY(), "server2");
+    }
+
+    // Update the subnet in the database (both use the same ID).
+    subnet = test_subnets_[1];
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet));
+    {
+        SCOPED_TRACE("CREATE audit entry for the subnet");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "subnet set");
+    }
+
+    {
+        SCOPED_TRACE("testing various server selectors after update");
+        test_get_subnet("all servers", ServerSelector::ALL());
+        test_get_subnet("one server", ServerSelector::ONE("server1"));
+        test_get_subnet("any server", ServerSelector::ANY());
+    }
+
+    // The server2 specific subnet should not be returned if the server selector
+    // is not matching.
+    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ALL(), subnet2->getID()));
+    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ALL(), subnet2->toText()));
+    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ONE("server1"), subnet2->getID()));
+    EXPECT_FALSE(cbptr_->getSubnet4(ServerSelector::ONE("server1"), subnet2->toText()));
+
+    // Update the subnet in the database (both use the same prefix).
+    subnet2.reset(new Subnet4(IOAddress("192.0.3.0"), 24, 30, 40, 60, 8192));
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"),  subnet2));
+
+    // Fetch again and verify.
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server2"), subnet2->toText());
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_EQ(subnet2->toElement()->str(), returned_subnet->toElement()->str());
+
+    // Update the subnet when it conflicts same id and same prefix both
+    // with different subnets. This should throw.
+    // Subnets are 10.0.0.0/8 id 1024 and 192.0.3.0/24 id 8192
+    subnet2.reset(new Subnet4(IOAddress("10.0.0.0"), 8, 30, 40, 60, 8192));
+    EXPECT_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"),  subnet2),
+                 DuplicateEntry);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSubnet4byIdSelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ANY(), SubnetID(1)));
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::UNASSIGNED(), SubnetID(1)));
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ALL(), SubnetID(1)));
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ONE("server1"), SubnetID(1)));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                    SubnetID(1)),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSubnet4WithOptionalUnspecifiedTest() {
+    // Create a subnet and wrap it within a shared network. It is important
+    // to have the shared network to verify that the subnet doesn't inherit
+    // the values of the shared network but stores the NULL values in the
+    // for those parameters that are unspecified on the subnet level.
+    Subnet4Ptr subnet = test_subnets_[2];
+    SharedNetwork4Ptr shared_network = test_networks_[0];
+    shared_network->add(subnet);
+
+    // Need to add the shared network to the database because otherwise
+    // the subnet foreign key would fail.
+    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), shared_network);
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    // Fetch this subnet by subnet identifier.
+    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                                    subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    EXPECT_TRUE(returned_subnet->getIface().unspecified());
+    EXPECT_TRUE(returned_subnet->getIface().empty());
+
+    EXPECT_TRUE(returned_subnet->getClientClass().unspecified());
+    EXPECT_TRUE(returned_subnet->getClientClass().empty());
+
+    EXPECT_TRUE(returned_subnet->getValid().unspecified());
+    EXPECT_EQ(0, returned_subnet->getValid().get());
+
+    EXPECT_TRUE(returned_subnet->getT1().unspecified());
+    EXPECT_EQ(0, returned_subnet->getT1().get());
+
+    EXPECT_TRUE(returned_subnet->getT2().unspecified());
+    EXPECT_EQ(0, returned_subnet->getT2().get());
+
+    EXPECT_TRUE(returned_subnet->getReservationsGlobal().unspecified());
+    EXPECT_FALSE(returned_subnet->getReservationsGlobal().get());
+
+    EXPECT_TRUE(returned_subnet->getReservationsInSubnet().unspecified());
+    EXPECT_TRUE(returned_subnet->getReservationsInSubnet().get());
+
+    EXPECT_TRUE(returned_subnet->getReservationsOutOfPool().unspecified());
+    EXPECT_FALSE(returned_subnet->getReservationsOutOfPool().get());
+
+    EXPECT_TRUE(returned_subnet->getCalculateTeeTimes().unspecified());
+    EXPECT_FALSE(returned_subnet->getCalculateTeeTimes().get());
+
+    EXPECT_TRUE(returned_subnet->getT1Percent().unspecified());
+    EXPECT_EQ(0.0, returned_subnet->getT1Percent().get());
+
+    EXPECT_TRUE(returned_subnet->getT2Percent().unspecified());
+    EXPECT_EQ(0.0, returned_subnet->getT2Percent().get());
+
+    EXPECT_TRUE(returned_subnet->getMatchClientId().unspecified());
+    EXPECT_TRUE(returned_subnet->getMatchClientId().get());
+
+    EXPECT_TRUE(returned_subnet->getAuthoritative().unspecified());
+    EXPECT_FALSE(returned_subnet->getAuthoritative().get());
+
+    EXPECT_TRUE(returned_subnet->getSiaddr().unspecified());
+    EXPECT_TRUE(returned_subnet->getSiaddr().get().isV4Zero());
+
+    EXPECT_TRUE(returned_subnet->getSname().unspecified());
+    EXPECT_TRUE(returned_subnet->getSname().empty());
+
+    EXPECT_TRUE(returned_subnet->getFilename().unspecified());
+    EXPECT_TRUE(returned_subnet->getFilename().empty());
+
+    EXPECT_FALSE(returned_subnet->get4o6().enabled());
+
+    EXPECT_TRUE(returned_subnet->get4o6().getIface4o6().unspecified());
+    EXPECT_TRUE(returned_subnet->get4o6().getIface4o6().empty());
+
+    EXPECT_TRUE(returned_subnet->get4o6().getSubnet4o6().unspecified());
+    EXPECT_TRUE(returned_subnet->get4o6().getSubnet4o6().get().first.isV6Zero());
+    EXPECT_EQ(128, returned_subnet->get4o6().getSubnet4o6().get().second);
+
+    EXPECT_FALSE(returned_subnet->getDdnsSendUpdates().unspecified());
+    EXPECT_TRUE(returned_subnet->getDdnsSendUpdates().get());
+
+    EXPECT_FALSE(returned_subnet->getDdnsOverrideNoUpdate().unspecified());
+    EXPECT_TRUE(returned_subnet->getDdnsOverrideNoUpdate().get());
+
+    EXPECT_FALSE(returned_subnet->getDdnsOverrideClientUpdate().unspecified());
+    EXPECT_FALSE(returned_subnet->getDdnsOverrideClientUpdate().get());
+
+    EXPECT_FALSE(returned_subnet->getDdnsReplaceClientNameMode().unspecified());
+    EXPECT_EQ(D2ClientConfig::ReplaceClientNameMode::RCM_WHEN_PRESENT,
+              returned_subnet->getDdnsReplaceClientNameMode().get());
+
+    EXPECT_FALSE(returned_subnet->getDdnsGeneratedPrefix().unspecified());
+    EXPECT_EQ("myhost", returned_subnet->getDdnsGeneratedPrefix().get());
+
+    EXPECT_FALSE(returned_subnet->getDdnsQualifyingSuffix().unspecified());
+    EXPECT_EQ("example.org", returned_subnet->getDdnsQualifyingSuffix().get());
+
+    // The easiest way to verify whether the returned subnet matches the inserted
+    // subnet is to convert both to text.
+    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+}
+
+
+void
+GenericConfigBackendDHCPv4Test::getSubnet4SharedNetworkTest() {
+    Subnet4Ptr subnet = test_subnets_[0];
+    SharedNetwork4Ptr shared_network = test_networks_[0];
+
+    // Add subnet to a shared network.
+    shared_network->add(subnet);
+
+    // Store shared network in the database.
+    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                       shared_network);
+
+    // Store subnet associated with the shared network in the database.
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    // Fetch this subnet by subnet identifier.
+    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                                    test_subnets_[0]->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    // The easiest way to verify whether the returned subnet matches the inserted
+    // subnet is to convert both to text.
+    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+
+    // However, the check above doesn't verify whether shared network name was
+    // correctly returned from the database.
+    EXPECT_EQ(shared_network->getName(), returned_subnet->getSharedNetworkName());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSubnet4ByPrefixTest() {
+    // Insert subnet to the database.
+    Subnet4Ptr subnet = test_subnets_[0];
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    // Fetch the subnet by prefix.
+    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                                    "192.0.2.0/24");
+    ASSERT_TRUE(returned_subnet);
+    ASSERT_EQ(1, returned_subnet->getServerTags().size());
+    EXPECT_EQ("all", returned_subnet->getServerTags().begin()->get());
+
+    // Verify subnet contents.
+    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+
+    // Fetching the subnet for an explicitly specified server tag should
+    // succeed too.
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"),
+                                         "192.0.2.0/24");
+    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSubnet4byPrefixSelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ANY(), "192.0.2.0/24"));
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::UNASSIGNED(), "192.0.2.0/24"));
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ALL(), "192.0.2.0/24"));
+    EXPECT_NO_THROW(cbptr_->getSubnet4(ServerSelector::ONE("server1"), "192.0.2.0/24"));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                    "192.0.2.0/24"),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllSubnets4Test() {
+    // Insert test subnets into the database. Note that the second subnet will
+    // overwrite the first subnet as they use the same ID.
+    for (auto subnet : test_subnets_) {
+        cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+        // That subnet overrides the first subnet so the audit entry should
+        // indicate an update.
+        if (subnet->toText() == "10.0.0.0/8") {
+            SCOPED_TRACE("UPDATE audit entry for the subnet " + subnet->toText());
+            testNewAuditEntry("dhcp4_subnet",
+                              AuditEntry::ModificationType::UPDATE,
+                              "subnet set");
+
+        } else {
+            SCOPED_TRACE("CREATE audit entry for the subnet " + subnet->toText());
+            testNewAuditEntry("dhcp4_subnet",
+                              AuditEntry::ModificationType::CREATE,
+                              "subnet set");
+        }
+    }
+
+    // Fetch all subnets.
+    Subnet4Collection subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
+    ASSERT_EQ(test_subnets_.size() - 1, subnets.size());
+
+    // All subnets should also be returned for explicitly specified server tag.
+    subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server1"));
+    ASSERT_EQ(test_subnets_.size() - 1, subnets.size());
+
+    // See if the subnets are returned ok.
+    auto subnet_it = subnets.begin();
+    for (auto i = 0; i < subnets.size(); ++i, ++subnet_it) {
+        ASSERT_EQ(1, (*subnet_it)->getServerTags().size());
+        EXPECT_EQ("all", (*subnet_it)->getServerTags().begin()->get());
+        EXPECT_EQ(test_subnets_[i + 1]->toElement()->str(),
+                  (*subnet_it)->toElement()->str());
+    }
+
+    // Attempt to remove the non existing subnet should  return 0.
+    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ALL(), 22));
+    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ALL(),
+                                       "155.0.3.0/24"));
+    // All subnets should be still there.
+    ASSERT_EQ(test_subnets_.size() - 1, subnets.size());
+
+    // Should not delete the subnet for explicit server tag because
+    // our subnet is for all servers.
+    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ONE("server1"),
+                                       test_subnets_[1]->getID()));
+
+    // Also, verify that behavior when deleting by prefix.
+    EXPECT_EQ(0, cbptr_->deleteSubnet4(ServerSelector::ONE("server1"),
+                                       test_subnets_[2]->toText()));
+
+    // Same for all subnets.
+    EXPECT_EQ(0, cbptr_->deleteAllSubnets4(ServerSelector::ONE("server1")));
+
+    // Delete first subnet by id and verify that it is gone.
+    EXPECT_EQ(1, cbptr_->deleteSubnet4(ServerSelector::ALL(),
+                                       test_subnets_[1]->getID()));
+
+    {
+        SCOPED_TRACE("DELETE first subnet audit entry");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::DELETE,
+                          "subnet deleted");
+    }
+
+    subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
+    ASSERT_EQ(test_subnets_.size() - 2, subnets.size());
+
+    // Delete second subnet by prefix and verify it is gone.
+    EXPECT_EQ(1, cbptr_->deleteSubnet4(ServerSelector::ALL(),
+                                       test_subnets_[2]->toText()));
+    subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
+    ASSERT_EQ(test_subnets_.size() - 3, subnets.size());
+
+    {
+        SCOPED_TRACE("DELETE second subnet audit entry");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::DELETE,
+                          "subnet deleted");
+    }
+
+    // Delete all.
+    EXPECT_EQ(1, cbptr_->deleteAllSubnets4(ServerSelector::ALL()));
+    subnets = cbptr_->getAllSubnets4(ServerSelector::ALL());
+    ASSERT_TRUE(subnets.empty());
+
+    {
+        SCOPED_TRACE("DELETE all subnets audit entry");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all subnets");
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllSubnets4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::UNASSIGNED()));
+    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::ALL()));
+    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::ONE("server1")));
+    EXPECT_NO_THROW(cbptr_->getAllSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" })));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getAllSubnets4(ServerSelector::ANY()), isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllSubnets4WithServerTagsTest() {
+    auto subnet1 = test_subnets_[0];
+    auto subnet2 = test_subnets_[2];
+    auto subnet3 = test_subnets_[3];
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
+                                                subnet1));
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"),
+                                                subnet2));
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                subnet3));
+
+    Subnet4Collection subnets;
+
+    // All three subnets are associated with the server1.
+    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server1")));
+    EXPECT_EQ(3, subnets.size());
+
+    // First subnet is associated with all servers.
+    auto returned_subnet = SubnetFetcher4::get(subnets, SubnetID(1024));
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_TRUE(returned_subnet->hasAllServerTag());
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
+
+    // Second subnet is only associated with the server1.
+    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(2048));
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_FALSE(returned_subnet->hasAllServerTag());
+    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
+
+    // Third subnet is associated with both server1 and server2.
+    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(4096));
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_FALSE(returned_subnet->hasAllServerTag());
+    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server1")));
+    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server2")));
+
+    // For server2 we should only get two subnets, i.e. first and last.
+    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server2")));
+    EXPECT_EQ(2, subnets.size());
+
+    // First subnet is associated with all servers.
+    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(1024));
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_TRUE(returned_subnet->hasAllServerTag());
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
+
+    // Last subnet is associated with server1 and server2.
+    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(4096));
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_FALSE(returned_subnet->hasAllServerTag());
+    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server1")));
+    EXPECT_TRUE(returned_subnet->hasServerTag(ServerTag("server2")));
+
+    // Only the first subnet is associated with all servers.
+    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ALL()));
+    EXPECT_EQ(1, subnets.size());
+
+    returned_subnet = SubnetFetcher4::get(subnets, SubnetID(1024));
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_TRUE(returned_subnet->hasAllServerTag());
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_subnet->hasServerTag(ServerTag("server2")));
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedSubnets4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::UNASSIGNED(),
+                                                timestamps_["yesterday"]));
+    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
+                                                timestamps_["yesterday"]));
+    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::ONE("server1"),
+                                                timestamps_["yesterday"]));
+    EXPECT_NO_THROW(cbptr_->getModifiedSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                timestamps_["yesterday"]));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getModifiedSubnets4(ServerSelector::ANY(),
+                                             timestamps_["yesterday"]),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteSubnet4Test() {
+    // Create two servers in the database.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    auto subnet1 = test_subnets_[0];
+    auto subnet2 = test_subnets_[2];
+    auto subnet3 = test_subnets_[3];
+
+    auto create_test_subnets = [&] () {
+        // Insert three subnets, one for all servers, one for server2 and one for two
+        // servers: server1 and server2.
+        EXPECT_NO_THROW(
+            cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet1)
+        );
+        EXPECT_NO_THROW(
+            cbptr_->createUpdateSubnet4(ServerSelector::ONE("server2"), subnet2)
+        );
+        EXPECT_NO_THROW(
+            cbptr_->createUpdateSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                        subnet3)
+        );
+    };
+
+    create_test_subnets();
+
+    // Test that subnet is not deleted for a specified server selector.
+    auto test_no_delete = [this] (const std::string& test_case_name,
+                                  const ServerSelector& server_selector,
+                                  const Subnet4Ptr& subnet) {
+        SCOPED_TRACE(test_case_name);
+        uint64_t deleted_count = 0;
+        EXPECT_NO_THROW(
+            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->getID())
+        );
+        EXPECT_EQ(0, deleted_count);
+
+        deleted_count = 0;
+        EXPECT_NO_THROW(
+            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->toText())
+        );
+        EXPECT_EQ(0, deleted_count);
+    };
+
+    {
+        SCOPED_TRACE("Test valid but non matching server selectors");
+        test_no_delete("selector: one, actual: all", ServerSelector::ONE("server2"),
+                       subnet1);
+        test_no_delete("selector: all, actual: one", ServerSelector::ALL(),
+                       subnet2);
+        test_no_delete("selector: all, actual: multiple", ServerSelector::ALL(),
+                       subnet3);
+    }
+
+    // Test successful deletion of a subnet by ID.
+    auto test_delete_by_id = [this] (const std::string& test_case_name,
+                                     const ServerSelector& server_selector,
+                                     const Subnet4Ptr& subnet) {
+        SCOPED_TRACE(test_case_name);
+        uint64_t deleted_count = 0;
+        EXPECT_NO_THROW(
+            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->getID())
+        );
+        EXPECT_EQ(1, deleted_count);
+
+        EXPECT_FALSE(cbptr_->getSubnet4(server_selector, subnet->getID()));
+    };
+
+    test_delete_by_id("all servers", ServerSelector::ALL(), subnet1);
+    test_delete_by_id("any server", ServerSelector::ANY(), subnet2);
+    test_delete_by_id("one server", ServerSelector::ONE("server1"), subnet3);
+
+    // Re-create deleted subnets.
+    create_test_subnets();
+
+    // Test successful deletion of a subnet by prefix.
+    auto test_delete_by_prefix = [this] (const std::string& test_case_name,
+                                         const ServerSelector& server_selector,
+                                         const Subnet4Ptr& subnet) {
+        SCOPED_TRACE(test_case_name);
+        uint64_t deleted_count = 0;
+        EXPECT_NO_THROW(
+            deleted_count = cbptr_->deleteSubnet4(server_selector, subnet->toText())
+        );
+        EXPECT_EQ(1, deleted_count);
+
+        EXPECT_FALSE(cbptr_->getSubnet4(server_selector, subnet->toText()));
+    };
+
+    test_delete_by_prefix("all servers", ServerSelector::ALL(), subnet1);
+    test_delete_by_prefix("any server", ServerSelector::ANY(), subnet2);
+    test_delete_by_prefix("one server", ServerSelector::ONE("server1"), subnet3);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteSubnet4ByIdSelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ANY(), SubnetID(1)));
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), SubnetID(1)));
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ONE("server1"), SubnetID(1)));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                           SubnetID(1)),
+                 isc::InvalidOperation);
+
+    // Not implemented selectors.
+    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::UNASSIGNED(), SubnetID(1)),
+                 isc::NotImplemented);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteSubnet4ByPrefixSelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ANY(), "192.0.2.0/24"));
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), "192.0.2.0/24"));
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ONE("server1"), "192.0.2.0/24"));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                           "192.0.2.0/24"),
+                 isc::InvalidOperation);
+
+    // Not implemented selectors.
+    EXPECT_THROW(cbptr_->deleteSubnet4(ServerSelector::UNASSIGNED(), "192.0.2.0/24"),
+                 isc::NotImplemented);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteAllSubnets4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->deleteAllSubnets4(ServerSelector::UNASSIGNED()));
+    EXPECT_NO_THROW(cbptr_->deleteAllSubnets4(ServerSelector::ALL()));
+    EXPECT_NO_THROW(cbptr_->deleteAllSubnets4(ServerSelector::ONE("server1")));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->deleteAllSubnets4(ServerSelector::ANY()),
+                 isc::InvalidOperation);
+    EXPECT_THROW(cbptr_->deleteAllSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" })),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::unassignedSubnet4Test() {
+    // Create the server.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+
+    // Create the subnets and associate them with the server1.
+    auto subnet = test_subnets_[0];
+    auto subnet2 = test_subnets_[2];
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"), subnet)
+    );
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSubnet4(ServerSelector::ONE("server1"), subnet2)
+    );
+
+    // Delete the server. The subnets should be preserved but are considered orphaned,
+    // i.e. do not belong to any server.
+    uint64_t deleted_count = 0;
+    EXPECT_NO_THROW(deleted_count = cbptr_->deleteServer4(ServerTag("server1")));
+    EXPECT_EQ(1, deleted_count);
+
+    // Trying to fetch the subnet by server tag should return no result.
+    Subnet4Ptr returned_subnet;
+    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"),
+                                                         subnet->getID()));
+    EXPECT_FALSE(returned_subnet);
+
+    // The same if we use other calls.
+    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ONE("server1"),
+                                                         subnet->toText()));
+    EXPECT_FALSE(returned_subnet);
+
+    Subnet4Collection returned_subnets;
+    EXPECT_NO_THROW(returned_subnets = cbptr_->getAllSubnets4(ServerSelector::ONE("server1")));
+    EXPECT_TRUE(returned_subnets.empty());
+
+    EXPECT_NO_THROW(
+        returned_subnets = cbptr_->getModifiedSubnets4(ServerSelector::ONE("server1"),
+                                                       timestamps_["two days ago"])
+    );
+    EXPECT_TRUE(returned_subnets.empty());
+
+    // We should get the subnet if we ask for unassigned.
+    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::UNASSIGNED(),
+                                                         subnet->getID()));
+    ASSERT_TRUE(returned_subnet);
+
+    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::UNASSIGNED(),
+                                                         subnet->toText()));
+    ASSERT_TRUE(returned_subnet);
+
+    // Also if we ask for all unassigned subnets it should be returned.
+    EXPECT_NO_THROW(returned_subnets = cbptr_->getAllSubnets4(ServerSelector::UNASSIGNED()));
+    ASSERT_EQ(2, returned_subnets.size());
+
+    // Same for modified subnets.
+    EXPECT_NO_THROW(
+        returned_subnets = cbptr_->getModifiedSubnets4(ServerSelector::UNASSIGNED(),
+                                                       timestamps_["two days ago"])
+    );
+    ASSERT_EQ(2, returned_subnets.size());
+
+    // If we ask for any subnet by subnet id, it should be returned too.
+    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ANY(),
+                                                         subnet->getID()));
+    ASSERT_TRUE(returned_subnet);
+
+    EXPECT_NO_THROW(returned_subnet = cbptr_->getSubnet4(ServerSelector::ANY(),
+                                                         subnet->toText()));
+    ASSERT_TRUE(returned_subnet);
+
+    // Deleting the subnet with the mismatched server tag should not affect our
+    // subnet.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteSubnet4(ServerSelector::ONE("server1"),
+                                              subnet->getID())
+    );
+    EXPECT_EQ(0, deleted_count);
+
+    // Also, if we delete all subnets for server1.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteAllSubnets4(ServerSelector::ONE("server1"))
+    );
+    EXPECT_EQ(0, deleted_count);
+
+    // We can delete this subnet when we specify ANY and the matching id.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteSubnet4(ServerSelector::ANY(), subnet->getID())
+    );
+    EXPECT_EQ(1, deleted_count);
+
+    // We can delete all subnets using UNASSIGNED selector.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteAllSubnets4(ServerSelector::UNASSIGNED());
+    );
+    EXPECT_EQ(1, deleted_count);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedSubnets4Test() {
+    // Explicitly set timestamps of subnets. First subnet has a timestamp
+    // pointing to the future. Second subnet has timestamp pointing to the
+    // past (yesterday). Third subnet has a timestamp pointing to the
+    // past (an hour ago).
+    test_subnets_[1]->setModificationTime(timestamps_["tomorrow"]);
+    test_subnets_[2]->setModificationTime(timestamps_["yesterday"]);
+    test_subnets_[3]->setModificationTime(timestamps_["today"]);
+
+    // Insert subnets into the database.
+    for (int i = 1; i < test_subnets_.size(); ++i) {
+        cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
+                                    test_subnets_[i]);
+    }
+
+    // Fetch subnets with timestamp later than today. Only one subnet
+    // should be returned.
+    Subnet4Collection
+        subnets = cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
+                                              timestamps_["after today"]);
+    ASSERT_EQ(1, subnets.size());
+
+    // All subnets should also be returned for explicitly specified server tag.
+    subnets = cbptr_->getModifiedSubnets4(ServerSelector::ONE("server1"),
+                                          timestamps_["after today"]);
+    ASSERT_EQ(1, subnets.size());
+
+    // Fetch subnets with timestamp later than yesterday. We should get
+    // two subnets.
+    subnets = cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
+                                          timestamps_["after yesterday"]);
+    ASSERT_EQ(2, subnets.size());
+
+    // Fetch subnets with timestamp later than tomorrow. Nothing should
+    // be returned.
+    subnets = cbptr_->getModifiedSubnets4(ServerSelector::ALL(),
+                                          timestamps_["after tomorrow"]);
+    ASSERT_TRUE(subnets.empty());
+}
+
+void
+GenericConfigBackendDHCPv4Test::subnetLifetimeTest() {
+    // Insert new subnet with unspecified valid lifetime
+    Triplet<uint32_t> unspecified;
+    Subnet4Ptr subnet(new Subnet4(IOAddress("192.0.2.0"), 24, 30, 40,
+                                  unspecified, 1111));
+    subnet->setIface("eth1");
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    // Fetch this subnet by subnet identifier
+    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                                    subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    // Verified returned and original subnets match.
+    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+
+    // Update the valid lifetime.
+    subnet->setValid( Triplet<uint32_t>(100, 200, 300));
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    // Fetch and verify again.
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(), subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+    EXPECT_EQ(subnet->toElement()->str(), returned_subnet->toElement()->str());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSharedNetworkSubnets4Test() {
+    // Assign test subnets to shared networks level1 and level2.
+    test_subnets_[1]->setSharedNetworkName("level1");
+    test_subnets_[2]->setSharedNetworkName("level2");
+    test_subnets_[3]->setSharedNetworkName("level2");
+
+    // Store shared networks in the database.
+    for (auto network : test_networks_) {
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
+    }
+
+    // Store subnets in the database.
+    for (auto subnet : test_subnets_) {
+        cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+    }
+
+    // Fetch all subnets belonging to shared network level1.
+    Subnet4Collection subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ALL(),
+                                                                 "level1");
+    ASSERT_EQ(1, subnets.size());
+
+    // Returned subnet should match test subnet #1.
+    EXPECT_TRUE(isEquivalent(test_subnets_[1]->toElement(),
+                             (*subnets.begin())->toElement()));
+
+    // All subnets should also be returned for ANY server.
+    subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ANY(), "level1");
+    ASSERT_EQ(1, subnets.size());
+
+    // Returned subnet should match test subnet #1.
+    EXPECT_TRUE(isEquivalent(test_subnets_[1]->toElement(),
+                             (*subnets.begin())->toElement()));
+
+    // Check server tag
+    ASSERT_EQ(1, (*subnets.begin())->getServerTags().size());
+    EXPECT_EQ("all", (*subnets.begin())->getServerTags().begin()->get());
+
+    // Fetch all subnets belonging to shared network level2.
+    subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ALL(), "level2");
+    ASSERT_EQ(2, subnets.size());
+
+    ElementPtr test_list = Element::createList();
+    test_list->add(test_subnets_[2]->toElement());
+    test_list->add(test_subnets_[3]->toElement());
+
+    ElementPtr returned_list = Element::createList();
+    auto subnet = subnets.begin();
+    returned_list->add((*subnet)->toElement());
+    returned_list->add((*++subnet)->toElement());
+
+    EXPECT_TRUE(isEquivalent(returned_list, test_list));
+
+    // All subnets should also be returned for explicitly specified server tag.
+    subnets = cbptr_->getSharedNetworkSubnets4(ServerSelector::ONE("server1"), "level2");
+    ASSERT_EQ(2, subnets.size());
+
+    returned_list = Element::createList();
+    subnet = subnets.begin();
+    returned_list->add((*subnet)->toElement());
+    returned_list->add((*++subnet)->toElement());
+
+    EXPECT_TRUE(isEquivalent(returned_list, test_list));
+}
+
+void
+GenericConfigBackendDHCPv4Test::subnetUpdatePoolsTest() {
+
+    auto test_subnet_update = [this](const std::string& subnet_prefix,
+                                     const SubnetID& subnet_id) {
+        // Add the subnet with two pools.
+        EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(),
+                                                    test_subnets_[0]));
+        // Make sure that the pools have been added to the database.
+        EXPECT_EQ(2, countRows("dhcp4_pool"));
+
+        // Create the subnet without options which updates the existing
+        // subnet.
+        Subnet4Ptr subnet(new Subnet4(IOAddress(subnet_prefix), 24, 30, 40, 60,
+                                      subnet_id));
+        EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet));
+        // Check that options are gone.
+        EXPECT_EQ(0, countRows("dhcp4_pool"));
+    };
+
+    {
+        SCOPED_TRACE("update subnet, modify subnet id");
+        // Create another subnet with the same prefix as the original subnet but
+        // different id. This is legal to update the subnet id if the prefix is
+        // stable. However, the new subnet has no address pools, so we need to
+        // check of the pools associated with the existing subnet instance are
+        // gone after the update.
+        test_subnet_update("192.0.2.0", 2048);
+    }
+
+    {
+        SCOPED_TRACE("update subnet, modify prefix");
+        // Create a subnet with the same subnet id but different prefix.
+        // The prefix should be updated.
+        test_subnet_update("192.0.3.0", 1024);
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::subnetOptionsTest() {
+    // Add the subnet with two pools and three options.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+    EXPECT_EQ(3, countRows("dhcp4_options"));
+
+    // The second subnet uses the same subnet id, so this operation should replace
+    // the existing subnet and its options. The new instance has two pools, each
+    // including one option, so we should end up with two options.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[1]));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+    EXPECT_EQ(2, countRows("dhcp4_options"));
+
+    // Add third subnet with a single option. The number of options in the database
+    // should now be 3.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[2]));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+    EXPECT_EQ(3, countRows("dhcp4_options"));
+
+    // Delete the subnet. All options and pools it contains should also be removed, leaving
+    // the last added subnet and its sole option.
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), test_subnets_[1]->getID()));
+    EXPECT_EQ(1, countRows("dhcp4_subnet"));
+    EXPECT_EQ(0, countRows("dhcp4_pool"));
+    EXPECT_EQ(1, countRows("dhcp4_options"));
+
+    // Add the first subnet again. We should now have 4 options: 3 options from the
+    // newly added subnet and one option from the existing subnet.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]));
+    EXPECT_EQ(4, countRows("dhcp4_options"));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+
+    // Delete the subnet including 3 options. The option from the other subnet should not
+    // be affected.
+    EXPECT_NO_THROW(cbptr_->deleteSubnet4(ServerSelector::ALL(), test_subnets_[0]->getID()));
+    EXPECT_EQ(1, countRows("dhcp4_subnet"));
+    EXPECT_EQ(0, countRows("dhcp4_pool"));
+    EXPECT_EQ(1, countRows("dhcp4_options"));
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSharedNetwork4Test() {
+    // Insert the server2 into the database.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    auto shared_network = test_networks_[0];
+    auto shared_network2 = test_networks_[2];
+
+    // Insert two shared networks, one for all servers, and one for server2.
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       shared_network));
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server2"),
+                                                       shared_network2));
+
+    // We are not going to support selection of a single entry for multiple servers.
+    EXPECT_THROW(cbptr_->getSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                           test_networks_[0]->getName()),
+                 isc::InvalidOperation);
+
+    // Test that this shared network will be fetched for various server selectors.
+    auto test_get_network = [this, &shared_network] (const std::string& test_case_name,
+                                                     const ServerSelector& server_selector,
+                                                     const std::string& expected_tag = ServerTag::ALL) {
+        SCOPED_TRACE(test_case_name);
+        SharedNetwork4Ptr network;
+        ASSERT_NO_THROW(network = cbptr_->getSharedNetwork4(server_selector,
+                                                            shared_network->getName()));
+        ASSERT_TRUE(network);
+
+        EXPECT_GT(network->getId(), 0);
+        ASSERT_EQ(1, network->getServerTags().size());
+        EXPECT_EQ(expected_tag, network->getServerTags().begin()->get());
+
+        // The easiest way to verify whether the returned shared network matches the
+        // inserted shared network is to convert both to text.
+        EXPECT_EQ(shared_network->toElement()->str(), network->toElement()->str());
+    };
+
+    {
+        SCOPED_TRACE("testing various server selectors before update");
+        test_get_network("all servers", ServerSelector::ALL());
+        test_get_network("one server", ServerSelector::ONE("server1"));
+        test_get_network("any server", ServerSelector::ANY());
+    }
+
+    {
+        SCOPED_TRACE("CREATE audit entry for a shared network");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::CREATE,
+                          "shared network set");
+    }
+
+    // Update shared network in the database.
+    shared_network = test_networks_[1];
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       shared_network));
+
+    {
+        SCOPED_TRACE("testing various server selectors after update");
+        test_get_network("all servers after update", ServerSelector::ALL());
+        test_get_network("one server after update", ServerSelector::ONE("server1"));
+        test_get_network("any server after update", ServerSelector::ANY());
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for a shared network");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::UPDATE,
+                          "shared network set");
+    }
+
+    // The server2 specific shared network should not be returned if the
+    // server selector is not matching.
+    EXPECT_FALSE(cbptr_->getSharedNetwork4(ServerSelector::ALL(),
+                                           shared_network2->getName()));
+    EXPECT_FALSE(cbptr_->getSharedNetwork4(ServerSelector::ONE("server1"),
+                                           shared_network2->getName()));
+
+    {
+        SCOPED_TRACE("testing selectors for server2 specific shared network");
+        shared_network = shared_network2;
+        test_get_network("one server", ServerSelector::ONE("server2"), "server2");
+        test_get_network("any server", ServerSelector::ANY(), "server2");
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSharedNetwork4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::ANY(), "level1"));
+    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::UNASSIGNED(), "level1"));
+    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::ALL(), "level1"));
+    EXPECT_NO_THROW(cbptr_->getSharedNetwork4(ServerSelector::ONE("server1"), "level1"));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                           "level1"),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateSharedNetwork4Test() {
+    auto shared_network = test_networks_[0];
+
+    // An attempt to insert the shared network for non-existing server should fail.
+    EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"),
+                                                    shared_network),
+                 NullKeyError);
+
+    // Insert the server1 into the database.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    // Insert the server2 into the database.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       shared_network));
+    {
+        SCOPED_TRACE("CREATE audit entry for shared network and ALL servers");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::CREATE,
+                          "shared network set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                       shared_network));
+    {
+        SCOPED_TRACE("CREATE audit entry for shared network and MULTIPLE servers");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::UPDATE,
+                          "shared network set");
+    }
+
+    SharedNetwork4Ptr network;
+    ASSERT_NO_THROW(network = cbptr_->getSharedNetwork4(ServerSelector::ANY(),
+                                                        shared_network->getName()));
+    ASSERT_TRUE(network);
+    EXPECT_TRUE(network->hasServerTag(ServerTag("server1")));
+    EXPECT_TRUE(network->hasServerTag(ServerTag("server2")));
+    EXPECT_FALSE(network->hasServerTag(ServerTag()));
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateSharedNetwork4SelectorsTest() {
+    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    ASSERT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+
+    // Supported selectors.
+    SharedNetwork4Ptr shared_network(new SharedNetwork4("all"));
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       shared_network));
+    shared_network.reset(new SharedNetwork4("one"));
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"),
+                                                       shared_network));
+    shared_network.reset(new SharedNetwork4("multiple"));
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                       shared_network));
+
+    // Not supported server selectors.
+    EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ANY(), shared_network),
+                 isc::InvalidOperation);
+
+    // Not implemented server selectors.
+    EXPECT_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::UNASSIGNED(),
+                                                    shared_network),
+                 isc::NotImplemented);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getSharedNetwork4WithOptionalUnspecifiedTest() {
+    // Insert new shared network.
+    SharedNetwork4Ptr shared_network = test_networks_[2];
+    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), shared_network);
+
+    // Fetch this shared network by name.
+    SharedNetwork4Ptr
+        returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
+                                                     test_networks_[2]->getName());
+    ASSERT_TRUE(returned_network);
+
+    EXPECT_TRUE(returned_network->getIface().unspecified());
+    EXPECT_TRUE(returned_network->getIface().empty());
+
+    EXPECT_TRUE(returned_network->getClientClass().unspecified());
+    EXPECT_TRUE(returned_network->getClientClass().empty());
+
+    EXPECT_TRUE(returned_network->getValid().unspecified());
+    EXPECT_EQ(0, returned_network->getValid().get());
+
+    EXPECT_TRUE(returned_network->getT1().unspecified());
+    EXPECT_EQ(0, returned_network->getT1().get());
+
+    EXPECT_TRUE(returned_network->getT2().unspecified());
+    EXPECT_EQ(0, returned_network->getT2().get());
+
+    EXPECT_TRUE(returned_network->getReservationsGlobal().unspecified());
+    EXPECT_FALSE(returned_network->getReservationsGlobal().get());
+
+    EXPECT_TRUE(returned_network->getReservationsInSubnet().unspecified());
+    EXPECT_TRUE(returned_network->getReservationsInSubnet().get());
+
+    EXPECT_TRUE(returned_network->getReservationsOutOfPool().unspecified());
+    EXPECT_FALSE(returned_network->getReservationsOutOfPool().get());
+
+    EXPECT_TRUE(returned_network->getCalculateTeeTimes().unspecified());
+    EXPECT_FALSE(returned_network->getCalculateTeeTimes().get());
+
+    EXPECT_TRUE(returned_network->getT1Percent().unspecified());
+    EXPECT_EQ(0.0, returned_network->getT1Percent().get());
+
+    EXPECT_TRUE(returned_network->getT2Percent().unspecified());
+    EXPECT_EQ(0.0, returned_network->getT2Percent().get());
+
+    EXPECT_TRUE(returned_network->getMatchClientId().unspecified());
+    EXPECT_TRUE(returned_network->getMatchClientId().get());
+
+    EXPECT_TRUE(returned_network->getAuthoritative().unspecified());
+    EXPECT_FALSE(returned_network->getAuthoritative().get());
+
+    EXPECT_FALSE(returned_network->getDdnsSendUpdates().unspecified());
+    EXPECT_TRUE(returned_network->getDdnsSendUpdates().get());
+
+    EXPECT_FALSE(returned_network->getDdnsOverrideNoUpdate().unspecified());
+    EXPECT_TRUE(returned_network->getDdnsOverrideNoUpdate().get());
+
+    EXPECT_FALSE(returned_network->getDdnsOverrideClientUpdate().unspecified());
+    EXPECT_FALSE(returned_network->getDdnsOverrideClientUpdate().get());
+
+    EXPECT_FALSE(returned_network->getDdnsReplaceClientNameMode().unspecified());
+    EXPECT_EQ(D2ClientConfig::ReplaceClientNameMode::RCM_WHEN_PRESENT,
+              returned_network->getDdnsReplaceClientNameMode().get());
+
+    EXPECT_FALSE(returned_network->getDdnsGeneratedPrefix().unspecified());
+    EXPECT_EQ("myhost", returned_network->getDdnsGeneratedPrefix().get());
+
+    EXPECT_FALSE(returned_network->getDdnsQualifyingSuffix().unspecified());
+    EXPECT_EQ("example.org", returned_network->getDdnsQualifyingSuffix().get());
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteSharedNetworkSubnets4Test() {
+    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::UNASSIGNED(),
+                                                     test_networks_[1]->getName()),
+                 isc::InvalidOperation);
+    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ALL(),
+                                                     test_networks_[1]->getName()),
+                 isc::InvalidOperation);
+    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ONE("server1"),
+                                                     test_networks_[1]->getName()),
+                 isc::InvalidOperation);
+    EXPECT_THROW(cbptr_->deleteSharedNetworkSubnets4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                     test_networks_[1]->getName()),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllSharedNetworks4Test() {
+    // Insert test shared networks into the database. Note that the second shared
+    // network will overwrite the first shared network as they use the same name.
+    for (auto network : test_networks_) {
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
+
+        // That shared network overrides the first one so the audit entry should
+        // indicate an update.
+        if ((network->getName() == "level1") && (!audit_entries_["all"].empty())) {
+            SCOPED_TRACE("UPDATE audit entry for the shared network " +
+                         network->getName());
+            testNewAuditEntry("dhcp4_shared_network",
+                              AuditEntry::ModificationType::UPDATE,
+                              "shared network set");
+
+        } else {
+            SCOPED_TRACE("CREATE audit entry for the shared network " +
+                         network->getName());
+            testNewAuditEntry("dhcp4_shared_network",
+                              AuditEntry::ModificationType::CREATE,
+                              "shared network set");
+        }
+    }
+
+    // Fetch all shared networks.
+    SharedNetwork4Collection networks =
+        cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
+    ASSERT_EQ(test_networks_.size() - 1, networks.size());
+
+    // All shared networks should also be returned for explicitly specified
+    // server tag.
+    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1"));
+    ASSERT_EQ(test_networks_.size() - 1, networks.size());
+
+    // See if shared networks are returned ok.
+    for (auto i = 0; i < networks.size(); ++i) {
+        EXPECT_EQ(test_networks_[i + 1]->toElement()->str(),
+                  networks[i]->toElement()->str());
+        ASSERT_EQ(1, networks[i]->getServerTags().size());
+        EXPECT_EQ("all", networks[i]->getServerTags().begin()->get());
+    }
+
+    // Add some subnets.
+    test_networks_[1]->add(test_subnets_[0]);
+    test_subnets_[2]->setSharedNetworkName("level2");
+    test_networks_[2]->add(test_subnets_[3]);
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]);
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[2]);
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[3]);
+
+    // Both ways to attach a subnet are equivalent.
+    Subnet4Ptr subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                           test_subnets_[0]->getID());
+    ASSERT_TRUE(subnet);
+    EXPECT_EQ("level1", subnet->getSharedNetworkName());
+
+    {
+        SCOPED_TRACE("CREATE audit entry for subnets");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::CREATE,
+                          "subnet set", ServerSelector::ALL(), 3);
+    }
+
+    // Deleting non-existing shared network should return 0.
+    EXPECT_EQ(0, cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
+                                              "big-fish"));
+    // All shared networks should be still there.
+    ASSERT_EQ(test_networks_.size() - 1, networks.size());
+
+    // Should not delete the shared network for explicit server tag
+    // because our shared network is for all servers.
+    EXPECT_EQ(0, cbptr_->deleteSharedNetwork4(ServerSelector::ONE("server1"),
+                                              test_networks_[1]->getName()));
+
+    // Same for all shared networks.
+    EXPECT_EQ(0, cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1")));
+
+    // Delete first shared network with it subnets and verify it is gone.
+    // Begin by its subnet.
+    EXPECT_EQ(1, cbptr_->deleteSharedNetworkSubnets4(ServerSelector::ANY(),
+                                                     test_networks_[1]->getName()));
+
+    {
+        SCOPED_TRACE("DELETE audit entry for subnets of the first shared network");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all subnets for a shared network");
+    }
+
+    // Check that the subnet is gone..
+    subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                test_subnets_[0]->getID());
+    EXPECT_FALSE(subnet);
+
+    // And after the shared network itself.
+    EXPECT_EQ(1, cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
+                                              test_networks_[1]->getName()));
+    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
+    ASSERT_EQ(test_networks_.size() - 2, networks.size());
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the first shared network");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::DELETE,
+                          "shared network deleted");
+    }
+
+    // Delete all.
+    EXPECT_EQ(2, cbptr_->deleteAllSharedNetworks4(ServerSelector::ALL()));
+    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
+    ASSERT_TRUE(networks.empty());
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the remaining two shared networks");
+        // The last parameter indicates that we expect two new audit entries.
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all shared networks", ServerSelector::ALL(), 2);
+    }
+
+    // Check that subnets are still there but detached.
+    subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                test_subnets_[2]->getID());
+    ASSERT_TRUE(subnet);
+    EXPECT_TRUE(subnet->getSharedNetworkName().empty());
+    subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                test_subnets_[3]->getID());
+    ASSERT_TRUE(subnet);
+    EXPECT_TRUE(subnet->getSharedNetworkName().empty());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllSharedNetworks4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::UNASSIGNED()));
+    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::ALL()));
+    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1")));
+    EXPECT_NO_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::MULTIPLE({ "server1", "server2" })));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getAllSharedNetworks4(ServerSelector::ANY()),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllSharedNetworks4WithServerTagsTest() {
+    auto shared_network1 = test_networks_[0];
+    auto shared_network2 = test_networks_[2];
+    auto shared_network3 = test_networks_[3];
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       shared_network1));
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"),
+                                                       shared_network2));
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                       shared_network3));
+
+    SharedNetwork4Collection networks;
+
+    // All three networks are associated with the server1.
+    EXPECT_NO_THROW(networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1")));
+    EXPECT_EQ(3, networks.size());
+
+    // First network is associated with all servers.
+    auto returned_network = SharedNetworkFetcher4::get(networks, "level1");
+    ASSERT_TRUE(returned_network);
+    EXPECT_TRUE(returned_network->hasAllServerTag());
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
+
+    // Second network is only associated with the server1.
+    returned_network = SharedNetworkFetcher4::get(networks, "level2");
+    ASSERT_TRUE(returned_network);
+    EXPECT_FALSE(returned_network->hasAllServerTag());
+    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
+
+    // Third network is associated with both server1 and server2.
+    returned_network = SharedNetworkFetcher4::get(networks, "level3");
+    ASSERT_TRUE(returned_network);
+    EXPECT_FALSE(returned_network->hasAllServerTag());
+    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server1")));
+    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server2")));
+
+    // For server2 we should only get two shared networks, i.e. first and last.
+    EXPECT_NO_THROW(networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server2")));
+    EXPECT_EQ(2, networks.size());
+
+    // First shared network is associated with all servers.
+    returned_network = SharedNetworkFetcher4::get(networks, "level1");
+    ASSERT_TRUE(returned_network);
+    EXPECT_TRUE(returned_network->hasAllServerTag());
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
+
+    // Last shared network is associated with server1 and server2.
+    returned_network = SharedNetworkFetcher4::get(networks, "level3");
+    ASSERT_TRUE(returned_network);
+    EXPECT_FALSE(returned_network->hasAllServerTag());
+    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server1")));
+    EXPECT_TRUE(returned_network->hasServerTag(ServerTag("server2")));
+
+    // Only the first shared network is associated with all servers.
+    EXPECT_NO_THROW(networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL()));
+    EXPECT_EQ(1, networks.size());
+
+    returned_network = SharedNetworkFetcher4::get(networks, "level1");
+    ASSERT_TRUE(returned_network);
+    EXPECT_TRUE(returned_network->hasAllServerTag());
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server1")));
+    EXPECT_FALSE(returned_network->hasServerTag(ServerTag("server2")));
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedSharedNetworks4Test() {
+    // Explicitly set timestamps of shared networks. First shared
+    // network has a timestamp pointing to the future. Second shared
+    // network has timestamp pointing to the past (yesterday).
+    // Third shared network has a timestamp pointing to the
+    // past (an hour ago).
+    test_networks_[1]->setModificationTime(timestamps_["tomorrow"]);
+    test_networks_[2]->setModificationTime(timestamps_["yesterday"]);
+    test_networks_[3]->setModificationTime(timestamps_["today"]);
+
+    // Insert shared networks into the database.
+    for (int i = 1; i < test_networks_.size(); ++i) {
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                           test_networks_[i]);
+    }
+
+    // Fetch shared networks with timestamp later than today. Only one
+    // shared network  should be returned.
+    SharedNetwork4Collection
+        networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
+                                                      timestamps_["after today"]);
+    ASSERT_EQ(1, networks.size());
+
+    // Fetch shared networks with timestamp later than yesterday. We
+    // should get two shared networks.
+    networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
+                                                 timestamps_["after yesterday"]);
+    ASSERT_EQ(2, networks.size());
+
+    // Fetch shared networks with timestamp later than tomorrow. Nothing
+    // should be returned.
+    networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
+                                                  timestamps_["after tomorrow"]);
+    ASSERT_TRUE(networks.empty());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedSharedNetworks4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::UNASSIGNED(),
+                                                       timestamps_["yesterday"]));
+    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::ALL(),
+                                                       timestamps_["yesterday"]));
+    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::ONE("server1"),
+                                                       timestamps_["yesterday"]));
+    EXPECT_NO_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                                       timestamps_["yesterday"]));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->getModifiedSharedNetworks4(ServerSelector::ANY(),
+                                                    timestamps_["yesterday"]),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteSharedNetwork4Test() {
+    // Create two servers in the database.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("CREATE audit entry for server");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    auto shared_network1 = test_networks_[0];
+    auto shared_network2 = test_networks_[2];
+    auto shared_network3 = test_networks_[3];
+
+    // Insert three shared networks, one for all servers, one for server2 and
+    // one for two servers: server1 and server2.
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), shared_network1)
+    );
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server2"), shared_network2)
+    );
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                           shared_network3)
+    );
+
+    auto test_no_delete = [this] (const std::string& test_case_name,
+                                  const ServerSelector& server_selector,
+                                  const SharedNetwork4Ptr& shared_network) {
+        SCOPED_TRACE(test_case_name);
+        uint64_t deleted_count = 0;
+        EXPECT_NO_THROW(
+            deleted_count = cbptr_->deleteSharedNetwork4(server_selector,
+                                                         shared_network->getName())
+        );
+        EXPECT_EQ(0, deleted_count);
+    };
+
+    {
+        SCOPED_TRACE("Test valid but non matching server selectors");
+        test_no_delete("selector: one, actual: all", ServerSelector::ONE("server2"),
+                       shared_network1);
+        test_no_delete("selector: all, actual: one", ServerSelector::ALL(),
+                       shared_network2);
+        test_no_delete("selector: all, actual: multiple", ServerSelector::ALL(),
+                       shared_network3);
+    }
+
+    // We are not going to support deletion of a single entry for multiple servers.
+    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                              shared_network3->getName()),
+                 isc::InvalidOperation);
+
+    // We currently don't support deleting a shared network with specifying
+    // an unassigned server tag. Use ANY to delete any subnet instead.
+    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::UNASSIGNED(),
+                                              shared_network1->getName()),
+                 isc::NotImplemented);
+
+    // Test successful deletion of a shared network.
+    auto test_delete = [this] (const std::string& test_case_name,
+                               const ServerSelector& server_selector,
+                               const SharedNetwork4Ptr& shared_network) {
+        SCOPED_TRACE(test_case_name);
+        uint64_t deleted_count = 0;
+        EXPECT_NO_THROW(
+            deleted_count = cbptr_->deleteSharedNetwork4(server_selector,
+                                                         shared_network->getName())
+        );
+        EXPECT_EQ(1, deleted_count);
+
+        EXPECT_FALSE(cbptr_->getSharedNetwork4(server_selector,
+                                               shared_network->getName()));
+    };
+
+    test_delete("all servers", ServerSelector::ALL(), shared_network1);
+    test_delete("any server", ServerSelector::ANY(), shared_network2);
+    test_delete("one server", ServerSelector::ONE("server1"), shared_network3);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteSharedNetwork4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ANY(), "level1"));
+    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(), "level1"));
+    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ONE("server1"), "level1"));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::MULTIPLE({ "server1", "server2" }),
+                                           "level1"),
+                 isc::InvalidOperation);
+
+    // Not implemented selectors.
+    EXPECT_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::UNASSIGNED(), "level1"),
+                 isc::NotImplemented);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteAllSharedNetworks4SelectorsTest() {
+    // Supported selectors.
+    EXPECT_NO_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::UNASSIGNED()));
+    EXPECT_NO_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::ALL()));
+    EXPECT_NO_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1")));
+
+    // Not supported selectors.
+    EXPECT_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::ANY()),
+                 isc::InvalidOperation);
+    EXPECT_THROW(cbptr_->deleteAllSharedNetworks4(ServerSelector::MULTIPLE({ "server1", "server2" })),
+                 isc::InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::unassignedSharedNetworkTest() {
+    // Create the server.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+
+    // Create the shared networks and associate them with the server1.
+    auto shared_network = test_networks_[0];
+    auto shared_network2 = test_networks_[2];
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"), shared_network)
+    );
+    EXPECT_NO_THROW(
+        cbptr_->createUpdateSharedNetwork4(ServerSelector::ONE("server1"), shared_network2)
+    );
+
+    // Delete the server. The shared networks should be preserved but are
+    // considered orphaned, i.e. do not belong to any server.
+    uint64_t deleted_count = 0;
+    EXPECT_NO_THROW(deleted_count = cbptr_->deleteServer4(ServerTag("server1")));
+    EXPECT_EQ(1, deleted_count);
+
+    // Trying to fetch this shared network by server tag should return no result.
+    SharedNetwork4Ptr returned_network;
+    EXPECT_NO_THROW(returned_network = cbptr_->getSharedNetwork4(ServerSelector::ONE("server1"),
+                                                                 "level1"));
+    EXPECT_FALSE(returned_network);
+
+    // The same if we use other calls.
+    SharedNetwork4Collection returned_networks;
+    EXPECT_NO_THROW(
+        returned_networks = cbptr_->getAllSharedNetworks4(ServerSelector::ONE("server1"))
+    );
+    EXPECT_TRUE(returned_networks.empty());
+
+    EXPECT_NO_THROW(
+        returned_networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::ONE("server1"),
+                                                               timestamps_["two days ago"])
+    );
+    EXPECT_TRUE(returned_networks.empty());
+
+    // We should get the shared network if we ask for unassigned.
+    EXPECT_NO_THROW(returned_network = cbptr_->getSharedNetwork4(ServerSelector::UNASSIGNED(),
+                                                                 "level1"));
+    ASSERT_TRUE(returned_network);
+
+    // Also if we ask for all unassigned networks it should be returned.
+    EXPECT_NO_THROW(returned_networks = cbptr_->getAllSharedNetworks4(ServerSelector::UNASSIGNED()));
+    ASSERT_EQ(2, returned_networks.size());
+
+    // And all modified.
+    EXPECT_NO_THROW(
+        returned_networks = cbptr_->getModifiedSharedNetworks4(ServerSelector::UNASSIGNED(),
+                                                               timestamps_["two days ago"])
+    );
+    ASSERT_EQ(2, returned_networks.size());
+
+    // If we ask for any network by name, it should be returned too.
+    EXPECT_NO_THROW(returned_network = cbptr_->getSharedNetwork4(ServerSelector::ANY(),
+                                                                 "level1"));
+    ASSERT_TRUE(returned_network);
+
+    // Deleting a shared network with the mismatched server tag should not affect
+    // our shared network.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteSharedNetwork4(ServerSelector::ONE("server1"),
+                                                     "level1")
+    );
+    EXPECT_EQ(0, deleted_count);
+
+    // Also, if we delete all shared networks for server1.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteAllSharedNetworks4(ServerSelector::ONE("server1"))
+    );
+    EXPECT_EQ(0, deleted_count);
+
+    // We can delete this shared network when we specify ANY and the matching name.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteSharedNetwork4(ServerSelector::ANY(), "level1")
+    );
+    EXPECT_EQ(1, deleted_count);
+
+    // We can delete all networks using UNASSIGNED selector.
+    EXPECT_NO_THROW(
+        deleted_count = cbptr_->deleteAllSharedNetworks4(ServerSelector::UNASSIGNED());
+    );
+    EXPECT_EQ(1, deleted_count);
+}
+
+void
+GenericConfigBackendDHCPv4Test::sharedNetworkLifetimeTest() {
+    // Insert new shared network with unspecified valid lifetime
+    SharedNetwork4Ptr network(new SharedNetwork4("foo"));
+    Triplet<uint32_t> unspecified;
+    network->setValid(unspecified);
+    network->setIface("eth1");
+    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
+
+    // Fetch this shared network.
+    SharedNetwork4Ptr returned_network =
+        cbptr_->getSharedNetwork4(ServerSelector::ALL(), "foo");
+    ASSERT_TRUE(returned_network);
+
+    // Verified returned and original shared networks match.
+    EXPECT_EQ(network->toElement()->str(),
+              returned_network->toElement()->str());
+
+    // Update the preferred and valid lifetime.
+    network->setValid( Triplet<uint32_t>(100, 200, 300));
+    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), network);
+
+    // Fetch and verify again.
+    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(), "foo");
+    ASSERT_TRUE(returned_network);
+    EXPECT_EQ(network->toElement()->str(),
+              returned_network->toElement()->str());
+}
+
+void
+GenericConfigBackendDHCPv4Test::sharedNetworkOptionsTest() {
+    // Add shared network with three options.
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[0]));
+    EXPECT_EQ(3, countRows("dhcp4_options"));
+
+    // Add another shared network with a single option. The numnber of options in the
+    // database should now be 4.
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[2]));
+    EXPECT_EQ(4, countRows("dhcp4_options"));
+
+    // The second shared network uses the same name as the first shared network, so
+    // this operation should replace the existing shared network and its options.
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[1]));
+    EXPECT_EQ(1, countRows("dhcp4_options"));
+
+    // Remove the shared network. This should not affect options assigned to the
+    // other shared network.
+    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
+                                                 test_networks_[1]->getName()));
+    EXPECT_EQ(1, countRows("dhcp4_shared_network"));
+    EXPECT_EQ(1, countRows("dhcp4_options"));
+
+    // Create the first option again. The number of options should be equal to the
+    // sum of options associated with both shared networks.
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(), test_networks_[0]));
+    EXPECT_EQ(4, countRows("dhcp4_options"));
+
+    // Delete this shared network. This should not affect the option associated
+    // with the remaining shared network.
+    EXPECT_NO_THROW(cbptr_->deleteSharedNetwork4(ServerSelector::ALL(),
+                                                 test_networks_[0]->getName()));
+    EXPECT_EQ(1, countRows("dhcp4_shared_network"));
+    EXPECT_EQ(1, countRows("dhcp4_options"));
+}
+
+void
+GenericConfigBackendDHCPv4Test::getOptionDef4Test() {
+    // Insert new option definition.
+    OptionDefinitionPtr option_def = test_option_defs_[0];
+    cbptr_->createUpdateOptionDef4(ServerSelector::ALL(), option_def);
+
+    // Fetch this option_definition by subnet identifier.
+    OptionDefinitionPtr returned_option_def =
+        cbptr_->getOptionDef4(ServerSelector::ALL(),
+                              test_option_defs_[0]->getCode(),
+                              test_option_defs_[0]->getOptionSpaceName());
+    ASSERT_TRUE(returned_option_def);
+    EXPECT_GT(returned_option_def->getId(), 0);
+    ASSERT_EQ(1, returned_option_def->getServerTags().size());
+    EXPECT_EQ("all", returned_option_def->getServerTags().begin()->get());
+
+    EXPECT_TRUE(returned_option_def->equals(*option_def));
+
+    {
+        SCOPED_TRACE("CREATE audit entry for an option definition");
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::CREATE,
+                          "option definition set");
+    }
+
+    // Update the option definition in the database.
+    OptionDefinitionPtr option_def2 = test_option_defs_[1];
+    cbptr_->createUpdateOptionDef4(ServerSelector::ALL(), option_def2);
+
+    // Fetch updated option definition and see if it matches.
+    returned_option_def = cbptr_->getOptionDef4(ServerSelector::ALL(),
+                                                test_option_defs_[1]->getCode(),
+                                                test_option_defs_[1]->getOptionSpaceName());
+    EXPECT_TRUE(returned_option_def->equals(*option_def2));
+
+    // Fetching option definition for an explicitly specified server tag
+    // should succeed too.
+    returned_option_def = cbptr_->getOptionDef4(ServerSelector::ONE("server1"),
+                                                test_option_defs_[1]->getCode(),
+                                                test_option_defs_[1]->getOptionSpaceName());
+    EXPECT_TRUE(returned_option_def->equals(*option_def2));
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for an option definition");
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::UPDATE,
+                          "option definition set");
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::optionDefs4WithServerTagsTest() {
+    OptionDefinitionPtr option1 = test_option_defs_[0];
+    OptionDefinitionPtr option2 = test_option_defs_[1];
+    OptionDefinitionPtr option3 = test_option_defs_[4];
+
+    // An attempt to create option definition for non-existing server should
+    // fail.
+    EXPECT_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server1"),
+                                                option1),
+                 NullKeyError);
+
+    // Create two servers.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("server2 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    // This time creation of the option definition for the server1 should pass.
+    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server1"),
+                                                   option1));
+    {
+        SCOPED_TRACE("option definition for server1 is set");
+        // The value of 3 means there should be 3 audit entries available for the
+        // server1, two that indicate creation of the servers and one that we
+        // validate, which sets the option definition.
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::CREATE,
+                          "option definition set",
+                          ServerSelector::ONE("server1"),
+                          3, 1);
+    }
+
+    // Creation of the option definition for the server2 should also pass.
+    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server2"),
+                                                   option2));
+    {
+        SCOPED_TRACE("option definition for server2 is set");
+        // Same as in case of the server1, there should be 3 audit entries and
+        // we validate one of them.
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::CREATE,
+                          "option definition set",
+                          ServerSelector::ONE("server2"),
+                          3, 1);
+    }
+
+    // Finally, creation of the option definition for all servers should
+    // also pass.
+    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ALL(),
+                                                   option3));
+    {
+        SCOPED_TRACE("option definition for server2 is set");
+        // There should be one new audit entry for all servers. It logs
+        // the insertion of the option definition.
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::CREATE,
+                          "option definition set",
+                          ServerSelector::ALL(),
+                          1, 1);
+    }
+
+    OptionDefinitionPtr returned_option_def;
+
+    // Try to fetch the option definition specified for all servers. It should
+    // return the third one.
+    EXPECT_NO_THROW(
+        returned_option_def = cbptr_->getOptionDef4(ServerSelector::ALL(),
+                                                    option3->getCode(),
+                                                    option3->getOptionSpaceName())
+    );
+    ASSERT_TRUE(returned_option_def);
+    EXPECT_TRUE(returned_option_def->equals(*option3));
+
+    // Try to fetch the option definition specified for server1. It should
+    // override the definition for all servers.
+    EXPECT_NO_THROW(
+        returned_option_def = cbptr_->getOptionDef4(ServerSelector::ONE("server1"),
+                                                    option1->getCode(),
+                                                    option1->getOptionSpaceName())
+    );
+    ASSERT_TRUE(returned_option_def);
+    EXPECT_TRUE(returned_option_def->equals(*option1));
+
+    // The same in case of the server2.
+    EXPECT_NO_THROW(
+        returned_option_def = cbptr_->getOptionDef4(ServerSelector::ONE("server2"),
+                                                    option2->getCode(),
+                                                    option2->getOptionSpaceName())
+    );
+    ASSERT_TRUE(returned_option_def);
+    EXPECT_TRUE(returned_option_def->equals(*option2));
+
+    OptionDefContainer returned_option_defs;
+
+    // Try to fetch the collection of the option definitions for server1, server2
+    // and server3. The server3 does not have an explicit option definition, so
+    // for this server we should get the definition associated with "all" servers.
+    EXPECT_NO_THROW(
+        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::
+                                                         MULTIPLE({ "server1", "server2",
+                                                                    "server3" }));
+    );
+    ASSERT_EQ(3, returned_option_defs.size());
+
+    // Check that expected option definitions have been returned.
+    auto current_option = returned_option_defs.begin();
+    EXPECT_TRUE((*current_option)->equals(*option1));
+    EXPECT_TRUE((*(++current_option))->equals(*option2));
+    EXPECT_TRUE((*(++current_option))->equals(*option3));
+
+    // Try to fetch the collection of options specified for all servers.
+    // This excludes the options specific to server1 and server2. It returns
+    // only the common ones.
+    EXPECT_NO_THROW(
+        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
+
+    );
+    ASSERT_EQ(1, returned_option_defs.size());
+    EXPECT_TRUE((*returned_option_defs.begin())->equals(*option3));
+
+    // Delete the server1. It should remove associations of this server with the
+    // option definitions and the option definition itself.
+    EXPECT_NO_THROW(cbptr_->deleteServer4(ServerTag("server1")));
+    EXPECT_NO_THROW(
+        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ONE("server1"));
+
+    );
+    ASSERT_EQ(1, returned_option_defs.size());
+    EXPECT_TRUE((*returned_option_defs.begin())->equals(*option3));
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the option definition after server deletion");
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleting a server", ServerSelector::ONE("server1"),
+                          2, 1);
+    }
+
+    // Attempt to delete option definition for server1.
+    uint64_t deleted_num = 0;
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOptionDef4(ServerSelector::ONE("server1"),
+                                                           option1->getCode(),
+                                                           option1->getOptionSpaceName()));
+    EXPECT_EQ(0, deleted_num);
+
+    // Deleting the existing option definition for server2 should succeed.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOptionDef4(ServerSelector::ONE("server2"),
+                                                           option2->getCode(),
+                                                           option2->getOptionSpaceName()));
+    EXPECT_EQ(1, deleted_num);
+
+    // Create this option definition again to test that deletion of all servers
+    // removes it too.
+    EXPECT_NO_THROW(cbptr_->createUpdateOptionDef4(ServerSelector::ONE("server2"),
+                                                   option2));
+
+    // Delete all servers, except 'all'.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
+    EXPECT_NO_THROW(
+        returned_option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
+    );
+    EXPECT_EQ(1, deleted_num);
+    EXPECT_EQ(1, returned_option_defs.size());
+    EXPECT_TRUE((*returned_option_defs.begin())->equals(*option3));
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the option definition after deletion of"
+                     " all servers");
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleting all servers", ServerSelector::ONE("server2"),
+                          4, 1);
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllOptionDefs4Test() {
+    // Insert test option definitions into the database. Note that the second
+    // option definition will overwrite the first option definition as they use
+    // the same code and space.
+    size_t updates_num = 0;
+    for (auto option_def : test_option_defs_) {
+        cbptr_->createUpdateOptionDef4(ServerSelector::ALL(), option_def);
+
+        // That option definition overrides the first one so the audit entry should
+        // indicate an update.
+        auto name = option_def->getName();
+        if (name.find("bar") != std::string::npos) {
+            SCOPED_TRACE("UPDATE audit entry for the option definition " + name);
+            testNewAuditEntry("dhcp4_option_def",
+                              AuditEntry::ModificationType::UPDATE,
+                              "option definition set");
+            ++updates_num;
+
+        } else {
+            SCOPED_TRACE("CREATE audit entry for the option definition " + name);
+            testNewAuditEntry("dhcp4_option_def",
+                              AuditEntry::ModificationType::CREATE,
+                              "option definition set");
+        }
+    }
+
+    // Fetch all option_definitions.
+    OptionDefContainer option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
+    ASSERT_EQ(test_option_defs_.size() - updates_num, option_defs.size());
+
+    // All option definitions should also be returned for explicitly specified
+    // server tag.
+    option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ONE("server1"));
+    ASSERT_EQ(test_option_defs_.size() - updates_num, option_defs.size());
+
+    // See if option definitions are returned ok.
+    for (auto def = option_defs.begin(); def != option_defs.end(); ++def) {
+        ASSERT_EQ(1, (*def)->getServerTags().size());
+        EXPECT_EQ("all", (*def)->getServerTags().begin()->get());
+        bool success = false;
+        for (auto i = 1; i < test_option_defs_.size(); ++i) {
+            if ((*def)->equals(*test_option_defs_[i])) {
+                success = true;
+            }
+        }
+        ASSERT_TRUE(success) << "failed for option definition " << (*def)->getCode()
+            << ", option space " << (*def)->getOptionSpaceName();
+    }
+
+    // Deleting non-existing option definition should return 0.
+    EXPECT_EQ(0, cbptr_->deleteOptionDef4(ServerSelector::ALL(),
+                                          99, "non-exiting-space"));
+    // All option definitions should be still there.
+    ASSERT_EQ(test_option_defs_.size() - updates_num, option_defs.size());
+
+    // Should not delete option definition for explicit server tag
+    // because our option definition is for all servers.
+    EXPECT_EQ(0, cbptr_->deleteOptionDef4(ServerSelector::ONE("server1"),
+                                          test_option_defs_[1]->getCode(),
+                                          test_option_defs_[1]->getOptionSpaceName()));
+
+    // Same for all option definitions.
+    EXPECT_EQ(0, cbptr_->deleteAllOptionDefs4(ServerSelector::ONE("server1")));
+
+    // Delete one of the option definitions and see if it is gone.
+    EXPECT_EQ(1, cbptr_->deleteOptionDef4(ServerSelector::ALL(),
+                                          test_option_defs_[2]->getCode(),
+                                          test_option_defs_[2]->getOptionSpaceName()));
+    ASSERT_FALSE(cbptr_->getOptionDef4(ServerSelector::ALL(),
+                                       test_option_defs_[2]->getCode(),
+                                       test_option_defs_[2]->getOptionSpaceName()));
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the first option definition");
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::DELETE,
+                          "option definition deleted");
+    }
+
+    // Delete all remaining option definitions.
+    EXPECT_EQ(2, cbptr_->deleteAllOptionDefs4(ServerSelector::ALL()));
+    option_defs = cbptr_->getAllOptionDefs4(ServerSelector::ALL());
+    ASSERT_TRUE(option_defs.empty());
+
+    {
+        SCOPED_TRACE("DELETE audit entries for the remaining option definitions");
+        // The last parameter indicates that we expect two new audit entries.
+        testNewAuditEntry("dhcp4_option_def",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all option definitions", ServerSelector::ALL(), 2);
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedOptionDefs4Test() {
+    // Explicitly set timestamps of option definitions. First option
+    // definition has a timestamp pointing to the future. Second option
+    // definition has timestamp pointing to the past (yesterday).
+    // Third option definitions has a timestamp pointing to the
+    // past (an hour ago).
+    test_option_defs_[1]->setModificationTime(timestamps_["tomorrow"]);
+    test_option_defs_[2]->setModificationTime(timestamps_["yesterday"]);
+    test_option_defs_[3]->setModificationTime(timestamps_["today"]);
+
+    // Insert option definitions into the database.
+    for (int i = 1; i < test_networks_.size(); ++i) {
+        cbptr_->createUpdateOptionDef4(ServerSelector::ALL(),
+                                       test_option_defs_[i]);
+    }
+
+    // Fetch option definitions with timestamp later than today. Only one
+    // option definition should be returned.
+    OptionDefContainer
+        option_defs = cbptr_->getModifiedOptionDefs4(ServerSelector::ALL(),
+                                                     timestamps_["after today"]);
+    ASSERT_EQ(1, option_defs.size());
+
+    // Fetch option definitions with timestamp later than yesterday. We
+    // should get two option definitions.
+    option_defs = cbptr_->getModifiedOptionDefs4(ServerSelector::ALL(),
+                                                 timestamps_["after yesterday"]);
+    ASSERT_EQ(2, option_defs.size());
+
+    // Fetch option definitions with timestamp later than tomorrow. Nothing
+    // should be returned.
+    option_defs = cbptr_->getModifiedOptionDefs4(ServerSelector::ALL(),
+                                              timestamps_["after tomorrow"]);
+    ASSERT_TRUE(option_defs.empty());
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateDeleteOption4Test() {
+    // Add option to the database.
+    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                opt_boot_file_name);
+
+    // Make sure we can retrieve this option and that it is equal to the
+    // option we have inserted into the database.
+    OptionDescriptorPtr returned_opt_boot_file_name =
+        cbptr_->getOption4(ServerSelector::ALL(),
+                           opt_boot_file_name->option_->getType(),
+                           opt_boot_file_name->space_name_);
+    ASSERT_TRUE(returned_opt_boot_file_name);
+
+    {
+        SCOPED_TRACE("verify created option");
+        testOptionsEquivalent(*test_options_[0], *returned_opt_boot_file_name);
+    }
+
+    {
+        SCOPED_TRACE("CREATE audit entry for an option");
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::CREATE,
+                          "global option set");
+    }
+
+    // Modify option and update it in the database.
+    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                opt_boot_file_name);
+
+    // Retrieve the option again and make sure that updates were
+    // properly propagated to the database. Use explicit server selector
+    // which should also return this option.
+    returned_opt_boot_file_name = cbptr_->getOption4(ServerSelector::ONE("server1"),
+                                                     opt_boot_file_name->option_->getType(),
+                                                     opt_boot_file_name->space_name_);
+    ASSERT_TRUE(returned_opt_boot_file_name);
+
+    {
+        SCOPED_TRACE("verify updated option");
+        testOptionsEquivalent(*opt_boot_file_name, *returned_opt_boot_file_name);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for an option");
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::UPDATE,
+                          "global option set");
+    }
+
+    // Deleting an option with explicitly specified server tag should fail.
+    EXPECT_EQ(0, cbptr_->deleteOption4(ServerSelector::ONE("server1"),
+                                       opt_boot_file_name->option_->getType(),
+                                       opt_boot_file_name->space_name_));
+
+    // Deleting option for all servers should succeed.
+    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ALL(),
+                                       opt_boot_file_name->option_->getType(),
+                                       opt_boot_file_name->space_name_));
+
+    EXPECT_FALSE(cbptr_->getOption4(ServerSelector::ALL(),
+                                    opt_boot_file_name->option_->getType(),
+                                    opt_boot_file_name->space_name_));
+
+    {
+        SCOPED_TRACE("DELETE audit entry for an option");
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::DELETE,
+                          "global option deleted");
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::globalOptions4WithServerTagsTest() {
+    OptionDescriptorPtr opt_boot_file_name1 = test_options_[0];
+    OptionDescriptorPtr opt_boot_file_name2 = test_options_[6];
+    OptionDescriptorPtr opt_boot_file_name3 = test_options_[7];
+
+    EXPECT_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server1"),
+                                             opt_boot_file_name1),
+                 NullKeyError);
+
+    // Create two servers.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("server2 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set");
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server1"),
+                                                opt_boot_file_name1));
+    {
+        SCOPED_TRACE("global option for server1 is set");
+        // The value of 3 means there should be 3 audit entries available for the
+        // server1, two that indicate creation of the servers and one that we
+        // validate, which sets the global option.
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::CREATE,
+                          "global option set",
+                          ServerSelector::ONE("server1"),
+                          3, 1);
+
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server2"),
+                                                opt_boot_file_name2));
+    {
+        SCOPED_TRACE("global option for server2 is set");
+        // Same as in case of the server1, there should be 3 audit entries and
+        // we validate one of them.
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::CREATE,
+                          "global option set",
+                          ServerSelector::ONE("server2"),
+                          3, 1);
+
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                                opt_boot_file_name3));
+    {
+        SCOPED_TRACE("global option for all servers is set");
+        // There should be one new audit entry for all servers. It logs
+        // the insertion of the global option.
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::CREATE,
+                          "global option set",
+                          ServerSelector::ALL(),
+                          1, 1);
+
+    }
+
+    OptionDescriptorPtr returned_option;
+
+    // Try to fetch the option specified for all servers. It should return
+    // the third option.
+    EXPECT_NO_THROW(
+        returned_option = cbptr_->getOption4(ServerSelector::ALL(),
+                                             opt_boot_file_name3->option_->getType(),
+                                             opt_boot_file_name3->space_name_);
+    );
+    ASSERT_TRUE(returned_option);
+    testOptionsEquivalent(*opt_boot_file_name3, *returned_option);
+
+    // Try to fetch the option specified for the server1. It should override the
+    // option specified for all servers.
+    EXPECT_NO_THROW(
+        returned_option = cbptr_->getOption4(ServerSelector::ONE("server1"),
+                                             opt_boot_file_name1->option_->getType(),
+                                             opt_boot_file_name1->space_name_);
+    );
+    ASSERT_TRUE(returned_option);
+    testOptionsEquivalent(*opt_boot_file_name1, *returned_option);
+
+    // The same in case of the server2.
+    EXPECT_NO_THROW(
+        returned_option = cbptr_->getOption4(ServerSelector::ONE("server2"),
+                                             opt_boot_file_name2->option_->getType(),
+                                             opt_boot_file_name2->space_name_);
+    );
+    ASSERT_TRUE(returned_option);
+    testOptionsEquivalent(*opt_boot_file_name2, *returned_option);
+
+    OptionContainer returned_options;
+
+    // Try to fetch the collection of global options for the server1, server2
+    // and server3. The server3 does not have an explicit value so for this server
+    // we should get the option associated with "all" servers.
+    EXPECT_NO_THROW(
+        returned_options = cbptr_->getAllOptions4(ServerSelector::
+                                                  MULTIPLE({ "server1", "server2",
+                                                             "server3" }));
+    );
+    ASSERT_EQ(3, returned_options.size());
+
+    // Check that expected options have been returned.
+    auto current_option = returned_options.begin();
+    testOptionsEquivalent(*opt_boot_file_name1, *current_option);
+    testOptionsEquivalent(*opt_boot_file_name2, *(++current_option));
+    testOptionsEquivalent(*opt_boot_file_name3, *(++current_option));
+
+    // Try to fetch the collection of options specified for all servers.
+    // This excludes the options specific to server1 and server2. It returns
+    // only the common ones.
+    EXPECT_NO_THROW(
+        returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
+    );
+    ASSERT_EQ(1, returned_options.size());
+    testOptionsEquivalent(*opt_boot_file_name3, *returned_options.begin());
+
+    // Delete the server1. It should remove associations of this server with the
+    // option and the option itself.
+    EXPECT_NO_THROW(cbptr_->deleteServer4(ServerTag("server1")));
+    EXPECT_NO_THROW(
+        returned_options = cbptr_->getAllOptions4(ServerSelector::ONE("server1"));
+    );
+    ASSERT_EQ(1, returned_options.size());
+    testOptionsEquivalent(*opt_boot_file_name3, *returned_options.begin());
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the global option after server deletion");
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleting a server", ServerSelector::ONE("server1"),
+                          2, 1);
+    }
+
+    // Attempt to delete global option for server1.
+    uint64_t deleted_num = 0;
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOption4(ServerSelector::ONE("server1"),
+                                                        opt_boot_file_name1->option_->getType(),
+                                                        opt_boot_file_name1->space_name_));
+    EXPECT_EQ(0, deleted_num);
+
+    // Deleting the existing option for server2 should succeed.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteOption4(ServerSelector::ONE("server2"),
+                                                        opt_boot_file_name2->option_->getType(),
+                                                        opt_boot_file_name2->space_name_));
+    EXPECT_EQ(1, deleted_num);
+
+    // Create this option again to test that deletion of all servers removes it too.
+    EXPECT_NO_THROW(cbptr_->createUpdateOption4(ServerSelector::ONE("server2"),
+                                                opt_boot_file_name2));
+
+    // Delete all servers, except 'all'.
+    EXPECT_NO_THROW(deleted_num = cbptr_->deleteAllServers4());
+    EXPECT_NO_THROW(
+        returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
+    );
+    EXPECT_EQ(1, deleted_num);
+    ASSERT_EQ(1, returned_options.size());
+    testOptionsEquivalent(*opt_boot_file_name3, *returned_options.begin());
+
+    {
+        SCOPED_TRACE("DELETE audit entry for the global option after deletion of"
+                     " all servers");
+        testNewAuditEntry("dhcp4_options",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleting all servers", ServerSelector::ONE("server2"),
+                          4, 1);
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getAllOptions4Test() {
+    // Add three global options to the database.
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                test_options_[0]);
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                test_options_[1]);
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                test_options_[5]);
+
+    // Retrieve all these options.
+    OptionContainer returned_options = cbptr_->getAllOptions4(ServerSelector::ALL());
+    ASSERT_EQ(3, returned_options.size());
+
+    // Fetching global options with explicitly specified server tag should return
+    // the same result.
+    returned_options = cbptr_->getAllOptions4(ServerSelector::ONE("server1"));
+    ASSERT_EQ(3, returned_options.size());
+
+    // Get the container index used to search options by option code.
+    const OptionContainerTypeIndex& index = returned_options.get<1>();
+
+    // Verify that all options we put into the database were
+    // returned.
+    {
+        SCOPED_TRACE("verify test_options_[0]");
+        auto option0 = index.find(test_options_[0]->option_->getType());
+        ASSERT_FALSE(option0 == index.end());
+        testOptionsEquivalent(*test_options_[0], *option0);
+        EXPECT_GT(option0->getId(), 0);
+        ASSERT_EQ(1, option0->getServerTags().size());
+        EXPECT_EQ("all", option0->getServerTags().begin()->get());
+    }
+
+    {
+        SCOPED_TRACE("verify test_options_[1]");
+        auto option1 = index.find(test_options_[1]->option_->getType());
+        ASSERT_FALSE(option1 == index.end());
+        testOptionsEquivalent(*test_options_[1], *option1);
+        EXPECT_GT(option1->getId(), 0);
+        ASSERT_EQ(1, option1->getServerTags().size());
+        EXPECT_EQ("all", option1->getServerTags().begin()->get());
+    }
+
+    {
+        SCOPED_TRACE("verify test_options_[5]");
+        auto option5 = index.find(test_options_[5]->option_->getType());
+        ASSERT_FALSE(option5 == index.end());
+        testOptionsEquivalent(*test_options_[5], *option5);
+        EXPECT_GT(option5->getId(), 0);
+        ASSERT_EQ(1, option5->getServerTags().size());
+        EXPECT_EQ("all", option5->getServerTags().begin()->get());
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedOptions4Test() {
+    // Assign timestamps to the options we're going to store in the
+    // database.
+    test_options_[0]->setModificationTime(timestamps_["tomorrow"]);
+    test_options_[1]->setModificationTime(timestamps_["yesterday"]);
+    test_options_[5]->setModificationTime(timestamps_["today"]);
+
+    // Put options into the database.
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                test_options_[0]);
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                test_options_[1]);
+    cbptr_->createUpdateOption4(ServerSelector::ALL(),
+                                test_options_[5]);
+
+    // Get options with the timestamp later than today. Only
+    // one option should be returned.
+    OptionContainer returned_options =
+        cbptr_->getModifiedOptions4(ServerSelector::ALL(),
+                                    timestamps_["after today"]);
+    ASSERT_EQ(1, returned_options.size());
+
+    // Fetching modified options with explicitly specified server selector
+    // should return the same result.
+    returned_options = cbptr_->getModifiedOptions4(ServerSelector::ONE("server1"),
+                                                   timestamps_["after today"]);
+    ASSERT_EQ(1, returned_options.size());
+
+    // The returned option should be the one with the timestamp
+    // set to tomorrow.
+    const OptionContainerTypeIndex& index = returned_options.get<1>();
+    auto option0 = index.find(test_options_[0]->option_->getType());
+    ASSERT_FALSE(option0 == index.end());
+    {
+        SCOPED_TRACE("verify returned option");
+        testOptionsEquivalent(*test_options_[0], *option0);
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateDeleteSubnetOption4Test() {
+    // Insert new subnet.
+    Subnet4Ptr subnet = test_subnets_[1];
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    // Fetch this subnet by subnet identifier.
+    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                                    subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    {
+        SCOPED_TRACE("CREATE audit entry for a new subnet");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::CREATE,
+                          "subnet set");
+    }
+
+    // The inserted subnet contains two options.
+    ASSERT_EQ(2, countRows("dhcp4_options"));
+
+    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
+    cbptr_->createUpdateOption4(ServerSelector::ANY(), subnet->getID(),
+                                opt_boot_file_name);
+
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                         subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    OptionDescriptor returned_opt_boot_file_name =
+        returned_subnet->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    {
+        SCOPED_TRACE("verify returned option");
+        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
+        EXPECT_GT(returned_opt_boot_file_name.getId(), 0);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for an added subnet option");
+        // Instead of adding an audit entry for an option we add an audit
+        // entry for the entire subnet so as the server refreshes the
+        // subnet with the new option. Note that the server doesn't
+        // have means to retrieve only the newly added option.
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "subnet specific option set");
+    }
+
+    // We have added one option to the existing subnet. We should now have
+    // three options.
+    ASSERT_EQ(3, countRows("dhcp4_options"));
+
+    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
+    cbptr_->createUpdateOption4(ServerSelector::ANY(), subnet->getID(),
+                                opt_boot_file_name);
+
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ANY(),
+                                         subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+    returned_opt_boot_file_name =
+        returned_subnet->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    {
+        SCOPED_TRACE("verify returned option with modified persistence");
+        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for an updated subnet option");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "subnet specific option set");
+    }
+
+    // Updating the option should replace the existing instance with the new
+    // instance. Therefore, we should still have three options.
+    ASSERT_EQ(3, countRows("dhcp4_options"));
+
+    // It should succeed for any server.
+    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ANY(), subnet->getID(),
+                                       opt_boot_file_name->option_->getType(),
+                                       opt_boot_file_name->space_name_));
+
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                         subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    EXPECT_FALSE(returned_subnet->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME).option_);
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for a deleted subnet option");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "subnet specific option deleted");
+    }
+
+    // We should have only two options after deleting one of them.
+    ASSERT_EQ(2, countRows("dhcp4_options"));
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateDeletePoolOption4Test() {
+    // Insert new subnet.
+    Subnet4Ptr subnet = test_subnets_[1];
+    cbptr_->createUpdateSubnet4(ServerSelector::ALL(), subnet);
+
+    {
+        SCOPED_TRACE("CREATE audit entry for a subnet");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::CREATE,
+                          "subnet set");
+    }
+
+    // Inserted subnet has two options.
+    ASSERT_EQ(2, countRows("dhcp4_options"));
+
+    // Add an option into the pool.
+    const PoolPtr pool = subnet->getPool(Lease::TYPE_V4, IOAddress("192.0.2.10"));
+    ASSERT_TRUE(pool);
+    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
+    cbptr_->createUpdateOption4(ServerSelector::ANY(),
+                                pool->getFirstAddress(),
+                                pool->getLastAddress(),
+                                opt_boot_file_name);
+
+    // Query for a subnet.
+    Subnet4Ptr returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                                    subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+
+    // The returned subnet should include our pool.
+    const PoolPtr returned_pool = returned_subnet->getPool(Lease::TYPE_V4,
+                                                           IOAddress("192.0.2.10"));
+    ASSERT_TRUE(returned_pool);
+
+    // The pool should contain option we added earlier.
+    OptionDescriptor returned_opt_boot_file_name =
+        returned_pool->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    {
+        SCOPED_TRACE("verify returned pool option");
+        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
+        EXPECT_GT(returned_opt_boot_file_name.getId(), 0);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for a subnet after adding an option "
+                     "to the pool");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "pool specific option set");
+    }
+
+    // With the newly inserted option we should now have three options.
+    ASSERT_EQ(3, countRows("dhcp4_options"));
+
+    // Modify the option and update it in the database.
+    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
+    cbptr_->createUpdateOption4(ServerSelector::ANY(),
+                                pool->getFirstAddress(),
+                                pool->getLastAddress(),
+                                opt_boot_file_name);
+
+    // Fetch the subnet and the corresponding pool.
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                         subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+    const PoolPtr returned_pool1 = returned_subnet->getPool(Lease::TYPE_V4,
+                                                            IOAddress("192.0.2.10"));
+    ASSERT_TRUE(returned_pool1);
+
+    // Test that the option has been correctly updated in the database.
+    returned_opt_boot_file_name =
+        returned_pool1->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    {
+        SCOPED_TRACE("verify updated option with modified persistence");
+        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for a subnet when updating pool "
+                     "specific option");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "pool specific option set");
+    }
+
+    // The new option instance should replace the existing one, so we should
+    // still have three options.
+    ASSERT_EQ(3, countRows("dhcp4_options"));
+
+    // Delete option for any server should succeed.
+    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ANY(),
+                                       pool->getFirstAddress(),
+                                       pool->getLastAddress(),
+                                       opt_boot_file_name->option_->getType(),
+                                       opt_boot_file_name->space_name_));
+
+    // Fetch the subnet and the pool from the database again to make sure
+    // that the option is really gone.
+    returned_subnet = cbptr_->getSubnet4(ServerSelector::ALL(),
+                                         subnet->getID());
+    ASSERT_TRUE(returned_subnet);
+    const PoolPtr returned_pool2 = returned_subnet->getPool(Lease::TYPE_V4,
+                                                            IOAddress("192.0.2.10"));
+    ASSERT_TRUE(returned_pool2);
+
+    // Option should be gone.
+    EXPECT_FALSE(returned_pool2->getCfgOption()->get(DHCP4_OPTION_SPACE,
+                                                     DHO_BOOT_FILE_NAME).option_);
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for a subnet when deleting pool "
+                     "specific option");
+        testNewAuditEntry("dhcp4_subnet",
+                          AuditEntry::ModificationType::UPDATE,
+                          "pool specific option deleted");
+    }
+
+    // The option has been deleted so the number of options should now
+    // be down to 2.
+    EXPECT_EQ(2, countRows("dhcp4_options"));
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateDeleteSharedNetworkOption4Test() {
+    // Insert new shared network.
+    SharedNetwork4Ptr shared_network = test_networks_[1];
+    cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                       shared_network);
+
+    // Fetch this shared network by name.
+    SharedNetwork4Ptr returned_network =
+        cbptr_->getSharedNetwork4(ServerSelector::ALL(),
+                                  shared_network->getName());
+    ASSERT_TRUE(returned_network);
+
+    {
+        SCOPED_TRACE("CREATE audit entry for the new shared network");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::CREATE,
+                          "shared network set");
+    }
+
+    // The inserted shared network has no options.
+    ASSERT_EQ(0, countRows("dhcp4_options"));
+
+    OptionDescriptorPtr opt_boot_file_name = test_options_[0];
+    cbptr_->createUpdateOption4(ServerSelector::ANY(),
+                                shared_network->getName(),
+                                opt_boot_file_name);
+
+    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
+                                                shared_network->getName());
+    ASSERT_TRUE(returned_network);
+
+    OptionDescriptor returned_opt_boot_file_name =
+        returned_network->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    {
+        SCOPED_TRACE("verify returned option");
+        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
+        EXPECT_GT(returned_opt_boot_file_name.getId(), 0);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for the added shared network option");
+        // Instead of adding an audit entry for an option we add an audit
+        // entry for the entire shared network so as the server refreshes the
+        // shared network with the new option. Note that the server doesn't
+        // have means to retrieve only the newly added option.
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::UPDATE,
+                          "shared network specific option set");
+    }
+
+    // One option should now be stored in the database.
+    ASSERT_EQ(1, countRows("dhcp4_options"));
+
+    opt_boot_file_name->persistent_ = !opt_boot_file_name->persistent_;
+    cbptr_->createUpdateOption4(ServerSelector::ANY(),
+                                shared_network->getName(),
+                                opt_boot_file_name);
+
+    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
+                                                 shared_network->getName());
+    ASSERT_TRUE(returned_network);
+    returned_opt_boot_file_name =
+        returned_network->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    {
+        SCOPED_TRACE("verify updated option with modified persistence");
+        testOptionsEquivalent(*opt_boot_file_name, returned_opt_boot_file_name);
+    }
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for the updated shared network option");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::UPDATE,
+                          "shared network specific option set");
+    }
+
+    // The new option instance should replace the existing option instance,
+    // so we should still have one option.
+    ASSERT_EQ(1, countRows("dhcp4_options"));
+
+    // Deleting an option for any server should succeed.
+    EXPECT_EQ(1, cbptr_->deleteOption4(ServerSelector::ANY(),
+                                       shared_network->getName(),
+                                       opt_boot_file_name->option_->getType(),
+                                       opt_boot_file_name->space_name_));
+    returned_network = cbptr_->getSharedNetwork4(ServerSelector::ALL(),
+                                                 shared_network->getName());
+    ASSERT_TRUE(returned_network);
+    EXPECT_FALSE(returned_network->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME).option_);
+
+    {
+        SCOPED_TRACE("UPDATE audit entry for the deleted shared network option");
+        testNewAuditEntry("dhcp4_shared_network",
+                          AuditEntry::ModificationType::UPDATE,
+                          "shared network specific option deleted");
+    }
+
+    // After deleting the option we should be back to 0.
+    EXPECT_EQ(0, countRows("dhcp4_options"));
+}
+
+void
+GenericConfigBackendDHCPv4Test::subnetOptionIdOrderTest() {
+
+    // Add a subnet with two pools with one option each.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[1]));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+    EXPECT_EQ(2, countRows("dhcp4_options"));
+
+    // Add a second subnet with a single option. The number of options in the database
+    // should now be 3.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[2]));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+    EXPECT_EQ(3, countRows("dhcp4_options"));
+
+    // Now replace the first subnet with three options and two pools.  This will cause
+    // the option id values for this subnet to be larger than those in the second
+    // subnet.
+    EXPECT_NO_THROW(cbptr_->createUpdateSubnet4(ServerSelector::ALL(), test_subnets_[0]));
+    EXPECT_EQ(2, countRows("dhcp4_pool"));
+    EXPECT_EQ(4, countRows("dhcp4_options"));
+
+    // Now fetch all subnets.
+    Subnet4Collection subnets;
+    EXPECT_NO_THROW(subnets = cbptr_->getAllSubnets4(ServerSelector::ALL()));
+    ASSERT_EQ(2, subnets.size());
+
+    // Verify that the subnets returned are as expected.
+    for (auto subnet : subnets) {
+        ASSERT_EQ(1, subnet->getServerTags().size());
+        EXPECT_EQ("all", subnet->getServerTags().begin()->get());
+        if (subnet->getID() == 1024) {
+            EXPECT_EQ(test_subnets_[0]->toElement()->str(), subnet->toElement()->str());
+        } else if (subnet->getID() == 2048) {
+            EXPECT_EQ(test_subnets_[2]->toElement()->str(), subnet->toElement()->str());
+        } else {
+            ADD_FAILURE() << "unexpected subnet id:" << subnet->getID();
+        }
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::sharedNetworkOptionIdOrderTest() {
+    auto level1_options = test_networks_[0];
+    auto level1_no_options = test_networks_[1];
+    auto level2 = test_networks_[2];
+
+    // Insert two shared networks. We insert level1 without options first,
+    // then level2.
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       level1_no_options));
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       level2));
+    // Fetch all shared networks.
+    SharedNetwork4Collection networks =
+        cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
+
+    ASSERT_EQ(2, networks.size());
+
+    // See if shared networks are returned ok.
+    for (auto i = 0; i < networks.size(); ++i) {
+        if (i == 0) {
+            // level1_no_options
+            EXPECT_EQ(level1_no_options->toElement()->str(),
+                  networks[i]->toElement()->str());
+        } else {
+            // bar
+            EXPECT_EQ(level2->toElement()->str(),
+                  networks[i]->toElement()->str());
+        }
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateSharedNetwork4(ServerSelector::ALL(),
+                                                       level1_options));
+
+    // Fetch all shared networks.
+    networks = cbptr_->getAllSharedNetworks4(ServerSelector::ALL());
+    ASSERT_EQ(2, networks.size());
+
+    // See if shared networks are returned ok.
+    for (auto i = 0; i < networks.size(); ++i) {
+        if (i == 0) {
+            // level1_no_options
+            EXPECT_EQ(level1_options->toElement()->str(),
+                  networks[i]->toElement()->str());
+        } else {
+            // bar
+            EXPECT_EQ(level2->toElement()->str(),
+                  networks[i]->toElement()->str());
+        }
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::setAndGetAllClientClasses4Test() {
+    // Create a server.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server1"));
+    }
+    // Create first class.
+    auto class1 = test_client_classes_[0];
+    class1->setTest("pkt4.msgtype == 1");
+    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+    {
+        SCOPED_TRACE("client class foo is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+    // Create second class.
+    auto class2 = test_client_classes_[1];
+    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
+    {
+        SCOPED_TRACE("client class bar is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+    // Create third class.
+    auto class3 = test_client_classes_[2];
+    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
+    {
+        SCOPED_TRACE("client class foobar is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+    // Update the third class to depend on the second class.
+    class3->setTest("member('foo')");
+    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
+    {
+        SCOPED_TRACE("client class bar is updated");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::UPDATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+    // Only the first class should be returned for the server selector ALL.
+    auto client_classes = cbptr_->getAllClientClasses4(ServerSelector::ALL());
+    ASSERT_EQ(1, client_classes.getClasses()->size());
+    // All three classes should be returned for the server1.
+    client_classes = cbptr_->getAllClientClasses4(ServerSelector::ONE("server1"));
+    auto classes_list = client_classes.getClasses();
+    ASSERT_EQ(3, classes_list->size());
+    EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_EQ("bar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_EQ("foobar", (*(classes_list->begin() + 2))->getName());
+
+
+    // Move the third class between the first and second class.
+    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, "foo"));
+
+    // Ensure that the classes order has changed.
+    client_classes = cbptr_->getAllClientClasses4(ServerSelector::ONE("server1"));
+    classes_list = client_classes.getClasses();
+    ASSERT_EQ(3, classes_list->size());
+    EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
+
+    // Update the foobar class without specifying its position. It should not
+    // be moved.
+    ASSERT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
+
+    client_classes = cbptr_->getAllClientClasses4(ServerSelector::ONE("server1"));
+    classes_list = client_classes.getClasses();
+    ASSERT_EQ(3, classes_list->size());
+    EXPECT_EQ("foo", (*classes_list->begin())->getName());
+    EXPECT_EQ("foobar", (*(classes_list->begin() + 1))->getName());
+    EXPECT_EQ("bar", (*(classes_list->begin() + 2))->getName());
+}
+
+void
+GenericConfigBackendDHCPv4Test::getClientClass4Test() {
+    // Create a server.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+
+    // Add classes.
+    auto class1 = test_client_classes_[0];
+    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[0]->option_,
+                                                test_options_[0]->persistent_,
+                                                test_options_[0]->space_name_));
+    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[1]->option_,
+                                                test_options_[1]->persistent_,
+                                                test_options_[1]->space_name_));
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+
+    auto class2 = test_client_classes_[1];
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
+
+    // Get the first client class and validate its contents.
+    ClientClassDefPtr client_class;
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(), class1->getName()));
+    ASSERT_TRUE(client_class);
+    EXPECT_EQ("foo", client_class->getName());
+    EXPECT_TRUE(client_class->getRequired());
+    EXPECT_EQ("1.2.3.4", client_class->getNextServer().toText());
+    EXPECT_EQ("cool", client_class->getSname());
+    EXPECT_EQ("epc.cfg", client_class->getFilename());
+    EXPECT_EQ(30, client_class->getValid().getMin());
+    EXPECT_EQ(60, client_class->getValid().get());
+    EXPECT_EQ(90, client_class->getValid().getMax());
+
+    // Validate options belonging to this class.
+    ASSERT_TRUE(client_class->getCfgOption());
+    OptionDescriptor returned_opt_boot_file_name =
+        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    OptionDescriptor returned_opt_ip_ttl =
+        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_DEFAULT_IP_TTL);
+    ASSERT_TRUE(returned_opt_ip_ttl.option_);
+
+    // Fetch the same class using different server selectors.
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ANY(),
+                                                           class1->getName()));
+    EXPECT_TRUE(client_class);
+
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ONE("server1"),
+                                                           class1->getName()));
+    EXPECT_TRUE(client_class);
+
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::UNASSIGNED(),
+                                                           class1->getName()));
+    EXPECT_FALSE(client_class);
+
+    // Fetch the second client class using different selectors. This time the
+    // class should not be returned for the ALL server selector because it is
+    // associated with the server1.
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(),
+                                                           class2->getName()));
+    EXPECT_FALSE(client_class);
+
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ANY(),
+                                                           class2->getName()));
+    EXPECT_TRUE(client_class);
+
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ONE("server1"),
+                                                           class2->getName()));
+    EXPECT_TRUE(client_class);
+
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::UNASSIGNED(),
+                                                           class2->getName()));
+    EXPECT_FALSE(client_class);
+}
+
+void
+GenericConfigBackendDHCPv4Test::createUpdateClientClass4OptionsTest() {
+    // Add class with two options and two option definitions.
+    auto class1 = test_client_classes_[0];
+    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[0]->option_,
+                                                test_options_[0]->persistent_,
+                                                test_options_[0]->space_name_));
+    EXPECT_NO_THROW(class1->getCfgOption()->add(test_options_[1]->option_,
+                                                test_options_[1]->persistent_,
+                                                test_options_[1]->space_name_));
+    auto cfg_option_def = boost::make_shared<CfgOptionDef>();
+    class1->setCfgOptionDef(cfg_option_def);
+    EXPECT_NO_THROW(class1->getCfgOptionDef()->add(test_option_defs_[0]));
+    EXPECT_NO_THROW(class1->getCfgOptionDef()->add(test_option_defs_[2]));
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+
+    // Fetch the class and the options from the database.
+    ClientClassDefPtr client_class;
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(), class1->getName()));
+    ASSERT_TRUE(client_class);
+
+    // Validate options belonging to the class.
+    ASSERT_TRUE(client_class->getCfgOption());
+    OptionDescriptor returned_opt_boot_file_name =
+        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME);
+    ASSERT_TRUE(returned_opt_boot_file_name.option_);
+
+    OptionDescriptor returned_opt_ip_ttl =
+        client_class->getCfgOption()->get(DHCP4_OPTION_SPACE, DHO_DEFAULT_IP_TTL);
+    ASSERT_TRUE(returned_opt_ip_ttl.option_);
+
+    // Validate option definitions belonging to the class.
+    ASSERT_TRUE(client_class->getCfgOptionDef());
+    auto returned_def_foo = client_class->getCfgOptionDef()->get(test_option_defs_[0]->getOptionSpaceName(),
+                                                                 test_option_defs_[0]->getCode());
+    ASSERT_TRUE(returned_def_foo);
+    EXPECT_EQ(234, returned_def_foo->getCode());
+    EXPECT_EQ("foo", returned_def_foo->getName());
+    EXPECT_EQ(DHCP4_OPTION_SPACE, returned_def_foo->getOptionSpaceName());
+    EXPECT_EQ("espace", returned_def_foo->getEncapsulatedSpace());
+    EXPECT_EQ(OPT_STRING_TYPE, returned_def_foo->getType());
+    EXPECT_FALSE(returned_def_foo->getArrayType());
+
+    auto returned_def_fish = client_class->getCfgOptionDef()->get(test_option_defs_[2]->getOptionSpaceName(),
+                                                                  test_option_defs_[2]->getCode());
+    ASSERT_TRUE(returned_def_fish);
+    EXPECT_EQ(235, returned_def_fish->getCode());
+    EXPECT_EQ("fish", returned_def_fish->getName());
+    EXPECT_EQ(DHCP4_OPTION_SPACE, returned_def_fish->getOptionSpaceName());
+    EXPECT_TRUE(returned_def_fish->getEncapsulatedSpace().empty());
+    EXPECT_EQ(OPT_RECORD_TYPE, returned_def_fish->getType());
+    EXPECT_TRUE(returned_def_fish->getArrayType());
+
+    // Replace client class specific option definitions. Leave only one option
+    // definition.
+    cfg_option_def = boost::make_shared<CfgOptionDef>();
+    class1->setCfgOptionDef(cfg_option_def);
+    EXPECT_NO_THROW(class1->getCfgOptionDef()->add(test_option_defs_[2]));
+
+    // Delete one of the options and update the class.
+    class1->getCfgOption()->del(test_options_[0]->space_name_,
+                                test_options_[0]->option_->getType());
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+    EXPECT_NO_THROW(client_class = cbptr_->getClientClass4(ServerSelector::ALL(), class1->getName()));
+    ASSERT_TRUE(client_class);
+
+    // Ensure that the first option definition is gone.
+    ASSERT_TRUE(client_class->getCfgOptionDef());
+    returned_def_foo = client_class->getCfgOptionDef()->get(test_option_defs_[0]->getOptionSpaceName(),
+                                                            test_option_defs_[0]->getCode());
+    EXPECT_FALSE(returned_def_foo);
+
+    // The second option definition should be present.
+    returned_def_fish = client_class->getCfgOptionDef()->get(test_option_defs_[2]->getOptionSpaceName(),
+                                                             test_option_defs_[2]->getCode());
+    EXPECT_TRUE(returned_def_fish);
+
+    // Make sure that the first option is gone.
+    ASSERT_TRUE(client_class->getCfgOption());
+    returned_opt_boot_file_name = client_class->getCfgOption()->get(DHCP4_OPTION_SPACE,
+                                                                    DHO_BOOT_FILE_NAME);
+    EXPECT_FALSE(returned_opt_boot_file_name.option_);
+
+    // The second option should be there.
+    returned_opt_ip_ttl = client_class->getCfgOption()->get(DHCP4_OPTION_SPACE,
+                                                            DHO_DEFAULT_IP_TTL);
+    ASSERT_TRUE(returned_opt_ip_ttl.option_);
+}
+
+void
+GenericConfigBackendDHCPv4Test::getModifiedClientClasses4Test() {
+    // Create server1.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+
+    // Add three classes to the database with different timestamps.
+    auto class1 = test_client_classes_[0];
+    class1->setModificationTime(timestamps_["yesterday"]);
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+
+    auto class2 = test_client_classes_[1];
+    class2->setModificationTime(timestamps_["today"]);
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class2, ""));
+
+    auto class3 = test_client_classes_[2];
+    class3->setModificationTime(timestamps_["tomorrow"]);
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class3, ""));
+
+    // Get modified client classes configured for all servers.
+    auto client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ALL(),
+                                                            timestamps_["two days ago"]);
+    EXPECT_EQ(2, client_classes.getClasses()->size());
+
+    // Get modified client classes appropriate for server1. It includes classes
+    // for all servers and for the server1.
+    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
+                                                       timestamps_["two days ago"]);
+    EXPECT_EQ(3, client_classes.getClasses()->size());
+
+    // Get the classes again but use the timestamp equal to the modification
+    // time of the first class.
+    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
+                                                       timestamps_["yesterday"]);
+    EXPECT_EQ(3, client_classes.getClasses()->size());
+
+    // Get modified classes starting from today. It should return only two.
+    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
+                                                       timestamps_["today"]);
+    EXPECT_EQ(2, client_classes.getClasses()->size());
+
+    // Get client classes modified in the future. It should return none.
+    client_classes = cbptr_->getModifiedClientClasses4(ServerSelector::ONE("server1"),
+                                                       timestamps_["after tomorrow"]);
+    EXPECT_EQ(0, client_classes.getClasses()->size());
+
+    // Getting modified client classes for any server is unsupported.
+    EXPECT_THROW(cbptr_->getModifiedClientClasses4(ServerSelector::ANY(),
+                                                   timestamps_["two days ago"]),
+                 InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteClientClass4Test() {
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("server1 is created and available for server1");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("server1 is created and available for server2");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    auto class1 = test_client_classes_[0];
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+    {
+        SCOPED_TRACE("client class foo is created and available for server1");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("client class foo is created and available for server 2");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    auto class2 = test_client_classes_[1];
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
+    {
+        SCOPED_TRACE("client class bar is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+
+    auto class3 = test_client_classes_[2];
+    class3->setTest("member('foo')");
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server2"), class3, ""));
+    {
+        SCOPED_TRACE("client class foobar is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    uint64_t result;
+    EXPECT_NO_THROW(result = cbptr_->deleteClientClass4(ServerSelector::ONE("server1"),
+                                                        class2->getName()));
+    EXPECT_EQ(1, result);
+    {
+        SCOPED_TRACE("client class bar is deleted");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "client class deleted",
+                          ServerSelector::ONE("server1"));
+    }
+
+    EXPECT_NO_THROW(result = cbptr_->deleteClientClass4(ServerSelector::ONE("server2"),
+                                                        class3->getName()));
+    EXPECT_EQ(1, result);
+    {
+        SCOPED_TRACE("client class foobar is deleted");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "client class deleted",
+                          ServerSelector::ONE("server2"));
+    }
+
+    EXPECT_NO_THROW(result = cbptr_->deleteClientClass4(ServerSelector::ANY(),
+                                                        class1->getName()));
+    EXPECT_EQ(1, result);
+    {
+        SCOPED_TRACE("client class foo is deleted and no longer available for the server1");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "client class deleted",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("client class foo is deleted and no longer available for the server2");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "client class deleted",
+                          ServerSelector::ONE("server2"));
+    }
+}
+
+void
+GenericConfigBackendDHCPv4Test::deleteAllClientClasses4Test() {
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("server1 is created");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[2]));
+    {
+        SCOPED_TRACE("server1 is created and available for server1");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("server1 is created and available for server2");
+        testNewAuditEntry("dhcp4_server",
+                          AuditEntry::ModificationType::CREATE,
+                          "server set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    auto class1 = test_client_classes_[0];
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+    {
+        SCOPED_TRACE("client class foo is created and available for server1");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+    {
+        SCOPED_TRACE("client class foo is created and available for server 2");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    auto class2 = test_client_classes_[1];
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server1"), class2, ""));
+    {
+        SCOPED_TRACE("client class bar is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server1"));
+    }
+
+    auto class3 = test_client_classes_[2];
+    class3->setTest("member('foo')");
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ONE("server2"), class3, ""));
+    {
+        SCOPED_TRACE("client class foobar is created");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::CREATE,
+                          "client class set",
+                          ServerSelector::ONE("server2"));
+    }
+
+    uint64_t result;
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::UNASSIGNED()));
+    EXPECT_EQ(0, result);
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server2")));
+    EXPECT_EQ(1, result);
+    {
+        SCOPED_TRACE("client classes for server2 deleted");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all client classes",
+                          ServerSelector::ONE("server2"));
+    }
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server2")));
+    EXPECT_EQ(0, result);
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server1")));
+    EXPECT_EQ(1, result);
+    {
+        SCOPED_TRACE("client classes for server1 deleted");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all client classes",
+                          ServerSelector::ONE("server1"));
+    }
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ONE("server1")));
+    EXPECT_EQ(0, result);
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ALL()));
+    EXPECT_EQ(1, result);
+    {
+        SCOPED_TRACE("client classes for all deleted");
+        testNewAuditEntry("dhcp4_client_class",
+                          AuditEntry::ModificationType::DELETE,
+                          "deleted all client classes",
+                          ServerSelector::ONE("server1"));
+    }
+
+    EXPECT_NO_THROW(result = cbptr_->deleteAllClientClasses4(ServerSelector::ALL()));
+    EXPECT_EQ(0, result);
+
+    // Deleting multiple objects using ANY server tag is unsupported.
+    EXPECT_THROW(cbptr_->deleteAllClientClasses4(ServerSelector::ANY()), InvalidOperation);
+}
+
+void
+GenericConfigBackendDHCPv4Test::clientClassDependencies4Test() {
+    // Create a server.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[0]));
+
+    // Create first class. It depends on KNOWN built-in class.
+    auto class1 = test_client_classes_[0];
+    class1->setTest("member('KNOWN')");
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""));
+
+    // Create second class which depends on the first class. This yelds indirect
+    // dependency on KNOWN class.
+    auto class2 = test_client_classes_[1];
+    class2->setTest("member('foo')");
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class2, ""));
+
+    // Create third class depending on the second class. This also yelds indirect
+    // dependency on KNOWN class.
+    auto class3 = test_client_classes_[2];
+    class3->setTest("member('bar')");
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class3, ""));
+
+    // An attempt to move the first class to the end of the class hierarchy should
+    // fail because other classes depend on it.
+    EXPECT_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, "bar"),
+                 DbOperationError);
+
+    // Try to change the dependency of the first class. There are other classes
+    // having indirect dependency on KNOWN class via this class. Therefore, the
+    // update should be unsuccessful.
+    class1->setTest("member('HA_server1')");
+    EXPECT_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class1, ""),
+                 DbOperationError);
+
+    // Try to change the dependency of the second class. This should result in
+    // an error because the third class depends on it.
+    class2->setTest("member('HA_server1')");
+    EXPECT_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class2, ""),
+                 DbOperationError);
+
+    // Changing the indirect dependency of the third class should succeed, because
+    // no other classes depend on this class.
+    class3->setTest("member('HA_server1')");
+    EXPECT_NO_THROW(cbptr_->createUpdateClientClass4(ServerSelector::ALL(), class3, ""));
+}
+
+void
+GenericConfigBackendDHCPv4Test::multipleAuditEntriesTest() {
+    // Get current time.
+    boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
+
+    // Create a server.
+    EXPECT_NO_THROW(cbptr_->createUpdateServer4(test_servers_[1]));
+
+    // Create a global parameter and update it many times.
+    const ServerSelector& server_selector = ServerSelector::ALL();
+    StampedValuePtr param;
+    ElementPtr value;
+    for (int i = 0; i < 100; ++i) {
+        value = Element::create(i);
+        param = StampedValue::create("my-parameter", value);
+        cbptr_->createUpdateGlobalParameter4(server_selector, param);
+    }
+
+    // Get all audit entries from now.
+    AuditEntryCollection audit_entries =
+        cbptr_->getRecentAuditEntries(server_selector, now, 0);
+
+    // Check that partial retrieves return the right count.
+    auto& mod_time_idx = audit_entries.get<AuditEntryModificationTimeIdTag>();
+    for (auto it = mod_time_idx.begin(); it != mod_time_idx.end(); ++it) {
+        size_t partial_size =
+            cbptr_->getRecentAuditEntries(server_selector,
+                                          (*it)->getModificationTime(),
+                                          (*it)->getRevisionId()).size();
+        EXPECT_EQ(partial_size + 1,
+                  std::distance(it, mod_time_idx.end()));
+    }
+}
index 9bcabc231affe1359d9d55cb592fc1f7d479799a..117b08cb836dd5845291334343ae688cd6932fbc 100644 (file)
@@ -126,7 +126,7 @@ public:
     /// @param server_selector Server selector to be used for next query.
     /// @param new_entries_num Number of the new entries expected to be inserted.
     /// @param max_tested_entries Maximum number of entries tested.
-    void newAuditEntryTest(const std::string& exp_object_type,
+    void testNewAuditEntry(const std::string& exp_object_type,
                            const db::AuditEntry::ModificationType& exp_modification_type,
                            const std::string& exp_log_message,
                            const db::ServerSelector& server_selector = db::ServerSelector::ALL(),
@@ -136,6 +136,246 @@ public:
     /// @brief Verifies that the server can be added, updated and deleted.
     void createUpdateDeleteServerTest();
 
+       /// @brief This test verifies that it is possible to retrieve all servers from the
+       /// database and then delete all of them.
+       void getAndDeleteAllServersTest();
+
+       /// @brief This test verifies that the global parameter can be added, updated and
+       /// deleted.
+       void createUpdateDeleteGlobalParameter4Test();
+
+       /// @brief This test verifies that it is possible to differentiate between the
+       /// global parameters by server tag and that the value specified for the
+       /// particular server overrides the value specified for all servers.
+       void globalParameters4WithServerTagsTest();
+
+       /// @brief This test verifies that all global parameters can be retrieved and deleted.
+       void getAllGlobalParameters4Test();
+
+       /// @brief This test verifies that modified global parameters can be retrieved.
+       void getModifiedGlobalParameters4Test();
+
+       /// @brief Test that the NullKeyError message is correctly updated.
+       void nullKeyErrorTest();
+
+       /// @brief Test that ceateUpdateSubnet4 throws appropriate exceptions for various
+       /// server selectors.
+       void createUpdateSubnet4SelectorsTest();
+
+       /// @brief Test that subnet can be inserted, fetched, updated and then fetched again.
+       void getSubnet4Test();
+
+       /// @brief Test that getSubnet4 by ID throws appropriate exceptions for various server
+       /// selectors.
+       void getSubnet4byIdSelectorsTest();
+
+       /// @brief Test that the information about unspecified optional parameters gets
+       /// propagated to the database.
+       void getSubnet4WithOptionalUnspecifiedTest();
+
+       /// @brief Test that subnet can be associated with a shared network.
+       void getSubnet4SharedNetworkTest();
+
+       /// @brief Test that subnet can be fetched by prefix.
+       void getSubnet4ByPrefixTest();
+
+       /// @brief Test that getSubnet4 by prefix throws appropriate exceptions for various server
+       /// selectors.
+       void getSubnet4byPrefixSelectorsTest();
+
+       /// @brief Test that all subnets can be fetched and then deleted.
+       void getAllSubnets4Test();
+
+       /// @brief Test that getAllSubnets4 throws appropriate exceptions for various
+       /// server selectors.
+       void getAllSubnets4SelectorsTest();
+
+       /// @brief Test that subnets with different server associations are returned.
+       void getAllSubnets4WithServerTagsTest();
+
+       /// @brief Test that getModifiedSubnets4 throws appropriate exceptions for various
+       /// server selectors.
+       void getModifiedSubnets4SelectorsTest();
+
+       /// @brief Test that selected subnet can be deleted.
+       void deleteSubnet4Test();
+
+       /// @brief Test that deleteSubnet4 by ID throws appropriate exceptions for various
+       /// server selectors.
+       void deleteSubnet4ByIdSelectorsTest();
+
+       /// @brief Test that deleteSubnet4 by prefix throws appropriate exceptions for various
+       /// server selectors.
+       void deleteSubnet4ByPrefixSelectorsTest();
+
+       /// @brief Test that deleteAllSubnets4 throws appropriate exceptions for various
+       /// server selectors.
+       void deleteAllSubnets4SelectorsTest();
+
+       /// @brief Test that it is possible to retrieve and delete orphaned subnet.
+       void unassignedSubnet4Test();
+
+       /// @brief Test that subnets modified after given time can be fetched.
+       void getModifiedSubnets4Test();
+
+       /// @brief Test that lifetimes in subnets are handled as expected.
+       void subnetLifetimeTest();
+
+       /// @brief Test that subnets belonging to a shared network can be retrieved.
+       void getSharedNetworkSubnets4Test();
+
+       /// @brief Test that pools are properly updated as a result a subnet update.
+       void subnetUpdatePoolsTest();
+
+       /// @brief Test that deleting a subnet triggers deletion of the options associated
+       /// with the subnet and pools.
+       void subnetOptionsTest();
+
+       /// @brief Test that shared network can be inserted, fetched, updated and then
+       /// fetched again.
+       void getSharedNetwork4Test();
+
+       /// @brief Test that getSharedNetwork4 throws appropriate exceptions for various
+       /// server selectors.
+       void getSharedNetwork4SelectorsTest();
+
+       /// @brief Test that shared network may be created and updated and the server tags
+       /// are properly assigned to it.
+       void createUpdateSharedNetwork4Test();
+
+       /// @brief Test that createUpdateSharedNetwork4 throws appropriate exceptions for various
+       /// server selectors.
+       void createUpdateSharedNetwork4SelectorsTest();
+
+       /// @brief Test that the information about unspecified optional parameters gets
+       /// propagated to the database.
+       void getSharedNetwork4WithOptionalUnspecifiedTest();
+
+       /// @brief Test that deleteSharedNetworkSubnets4 with not ANY selector throw.
+       void deleteSharedNetworkSubnets4Test();
+
+       /// @brief Test that all shared networks can be fetched.
+       void getAllSharedNetworks4Test();
+
+       /// @brief Test that getAllSharedNetworks4 throws appropriate exceptions for various
+       /// server selectors.
+       void getAllSharedNetworks4SelectorsTest();
+
+       /// @brief Test that shared networks with different server associations are returned.
+       void getAllSharedNetworks4WithServerTagsTest();
+
+       /// @brief Test that shared networks modified after given time can be fetched.
+       void getModifiedSharedNetworks4Test();
+
+       /// @brief Test that getModifiedSharedNetworks4 throws appropriate exceptions for various
+       /// server selectors.
+       void getModifiedSharedNetworks4SelectorsTest();
+
+       /// @brief Test that selected shared network can be deleted.
+       void deleteSharedNetwork4Test();
+
+       /// @brief Test that deleteSharedNetwork4 throws appropriate exceptions for various
+       /// server selectors.
+       void deleteSharedNetwork4SelectorsTest();
+
+       /// @brief Test that deleteAllSharedNetworks4 throws appropriate exceptions for various
+       /// server selectors.
+       void deleteAllSharedNetworks4SelectorsTest();
+
+       /// @brief Test that it is possible to retrieve and delete orphaned shared network.
+       void unassignedSharedNetworkTest();
+
+       /// @brief Test that lifetimes in shared networks are handled as expected.
+       void sharedNetworkLifetimeTest();
+
+       /// @brief Test that deleting a shared network triggers deletion of the options
+       /// associated with the shared network.
+       void sharedNetworkOptionsTest();
+
+       /// @brief Test that option definition can be inserted, fetched, updated and then
+       /// fetched again.
+       void getOptionDef4Test();
+
+       /// @brief This test verifies that it is possible to differentiate between the
+       /// option definitions by server tag and that the option definition
+       /// specified for the particular server overrides the definition for
+       /// all servers.
+       void optionDefs4WithServerTagsTest();
+
+       /// @brief Test that all option definitions can be fetched.
+       void getAllOptionDefs4Test();
+
+       /// @brief Test that option definitions modified after given time can be fetched.
+       void getModifiedOptionDefs4Test();
+
+       /// @brief This test verifies that global option can be added, updated and deleted.
+       void createUpdateDeleteOption4Test();
+
+       /// @brief This test verifies that it is possible to differentiate between the
+       /// global options by server tag and that the option specified for the
+       /// particular server overrides the value specified for all servers.
+       void globalOptions4WithServerTagsTest();
+
+       /// @brief This test verifies that all global options can be retrieved.
+       void getAllOptions4Test();
+
+       /// @brief This test verifies that modified global options can be retrieved.
+       void getModifiedOptions4Test();
+
+       /// @brief This test verifies that subnet level option can be added, updated and
+       /// deleted.
+       void createUpdateDeleteSubnetOption4Test();
+
+       /// @brief This test verifies that option can be inserted, updated and deleted
+       /// from the pool.
+       void createUpdateDeletePoolOption4Test();
+
+       /// @brief This test verifies that shared network level option can be added,
+       /// updated and deleted.
+       void createUpdateDeleteSharedNetworkOption4Test();
+
+       /// @brief This test verifies that option id values in one subnet do
+       /// not impact options returned in subsequent subnets when
+       /// fetching subnets from the backend.
+       void subnetOptionIdOrderTest();
+
+       /// @brief This test verifies that option id values in one shared network do
+       /// not impact options returned in subsequent shared networks when
+       /// fetching shared networks from the backend.
+       void sharedNetworkOptionIdOrderTest();
+
+       /// @brief This test verifies that it is possible to create client classes, update them
+       /// and retrieve all classes for a given server.
+       void setAndGetAllClientClasses4Test();
+
+       /// @brief This test verifies that a single class can be retrieved from the database.
+       void getClientClass4Test();
+
+       /// @brief This test verifies that client class specific DHCP options can be
+       /// modified during the class update.
+       void createUpdateClientClass4OptionsTest();
+
+       /// @brief This test verifies that modified client classes can be retrieved from the database.
+       void getModifiedClientClasses4Test();
+
+       /// @brief This test verifies that a specified client class can be deleted.
+       void deleteClientClass4Test();
+
+       /// @brief This test verifies that all client classes can be deleted using
+       /// a specified server selector.
+       void deleteAllClientClasses4Test();
+
+       /// @brief This test verifies that client class dependencies are tracked when the
+       /// classes are added to the database. It verifies that an attempt to update
+       /// a class violating the dependencies results in an error.
+       void clientClassDependencies4Test();
+
+       /// @brief This test verifies that audit entries can be retrieved from a given
+       /// timestamp and id including when two entries can get the same timestamp.
+       /// (either it is a common even and this should catch it, or it is a rare
+       /// event and it does not matter).
+       void multipleAuditEntriesTest();
+
     /// @brief Holds pointers to subnets used in tests.
     std::vector<Subnet4Ptr> test_subnets_;
 
index b45aa7e1ea4a36473c1132b17a49916c4523900f..bd91e21a1d2c2033af4c677e3227f98e419812bc 100644 (file)
@@ -18,7 +18,7 @@ MySqlGenericBackendTest::MySqlGenericBackendTest()
 }
 
 size_t
-MySqlGenericBackendTest::countRows(MySqlConnection& conn, const std::string& table) const {
+MySqlGenericBackendTest::countRows(MySqlConnection& conn, const std::string& table) {
     // Execute a simple select query on all rows.
     std::string query = "SELECT * FROM " + table;
     auto status = mysql_query(conn.mysql_, query.c_str());
index 5e4d7a4d71ae23a66d12e0cc911e0aa1aa07c024..843b6c21a50470ab5413555e8d558b9f49365b4d 100644 (file)
@@ -35,7 +35,7 @@ public:
     /// @param conn MySql connection to be used for the query.
     /// @param table Table name.
     /// @return Number of rows in the specified table.
-    size_t countRows(db::MySqlConnection& conn, const std::string& table) const;
+    static size_t countRows(db::MySqlConnection& conn, const std::string& table);
 };
 
 }