Merge pull request #7449 from aldbr/v8.0_FIX_getQueue-tags

[8.0] fix: getQueue() overrides the CE tags

Author: fstagni

src/DIRAC/ConfigurationSystem/Client/Helpers/Resources.py

@@ -200,29 +200,29 @@ def getSiteGrid(site):
 def getQueue(site, ce, queue):
     """Get parameters of the specified queue"""
     grid = site.split(".")[0]
-    result = gConfig.getOptionsDict(f"/Resources/Sites/{grid}/{site}/CEs/{ce}")
-    if not result["OK"]:
+
+    # Get CE parameters
+    if not (result := gConfig.getOptionsDict(f"/Resources/Sites/{grid}/{site}/CEs/{ce}"))["OK"]:
         return result
-    resultDict = result["Value"]
+    ceDict = result["Value"]
 
-    # Get queue defaults
-    result = gConfig.getOptionsDict(f"/Resources/Sites/{grid}/{site}/CEs/{ce}/Queues/{queue}")
-    if not result["OK"]:
+    tags = set(fromChar(ceDict.get("Tag")) or [])
+    requiredTags = set(fromChar(ceDict.get("RequiredTag")) or [])
+
+    # Get queue parameters
+    if not (result := gConfig.getOptionsDict(f"/Resources/Sites/{grid}/{site}/CEs/{ce}/Queues/{queue}"))["OK"]:
         return result
-    resultDict.update(result["Value"])
-
-    # Handle tag lists for the queue
-    for tagFieldName in ("Tag", "RequiredTag"):
-        tags = []
-        ceTags = resultDict.get(tagFieldName)
-        if ceTags:
-            tags = fromChar(ceTags)
-        queueTags = resultDict.get(tagFieldName)
-        if queueTags:
-            queueTags = fromChar(queueTags)
-            tags = list(set(tags + queueTags))
-        if tags:
-            resultDict[tagFieldName] = tags
+    queueDict = result["Value"]
+
+    # Union the sets to combine tags and required tags from CE and queue
+    tags = tags.union(set(fromChar(queueDict.get("Tag")) or []))
+    requiredTags = requiredTags.union(set(fromChar(queueDict.get("RequiredTag")) or []))
+
+    resultDict = {**ceDict, **queueDict}
+    if tags:
+        resultDict["Tag"] = list(tags)
+    if requiredTags:
+        resultDict["RequiredTag"] = list(requiredTags)
 
     resultDict["Queue"] = queue
     return S_OK(resultDict)

src/DIRAC/ConfigurationSystem/Client/Helpers/test/Test_Helpers.py

@@ -1,12 +1,16 @@
 from itertools import zip_longest
+from diraccfg import CFG
 
 import pytest
 from unittest.mock import MagicMock
 
+from DIRAC import gConfig
+from DIRAC.ConfigurationSystem.Client import ConfigurationData
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import (
     getDIRACPlatform,
     getCompatiblePlatforms,
     _platformSortKey,
+    getQueue,
 )
 
 
@@ -122,3 +126,79 @@ def test_getCompatiblePlatforms(mocker, mockGCReplyInput, requested, expectedRes
     assert res["OK"] is expectedRes, res
     if expectedRes:
         assert set(res["Value"]) == set(expectedValue), res["Value"]
+
+
+config = """
+Resources
+{
+    Sites
+    {
+        LHCb
+        {
+            LHCb.CERN.cern
+            {
+                CEs
+                {
+                    ce1.cern.ch
+                    {
+                        CEType = AREX
+                        architecture = x86_64
+                        OS = linux_CentOS_7.9.2009
+                        Tag = Token
+                        Queues
+                        {
+                            nordugrid-SLURM-grid
+                            {
+                                SI00 = 2775
+                                MaxRAM = 128534
+                                CPUTime = 3836159
+                                maxCPUTime = 5760
+                                Tag = MultiProcessor
+                                MaxWaitingJobs = 10
+                                MaxTotalJobs = 200
+                                LocalCEType = Pool/Singularity
+                                OS = linux_AlmaLinux_9.4.2104
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+"""
+
+
+def test_getQueue():
+    """Test getQueue function."""
+
+    # Set up the configuration file
+    ConfigurationData.localCFG = CFG()
+    cfg = CFG()
+    cfg.loadFromBuffer(config)
+    gConfig.loadCFG(cfg)
+
+    # Test getQueue
+    site = "LHCb.CERN.cern"
+    ce = "ce1.cern.ch"
+    queue = "nordugrid-SLURM-grid"
+
+    result = getQueue(site, ce, queue)
+    assert result["OK"]
+
+    expectedDict = {
+        "CEType": "AREX",
+        "Queue": "nordugrid-SLURM-grid",
+        "architecture": "x86_64",
+        "SI00": "2775",
+        "MaxRAM": "128534",
+        "CPUTime": "3836159",
+        "maxCPUTime": "5760",
+        "Tag": ["MultiProcessor", "Token"],
+        "MaxWaitingJobs": "10",
+        "MaxTotalJobs": "200",
+        "LocalCEType": "Pool/Singularity",
+        "OS": "linux_AlmaLinux_9.4.2104",
+    }
+    assert sorted(result["Value"].pop("Tag")) == sorted(expectedDict.pop("Tag"))
+    assert result["Value"] == expectedDict