[#2419] Fix statistics (add v4-reservation-conflicts) unit tests for dhcp4

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 69580a0c25ce0566a40cb9530b658c9412df16ef..4f38e126ece1e33521deaa5f00920e4d072fa318 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -648,7 +648,8 @@ TEST_F(CtrlChannelDhcpv4SrvTest, controlChannelStats) {
         "v4-allocation-fail-shared-network",
         "v4-allocation-fail-subnet",
         "v4-allocation-fail-no-pools",
-        "v4-allocation-fail-classes"
+        "v4-allocation-fail-classes",
+        "v4-reservation-conflicts"
     };
 
     // preparing the schema which check if all statistics are set to zero

diff --git a/src/bin/dhcp4/tests/shared_network_unittest.cc b/src/bin/dhcp4/tests/shared_network_unittest.cc
index 5fb3b30efcf30cc7d0f77e6c1029b52060901dc0..8e9601f96960ac5b3f1e8a94618351ee2ea80e01 100644 (file)
--- a/src/bin/dhcp4/tests/shared_network_unittest.cc
+++ b/src/bin/dhcp4/tests/shared_network_unittest.cc
@@ -1771,7 +1771,7 @@ TEST_F(Dhcpv4SharedNetworkTest, reservationInSharedNetworkTwoClientsSameIdentifi
 
     // Ensure stats are being recorded for HR conflicts
     ObservationPtr subnet_conflicts = StatsMgr::instance().getObservation(
-        "subnet[100].reservation-conflicts");
+        "subnet[10].reservation-conflicts");
     ASSERT_TRUE(subnet_conflicts);
     ASSERT_EQ(1, subnet_conflicts->getInteger().first);
     ObservationPtr global_conflicts = StatsMgr::instance().getObservation(

diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 350cc46758191a0f246a9a5ea88960b19f611e33..444c95fca29c723d94090629e7777a5876eb3534 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -3703,7 +3703,7 @@ AllocEngine::discoverLease4(AllocEngine::ClientContext4& ctx) {
                          "(no lease info)");
                 StatsMgr::instance().addValue(StatsMgr::generateName(
                                                   "subnet",
-                                                  new_lease->subnet_id_,
+                                                  ctx.conflicting_lease_->subnet_id_,
                                                   "reservation-conflicts"),
                                               static_cast<int64_t>(1));
                 StatsMgr::instance().addValue("v4-reservation-conflicts",