mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 05:27:55 +00:00
Code Issues Releases Wiki Activity

[717-mysql_cb-extend-the-backend-with-the-ability-to-associate-the-subnets-with-the-server-tags] Fixed SubnetFetcher comments

Browse Source
This commit is contained in:
Francis Dupont 2019-07-12 12:42:32 +02:00 committed by Marcin Siodelski
parent 0705a49e75
commit b6927e1a06
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/dhcpsrv/subnet.h
View File

@ -865,13 +865,13 @@ template<typename ReturnPtrType, typename CollectionType>
class SubnetFetcher {
public:
/// @brief Fetches shared network by name.
/// @brief Fetches subnets by id.
///
/// @param collection Const reference to the collection from which the shared
/// network is to be fetched.
/// @param name Name of the shared network to be fetched.
/// @return Pointer to the fetched shared network or null if no such shared
/// network could be found.
/// @param collection Const reference to the collection from which the
/// subnet is to be fetched.
/// @param subnet_id Id of the subnet to be fetched.
/// @return Pointer to the fetched subnet or null if no such subnet
/// could be found.
static ReturnPtrType get(const CollectionType& collection,
const SubnetID& subnet_id) {
auto& index = collection.template get<SubnetSubnetIdIndexTag>();

12
src/lib/dhcpsrv/tests/subnet_unittest.cc
View File

@ -1042,16 +1042,16 @@ TEST(Subnet6Test, Pool6InSubnet6) {
// Pool3 requires a member of bar
mypool = subnet->getPool(Lease::TYPE_NA, no_class,
IOAddress("2001:db8:1:3::dead:beef"));
IOAddress("2001:db8:1:3::dead:beef"));
EXPECT_FALSE(mypool);
mypool = subnet->getPool(Lease::TYPE_NA, foo_class,
IOAddress("2001:db8:1:3::dead:beef"));
IOAddress("2001:db8:1:3::dead:beef"));
EXPECT_FALSE(mypool);
mypool = subnet->getPool(Lease::TYPE_NA, bar_class,
IOAddress("2001:db8:1:3::dead:beef"));
IOAddress("2001:db8:1:3::dead:beef"));
EXPECT_EQ(mypool, pool3);
mypool = subnet->getPool(Lease::TYPE_NA, three_classes,
IOAddress("2001:db8:1:3::dead:beef"));
IOAddress("2001:db8:1:3::dead:beef"));
EXPECT_EQ(mypool, pool3);
}
@ -1688,7 +1688,7 @@ TEST(Subnet6Test, lastAllocated) {
TEST(SubnetFetcherTest, getSubnet4ById) {
Subnet4Collection collection;
// Shared network hasn't been added to the collection. A null pointer should
// Subnet hasn't been added to the collection. A null pointer should
// be returned.
auto subnet = SubnetFetcher4::get(collection, SubnetID(1024));
EXPECT_FALSE(subnet);
@ -1714,7 +1714,7 @@ TEST(SubnetFetcherTest, getSubnet4ById) {
TEST(SubnetFetcherTest, getSubnet6ById) {
Subnet6Collection collection;
// Shared network hasn't been added to the collection. A null pointer should
// Subnet hasn't been added to the collection. A null pointer should
// be returned.
auto subnet = SubnetFetcher6::get(collection, SubnetID(1026));
EXPECT_FALSE(subnet);