From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 25 May 2023 19:44:29 +0000 (+0300)
Subject: [#145] addressed review comments
X-Git-Tag: Kea-2.3.8~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9e717aacabf683275cd3433271feb5dd7158d0f;p=thirdparty%2Fkea.git

[#145] addressed review comments
---

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index a771d0563c..0b30e75c96 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -3664,7 +3664,7 @@ Dhcpv4Srv::processRelease(Pkt4Ptr& release, AllocEngine::ClientContext4Ptr& cont
                         if (pool) {
                             StatsMgr::instance().addValue(
                                 StatsMgr::generateName("subnet", subnet->getID(),
-                                                       StatsMgr::generateName(".pool", pool->getID(), "assigned-addresses")),
+                                                       StatsMgr::generateName("pool", pool->getID(), "assigned-addresses")),
                                 static_cast<int64_t>(-1));
                         }
                     }
@@ -3836,7 +3836,7 @@ Dhcpv4Srv::declineLease(const Lease4Ptr& lease, const Pkt4Ptr& decline,
         if (pool) {
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", subnet->getID(),
-                                       StatsMgr::generateName(".pool", pool->getID(), "declined-addresses")),
+                                       StatsMgr::generateName("pool", pool->getID(), "declined-addresses")),
                 static_cast<int64_t>(1));
         }
     }
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 4ccd2e36b0..8b389448f3 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -3272,7 +3272,7 @@ Dhcpv6Srv::releaseIA_NA(const DuidPtr& duid, const Pkt6Ptr& query,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(), "assigned-nas")),
+                                               StatsMgr::generateName("pool", pool->getID(), "assigned-nas")),
                         static_cast<int64_t>(-1));
                 }
             }
@@ -3480,7 +3480,7 @@ Dhcpv6Srv::releaseIA_PD(const DuidPtr& duid, const Pkt6Ptr& query,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pd-pool", pool->getID(), "assigned-pds")),
+                                               StatsMgr::generateName("pd-pool", pool->getID(), "assigned-pds")),
                         static_cast<int64_t>(-1));
                 }
             }
@@ -4073,7 +4073,7 @@ Dhcpv6Srv::declineLease(const Pkt6Ptr& decline, const Lease6Ptr lease,
         if (pool) {
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", subnet->getID(),
-                                       StatsMgr::generateName(".pool", pool->getID(), "declined-addresses")),
+                                       StatsMgr::generateName("pool", pool->getID(), "declined-addresses")),
                 static_cast<int64_t>(1));
         }
     }
diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index c488c85569..6549cba755 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -489,7 +489,7 @@ LeaseCmdsImpl::updateStatsOnAdd(const Lease4Ptr& lease) {
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "assigned-addresses")),
                     static_cast<int64_t>(1));
             }
@@ -506,7 +506,7 @@ LeaseCmdsImpl::updateStatsOnAdd(const Lease4Ptr& lease) {
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "declined-addresses")),
                     static_cast<int64_t>(1));
             }
@@ -531,7 +531,7 @@ LeaseCmdsImpl::updateStatsOnAdd(const Lease6Ptr& lease) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
                                            StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ?
-                                                                  ".pool" : ".pd-pool", pool->getID(),
+                                                                  "pool" : "pd-pool", pool->getID(),
                                                                   lease->type_ == Lease::TYPE_NA ?
                                                                   "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(1));
@@ -549,7 +549,7 @@ LeaseCmdsImpl::updateStatsOnAdd(const Lease6Ptr& lease) {
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "declined-addresses")),
                     static_cast<int64_t>(1));
             }
@@ -577,7 +577,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-addresses")),
                         static_cast<int64_t>(-1));
                 }
@@ -596,7 +596,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "declined-addresses")),
                     static_cast<int64_t>(-1));
             }
@@ -618,7 +618,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
                     if (pool) {
                         StatsMgr::instance().addValue(
                             StatsMgr::generateName("subnet", subnet->getID(),
-                                                   StatsMgr::generateName(".pool", pool->getID(),
+                                                   StatsMgr::generateName("pool", pool->getID(),
                                                                           "assigned-addresses")),
                             static_cast<int64_t>(1));
                     }
@@ -637,7 +637,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(1));
                 }
