[#2448] add virtual in LeaseMgr methods

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index 73afd45e875575d43c2279bce6d63e798a711975..5f3cbac3eabfca8086e2c9c745835fe9f8e7b442 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -1246,8 +1246,8 @@ public:
     /// Lease::TYPE_V4.
     ///
     /// @return number of leases
-    size_t getClassLeaseCount(const ClientClass& client_class,
-                              const Lease::Type& ltype = Lease::TYPE_V4) const override;
+    virtual size_t getClassLeaseCount(const ClientClass& client_class,
+                                      const Lease::Type& ltype = Lease::TYPE_V4) const override;
 
     /// @brief Recount the leases per class for V4 leases.
     ///
@@ -1256,7 +1256,7 @@ public:
     /// user-context.
     ///
     /// Must be called from a thread-safe context.
-    void recountClassLeases4() override;
+    virtual void recountClassLeases4() override;
 
     /// @brief Recount the leases per class for V6 leases.
     ///
@@ -1265,12 +1265,12 @@ public:
     /// user-context.
     ///
     /// Must be called from a thread-safe context.
-    void recountClassLeases6() override;
+    virtual void recountClassLeases6() override;
 
     /// @brief Clears the class-lease count map.
     ///
     /// Must be called from a thread-safe context.
-    void clearClassLeaseCounts() override;
+    virtual void clearClassLeaseCounts() override;
 };
 
 }  // namespace dhcp

diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index 7392c9c3ba7ff212ec0b08a638078fab5be5ca6d..6bafd05f44eacc1f69b41987d6c904af62ce5f9d 100644 (file)
--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -976,7 +976,7 @@ private:
     /// MySQL implementation.
     ///
     /// @return true if there is JSON support, false otherwise
-    bool isJsonSupported() const override;
+    virtual bool isJsonSupported() const override;
 
     /// @brief Returns the class lease count for a given class and lease type.
     ///
@@ -985,17 +985,17 @@ private:
     /// Lease::TYPE_V4.
     ///
     /// @return number of leases
-    size_t getClassLeaseCount(const ClientClass& client_class,
-                              const Lease::Type& ltype = Lease::TYPE_V4) const override;
+    virtual size_t getClassLeaseCount(const ClientClass& client_class,
+                                      const Lease::Type& ltype = Lease::TYPE_V4) const override;
 
     /// @brief Recount the leases per class for V4 leases.
-    void recountClassLeases4() override;
+    virtual void recountClassLeases4() override;
 
     /// @brief Recount the leases per class for V6 leases.
-    void recountClassLeases6() override;
+    virtual void recountClassLeases6() override;
 
     /// @brief Clears the class-lease count map.
-    void clearClassLeaseCounts() override;
+    virtual void clearClassLeaseCounts() override;
 
     /// @brief Check Error and Throw Exception
     ///

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h
index 50709f0ebc30c5cb626fea121de4ddd2d842f264..7ef28e65faffba836fe7f7c19a5f5232f901df14 100644 (file)
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.h
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h
@@ -950,7 +950,7 @@ private:
     /// PostgreSQL implementation.
     ///
     /// @return true if there is JSON support, false otherwise
-    bool isJsonSupported() const override;
+    virtual bool isJsonSupported() const override;
 
     /// @brief Returns the class lease count for a given class and lease type.
     ///
@@ -959,17 +959,17 @@ private:
     /// Lease::TYPE_V4.
     ///
     /// @return number of leases
-    size_t getClassLeaseCount(const ClientClass& client_class,
-                              const Lease::Type& ltype = Lease::TYPE_V4) const override;
+    virtual size_t getClassLeaseCount(const ClientClass& client_class,
+                                      const Lease::Type& ltype = Lease::TYPE_V4) const override;
 
     /// @brief Recount the leases per class for V4 leases.
-    void recountClassLeases4() override;
+    virtual void recountClassLeases4() override;
 
     /// @brief Recount the leases per class for V6 leases.
-    void recountClassLeases6() override;
+    virtual void recountClassLeases6() override;
 
     /// @brief Clears the class-lease count map.
-    void clearClassLeaseCounts() override;
+    virtual void clearClassLeaseCounts() override;
 
     /// @brief Context RAII Allocator.
     class PgSqlLeaseContextAlloc {

diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
index 57197a3f3332dbd6e7a5027a388133ea373d26d5..00675ecc327f072ecb8e862beea2126d3aca5fcb 100644 (file)
--- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
@@ -350,20 +350,22 @@ public:
 
     /// @brief Pretends to check if the IPv4 lease limits set in the given user
     /// context are exceeded.
-    std::string checkLimits4(isc::data::ConstElementPtr const& /* user_context */) const override {
+    virtual std::string
+    checkLimits4(isc::data::ConstElementPtr const& /* user_context */) const override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::checkLimits4() not implemented");
     }
 
     /// @brief Pretends to check if the IPv6 lease limits set in the given user
     /// context are exceeded.
-    std::string checkLimits6(isc::data::ConstElementPtr const& /* user_context */) const override{
+    virtual std::string
+    checkLimits6(isc::data::ConstElementPtr const& /* user_context */) const override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::checkLimits6() not implemented");
     }
 
     /// @brief Pretends to check if JSON support is enabled in the database.
     ///
     /// @return true if there is JSON support, false otherwise
-    bool isJsonSupported() const override {
+    virtual bool isJsonSupported() const override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::isJsonSupported() not implemented");
     }
 
@@ -374,23 +376,23 @@ public:
     /// Lease::TYPE_V4.
     ///
     /// @return number of leases
-    size_t getClassLeaseCount(const ClientClass& /* client_class */,
+    virtual size_t getClassLeaseCount(const ClientClass& /* client_class */,
                               const Lease::Type& /* ltype = Lease::TYPE_V4 */) const override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::getClassLeaseCount() not implemented");
     }
 
     /// @brief Pretends to recount the leases per class for V4 leases.
-    void recountClassLeases4() override {
+    virtual void recountClassLeases4() override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::recountClassLeases4() not implemented");
     }
 
     /// @brief Pretends to recount the leases per class for V6 leases.
-    void recountClassLeases6() override {
+    virtual void recountClassLeases6() override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::recountClassLeases6() not implemented");
     }
 
     /// @brief Pretends to clear the class-lease count map.
-    void clearClassLeaseCounts() override {
+    virtual void clearClassLeaseCounts() override {
         isc_throw(NotImplemented, "ConcreteLeaseMgr::clearClassLeaseCounts() not implemented");
     }