From: Francis Dupont <fdupont@isc.org>
Date: Thu, 11 May 2017 12:12:07 +0000 (+0200)
Subject: [3389a] Renamed patchIfacesReDetect into disableIfacesReDetect
X-Git-Tag: trac5227_base~14^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95ef2e1ec60bfa9f191ef29e843554b641ed4beb;p=thirdparty%2Fkea.git

[3389a] Renamed patchIfacesReDetect into disableIfacesReDetect
---

diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 0ac816e40b..3d66c465af 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -608,8 +608,8 @@ Dhcpv4SrvTest::configure(const std::string& config, NakedDhcpv4Srv& srv,
     ASSERT_NO_THROW(json = parseJSON(config));
     ConstElementPtr status;
 
-    // Patch the re-detect flag
-    patchIfacesReDetect(json);
+    // Disable the re-detect flag
+    disableIfacesReDetect(json);
 
     // Configure the server and make sure the config is accepted
     EXPECT_NO_THROW(status = configureDhcp4Server(srv, json));
diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.h b/src/bin/dhcp4/tests/dhcp4_test_utils.h
index 5c9581a3fc..5bdd5c4ebd 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.h
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.h
@@ -482,7 +482,7 @@ public:
 /// @brief Patch the server config to add interface-config/re-detect=false
 /// @param json the server config
 inline void
-patchIfacesReDetect(isc::data::ConstElementPtr json) {
+disableIfacesReDetect(isc::data::ConstElementPtr json) {
     isc::data::ConstElementPtr ifaces_cfg = json->get("interfaces-config");
     if (ifaces_cfg) {
         isc::data::ElementPtr mutable_cfg =
@@ -517,7 +517,7 @@ parseDHCP4(const std::string& in, bool verbose = false)
         isc::dhcp::Parser4Context ctx;
         isc::data::ElementPtr json;
         json = ctx.parseString(in, isc::dhcp::Parser4Context::SUBPARSER_DHCP4);
-        patchIfacesReDetect(json);
+        disableIfacesReDetect(json);
         return (json);
     }
     catch (const std::exception& ex) {
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 70b64d4189..b836b8fbc9 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -702,8 +702,8 @@ Dhcpv6SrvTest::configure(const std::string& config, NakedDhcpv6Srv& srv) {
     ASSERT_NO_THROW(json = parseJSON(config));
     ConstElementPtr status;
 
-    // Patch the re-detect flag
-    patchIfacesReDetect(json);
+    // Disable the re-detect flag
+    disableIfacesReDetect(json);
 
     // Configure the server and make sure the config is accepted
     EXPECT_NO_THROW(status = configureDhcp6Server(srv, json));
diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.h b/src/bin/dhcp6/tests/dhcp6_test_utils.h
index 3846029b4a..e0edfe9761 100644
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.h
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h
@@ -642,7 +642,7 @@ public:
 /// @brief Patch the server config to add interface-config/re-detect=false
 /// @param json the server config
 inline void
-patchIfacesReDetect(isc::data::ConstElementPtr json) {
+disableIfacesReDetect(isc::data::ConstElementPtr json) {
     isc::data::ConstElementPtr ifaces_cfg = json->get("interfaces-config");
     if (ifaces_cfg) {
         isc::data::ElementPtr mutable_cfg =
@@ -677,7 +677,7 @@ parseDHCP6(const std::string& in, bool verbose = false)
         isc::dhcp::Parser6Context ctx;
         isc::data::ElementPtr json;
         json = ctx.parseString(in, isc::dhcp::Parser6Context::SUBPARSER_DHCP6);
-        patchIfacesReDetect(json);
+        disableIfacesReDetect(json);
         return (json);
     }
     catch (const std::exception& ex) {