@@ -659,7 +659,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-addresses")),
                         static_cast<int64_t>(1));
                 }
@@ -677,7 +677,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(1));
                 }
@@ -708,7 +708,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
                                                StatsMgr::generateName(existing->type_ == Lease::TYPE_NA ?
-                                                                      ".pool" : ".pd-pool", pool->getID(),
+                                                                      "pool" : "pd-pool", pool->getID(),
                                                                       existing->type_ == Lease::TYPE_NA ?
                                                                       "assigned-nas" : "assigned-pds")),
                         static_cast<int64_t>(-1));
@@ -728,7 +728,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "declined-addresses")),
                     static_cast<int64_t>(-1));
             }
@@ -752,7 +752,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
                         StatsMgr::instance().addValue(
                             StatsMgr::generateName("subnet", subnet->getID(),
                                                    StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ?
-                                                                          ".pool" : ".pd-pool", pool->getID(),
+                                                                          "pool" : "pd-pool", pool->getID(),
                                                                           lease->type_ == Lease::TYPE_NA ?
                                                                           "assigned-nas" : "assigned-pds")),
                             static_cast<int64_t>(1));
@@ -772,7 +772,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(1));
                 }
@@ -796,7 +796,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
                                                StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ?
-                                                                      ".pool" : ".pd-pool", pool->getID(),
+                                                                      "pool" : "pd-pool", pool->getID(),
                                                                       lease->type_ == Lease::TYPE_NA ?
                                                                       "assigned-nas" : "assigned-pds")),
                         static_cast<int64_t>(1));
@@ -815,7 +815,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(1));
                 }
@@ -839,7 +839,7 @@ LeaseCmdsImpl::updateStatsOnDelete(const Lease4Ptr& lease) {
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "assigned-addresses")),
                     static_cast<int64_t>(-1));
             }
@@ -856,7 +856,7 @@ LeaseCmdsImpl::updateStatsOnDelete(const Lease4Ptr& lease) {
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "declined-addresses")),
                     static_cast<int64_t>(-1));
             }
@@ -881,7 +881,7 @@ LeaseCmdsImpl::updateStatsOnDelete(const Lease6Ptr& lease) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
                                            StatsMgr::generateName(lease->type_ == Lease::TYPE_NA ?
-                                                                  ".pool" : ".pd-pool", pool->getID(),
+                                                                  "pool" : "pd-pool", pool->getID(),
                                                                   lease->type_ == Lease::TYPE_NA ?
                                                                   "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(-1));
@@ -899,7 +899,7 @@ LeaseCmdsImpl::updateStatsOnDelete(const Lease6Ptr& lease) {
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "declined-addresses")),
                     static_cast<int64_t>(-1));
             }
@@ -2247,13 +2247,13 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
                 for (const auto& pool : sub->getPools(Lease::TYPE_V4)) {
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-addresses")),
                         static_cast<int64_t>(0));
 
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(0));
                 }
@@ -2281,13 +2281,13 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
                 for (const auto& pool : sub->getPools(Lease::TYPE_V4)) {
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-addresses")),
                         static_cast<int64_t>(0));
 
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(0));
                 }
@@ -2367,13 +2367,13 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
                 for (const auto& pool : sub->getPools(Lease::TYPE_NA)) {
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-nas")),
                         static_cast<int64_t>(0));
 
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(0));
                 }
@@ -2381,7 +2381,7 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
                 for (const auto& pool : sub->getPools(Lease::TYPE_PD)) {
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pd-pool", pool->getID(),
+                                               StatsMgr::generateName("pd-pool", pool->getID(),
                                                                       "assigned-pds")),
                         static_cast<int64_t>(0));
                 }
@@ -2413,13 +2413,13 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
                 for (const auto& pool : sub->getPools(Lease::TYPE_NA)) {
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-nas")),
                         static_cast<int64_t>(0));
 
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "declined-addresses")),
                         static_cast<int64_t>(0));
                 }
