[#4161] Addressed review comments

Update stats after #3140 merge

modified:   src/bin/dhcp6/dhcp6_srv.cc
modified:   src/bin/dhcp6/tests/addr_reg_unittest.cc

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 6a1b1a9c41611b38e4c70549b4ac6eef2dcc4ff8..04a50acfed1a3a9996ceb90d937b33a9e0f64303 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -4565,10 +4565,9 @@ Dhcpv6Srv::processAddrRegInform(AllocEngine::ClientContext6& ctx) {
 
     if (allow_address_registration && !allow_address_registration->boolValue()) {
         LOG_DEBUG(packet6_logger, DBG_DHCP6_BASIC, DHCP6_ADDR6_REGISTER_DISABLED_DROP)
 
     if (allow_address_registration && !allow_address_registration->boolValue()) {
         LOG_DEBUG(packet6_logger, DBG_DHCP6_BASIC, DHCP6_ADDR6_REGISTER_DISABLED_DROP)

-                .arg(addr_reg_inf->getLabel());
+                .arg(ctx.query_->getLabel());

         StatsMgr::instance().addValue("pkt6-admin-filtered",
                                       static_cast<int64_t>(1));
         StatsMgr::instance().addValue("pkt6-admin-filtered",
                                       static_cast<int64_t>(1));

-

         StatsMgr::instance().addValue("pkt6-receive-drop",
                                       static_cast<int64_t>(1));
         return(Pkt6Ptr());
         StatsMgr::instance().addValue("pkt6-receive-drop",
                                       static_cast<int64_t>(1));
         return(Pkt6Ptr());

diff --git a/src/bin/dhcp6/tests/addr_reg_unittest.cc b/src/bin/dhcp6/tests/addr_reg_unittest.cc
index ffee9521ae3ed215d3a3717738b3663db74411f0..be4cf2623b6028570b10f0c4f6be9ece72ff8916 100644 (file)
--- a/src/bin/dhcp6/tests/addr_reg_unittest.cc
+++ b/src/bin/dhcp6/tests/addr_reg_unittest.cc
@@ -1915,11 +1915,15 @@ TEST_F(AddrRegTest, allowAddressRegistrationFalse) {
     // Verify no response.
     ASSERT_FALSE(srv_->processAddrRegInform(ctx));
 
     // Verify no response.
     ASSERT_FALSE(srv_->processAddrRegInform(ctx));
 

-    // Drop stat should have been bumped by one and the log emitted.
+    // Admin-filtered and drop stat should have been bumped by one and the log emitted.

     ObservationPtr stat;
     ObservationPtr stat;

+    stat = StatsMgr::instance().getObservation("pkt6-admin-filtered");
+    ASSERT_TRUE(stat);
+    EXPECT_EQ(1, stat->getInteger().first);

     stat = StatsMgr::instance().getObservation("pkt6-receive-drop");
     ASSERT_TRUE(stat);
     EXPECT_EQ(1, stat->getInteger().first);
     stat = StatsMgr::instance().getObservation("pkt6-receive-drop");
     ASSERT_TRUE(stat);
     EXPECT_EQ(1, stat->getInteger().first);

+

     EXPECT_EQ(1, countFile("DHCP6_ADDR6_REGISTER_DISABLED_DROP ADDR-REG-INFORM"));
 }
 
     EXPECT_EQ(1, countFile("DHCP6_ADDR6_REGISTER_DISABLED_DROP ADDR-REG-INFORM"));
 }