From: Francis Dupont <fdupont@isc.org>
Date: Fri, 12 Jul 2019 10:42:32 +0000 (+0200)
Subject: [717-mysql_cb-extend-the-backend-with-the-ability-to-associate-the-subnets-with-the... 
X-Git-Tag: Kea-1.6.0-beta2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6927e1a0630181789a238b428873ec40a177eb5;p=thirdparty%2Fkea.git

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

diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index da1284d4de..650b83f8dd 100644
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -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>();
diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc
index 8fe898b07b..3201e71ea0 100644
--- a/src/lib/dhcpsrv/tests/subnet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc
@@ -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);