@@ -2427,7 +2427,7 @@ LeaseCmdsImpl::lease6WipeHandler(CalloutHandle& handle) {
                 for (const auto& pool : sub->getPools(Lease::TYPE_PD)) {
                     StatsMgr::instance().setValue(
                         StatsMgr::generateName("subnet", sub->getID(),
-                                               StatsMgr::generateName(".pd-pool", pool->getID(),
+                                               StatsMgr::generateName("pd-pool", pool->getID(),
                                                                       "assigned-pds")),
                         static_cast<int64_t>(0));
                 }
diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index e98edf8c35..9abac9f4ec 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -1531,7 +1531,7 @@ AllocEngine::removeNonmatchingReservedLeases6(ClientContext6& ctx,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ? ".pool" : ".pd-pool", pool->getID(),
+                                           StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(),
                                                                   ctx.currentIA().type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(-1));
             }
@@ -1590,7 +1590,7 @@ AllocEngine::removeNonmatchingReservedNoHostLeases6(ClientContext6& ctx,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(candidate->type_ == Lease::TYPE_NA ? ".pool" : ".pd-pool", pool->getID(),
+                                           StatsMgr::generateName(candidate->type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(),
                                                                   candidate->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(-1));
             }
@@ -1673,7 +1673,7 @@ AllocEngine::removeNonreservedLeases6(ClientContext6& ctx,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ? ".pool" : ".pd-pool", pool->getID(),
+                                           StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ? "pool" : "pd-pool", pool->getID(),
                                                                   ctx.currentIA().type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(-1));
             }
@@ -1823,7 +1823,7 @@ AllocEngine::reuseExpiredLease(Lease6Ptr& expired, ClientContext6& ctx,
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                            StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                  ".pool" : ".pd-pool", pool->getID(),
+                                                                  "pool" : "pd-pool", pool->getID(),
                                                                   ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                   "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(1));
@@ -1831,7 +1831,7 @@ AllocEngine::reuseExpiredLease(Lease6Ptr& expired, ClientContext6& ctx,
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                            StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                  ".pool" : ".pd-pool", pool->getID(),
+                                                                  "pool" : "pd-pool", pool->getID(),
                                                                   ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                   "cumulative-assigned-nas" : "cumulative-assigned-pds")),
                     static_cast<int64_t>(1));
@@ -2017,7 +2017,7 @@ Lease6Ptr AllocEngine::createLease6(ClientContext6& ctx,
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                                StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                      ".pool" : ".pd-pool", pool->getID(),
+                                                                      "pool" : "pd-pool", pool->getID(),
                                                                       ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                       "assigned-nas" : "assigned-pds")),
                         static_cast<int64_t>(1));
@@ -2025,7 +2025,7 @@ Lease6Ptr AllocEngine::createLease6(ClientContext6& ctx,
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                                StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                      ".pool" : ".pd-pool", pool->getID(),
+                                                                      "pool" : "pd-pool", pool->getID(),
                                                                       ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                       "cumulative-assigned-nas" : "cumulative-assigned-pds")),
                         static_cast<int64_t>(1));
@@ -2209,7 +2209,7 @@ AllocEngine::extendLease6(ClientContext6& ctx, Lease6Ptr lease) {
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                        StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                              ".pool" : ".pd-pool", pool->getID(),
+                                                              "pool" : "pd-pool", pool->getID(),
                                                               ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                               "assigned-nas" : "assigned-pds")),
                 static_cast<int64_t>(1));
@@ -2365,7 +2365,7 @@ AllocEngine::extendLease6(ClientContext6& ctx, Lease6Ptr lease) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                            StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                  ".pool" : ".pd-pool", pool->getID(),
+                                                                  "pool" : "pd-pool", pool->getID(),
                                                                   ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                   "assigned-nas" : "assigned-pds")),
                     static_cast<int64_t>(1));
