From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 26 Aug 2015 17:40:21 +0000 (-0400)
Subject: [2615] Rollback unwanted dhcp6/tests changes
X-Git-Tag: fd4o6_base~8^2~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c114322a51071a5b37bbd97a890553f945388185;p=thirdparty%2Fkea.git

[2615] Rollback unwanted dhcp6/tests changes

Previous commit, 55207601c7a71e7db55d8fff2b451b054a7b315e, included
changes in the dhcp6/tests directory which should not have been included.
These have been removed.
---

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index ae23ffee9a..f00c7520dd 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -88,7 +88,6 @@ dhcp6_unittests_SOURCES += config_parser_unittest.cc
 dhcp6_unittests_SOURCES += confirm_unittest.cc
 dhcp6_unittests_SOURCES += infrequest_unittest.cc
 dhcp6_unittests_SOURCES += dhcp6_message_test.cc dhcp6_message_test.h
-dhcp6_unittests_SOURCES += out_of_range_unittest.cc
 
 dhcp6_unittests_SOURCES += kea_controller_unittest.cc
 
diff --git a/src/bin/dhcp6/tests/dhcp6_client.cc b/src/bin/dhcp6/tests/dhcp6_client.cc
index 18f21aa53d..9de4755c8b 100644
--- a/src/bin/dhcp6/tests/dhcp6_client.cc
+++ b/src/bin/dhcp6/tests/dhcp6_client.cc
@@ -336,11 +336,11 @@ Dhcp6Client::doRequest() {
         query->addOption(forced_server_id_);
     }
     copyIAs(context_.response_, query);
-    context_.query_ = query;
 
     // Add Client FQDN if configured.
     appendFQDN();
 
+    context_.query_ = query;
     sendMsg(context_.query_);
     context_.response_ = receiveOneMsg();
 
@@ -383,11 +383,11 @@ Dhcp6Client::doRenew() {
     Pkt6Ptr query = createMsg(DHCPV6_RENEW);
     query->addOption(context_.response_->getOption(D6O_SERVERID));
     copyIAsFromLeases(query);
-    context_.query_ = query;
 
     // Add Client FQDN if configured.
     appendFQDN();
 
+    context_.query_ = query;
     sendMsg(context_.query_);
     context_.response_ = receiveOneMsg();
     // Apply configuration only if the server has responded.
@@ -400,29 +400,6 @@ void
 Dhcp6Client::doRebind() {
     Pkt6Ptr query = createMsg(DHCPV6_REBIND);
     copyIAsFromLeases(query);
-    context_.query_ = query;
-
-    // Add Client FQDN if configured.
-    appendFQDN();
-
-    sendMsg(context_.query_);
-    context_.response_ = receiveOneMsg();
-    // Apply configuration only if the server has responded.
-    if (context_.response_) {
-        applyRcvdConfiguration(context_.response_);
-    }
-}
-
-
-void
-Dhcp6Client::doRelease() {
-    Pkt6Ptr query = createMsg(DHCPV6_RELEASE);
-    if (!forced_server_id_) {
-        query->addOption(context_.response_->getOption(D6O_SERVERID));
-    } else {
-        query->addOption(forced_server_id_);
-    }
-    copyIAsFromLeases(query);
 
     // Add Client FQDN if configured.
     appendFQDN();
@@ -436,7 +413,6 @@ Dhcp6Client::doRelease() {
     }
 }
 
-
 void
 Dhcp6Client::doConfirm() {
     context_.query_ = createMsg(DHCPV6_CONFIRM);