[#1982] implement MySqlConfigBackendDHCPv[4|6]::getParameters

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 557c538398e4f67705889ae1b14ff5294b3fc8c0..d0955d4fa5a8755bff664b81a7ec72dfcd94c469 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -180,7 +180,7 @@ public:
                                           parameters);
 
     /// @brief Destructor.
-    ~MySqlConfigBackendDHCPv4Impl();
+    ~MySqlConfigBackendDHCPv4Impl() = default;
 
     /// @brief Sends query to retrieve global parameter.
     ///
@@ -3645,7 +3645,7 @@ TaggedStatementArray tagged_statements = { {
 }
 };
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters)
     : MySqlConfigBackendImpl(parameters, &MySqlConfigBackendDHCPv4Impl::dbReconnect) {
@@ -3665,9 +3665,6 @@ MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnect
     conn_.makeReconnectCtl(timer_name_);
 }
 
-MySqlConfigBackendDHCPv4Impl::~MySqlConfigBackendDHCPv4Impl() {
-}
-
 MySqlConfigBackendDHCPv4::MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters)
     : impl_(new MySqlConfigBackendDHCPv4Impl(parameters)), base_impl_(impl_) {
 }
@@ -3677,6 +3674,11 @@ MySqlConfigBackendDHCPv4::isUnusable() {
     return (impl_->conn_.isUnusable());
 }
 
+DatabaseConnection::ParameterMap
+MySqlConfigBackendDHCPv4::getParameters() const {
+    return impl_->getParameters();
+}
+
 Subnet4Ptr
 MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector,
                                      const std::string& subnet_prefix) const {

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h
index e4a0bcf5037db66a5cb3fa505ab7680ccf2cfb2f..1c7dc168da864cc3e1110beb591ed88179eb0414 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h
@@ -604,6 +604,13 @@ public:
     /// otherwise
     virtual bool isUnusable();
 
+    /// @brief Return backend parameters
+    ///
+    /// Returns the backend parameters
+    ///
+    /// @return Parameters of the backend.
+    isc::db::DatabaseConnection::ParameterMap getParameters() const;
+
 protected:
 
     /// @brief Pointer to the implementation of the @c MySqlConfigBackendDHCPv4

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 5244047c65bd305dcbdd6d53a008a9e96fb30dbb..48668e9b663f25da6f91b32e8b860a8fc78a10d3 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -188,7 +188,7 @@ public:
                                           parameters);
 
     /// @brief Destructor.
-    ~MySqlConfigBackendDHCPv6Impl();
+    ~MySqlConfigBackendDHCPv6Impl() = default;
 
     /// @brief Sends query to retrieve global parameter.
     ///
@@ -4110,7 +4110,7 @@ TaggedStatementArray tagged_statements = { {
 }
 };
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters)
     : MySqlConfigBackendImpl(parameters, &MySqlConfigBackendDHCPv6Impl::dbReconnect) {
@@ -4130,9 +4130,6 @@ MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnect
     conn_.makeReconnectCtl(timer_name_);
 }
 
-MySqlConfigBackendDHCPv6Impl::~MySqlConfigBackendDHCPv6Impl() {
-}
-
 MySqlConfigBackendDHCPv6::MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters)
     : impl_(new MySqlConfigBackendDHCPv6Impl(parameters)), base_impl_(impl_) {
 }
@@ -4142,6 +4139,11 @@ MySqlConfigBackendDHCPv6::isUnusable() {
     return (impl_->conn_.isUnusable());
 }
 
+DatabaseConnection::ParameterMap
+MySqlConfigBackendDHCPv6::getParameters() const {
+    return impl_->getParameters();
+}
+
 Subnet6Ptr
 MySqlConfigBackendDHCPv6::getSubnet6(const ServerSelector& server_selector,
                                      const std::string& subnet_prefix) const {

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h
index 4ab608c9f4c23f153d956681b285e96642f45b8b..6af6553927e94fd67eba32986ddc0f91988e4268 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h
@@ -636,6 +636,13 @@ public:
     /// otherwise
     virtual bool isUnusable();
 
+    /// @brief Return backend parameters
+    ///
+    /// Returns the backend parameters
+    ///
+    /// @return Parameters of the backend.
+    isc::db::DatabaseConnection::ParameterMap getParameters() const;
+
 protected:
 
     /// @brief Pointer to the implementation of the @c MySqlConfigBackendDHCPv6