@@ -2373,7 +2373,7 @@ AllocEngine::extendLease6(ClientContext6& ctx, Lease6Ptr lease) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                            StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                  ".pool" : ".pd-pool", pool->getID(),
+                                                                  "pool" : "pd-pool", pool->getID(),
                                                                   ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                   "cumulative-assigned-nas" : "cumulative-assigned-pds")),
                     static_cast<int64_t>(1));
@@ -2463,7 +2463,7 @@ AllocEngine::updateLeaseData(ClientContext6& ctx, const Lease6Collection& leases
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                                StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                      ".pool" : ".pd-pool", pool->getID(),
+                                                                      "pool" : "pd-pool", pool->getID(),
                                                                       ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                       "assigned-nas" : "assigned-pds")),
                         static_cast<int64_t>(1));
@@ -2471,7 +2471,7 @@ AllocEngine::updateLeaseData(ClientContext6& ctx, const Lease6Collection& leases
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", ctx.subnet_->getID(),
                                                StatsMgr::generateName(ctx.currentIA().type_ == Lease::TYPE_NA ?
-                                                                      ".pool" : ".pd-pool", pool->getID(),
+                                                                      "pool" : "pd-pool", pool->getID(),
                                                                       ctx.currentIA().type_ == Lease::TYPE_NA ?
                                                                       "cumulative-assigned-nas" : "cumulative-assigned-pds")),
                         static_cast<int64_t>(1));
@@ -2898,13 +2898,13 @@ AllocEngine::reclaimExpiredLease(const Lease6Ptr& lease,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool" , pool->getID(),
+                                           StatsMgr::generateName("pool" , pool->getID(),
                                                                   "assigned-nas")),
                     static_cast<int64_t>(-1));
 
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pool" , pool->getID(),
+                                           StatsMgr::generateName("pool" , pool->getID(),
                                                                   "reclaimed-leases")),
                     static_cast<int64_t>(1));
             }
@@ -2923,13 +2923,13 @@ AllocEngine::reclaimExpiredLease(const Lease6Ptr& lease,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pd-pool" , pool->getID(),
+                                           StatsMgr::generateName("pd-pool" , pool->getID(),
                                                                   "assigned-pds")),
                     static_cast<int64_t>(-1));
 
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", subnet->getID(),
-                                           StatsMgr::generateName(".pd-pool" , pool->getID(),
+                                           StatsMgr::generateName("pd-pool" , pool->getID(),
                                                                   "reclaimed-leases")),
                     static_cast<int64_t>(1));
             }
@@ -3037,13 +3037,13 @@ AllocEngine::reclaimExpiredLease(const Lease4Ptr& lease,
         if (pool) {
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", subnet->getID(),
-                                       StatsMgr::generateName(".pool" , pool->getID(),
+                                       StatsMgr::generateName("pool" , pool->getID(),
                                                               "assigned-addresses")),
                 static_cast<int64_t>(-1));
 
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", subnet->getID(),
-                                       StatsMgr::generateName(".pool" , pool->getID(),
+                                       StatsMgr::generateName("pool" , pool->getID(),
                                                               "reclaimed-leases")),
                 static_cast<int64_t>(1));
         }
