[659-how-configure-client-class-for-pools-in-db] Post-rebase fixes

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 1eecc99ec222b64eceacc437bf4113ff0b193624..4539b49160b8d000a2780a0900ae075458fbecfb 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -818,10 +818,10 @@ public:
         PoolCollection pools;
         std::vector<uint64_t> pool_ids;
 
-        auto tags = getServerTags(server_selector);
+        auto tags = server_selector.getTags();
         for (auto tag : tags) {
             MySqlBindingCollection in_bindings = {
-                MySqlBinding::createString(tag),
+                MySqlBinding::createString(tag.get()),
                 MySqlBinding::createInteger<uint32_t>(pool_start_address.toUint32()),
                 MySqlBinding::createInteger<uint32_t>(pool_end_address.toUint32())
             };

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 93912f6266fce08577aebd58003c99e6c77f738f..0650c7f0ffdfeb609915fb1249efdb5a16a31653 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -1031,10 +1031,10 @@ public:
         PoolCollection pools;
         std::vector<uint64_t> pool_ids;
 
-        auto tags = getServerTags(server_selector);
+        auto tags = server_selector.getTags();
         for (auto tag : tags) {
             MySqlBindingCollection in_bindings = {
-                MySqlBinding::createString(tag),
+                MySqlBinding::createString(tag.get()),
                 MySqlBinding::createString(pool_start_address.toText()),
                 MySqlBinding::createString(pool_end_address.toText())
             };
@@ -1066,10 +1066,10 @@ public:
         PoolCollection pd_pools;
         std::vector<uint64_t> pd_pool_ids;
 
-        auto tags = getServerTags(server_selector);
+        auto tags = server_selector.getTags();
         for (auto tag : tags) {
             MySqlBindingCollection in_bindings = {
-                MySqlBinding::createString(tag),
+                MySqlBinding::createString(tag.get()),
                 MySqlBinding::createString(pd_pool_prefix.toText()),
                 MySqlBinding::createInteger<uint8_t>(pd_pool_prefix_length)
             };