BIND 10 trac3153, updated. bec7f21950fde94b6c845a23bc5202b6bc2232c1 [3153] pdReleaseReject unit-test written.
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Oct 4 18:33:10 UTC 2013
The branch, trac3153 has been updated
via bec7f21950fde94b6c845a23bc5202b6bc2232c1 (commit)
from a715f62a23e400828ce9ef9072e7690fac016551 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bec7f21950fde94b6c845a23bc5202b6bc2232c1
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Fri Oct 4 20:32:41 2013 +0200
[3153] pdReleaseReject unit-test written.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc | 120 +++++------------------------
src/bin/dhcp6/tests/dhcp6_test_utils.cc | 110 ++++++++++++++++++++++++++
src/bin/dhcp6/tests/dhcp6_test_utils.h | 14 +++-
3 files changed, 143 insertions(+), 101 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index e80907f..5279f81 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -1194,7 +1194,8 @@ TEST_F(Dhcpv6SrvTest, pdReleaseBasic) {
IOAddress("2001:db8:1:2::"));
}
-// This test verifies that incoming (invalid) RELEASE can be handled properly.
+// This test verifies that incoming (invalid) RELEASE with an address
+// can be handled properly.
//
// This test checks 3 scenarios:
// 1. there is no such lease at all
@@ -1204,108 +1205,27 @@ TEST_F(Dhcpv6SrvTest, pdReleaseBasic) {
// expected:
// - returned REPLY message has copy of client-id
// - returned REPLY message has server-id
-// - returned REPLY message has IA that includes STATUS-CODE
+// - returned REPLY message has IA_NA that includes STATUS-CODE
// - No lease in LeaseMgr
TEST_F(Dhcpv6SrvTest, ReleaseReject) {
+ testReleaseReject(Lease::TYPE_NA, IOAddress("2001:db8:1:1::dead"));
+}
- NakedDhcpv6Srv srv(0);
-
- const IOAddress addr("2001:db8:1:1::dead");
- const uint32_t transid = 1234;
- const uint32_t valid_iaid = 234;
- const uint32_t bogus_iaid = 456;
-
- // Quick sanity check that the address we're about to use is ok
- ASSERT_TRUE(subnet_->inPool(Lease::TYPE_NA, addr));
-
- // GenerateClientId() also sets duid_
- OptionPtr clientid = generateClientId();
-
- // Check that the lease is NOT in the database
- Lease6Ptr l = LeaseMgrFactory::instance().getLease6(Lease::TYPE_NA,
- addr);
- ASSERT_FALSE(l);
-
- // Let's create a RELEASE
- Pkt6Ptr req = Pkt6Ptr(new Pkt6(DHCPV6_RELEASE, transid));
- req->setRemoteAddr(IOAddress("fe80::abcd"));
- boost::shared_ptr<Option6IA> ia = generateIA(D6O_IA_NA, bogus_iaid, 1500, 3000);
-
- OptionPtr released_addr_opt(new Option6IAAddr(D6O_IAADDR, addr, 300, 500));
- ia->addOption(released_addr_opt);
- req->addOption(ia);
- req->addOption(clientid);
-
- // Server-id is mandatory in RENEW
- req->addOption(srv.getServerID());
-
- // Case 1: No lease known to server
- SCOPED_TRACE("CASE 1: No lease known to server");
-
- // Pass it to the server and hope for a REPLY
- Pkt6Ptr reply = srv.processRelease(req);
-
- // Check if we get response at all
- checkResponse(reply, DHCPV6_REPLY, transid);
- OptionPtr tmp = reply->getOption(D6O_IA_NA);
- ASSERT_TRUE(tmp);
- // Check that IA_NA was returned and that there's an address included
- ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
- ASSERT_TRUE(ia);
- checkIA_NAStatusCode(ia, STATUS_NoBinding);
- checkMsgStatusCode(reply, STATUS_NoBinding);
-
- // Check that the lease is not there
- l = LeaseMgrFactory::instance().getLease6(Lease::TYPE_NA, addr);
- ASSERT_FALSE(l);
-
- // CASE 2: Lease is known and belongs to this client, but to a different IAID
- SCOPED_TRACE("CASE 2: Lease is known and belongs to this client, but to a different IAID");
-
- Lease6Ptr lease(new Lease6(Lease::TYPE_NA, addr, duid_, valid_iaid,
- 501, 502, 503, 504, subnet_->getID(), 0));
- ASSERT_TRUE(LeaseMgrFactory::instance().addLease(lease));
-
- // Pass it to the server and hope for a REPLY
- reply = srv.processRelease(req);
- checkResponse(reply, DHCPV6_REPLY, transid);
- tmp = reply->getOption(D6O_IA_NA);
- ASSERT_TRUE(tmp);
- // Check that IA_NA was returned and that there's an address included
- ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
- ASSERT_TRUE(ia);
- checkIA_NAStatusCode(ia, STATUS_NoBinding);
- checkMsgStatusCode(reply, STATUS_NoBinding);
-
- // Check that the lease is still there
- l = LeaseMgrFactory::instance().getLease6(Lease::TYPE_NA, addr);
- ASSERT_TRUE(l);
-
- // CASE 3: Lease belongs to a client with different client-id
- SCOPED_TRACE("CASE 3: Lease belongs to a client with different client-id");
-
- req->delOption(D6O_CLIENTID);
- ia = boost::dynamic_pointer_cast<Option6IA>(req->getOption(D6O_IA_NA));
- ia->setIAID(valid_iaid); // Now iaid in renew matches that in leasemgr
- req->addOption(generateClientId(13)); // generate different DUID
- // (with length 13)
-
- reply = srv.processRelease(req);
- checkResponse(reply, DHCPV6_REPLY, transid);
- tmp = reply->getOption(D6O_IA_NA);
- ASSERT_TRUE(tmp);
- // Check that IA_NA was returned and that there's an address included
- ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
- ASSERT_TRUE(ia);
- checkIA_NAStatusCode(ia, STATUS_NoBinding);
- checkMsgStatusCode(reply, STATUS_NoBinding);
-
- // Check that the lease is still there
- l = LeaseMgrFactory::instance().getLease6(Lease::TYPE_NA, addr);
- ASSERT_TRUE(l);
-
- // Finally, let's cleanup the database
- EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(addr));
+// This test verifies that incoming (invalid) RELEASE with a prefix
+// can be handled properly.
+//
+// This test checks 3 scenarios:
+// 1. there is no such lease at all
+// 2. there is such a lease, but it is assigned to a different IAID
+// 3. there is such a lease, but it belongs to a different client
+//
+// expected:
+// - returned REPLY message has copy of client-id
+// - returned REPLY message has server-id
+// - returned REPLY message has IA_PD that includes STATUS-CODE
+// - No lease in LeaseMgr
+TEST_F(Dhcpv6SrvTest, pdReleaseReject) {
+ testReleaseReject(Lease::TYPE_PD, IOAddress("2001:db8:1:2::"));
}
// This test verifies if the status code option is generated properly.
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index e762945..bf10a8e 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -426,6 +426,116 @@ Dhcpv6SrvTest::testReleaseBasic(Lease::Type type, const IOAddress& existing,
ASSERT_FALSE(l);
}
+void
+Dhcpv6SrvTest::testReleaseReject(Lease::Type type, const IOAddress& addr) {
+ NakedDhcpv6Srv srv(0);
+
+ const uint32_t transid = 1234;
+ const uint32_t valid_iaid = 234;
+ const uint32_t bogus_iaid = 456;
+
+ uint32_t code; // option code of the container (IA_NA or IA_PD)
+ uint8_t prefix_len;
+ if (type == Lease::TYPE_NA) {
+ code = D6O_IA_NA;
+ prefix_len = 128;
+ } else if (type == Lease::TYPE_PD) {
+ code = D6O_IA_PD;
+ prefix_len = pd_pool_->getLength();
+ } else {
+ isc_throw(BadValue, "Invalid lease type");
+ }
+
+ // Quick sanity check that the address we're about to use is ok
+ ASSERT_TRUE(subnet_->inPool(type, addr));
+
+ // GenerateClientId() also sets duid_
+ OptionPtr clientid = generateClientId();
+
+ // Check that the lease is NOT in the database
+ Lease6Ptr l = LeaseMgrFactory::instance().getLease6(type, addr);
+ ASSERT_FALSE(l);
+
+ // Let's create a RELEASE
+ Pkt6Ptr rel = createMessage(DHCPV6_RELEASE, type, addr, prefix_len, valid_iaid);
+ rel->addOption(clientid);
+ rel->addOption(srv.getServerID());
+
+ // Case 1: No lease known to server
+ SCOPED_TRACE("CASE 1: No lease known to server");
+
+ // Pass it to the server and hope for a REPLY
+ Pkt6Ptr reply = srv.processRelease(rel);
+
+ // Check if we get response at all
+ checkResponse(reply, DHCPV6_REPLY, transid);
+ OptionPtr tmp = reply->getOption(code);
+ ASSERT_TRUE(tmp);
+ // Check that IA_NA/IA_PD was returned and that there's status code in it
+ boost::shared_ptr<Option6IA> ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
+ ASSERT_TRUE(ia);
+ checkIA_NAStatusCode(ia, STATUS_NoBinding);
+ checkMsgStatusCode(reply, STATUS_NoBinding);
+
+ // Check that the lease is not there
+ l = LeaseMgrFactory::instance().getLease6(type, addr);
+ ASSERT_FALSE(l);
+
+ // CASE 2: Lease is known and belongs to this client, but to a different IAID
+ SCOPED_TRACE("CASE 2: Lease is known and belongs to this client, but to a different IAID");
+
+ Lease6Ptr lease(new Lease6(type, addr, duid_, valid_iaid, 501, 502, 503,
+ 504, subnet_->getID(), prefix_len));
+ ASSERT_TRUE(LeaseMgrFactory::instance().addLease(lease));
+
+ // Let's create a different RELEASE, with a bogus iaid
+ rel = createMessage(DHCPV6_RELEASE, type, addr, prefix_len, bogus_iaid);
+ rel->addOption(clientid);
+ rel->addOption(srv.getServerID());
+
+ // Pass it to the server and hope for a REPLY
+ reply = srv.processRelease(rel);
+ checkResponse(reply, DHCPV6_REPLY, transid);
+ tmp = reply->getOption(code);
+ ASSERT_TRUE(tmp);
+ // Check that IA_NA was returned and that there's an address included
+ ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
+ ASSERT_TRUE(ia);
+ checkIA_NAStatusCode(ia, STATUS_NoBinding);
+ checkMsgStatusCode(reply, STATUS_NoBinding);
+
+ // Check that the lease is still there
+ l = LeaseMgrFactory::instance().getLease6(type, addr);
+ ASSERT_TRUE(l);
+
+ // CASE 3: Lease belongs to a client with different client-id
+ SCOPED_TRACE("CASE 3: Lease belongs to a client with different client-id");
+
+ rel->delOption(D6O_CLIENTID);
+ ia = boost::dynamic_pointer_cast<Option6IA>(rel->getOption(code));
+ ia->setIAID(valid_iaid); // Now iaid in renew matches that in leasemgr
+ rel->addOption(generateClientId(13)); // generate different DUID
+ // (with length 13)
+
+ reply = srv.processRelease(rel);
+ checkResponse(reply, DHCPV6_REPLY, transid);
+ tmp = reply->getOption(code);
+ ASSERT_TRUE(tmp);
+ // Check that IA_NA was returned and that there's an address included
+ ia = boost::dynamic_pointer_cast<Option6IA>(tmp);
+ ASSERT_TRUE(ia);
+ checkIA_NAStatusCode(ia, STATUS_NoBinding);
+ checkMsgStatusCode(reply, STATUS_NoBinding);
+
+ // Check that the lease is still there
+ l = LeaseMgrFactory::instance().getLease6(type, addr);
+ ASSERT_TRUE(l);
+
+ // Finally, let's cleanup the database
+ EXPECT_TRUE(LeaseMgrFactory::instance().deleteLease(addr));
+}
+
+
// Generate IA_NA option with specified parameters
boost::shared_ptr<Option6IA>
NakedDhcpv6SrvTest::generateIA(uint16_t type, uint32_t iaid, uint32_t t1,
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.h b/src/bin/dhcp6/tests/dhcp6_test_utils.h
index db92313..539d368 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.h
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h
@@ -420,7 +420,7 @@ public:
/// @brief Performs negative RENEW test
///
/// See renewReject and pdRenewReject tests for detailed explanation.
- /// In essence the test attempts to perform a successful RENEW scenario.
+ /// In essence the test attempts to perform couple failed RENEW scenarios.
///
/// This method does not throw, but uses gtest macros to signify failures.
///
@@ -447,6 +447,18 @@ public:
CfgMgr::instance().deleteSubnets6();
};
+ /// @brief Performs negative RELEASE test
+ ///
+ /// See releaseReject and pdReleaseReject tests for detailed explanation.
+ /// In essence the test attempts to perform couple failed RELEASE scenarios.
+ ///
+ /// This method does not throw, but uses gtest macros to signify failures.
+ ///
+ /// @param type type (TYPE_NA or TYPE_PD)
+ /// @param addr address being sent in RELEASE
+ void
+ testReleaseReject(Lease::Type type, const IOAddress& addr);
+
/// A subnet used in most tests
Subnet6Ptr subnet_;
More information about the bind10-changes
mailing list