From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 22 Sep 2015 19:19:22 +0000 (+0200)
Subject: [master] Merge branch 'trac3982' (Decline v6)
X-Git-Tag: trac4045_base~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11e2c4366d8624601172c01e95cff6a8b95833b3;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3982' (Decline v6)

Conflicts:
	src/bin/dhcp6/dhcp6_srv.cc
	src/lib/dhcpsrv/lease.cc
	src/lib/dhcpsrv/tests/lease_unittest.cc
---

11e2c4366d8624601172c01e95cff6a8b95833b3
diff --cc src/lib/dhcpsrv/tests/lease_unittest.cc
index 7b22f99a12,3b11e35404..908c862970
--- a/src/lib/dhcpsrv/tests/lease_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_unittest.cc
@@@ -770,9 -741,42 +770,42 @@@ TEST(Lease6Test, getDuidVector) 
      EXPECT_TRUE(returned_vec == duid_vec);
  }
  
 -// This test verifies if the IPv6 lease can be declined properly.
 +// Verify that decline() method properly clears up specific fields.
  TEST(Lease6Test, decline) {
-     /// @todo (see ticket 3981)
+ 
+     uint8_t llt[] = {0, 1, 2, 3, 4, 5, 6, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf};
+     DuidPtr duid(new DUID(llt, sizeof(llt)));
+ 
+     HWAddrPtr hwaddr(new HWAddr(HWADDR, sizeof(HWADDR), HTYPE_ETHER));
+ 
+     // Let's create a lease for 2001:db8::1, DUID, iaid=1234,
+     // t1=1000, t2=2000, pref=3000, valid=4000, subnet-id = 1
+     Lease6 lease(Lease::TYPE_NA, IOAddress("2001:db8::1"), duid,
+                  1234, 3000, 4000, 1000, 2000, 1, hwaddr);
+     lease.cltt_ = 12345678;
+     lease.hostname_ = "foo.example.org";
+     lease.fqdn_fwd_ = true;
+     lease.fqdn_rev_ = true;
+ 
+     time_t now = time(NULL);
+ 
+     // Move the lease to declined state and set probation-period to 123 seconds
+     lease.decline(123);
+ 
+     ASSERT_TRUE(lease.duid_);
+     ASSERT_EQ("00", lease.duid_->toText());
+     ASSERT_FALSE(lease.hwaddr_);
+     EXPECT_EQ(0, lease.t1_);
+     EXPECT_EQ(0, lease.t2_);
+     EXPECT_EQ(0, lease.preferred_lft_);
+ 
+     EXPECT_TRUE(now <= lease.cltt_);
+     EXPECT_TRUE(lease.cltt_ <= now + 1);
+     EXPECT_EQ("", lease.hostname_);
+     EXPECT_FALSE(lease.fqdn_fwd_);
+     EXPECT_FALSE(lease.fqdn_rev_);
+     EXPECT_EQ(Lease::STATE_DECLINED, lease.state_);
+     EXPECT_EQ(123, lease.valid_lft_);
  }
  
  // Verify the behavior of the function which checks FQDN data for equality.