@@ -3126,12 +3126,12 @@ AllocEngine::reclaimDeclined(const Lease4Ptr& lease) {
         const auto& pool = subnet->getPool(Lease::TYPE_V4, lease->addr_, false);
         if (pool) {
             stats_mgr.addValue(StatsMgr::generateName("subnet", subnet->getID(),
-                                                      StatsMgr::generateName(".pool" , pool->getID(),
+                                                      StatsMgr::generateName("pool" , pool->getID(),
                                                                              "declined-addresses")),
                 static_cast<int64_t>(-1));
 
             stats_mgr.addValue(StatsMgr::generateName("subnet", subnet->getID(),
-                                                      StatsMgr::generateName(".pool" , pool->getID(),
+                                                      StatsMgr::generateName("pool" , pool->getID(),
                                                                              "reclaimed-declined-addresses")),
                 static_cast<int64_t>(1));
         }
@@ -3198,12 +3198,12 @@ AllocEngine::reclaimDeclined(const Lease6Ptr& lease) {
         const auto& pool = subnet->getPool(lease->type_, lease->addr_, false);
         if (pool) {
             stats_mgr.addValue(StatsMgr::generateName("subnet", subnet->getID(),
-                                                      StatsMgr::generateName(".pool" , pool->getID(),
+                                                      StatsMgr::generateName("pool" , pool->getID(),
                                                                              "declined-addresses")),
                 static_cast<int64_t>(-1));
 
             stats_mgr.addValue(StatsMgr::generateName("subnet", subnet->getID(),
-                                                      StatsMgr::generateName(".pool" , pool->getID(),
+                                                      StatsMgr::generateName("pool" , pool->getID(),
                                                                              "reclaimed-declined-addresses")),
                 static_cast<int64_t>(-1));
         }
@@ -4109,7 +4109,7 @@ AllocEngine::requestLease4(AllocEngine::ClientContext4& ctx) {
                 if (pool) {
                     StatsMgr::instance().addValue(
                         StatsMgr::generateName("subnet", subnet->getID(),
-                                               StatsMgr::generateName(".pool", pool->getID(),
+                                               StatsMgr::generateName("pool", pool->getID(),
                                                                       "assigned-addresses")),
                         static_cast<int64_t>(-1));
                 }
@@ -4324,13 +4324,13 @@ AllocEngine::createLease4(const ClientContext4& ctx, const IOAddress& addr,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                  "assigned-addresses")),
                     static_cast<int64_t>(1));
 
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                  "cumulative-assigned-addresses")),
                     static_cast<int64_t>(1));
             }
@@ -4459,13 +4459,13 @@ AllocEngine::renewLease4(const Lease4Ptr& lease,
             if (pool) {
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "assigned-addresses")),
                     static_cast<int64_t>(1));
 
                 StatsMgr::instance().addValue(
                     StatsMgr::generateName("subnet", ctx.subnet_->getID(),
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "cumulative-assigned-addresses")),
                     static_cast<int64_t>(1));
             }
@@ -4585,13 +4585,13 @@ AllocEngine::reuseExpiredLease4(Lease4Ptr& expired,
         if (pool) {
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", ctx.subnet_->getID(),
-                                       StatsMgr::generateName(".pool", pool->getID(),
+                                       StatsMgr::generateName("pool", pool->getID(),
                                                               "assigned-addresses")),
                 static_cast<int64_t>(1));
 
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", ctx.subnet_->getID(),
-                                       StatsMgr::generateName(".pool", pool->getID(),
+                                       StatsMgr::generateName("pool", pool->getID(),
                                                               "cumulative-assigned-addresses")),
                 static_cast<int64_t>(1));
         }
diff --git a/src/lib/dhcpsrv/cfg_subnets4.cc b/src/lib/dhcpsrv/cfg_subnets4.cc
index 1947c2fe40..df366c2767 100644
--- a/src/lib/dhcpsrv/cfg_subnets4.cc
+++ b/src/lib/dhcpsrv/cfg_subnets4.cc
@@ -543,27 +543,27 @@ CfgSubnets4::removeStatistics() {
 
         for (const auto& pool : subnet4->getPools(Lease::TYPE_V4)) {
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "total-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "assigned-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "cumulative-assigned-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "declined-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "reclaimed-declined-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "reclaimed-leases")));
         }
     }
