[#2419] Begin adding stats to track HR assignment conflicts

Resolved merge conflict

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