[#1065] fixed rebase

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 03c5658a5145e1497b2d353ab7ada9136195f62d..1d099428d36cc3d2d3e1a540bad4539b4627f6a3 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -1858,7 +1858,6 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
                 StatsMgr::generateName("subnet", id, "assigned-addresses"),
                 int64_t(0));
 
-
             StatsMgr::instance().setValue(
                 StatsMgr::generateName("subnet", id, "declined-addresses"),
                 int64_t(0));

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 81d0443fc1dd293b731a102992f9bb5313abfa88..85ac4ebb435e30431053099570aeac85c1077390 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -4620,12 +4620,6 @@ TEST_F(LeaseCmdsTest, Lease6Update) {
     ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
               99, "assigned-pds"))->getInteger().first, 0);
 
-    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
-              66, "declined-addresses"))->getInteger().first, 2);
-
-    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
-              99, "declined-addresses"))->getInteger().first, 2);
-
     // Now send the command.
     string txt =
         "{\n"
@@ -4687,6 +4681,12 @@ TEST_F(LeaseCmdsTest, Lease6UpdateWithStats) {
     ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
               99, "assigned-pds"))->getInteger().first, 0);
 
+    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
+              66, "declined-addresses"))->getInteger().first, 2);
+
+    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
+              99, "declined-addresses"))->getInteger().first, 2);
+
     // Now send the command.
     string txt =
         "{\n"
@@ -4754,12 +4754,6 @@ TEST_F(LeaseCmdsTest, Lease6UpdateNoSubnetId) {
     ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
               99, "assigned-pds"))->getInteger().first, 0);
 
-    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
-              66, "declined-addresses"))->getInteger().first, 2);
-
-    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
-              99, "declined-addresses"))->getInteger().first, 2);
-
     // Now send the command.
     string txt =
         "{\n"
@@ -4823,6 +4817,12 @@ TEST_F(LeaseCmdsTest, Lease6UpdateNoSubnetIdWithStats) {
     ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
               99, "assigned-pds"))->getInteger().first, 0);
 
+    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
+              66, "declined-addresses"))->getInteger().first, 2);
+
+    ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
+              99, "declined-addresses"))->getInteger().first, 2);
+
     // Now send the command.
     string txt =
         "{\n"