@@ -598,12 +598,12 @@ CfgSubnets4::updateStatistics() {
 
         for (const auto& pool : subnet4->getPools(Lease::TYPE_V4)) {
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pool", pool->getID(),
+                                                      StatsMgr::generateName("pool", pool->getID(),
                                                                              "total-addresses")),
                                static_cast<int64_t>(pool->getCapacity()));
 
             name = StatsMgr::generateName("subnet", subnet_id,
-                                          StatsMgr::generateName(".pool", pool->getID(),
+                                          StatsMgr::generateName("pool", pool->getID(),
                                                                  "cumulative-assigned-addresses"));
             if (!stats_mgr.getObservation(name)) {
                 stats_mgr.setValue(name, static_cast<int64_t>(0));
diff --git a/src/lib/dhcpsrv/cfg_subnets6.cc b/src/lib/dhcpsrv/cfg_subnets6.cc
index a06505294d..9521a573df 100644
--- a/src/lib/dhcpsrv/cfg_subnets6.cc
+++ b/src/lib/dhcpsrv/cfg_subnets6.cc
@@ -441,45 +441,45 @@ CfgSubnets6::removeStatistics() {
 
         for (const auto& pool : subnet6->getPools(Lease::TYPE_NA)) {
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "total-nas")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "assigned-nas")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "cumulative-assigned-nas")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "declined-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "reclaimed-declined-addresses")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pool", pool->getID(),
+                                                 StatsMgr::generateName("pool", pool->getID(),
                                                                         "reclaimed-leases")));
         }
 
         for (const auto& pool : subnet6->getPools(Lease::TYPE_PD)) {
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pd-pool", pool->getID(),
+                                                 StatsMgr::generateName("pd-pool", pool->getID(),
                                                                         "total-pds")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pd-pool", pool->getID(),
+                                                 StatsMgr::generateName("pd-pool", pool->getID(),
                                                                         "assigned-pds")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pd-pool", pool->getID(),
+                                                 StatsMgr::generateName("pd-pool", pool->getID(),
                                                                         "cumulative-assigned-pds")));
 
             stats_mgr.del(StatsMgr::generateName("subnet", subnet_id,
-                                                 StatsMgr::generateName(".pd-pool", pool->getID(),
+                                                 StatsMgr::generateName("pd-pool", pool->getID(),
                                                                         "reclaimed-leases")));
         }
     }
