[#2028] Correct test config backend logic

diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
index 1b3a953a5f9bf8ceaa1ce43233a15767f0941a15..8648d97f295ed0e36555a4b49e65869b482d88aa 100644 (file)
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc
@@ -319,17 +319,24 @@ TestConfigBackendDHCPv4::getAllOptionDefs4(const db::ServerSelector& server_sele
     OptionDefContainer option_defs;
     for (auto option_def : option_defs_) {
         bool got = false;
-        for (auto tag : tags) {
-            if (option_def->hasServerTag(ServerTag(tag))) {
+        if (server_selector.amUnassigned()) {
+            if (option_def->getServerTags().empty()) {
                 option_defs.push_back(option_def);
                 got = true;
-                break;
+            }
+        } else {
+            for (auto tag : tags) {
+                if (option_def->hasServerTag(ServerTag(tag))) {
+                    option_defs.push_back(option_def);
+                    got = true;
+                    break;
+                }
             }
         }
         if (got) {
             continue;
         }
-        if (option_def->hasAllServerTag()) {
+        if (option_def->hasAllServerTag() && !server_selector.amUnassigned()) {
             option_defs.push_back(option_def);
         }
     }

diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
index 3afb48c6376763935dba543d549f4ac73dde8697..e59ad5dd668cef0ea5e3c3a2456be1022ae71028 100644 (file)
--- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
+++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc
@@ -318,17 +318,24 @@ TestConfigBackendDHCPv6::getAllOptionDefs6(const db::ServerSelector& server_sele
     OptionDefContainer option_defs;
     for (auto option_def : option_defs_) {
         bool got = false;
-        for (auto tag : tags) {
-            if (option_def->hasServerTag(ServerTag(tag))) {
+        if (server_selector.amUnassigned()) {
+            if (option_def->getServerTags().empty()) {
                 option_defs.push_back(option_def);
                 got = true;
-                break;
+            }
+        } else {
+            for (auto tag : tags) {
+                if (option_def->hasServerTag(ServerTag(tag))) {
+                    option_defs.push_back(option_def);
+                    got = true;
+                    break;
+                }
             }
         }
         if (got) {
             continue;
         }
-        if (option_def->hasAllServerTag()) {
+        if (option_def->hasAllServerTag() && !server_selector.amUnassigned()) {
             option_defs.push_back(option_def);
         }
     }