[#2436] Addressed most review comments prior to rebase

src/lib/dhcpsrv/memfile_lease_limits.cc
    ClassLeaseCounter::getLeaseClientClasses() - looks for classes in "ISC"

src/lib/dhcpsrv/memfile_lease_limits.h
    ClassCountMap& getCountMap() - reordered return logic

src/lib/dhcpsrv/memfile_lease_mgr.h
    override and virtual use correction

src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.*
    GenericLeaseMgrTest::makeContextWithClasses() - embed in "ISC" element

src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc
    makeContextWithClasses() - embed in "ISC" element

src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
    add using namespace data

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index b11eb59de3..724c492a2e 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -1224,15 +1224,15 @@ public:
     /// @param client_class client class for which the count is desired
     /// @param ltype type of lease for which the count is desired. Defaults to
     /// Lease::TYPE_V4.
-    virtual size_t getClassLeaseCount(const ClientClass& client_class,
-                                      const Lease::Type& ltype = Lease::TYPE_V4);
+    size_t getClassLeaseCount(const ClientClass& client_class,
+                              const Lease::Type& ltype = Lease::TYPE_V4) override;
 
     /// @brief Recount the leases per class for V4 leases.
     ///
     /// Clears the current class-lease count map and then iterates
     /// over all, retabulating counts based on class lists in each lease
     /// user-context.
-    virtual void recountClassLeases4();
+    void recountClassLeases4();
 
     /// @brief Recount the leases per class for V6 leases.
     ///