[676-add-support-for-server-tags-in-the-cb_cmds-hooks-library] Addressed comments

diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
index d6eb91dac10e051bbf21ca2d0a005128086cc8f4..222b3b0f81f808e2f38cd5f734c80c4506a566f5 100644 (file)
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
@@ -188,6 +188,7 @@ TestConfigBackendDHCPv4::getModifiedOptions4(const db::ServerSelector& /* server
 StampedValuePtr
 TestConfigBackendDHCPv4::getGlobalParameter4(const db::ServerSelector& server_selector,
                                              const std::string& name) const {
+    auto candidate = StampedValuePtr();
     const auto& index = globals_.get<StampedValueNameIndexTag>();
     auto global_range = index.equal_range(name);
     for (auto global_it = global_range.first; global_it != global_range.second;
@@ -196,16 +197,13 @@ TestConfigBackendDHCPv4::getGlobalParameter4(const db::ServerSelector& server_se
         for (auto tag : tags) {
             if ((*global_it)->hasServerTag(ServerTag(tag))) {
                 return (*global_it);
+            } else if ((*global_it)->hasAllServerTag()) {
+                candidate = *global_it;
             }
         }
     }
 
-    auto global_all_it = index.find(name);
-    if ((global_all_it != index.end()) && ((*global_all_it)->hasAllServerTag())) {
-        return (*global_all_it);
-    }
-
-    return (StampedValuePtr());
+    return (candidate);
 }
 
 

diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
index 5d6489875558d3c05b58d3a7c0564fb0237d9f19..6e183b39febe3529961d759cb4b820c7028342c6 100644 (file)
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
@@ -187,6 +187,7 @@ TestConfigBackendDHCPv6::getModifiedOptions6(const db::ServerSelector& /* server
 StampedValuePtr
 TestConfigBackendDHCPv6::getGlobalParameter6(const db::ServerSelector& server_selector,
                                              const std::string& name) const {
+    auto candidate = StampedValuePtr();
     const auto& index = globals_.get<StampedValueNameIndexTag>();
     auto global_range = index.equal_range(name);
     for (auto global_it = global_range.first; global_it != global_range.second;
@@ -196,15 +197,12 @@ TestConfigBackendDHCPv6::getGlobalParameter6(const db::ServerSelector& server_se
             if ((*global_it)->hasServerTag(ServerTag(tag))) {
                 return (*global_it);
             }
+        } else if ((*global_it)->hasAllServerTag()) {
+            candidate = *global_it;
         }
     }
 
-    auto global_all_it = index.find(name);
-    if ((global_all_it != index.end()) && ((*global_all_it)->hasAllServerTag())) {
-        return (*global_all_it);
-    }
-
-    return (StampedValuePtr());
+    return (candidate);
 }