[5104] Fixed comment and added unit tests

diff --git a/src/lib/dhcpsrv/subnet.cc b/src/lib/dhcpsrv/subnet.cc
index f49239143f0124b10c0efad92051cc35ac10ab99..f0874099cbb234178eba09e071f53d4114402c94 100644 (file)
--- a/src/lib/dhcpsrv/subnet.cc
+++ b/src/lib/dhcpsrv/subnet.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this

diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index 198bf457cb6b2c920244e05d7c3eb19e00eadeba..683ca4b6dacda539025edcbf4b310bfe79313ec0 100644 (file)
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -72,11 +72,12 @@ public:
 
     /// @brief checks if the specified address is in pools
     ///
-    /// Note the difference between inRange() and inPool(). For a given
-    /// subnet (e.g. 2001::/64) there may be one or more pools defined
-    /// that may or may not cover entire subnet, e.g. pool 2001::1-2001::10).
-    /// inPool() returning true implies inRange(), but the reverse implication
-    /// is not always true. For the given example, 2001::1234:abcd would return
+    /// Note the difference between inRange() and inPool() for addresses
+    /// (i.e. *not* prefixes). For a given subnet (e.g. 2001::/64) there
+    /// may be one or more pools defined that may or may not cover
+    /// entire subnet, e.g. pool 2001::1-2001::10). inPool() returning
+    /// true implies inRange(), but the reverse implication is not
+    /// always true. For the given example, 2001::1234:abcd would return
     /// true for inRange(), but false for inPool() check.
     ///
     /// @param type type of pools to iterate over

diff --git a/src/lib/dhcpsrv/tests/pool_unittest.cc b/src/lib/dhcpsrv/tests/pool_unittest.cc
index 1ce452fd3bbc46cb108f2c3241b66994ea7c0f70..143522d361b0f544480492c138a26ab7446d3a4a 100644 (file)
--- a/src/lib/dhcpsrv/tests/pool_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pool_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -112,7 +112,7 @@ TEST(Pool4Test, unique_id) {
 }
 
 // Simple check if toText returns reasonable values
-TEST(Pool4Test,toText) {
+TEST(Pool4Test, toText) {
     Pool4 pool1(IOAddress("192.0.2.7"), IOAddress("192.0.2.17"));
     EXPECT_EQ("type=V4, 192.0.2.7-192.0.2.17", pool1.toText());
 

diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc
index ea9a6dbc2feb0ecf48854fb83787b5521ff839bd..d7a8c97ab9704e72d1d348a199ec5c30d02b57ba 100644 (file)
--- a/src/lib/dhcpsrv/tests/subnet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2015,2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1096,7 +1096,7 @@ TEST(Subnet6Test, inRangeinPool) {
                              IOAddress("2001:db8::20")));
     subnet->addPool(pool1);
 
-    // 192.1.1.1 belongs to the subnet...
+    // 2001:db8::1 belongs to the subnet...
     EXPECT_TRUE(subnet->inRange(IOAddress("2001:db8::1")));
     // ... but it does not belong to any pool within
     EXPECT_FALSE(subnet->inPool(Lease::TYPE_NA, IOAddress("2001:db8::1")));
@@ -1122,6 +1122,40 @@ TEST(Subnet6Test, inRangeinPool) {
     EXPECT_FALSE(subnet->inPool(Lease::TYPE_NA, IOAddress("2001:db8::21")));
 }
 
+// This test verifies that inRange() and inPool() methods work properly
+// for prefixes too.
+TEST(Subnet6Test, PdinRangeinPool) {
+    Subnet6Ptr subnet(new Subnet6(IOAddress("2001:db8::"), 64, 1, 2, 3, 4));
+
+    // this one is in subnet
+    Pool6Ptr pool1(new Pool6(Lease::TYPE_PD, IOAddress("2001:db8::"),
+                             96, 112));
+    subnet->addPool(pool1);
+
+    // this one is not in subnet
+    Pool6Ptr pool2(new Pool6(Lease::TYPE_PD, IOAddress("2001:db8:1::"),
+                             96, 112));
+    subnet->addPool(pool2);
+
+    // 2001:db8::1:0:0 belongs to the subnet...
+    EXPECT_TRUE(subnet->inRange(IOAddress("2001:db8::1:0:0")));
+    // ... but it does not belong to any pool within
+    EXPECT_FALSE(subnet->inPool(Lease::TYPE_PD, IOAddress("2001:db8::1:0:0")));
+
+    // 2001:db8:1::1 does not belong to the subnet...
+    EXPECT_FALSE(subnet->inRange(IOAddress("2001:db8:1::1")));
+    // ... but it belongs to the second pool
+    EXPECT_TRUE(subnet->inPool(Lease::TYPE_PD, IOAddress("2001:db8:1::1")));
+
+    // 2001:db8::1 belongs to the subnet and to the first pool
+    EXPECT_TRUE(subnet->inRange(IOAddress("2001:db8::1")));
+    EXPECT_TRUE(subnet->inPool(Lease::TYPE_PD, IOAddress("2001:db8::1")));
+
+    // 2001:db8:0:1:0:1:: does not belong to the subnet and any pool
+    EXPECT_FALSE(subnet->inRange(IOAddress("2001:db8:0:1:0:1::")));
+    EXPECT_FALSE(subnet->inPool(Lease::TYPE_PD, IOAddress("2001:db8:0:1:0:1::")));
+}
+
 // This test checks if the toText() method returns text representation
 TEST(Subnet6Test, toText) {
     Subnet6 subnet(IOAddress("2001:db8::"), 32, 1, 2, 3, 4);