DELETE_ALL_SUBNETS4_UNASSIGNED,
DELETE_ALL_SUBNETS4_SHARED_NETWORK_NAME,
DELETE_SUBNET4_SERVER,
- DELETE_POOLS4_SUBNET_ID,
+ DELETE_POOLS4,
DELETE_SHARED_NETWORK4_NAME_WITH_TAG,
DELETE_SHARED_NETWORK4_NAME_ANY,
DELETE_ALL_SHARED_NETWORKS4,
/// @brief Deletes pools belonging to a subnet from the database.
///
+ /// The query deletes all pools associated with the subnet's
+ /// identifier or prefix.
/// @param subnet Pointer to the subnet for which pools should be
/// deleted.
uint64_t deletePools4(const Subnet4Ptr& subnet) {
MySqlBindingCollection in_bindings = {
- MySqlBinding::createInteger<uint32_t>(subnet->getID())
+ MySqlBinding::createInteger<uint32_t>(subnet->getID()),
+ MySqlBinding::createString(subnet->toText())
};
// Run DELETE.
- return (conn_.updateDeleteQuery(DELETE_POOLS4_SUBNET_ID, in_bindings));
+ return (conn_.updateDeleteQuery(DELETE_POOLS4, in_bindings));
}
/// @brief Sends query to the database to retrieve multiple shared
},
// Delete pools for a subnet.
- { MySqlConfigBackendDHCPv4Impl::DELETE_POOLS4_SUBNET_ID,
+ { MySqlConfigBackendDHCPv4Impl::DELETE_POOLS4,
MYSQL_DELETE_POOLS(dhcp4)
},
DELETE_ALL_SUBNETS6_UNASSIGNED,
DELETE_ALL_SUBNETS6_SHARED_NETWORK_NAME,
DELETE_SUBNET6_SERVER,
- DELETE_POOLS6_SUBNET_ID,
- DELETE_PD_POOLS_SUBNET_ID,
+ DELETE_POOLS6,
+ DELETE_PD_POOLS,
DELETE_SHARED_NETWORK6_NAME_WITH_TAG,
DELETE_SHARED_NETWORK6_NAME_ANY,
DELETE_ALL_SHARED_NETWORKS6,
/// @brief Deletes pools belonging to a subnet from the database.
///
+ /// The query deletes all pools associated with the subnet's
+ /// identifier or prefix.
/// @param subnet Pointer to the subnet for which pools should be
/// deleted.
uint64_t deletePools6(const Subnet6Ptr& subnet) {
MySqlBindingCollection in_bindings = {
- MySqlBinding::createInteger<uint32_t>(subnet->getID())
+ MySqlBinding::createInteger<uint32_t>(subnet->getID()),
+ MySqlBinding::createString(subnet->toText())
};
// Run DELETE.
- return (conn_.updateDeleteQuery(DELETE_POOLS6_SUBNET_ID, in_bindings));
+ return (conn_.updateDeleteQuery(DELETE_POOLS6, in_bindings));
}
/// @brief Deletes pd pools belonging to a subnet from the database.
///
+ /// The query deletes all pools associated with the subnet's
+ /// identifier or prefix.
/// @param subnet Pointer to the subnet for which pd pools should be
/// deleted.
uint64_t deletePdPools6(const Subnet6Ptr& subnet) {
MySqlBindingCollection in_bindings = {
- MySqlBinding::createInteger<uint32_t>(subnet->getID())
+ MySqlBinding::createInteger<uint32_t>(subnet->getID()),
+ MySqlBinding::createString(subnet->toText())
};
// Run DELETE.
- return (conn_.updateDeleteQuery(DELETE_PD_POOLS_SUBNET_ID, in_bindings));
+ return (conn_.updateDeleteQuery(DELETE_PD_POOLS, in_bindings));
}
/// @brief Sends query to the database to retrieve multiple shared
},
// Delete pools for a subnet.
- { MySqlConfigBackendDHCPv6Impl::DELETE_POOLS6_SUBNET_ID,
+ { MySqlConfigBackendDHCPv6Impl::DELETE_POOLS6,
MYSQL_DELETE_POOLS(dhcp6)
},
// Delete pd pools for a subnet.
- { MySqlConfigBackendDHCPv6Impl::DELETE_PD_POOLS_SUBNET_ID,
+ { MySqlConfigBackendDHCPv6Impl::DELETE_PD_POOLS,
MYSQL_DELETE_PD_POOLS()
},
#ifndef MYSQL_DELETE_POOLS
#define MYSQL_DELETE_POOLS(table_prefix) \
"DELETE FROM " #table_prefix "_pool " \
- "WHERE subnet_id = ?"
+ "WHERE subnet_id = ? OR subnet_id = " \
+ "(SELECT subnet_id FROM " #table_prefix "_subnet" \
+ " WHERE subnet_prefix = ?)"
#endif
#ifndef MYSQL_DELETE_PD_POOLS
#define MYSQL_DELETE_PD_POOLS() \
"DELETE FROM dhcp6_pd_pool " \
- "WHERE subnet_id = ?"
+ "WHERE subnet_id = ? OR subnet_id = " \
+ "(SELECT subnet_id FROM dhcp6_subnet" \
+ " WHERE subnet_prefix = ?)"
#endif
#ifndef MYSQL_DELETE_SHARED_NETWORK_COMMON
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) {
EXPECT_TRUE(isEquivalent(returned_list, test_list));
}
+// Test that pools are properly updated as a result a subnet update.
+TEST_F(MySqlConfigBackendDHCPv6Test, subnetUpdatePools) {
+
+ auto test_subnet_update = [this](const std::string& subnet_prefix,
+ const SubnetID& subnet_id) {
+ // Add the subnet with two address pools and two prefix delegation
+ // pools.
+ EXPECT_NO_THROW(cbptr_->createUpdateSubnet6(ServerSelector::ALL(),
+ test_subnets_[0]));
+ // Make sure that the pools have been added to the database.
+ EXPECT_EQ(2, countRows("dhcp6_pool"));
+ EXPECT_EQ(2, countRows("dhcp6_pd_pool"));
+
+ // Create the subnet without options which updates the existing
+ // subnet.
+ Subnet6Ptr subnet(new Subnet6(IOAddress(subnet_prefix), 64, 30, 60, 50, 60,
+ subnet_id));
+ EXPECT_NO_THROW(cbptr_->createUpdateSubnet6(ServerSelector::ALL(), subnet));
+ // Check that options are gone.
+ EXPECT_EQ(0, countRows("dhcp6_pool"));
+ EXPECT_EQ(0, countRows("dhcp6_pd_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("2001:db8::", 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("2001:db9::", 1024);
+ }
+}
+
// Test that deleting a subnet triggers deletion of the options associated
// with the subnet and pools.
TEST_F(MySqlConfigBackendDHCPv6Test, subnetOptions) {
projects / thirdparty / kea.git / commitdiff
