From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 8 Jan 2018 17:11:06 +0000 (+0100)
Subject: [5472] Make leaseX-update status consistent with leaseX-add.
X-Git-Tag: trac5425a_base~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a6be9dd3313eadef9face534956b3dd20894eda;p=thirdparty%2Fkea.git

[5472] Make leaseX-update status consistent with leaseX-add.
---

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 6267714855..794053c52e 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -608,7 +608,7 @@ LeaseCmdsImpl::lease4UpdateHandler(CalloutHandle& handle) {
         lease4 = parser.parse(config, cmd_args_, force_create);
         if (force_create && !LeaseMgrFactory::instance().getLease4(lease4->addr_)) {
             LeaseMgrFactory::instance().addLease(lease4);
-            setSuccessResponse(handle, "IPv4 lease created.");
+            setSuccessResponse(handle, "IPv4 lease added.");
 
         } else {
             LeaseMgrFactory::instance().updateLease4(lease4);
@@ -644,7 +644,7 @@ LeaseCmdsImpl::lease6UpdateHandler(CalloutHandle& handle) {
         if (force_create && !LeaseMgrFactory::instance().getLease6(lease6->type_,
                                                                    lease6->addr_)) {
             LeaseMgrFactory::instance().addLease(lease6);
-            setSuccessResponse(handle, "IPv6 lease created.");
+            setSuccessResponse(handle, "IPv6 lease added.");
         } else {
             LeaseMgrFactory::instance().updateLease6(lease6);
             setSuccessResponse(handle, "IPv6 lease updated.");
diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
index 9a41749efc..fbde9e0fb6 100644
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -1520,7 +1520,7 @@ TEST_F(LeaseCmdsTest, Lease4UpdateForceCreate) {
         "        \"force-create\": true"
         "    }\n"
         "}";
-    string exp_rsp = "IPv4 lease created.";
+    string exp_rsp = "IPv4 lease added.";
     testCommand(txt, CONTROL_RESULT_SUCCESS, exp_rsp);
 
     // Now check that the lease is still there.
@@ -1751,7 +1751,7 @@ TEST_F(LeaseCmdsTest, Lease6UpdateForceCreate) {
         "        \"force-create\": true"
         "    }\n"
         "}";
-    string exp_rsp = "IPv6 lease created.";
+    string exp_rsp = "IPv6 lease added.";
     testCommand(txt, CONTROL_RESULT_SUCCESS, exp_rsp);
 
     // Now check that the lease is really there.