[5468] Return status code indicating empty set for lease4-get-all.

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 3eb38797d70d9b7dc8c308dda67632ac160e57a5..22ae0804c5758fc0f721699e140fc78feed790de 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -516,8 +516,8 @@ LeaseCmdsImpl::lease4GetAllHandler(CalloutHandle& handle) {
         s << leases_json->size() << " IPv4 lease(s) found.";
         ElementPtr args = Element::createMap();
         args->set("leases", leases_json);
-        ConstElementPtr response = createAnswer(CONTROL_RESULT_SUCCESS,
-                                                s.str(), args);
+        ConstElementPtr response = createAnswer((leases_json->size() == 0 ? CONTROL_RESULT_EMPTY :
+                                                 CONTROL_RESULT_SUCCESS), s.str(), args);
         setResponse(handle, response);
 
 

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 d60ebe8d4a32052c930c176122e494759ff2452b..c3aa0c136291e7e6b86d51efca6aab28b15b9d1a 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -1170,7 +1170,7 @@ TEST_F(LeaseCmdsTest, Lease4GetAllNoLeases) {
         "    \"command\": \"lease4-get-all\"\n"
         "}";
     string exp_rsp = "0 IPv4 lease(s) found.";
-    ConstElementPtr rsp = testCommand(cmd, CONTROL_RESULT_SUCCESS, exp_rsp);
+    ConstElementPtr rsp = testCommand(cmd, CONTROL_RESULT_EMPTY, exp_rsp);
 
     // Now check that the lease parameters were indeed returned.
     ASSERT_TRUE(rsp);
@@ -1237,7 +1237,7 @@ TEST_F(LeaseCmdsTest, Lease4GetAllBySubnetIdNoLeases) {
         "    }\n"
         "}";
     string exp_rsp = "0 IPv4 lease(s) found.";
-    ConstElementPtr rsp = testCommand(cmd, CONTROL_RESULT_SUCCESS, exp_rsp);
+    ConstElementPtr rsp = testCommand(cmd, CONTROL_RESULT_EMPTY, exp_rsp);
 
     // Now check that the lease parameters were indeed returned.
     ASSERT_TRUE(rsp);