@@ -526,13 +526,13 @@ CfgSubnets6::updateStatistics() {
 
         for (const auto& pool : subnet6->getPools(Lease::TYPE_NA)) {
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pool", pool->getID(),
+                                                      StatsMgr::generateName("pool", pool->getID(),
                                                                              "total-nas")),
                                static_cast<int64_t>(pool->getCapacity()));
 
             const std::string& name_nas =
                 StatsMgr::generateName("subnet", subnet_id,
-                                       StatsMgr::generateName(".pool", pool->getID(),
+                                       StatsMgr::generateName("pool", pool->getID(),
                                        "cumulative-assigned-nas"));
             if (!stats_mgr.getObservation(name_nas)) {
                 stats_mgr.setValue(name_nas, static_cast<int64_t>(0));
@@ -541,13 +541,13 @@ CfgSubnets6::updateStatistics() {
 
         for (const auto& pool : subnet6->getPools(Lease::TYPE_PD)) {
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pd-pool", pool->getID(),
+                                                      StatsMgr::generateName("pd-pool", pool->getID(),
                                                                              "total-pds")),
                                static_cast<int64_t>(pool->getCapacity()));
 
             const std::string& name_nas =
                 StatsMgr::generateName("subnet", subnet_id,
-                                       StatsMgr::generateName(".pd-pool", pool->getID(),
+                                       StatsMgr::generateName("pd-pool", pool->getID(),
                                        "cumulative-assigned-pds"));
             if (!stats_mgr.getObservation(name_nas)) {
                 stats_mgr.setValue(name_nas, static_cast<int64_t>(0));
diff --git a/src/lib/dhcpsrv/csv_lease_file4.cc b/src/lib/dhcpsrv/csv_lease_file4.cc
index d8ca8c5dc2..ad6b9b5391 100644
--- a/src/lib/dhcpsrv/csv_lease_file4.cc
+++ b/src/lib/dhcpsrv/csv_lease_file4.cc
@@ -232,7 +232,7 @@ CSVLeaseFile4::readSubnetID(const CSVRow& row) {
 uint32_t
 CSVLeaseFile4::readPoolID(const CSVRow& row) {
     uint32_t pool_id =
-        row.readAndConvertAt<SubnetID>(getColumnIndex("pool_id"));
+        row.readAndConvertAt<uint32_t>(getColumnIndex("pool_id"));
     return (pool_id);
 }
 
diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc
index 55d370b6d7..e698965caf 100644
--- a/src/lib/dhcpsrv/lease_mgr.cc
+++ b/src/lib/dhcpsrv/lease_mgr.cc
@@ -139,33 +139,33 @@ LeaseMgr::recountLeaseStats4() {
 
         for (const auto & pool : (*subnet)->getPools(Lease::TYPE_V4)) {
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pool", pool->getID(),
+                                                      StatsMgr::generateName("pool", pool->getID(),
                                                                              "assigned-addresses")),
                                zero);
 
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pool", pool->getID(),
+                                                      StatsMgr::generateName("pool", pool->getID(),
                                                                              "declined-addresses")),
                                zero);
 
             if (!stats_mgr.getObservation(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-declined-addresses")))) {
                 stats_mgr.setValue(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-declined-addresses")),
                     zero);
             }
 
             if (!stats_mgr.getObservation(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-leases")))) {
                 stats_mgr.setValue(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-leases")),
                     zero);
             }
@@ -210,20 +210,20 @@ LeaseMgr::recountLeaseStats4() {
         if (row.lease_state_ == Lease::STATE_DEFAULT) {
             // Add to subnet and pool level value.
             stats_mgr.addValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                      StatsMgr::generateName(".pool", row.pool_id_,
+                                                      StatsMgr::generateName("pool", row.pool_id_,
                                                       "assigned-addresses")),
                                row.state_count_);
         } else if (row.lease_state_ == Lease::STATE_DECLINED) {
             // Set subnet and pool level value.
             stats_mgr.setValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                      StatsMgr::generateName(".pool", row.pool_id_,
+                                                      StatsMgr::generateName("pool", row.pool_id_,
                                                       "declined-addresses")),
                                row.state_count_);
 
             // Add to subnet and pool level value.
             // Declined leases also count as assigned.
             stats_mgr.addValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                      StatsMgr::generateName(".pool", row.pool_id_,
+                                                      StatsMgr::generateName("pool", row.pool_id_,
                                                       "assigned-addresses")),
                                row.state_count_);
         }
@@ -367,33 +367,33 @@ LeaseMgr::recountLeaseStats6() {
 
         for (const auto& pool : (*subnet)->getPools(Lease::TYPE_NA)) {
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pool", pool->getID(),
+                                                      StatsMgr::generateName("pool", pool->getID(),
                                                                              "assigned-nas")),
                                zero);
 
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pool", pool->getID(),
+                                                      StatsMgr::generateName("pool", pool->getID(),
                                                                              "declined-addresses")),
                                zero);
 
             if (!stats_mgr.getObservation(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-declined-addresses")))) {
                 stats_mgr.setValue(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-declined-addresses")),
                     zero);
             }
 
             if (!stats_mgr.getObservation(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-leases")))) {
                 stats_mgr.setValue(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pool", pool->getID(),
+                                           StatsMgr::generateName("pool", pool->getID(),
                                                                   "reclaimed-leases")),
                     zero);
             }
@@ -401,17 +401,17 @@ LeaseMgr::recountLeaseStats6() {
 
         for (const auto& pool : (*subnet)->getPools(Lease::TYPE_PD)) {
             stats_mgr.setValue(StatsMgr::generateName("subnet", subnet_id,
-                                                      StatsMgr::generateName(".pd-pool", pool->getID(),
+                                                      StatsMgr::generateName("pd-pool", pool->getID(),
                                                                              "assigned-pds")),
                                zero);
 
             if (!stats_mgr.getObservation(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pd-pool", pool->getID(),
+                                           StatsMgr::generateName("pd-pool", pool->getID(),
                                                                   "reclaimed-leases")))) {
                 stats_mgr.setValue(
                     StatsMgr::generateName("subnet", subnet_id,
-                                           StatsMgr::generateName(".pd-pool", pool->getID(),
+                                           StatsMgr::generateName("pd-pool", pool->getID(),
                                                                   "reclaimed-leases")),
                     zero);
             }
@@ -475,20 +475,20 @@ LeaseMgr::recountLeaseStats6() {
                 if (row.lease_state_ == Lease::STATE_DEFAULT) {
                     // Add to subnet and pool level value.
                     stats_mgr.addValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                              StatsMgr::generateName(".pool", row.pool_id_,
+                                                              StatsMgr::generateName("pool", row.pool_id_,
                                                               "assigned-nas")),
                                        row.state_count_);
                 } else if (row.lease_state_ == Lease::STATE_DECLINED) {
                     // Set subnet and pool level value.
                     stats_mgr.setValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                              StatsMgr::generateName(".pool", row.pool_id_,
+                                                              StatsMgr::generateName("pool", row.pool_id_,
                                                               "declined-addresses")),
                                        row.state_count_);
 
                     // Add to subnet and pool level value.
                     // Declined leases also count as assigned.
                     stats_mgr.addValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                              StatsMgr::generateName(".pool", row.pool_id_,
+                                                              StatsMgr::generateName("pool", row.pool_id_,
                                                               "assigned-nas")),
                                        row.state_count_);
                 }
@@ -498,7 +498,7 @@ LeaseMgr::recountLeaseStats6() {
                 if (row.lease_state_ == Lease::STATE_DEFAULT) {
                     // Set subnet and pool level value.
                     stats_mgr.setValue(StatsMgr::generateName("subnet", row.subnet_id_,
-                                                              StatsMgr::generateName(".pd-pool", row.pool_id_,
+                                                              StatsMgr::generateName("pd-pool", row.pool_id_,
                                                               "assigned-pds")),
                                        row.state_count_);
                 }
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index a7dc60ea15..e24c15725f 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -426,7 +426,7 @@ tagged_statements = { {
                         "fqdn_fwd, fqdn_rev, hostname, "
                         "hwaddr, hwtype, hwaddr_source, "
                         "state, user_context, binaddr, pool_id) "
-                            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"},
+                            "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"},
     {MySqlLeaseMgr::UPDATE_LEASE4,
                     "UPDATE lease4 SET address = ?, hwaddr = ?, "
                         "client_id = ?, valid_lifetime = ?, expire = ?, "
@@ -1441,7 +1441,7 @@ public:
             // bind_[17].is_null = &MLM_FALSE; // commented out for performance
                                                // reasons, see memset() above
 
-	    // pool_id: unsigned int
+            // pool_id: unsigned int
             // Can use lease_->pool_id_ directly as it is of type uint32_t.
             bind_[18].buffer_type = MYSQL_TYPE_LONG;
             bind_[18].buffer = reinterpret_cast<char*>(&lease_->pool_id_);
@@ -1619,14 +1619,14 @@ public:
                                            // reasons, see memset() above
 
         // Add the error flags
-        setErrorIndicators(bind_, error_, LEASE_COLUMNS - 1);
+        setErrorIndicators(bind_, error_, LEASE_COLUMNS);
 
         // .. and check that we have the numbers correct at compile time.
         BOOST_STATIC_ASSERT(18 < LEASE_COLUMNS);
 
         // Add the data to the vector.  Note the end element is one after the
         // end of the array.
-        return (std::vector<MYSQL_BIND>(&bind_[0], &bind_[LEASE_COLUMNS - 1]));
+        return (std::vector<MYSQL_BIND>(&bind_[0], &bind_[LEASE_COLUMNS]));
     }
 
     /// @brief Copy Received Data into Lease6 Object
diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index 9cd4b35acb..8630564dd7 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -1095,7 +1095,7 @@ public:
             addr_bin_ = lease_->addr_.toBytes();
             bind_array.add(addr_bin_);
 
-	    pool_id_str_ = boost::lexical_cast<std::string>(lease->pool_id_);
+            pool_id_str_ = boost::lexical_cast<std::string>(lease->pool_id_);
             bind_array.add(pool_id_str_);
         } catch (const std::exception& ex) {
             isc_throw(DbOperationError,