// This test verifies that externally configured shared-networks are
// merged correctly into staging configuration.
-TEST_F(Dhcp6CBTest, DISABLED_mergeSharedNetworks) {
+TEST_F(Dhcp6CBTest, mergeSharedNetworks) {
string base_config =
"{ \n"
" \"interfaces-config\": { \n"
return (network_it != index.cend());
}
-
-
-void
-CfgSharedNetworks4::merge(CfgOptionDefPtr cfg_def, CfgSharedNetworks4& other) {
- auto& index = networks_.get<SharedNetworkNameIndexTag>();
-
- // Iterate over the subnets to be merged. They will replace the existing
- // subnets with the same id. All new subnets will be inserted into this
- // configuration.
- auto other_networks = other.getAll();
- for (auto other_network = other_networks->begin();
- other_network != other_networks->end(); ++other_network) {
-
- // In theory we should drop subnet assignments from "other". The
- // idea being those that come from the CB should not have subnets_
- // populated. We will quietly throw them away, just in case.
- (*other_network)->delAll();
-
- // Check if the other network exists in this config.
- auto existing_network = index.find((*other_network)->getName());
- if (existing_network != index.end()) {
-
- // Somehow the same instance is in both, skip it.
- if (*existing_network == *other_network) {
- continue;
- }
-
- // Network exists, which means we're updating it.
- // First we need to move its subnets to the new
- // version of the network.
- const Subnet4Collection* subnets = (*existing_network)->getAllSubnets();
-
- Subnet4Collection copy_subnets(*subnets);
- for (auto subnet = copy_subnets.cbegin(); subnet != copy_subnets.cend(); ++subnet) {
- (*existing_network)->del((*subnet)->getID());
- (*other_network)->add(*subnet);
- }
-
- // Now we discard the existing copy of the network.
- index.erase(existing_network);
- }
-
- // Create the network's options based on the given definitions.
- (*other_network)->getCfgOption()->createOptions(cfg_def);
-
- // Add the new/updated nework.
- networks_.push_back(*other_network);
- }
-
-}
-
} // end of namespace isc::dhcp
} // end of namespace isc
template<typename SharedNetworkPtrType, typename SharedNetworkCollection>
class CfgSharedNetworks : public data::CfgToElement {
public:
+ /// @brief Returns pointer to all configured shared networks.
+ const SharedNetworkCollection* getAll() const {
+ return (&networks_);
+ }
/// @brief Adds new shared network to the configuration.
///
return (list);
}
-protected:
-
- /// @brief Multi index container holding shared networks.
- SharedNetworkCollection networks_;
-};
-
-/// @brief Represents configuration of IPv4 shared networks.
-class CfgSharedNetworks4 : public CfgSharedNetworks<SharedNetwork4Ptr,
- SharedNetwork4Collection> {
-public:
-
- /// @brief Returns pointer to all configured shared networks.
- const SharedNetwork4Collection* getAll() const {
- return (&networks_);
- }
-
- /// @brief Checks if specified server identifier has been specified for
- /// any network.
- ///
- /// @param server_id Server identifier.
- ///
- /// @return true if there is a network with a specified server identifier.
- bool hasNetworkWithServerId(const asiolink::IOAddress& server_id) const;
-
/// @brief Merges specified shared network configuration into this
/// configuration.
///
/// when creating option instances.
/// @param other the shared network configuration to be merged into this
/// configuration.
- void merge(CfgOptionDefPtr cfg_def, CfgSharedNetworks4& other);
+ void merge(CfgOptionDefPtr cfg_def, CfgSharedNetworks& other) {
+ auto& index = networks_.template get<SharedNetworkNameIndexTag>();
+
+ // Iterate over the subnets to be merged. They will replace the existing
+ // subnets with the same id. All new subnets will be inserted into this
+ // configuration.
+ auto other_networks = other.getAll();
+ for (auto other_network = other_networks->begin();
+ other_network != other_networks->end(); ++other_network) {
+
+ // In theory we should drop subnet assignments from "other". The
+ // idea being those that come from the CB should not have subnets_
+ // populated. We will quietly throw them away, just in case.
+ (*other_network)->delAll();
+
+ // Check if the other network exists in this config.
+ auto existing_network = index.find((*other_network)->getName());
+ if (existing_network != index.end()) {
+
+ // Somehow the same instance is in both, skip it.
+ if (*existing_network == *other_network) {
+ continue;
+ }
+
+ // Network exists, which means we're updating it.
+ // First we need to move its subnets to the new
+ // version of the network.
+ const auto subnets = (*existing_network)->getAllSubnets();
+
+ auto copy_subnets(*subnets);
+ for (auto subnet = copy_subnets.cbegin(); subnet != copy_subnets.cend(); ++subnet) {
+ (*existing_network)->del((*subnet)->getID());
+ (*other_network)->add(*subnet);
+ }
+
+ // Now we discard the existing copy of the network.
+ index.erase(existing_network);
+ }
+
+ // Create the network's options based on the given definitions.
+ (*other_network)->getCfgOption()->createOptions(cfg_def);
+
+ // Add the new/updated nework.
+ networks_.push_back(*other_network);
+ }
+ }
+
+protected:
+
+ /// @brief Multi index container holding shared networks.
+ SharedNetworkCollection networks_;
+};
+
+/// @brief Represents configuration of IPv4 shared networks.
+class CfgSharedNetworks4 : public CfgSharedNetworks<SharedNetwork4Ptr,
+ SharedNetwork4Collection> {
+public:
+ /// @brief Checks if specified server identifier has been specified for
+ /// any network.
+ ///
+ /// @param server_id Server identifier.
+ ///
+ /// @return true if there is a network with a specified server identifier.
+ bool hasNetworkWithServerId(const asiolink::IOAddress& server_id) const;
};
/// @brief Pointer to the configuration of IPv4 shared networks.
/// @brief Represents configuration of IPv6 shared networks.
class CfgSharedNetworks6 : public CfgSharedNetworks<SharedNetwork6Ptr,
SharedNetwork6Collection> {
-public:
-
- /// @brief Returns pointer to all configured shared networks.
- const SharedNetwork6Collection* getAll() const {
- return (&networks_);
- }
};
/// @brief Pointer to the configuration of IPv6 shared networks.
ConfigBase::merge(other);
try {
SrvConfig& other_srv_config = dynamic_cast<SrvConfig&>(other);
+ // We merge objects in order of dependency (real or theoretical).
+ // First we merge the common stuff.
+
+ // Merge globals.
+ mergeGlobals(other_srv_config);
+
+ // Merge option defs. We need to do this next so we
+ // pass these into subsequent merges so option instances
+ // at each level can be created based on the merged
+ // definitions.
+ cfg_option_def_->merge((*other_srv_config.getCfgOptionDef()));
+
+ // Merge options.
+ cfg_option_->merge(cfg_option_def_, (*other_srv_config.getCfgOption()));
+
if (CfgMgr::instance().getFamily() == AF_INET) {
merge4(other_srv_config);
} else {
void
SrvConfig::merge4(SrvConfig& other) {
- // We merge objects in order of dependency (real or theoretical).
-
- // Merge globals.
- mergeGlobals(other);
-
- // Merge option defs. We need to do this next so we
- // pass these into subsequent merges so option instances
- // at each level can be created based on the merged
- // definitions.
- cfg_option_def_->merge((*other.getCfgOptionDef()));
-
- // Merge options.
- cfg_option_->merge(cfg_option_def_, (*other.getCfgOption()));
-
// Merge shared networks.
cfg_shared_networks4_->merge(cfg_option_def_, *(other.getCfgSharedNetworks4()));
void
SrvConfig::merge6(SrvConfig& other) {
- // We merge objects in order of dependency (real or theoretical).
-
- // Merge globals.
- mergeGlobals(other);
-
- // Merge option defs. We need to do this next so we
- // pass these into subsequent merges so option instances
- // at each level can be created based on the merged
- // definitions.
- cfg_option_def_->merge((*other.getCfgOptionDef()));
-
- // Merge options.
- cfg_option_->merge(cfg_option_def_, (*other.getCfgOption()));
-
-#if 0
// Merge shared networks.
cfg_shared_networks6_->merge(cfg_option_def_, *(other.getCfgSharedNetworks6()));
+#if 0
// Merge subnets.
cfg_subnets6_->merge(cfg_option_def_, getCfgSharedNetworks4(),
*(other.getCfgSubnets6()));
namespace {
+/// Attempts to verify an expected network within a collection of networks
+/// @param networks set of networks in which to look
+/// @param name name of the expected network
+/// @param exp_valid expected valid lifetime of the network
+/// @param exp_subnets list of subnet IDs the network is expected to own
void checkMergedNetwork(const CfgSharedNetworks4& networks, const std::string& name,
const Triplet<uint32_t>& exp_valid,
const std::vector<SubnetID>& exp_subnets) {
OptionPtr option(new Option(Option::V4, 1));
option->setData(value.begin(), value.end());
ASSERT_NO_THROW(network1b->getCfgOption()->add(option, false, "isc"));
- // Verify that our option is a generic option.
- EXPECT_EQ("type=001, len=004: 59:61:79:21", option->toText());
-
ASSERT_NO_THROW(network1b->add(subnet4));
// Network2 we will not touch.
// Make sure we have option 1 and that it has been replaced with a string option.
auto network = cfg_to.getByName("network1");
auto desc = network->getCfgOption()->get("isc", 1);
- ASSERT_TRUE(desc.option_);
- EXPECT_EQ("type=001, len=004: \"Yay!\" (string)", desc.option_->toText());
+ OptionStringPtr opstr = boost::dynamic_pointer_cast<OptionString>(desc.option_);
+ ASSERT_TRUE(opstr);
+ EXPECT_EQ("Yay!", opstr->getValue());
// No changes to network2.
ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network2", Triplet<uint32_t>(200),
#include <config.h>
#include <exceptions/exceptions.h>
+#include <dhcp/option_string.h>
#include <dhcpsrv/cfg_shared_networks.h>
#include <asiolink/io_address.h>
#include <testutils/test_to_element.h>
namespace {
+/// Attempts to verify an expected network within a collection of networks
+/// @param networks set of networks in which to look
+/// @param name name of the expected network
+/// @param exp_valid expected valid lifetime of the network
+/// @param exp_subnets list of subnet IDs the network is expected to own
+void checkMergedNetwork(const CfgSharedNetworks6& networks, const std::string& name,
+ const Triplet<uint32_t>& exp_valid,
+ const std::vector<SubnetID>& exp_subnets) {
+ auto network = networks.getByName(name);
+ ASSERT_TRUE(network) << "expected network: " << name << " not found";
+ ASSERT_EQ(exp_valid, network->getValid()) << " network valid lifetime wrong";
+ const Subnet6Collection* subnets = network->getAllSubnets();
+ ASSERT_EQ(exp_subnets.size(), subnets->size()) << " wrong number of subnets";
+ for (auto exp_id : exp_subnets) {
+ ASSERT_TRUE(network->getSubnet(exp_id))
+ << " did not find expected subnet: " << exp_id;
+ }
+}
+
// This test verifies that shared networks can be added to the configruation
// and retrieved by name.
TEST(CfgSharedNetworks6Test, getByName) {
test::runToElementTest<CfgSharedNetworks6>(expected, cfg);
}
+// This test verifies that shared-network configurations are properly merged.
+TEST(CfgSharedNetworks6Test, mergeNetworks) {
+ // Create custom options dictionary for testing merge. We're keeping it
+ // simple because they are more rigorous tests elsewhere.
+ CfgOptionDefPtr cfg_def(new CfgOptionDef());
+ cfg_def->add((OptionDefinitionPtr(new OptionDefinition("one", 1, "string"))), "isc");
+
+ Subnet6Ptr subnet1(new Subnet6(IOAddress("2001:1::"),
+ 64, 60, 80, 100, 200, SubnetID(1)));
+ Subnet6Ptr subnet2(new Subnet6(IOAddress("2001:2::"),
+ 64, 60, 80, 100, 200, SubnetID(2)));
+ Subnet6Ptr subnet3(new Subnet6(IOAddress("2001:3::"),
+ 64, 60, 80, 100, 200, SubnetID(3)));
+ Subnet6Ptr subnet4(new Subnet6(IOAddress("2001:4::"),
+ 64, 60, 80, 100, 200, SubnetID(4)));
+
+ // Create network1 and add two subnets to it
+ SharedNetwork6Ptr network1(new SharedNetwork6("network1"));
+ network1->setValid(Triplet<uint32_t>(100));
+ ASSERT_NO_THROW(network1->add(subnet1));
+ ASSERT_NO_THROW(network1->add(subnet2));
+
+ // Create network2 with no subnets.
+ SharedNetwork6Ptr network2(new SharedNetwork6("network2"));
+ network2->setValid(Triplet<uint32_t>(200));
+
+ // Create network3 with one subnet.
+ SharedNetwork6Ptr network3(new SharedNetwork6("network3"));
+ network3->setValid(Triplet<uint32_t>(300));
+ ASSERT_NO_THROW(network3->add(subnet3));
+
+ // Create our "existing" configured networks.
+ // Add all three networks to the existing config.
+ CfgSharedNetworks6 cfg_to;
+ ASSERT_NO_THROW(cfg_to.add(network1));
+ ASSERT_NO_THROW(cfg_to.add(network2));
+ ASSERT_NO_THROW(cfg_to.add(network3));
+
+ // Merge in an "empty" config. Should have the original config, still intact.
+ CfgSharedNetworks6 cfg_from;
+ ASSERT_NO_THROW(cfg_to.merge(cfg_def, cfg_from));
+
+ ASSERT_EQ(3, cfg_to.getAll()->size());
+ ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network1", Triplet<uint32_t>(100),
+ std::vector<SubnetID>{SubnetID(1), SubnetID(2)}));
+ ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network2", Triplet<uint32_t>(200),
+ std::vector<SubnetID>()));
+
+ ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network3", Triplet<uint32_t>(300),
+ std::vector<SubnetID>{SubnetID(3)}));
+
+ // Create network1b, this is an "update" of network1
+ // We'll double the valid time and add subnet4 to it
+ SharedNetwork6Ptr network1b(new SharedNetwork6("network1"));
+ network1b->setValid(Triplet<uint32_t>(200));
+
+ // Now let's a add generic option 1 to network1b.
+ std::string value("Yay!");
+ OptionPtr option(new Option(Option::V6, 1));
+ option->setData(value.begin(), value.end());
+ ASSERT_NO_THROW(network1b->getCfgOption()->add(option, false, "isc"));
+ ASSERT_NO_THROW(network1b->add(subnet4));
+
+ // Network2 we will not touch.
+
+ // Create network3b, this is an "update" of network3.
+ // We'll double it's valid time, but leave off the subnet.
+ SharedNetwork6Ptr network3b(new SharedNetwork6("network3"));
+ network3b->setValid(Triplet<uint32_t>(600));
+
+ // Create our "existing" configured networks.
+ ASSERT_NO_THROW(cfg_from.add(network1b));
+ ASSERT_NO_THROW(cfg_from.add(network3b));
+
+ ASSERT_NO_THROW(cfg_to.merge(cfg_def, cfg_from));
+
+ // Should still have 3 networks.
+
+ // Network1 should have doubled its valid lifetime but still only have
+ // the orignal two subnets. Merge should discard assocations on CB
+ // subnets and preserve the associations from existing config.
+ ASSERT_EQ(3, cfg_to.getAll()->size());
+ ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network1", Triplet<uint32_t>(200),
+ std::vector<SubnetID>{SubnetID(1), SubnetID(2)}));
+
+ // Make sure we have option 1 and that it has been replaced with a string option.
+ auto network = cfg_to.getByName("network1");
+ auto desc = network->getCfgOption()->get("isc", 1);
+ ASSERT_TRUE(desc.option_);
+ OptionStringPtr opstr = boost::dynamic_pointer_cast<OptionString>(desc.option_);
+ ASSERT_TRUE(opstr);
+ EXPECT_EQ("Yay!", opstr->getValue());
+
+ // No changes to network2.
+ ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network2", Triplet<uint32_t>(200),
+ std::vector<SubnetID>()));
+
+ // Network1 should have doubled its valid lifetime and still subnet3.
+ ASSERT_NO_FATAL_FAILURE(checkMergedNetwork(cfg_to, "network3", Triplet<uint32_t>(600),
+ std::vector<SubnetID>{SubnetID(3)}));
+}
+
} // end of anonymous namespace
projects / thirdparty / kea.git / commitdiff
