Merge pull request #7327 from fstagni/81_fixes16

[9.0] fix: allow 'ANY' in the valid sites list

Author: chrisburr

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

@@ -3,12 +3,9 @@
 import re
 from urllib import parse
 
-from DIRAC import S_OK, S_ERROR, gConfig, gLogger
-from DIRAC.ConfigurationSystem.Client.Helpers import Registry, Operations
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger
 from DIRAC.ConfigurationSystem.Client.Helpers.Path import cfgPath
-from DIRAC.Core.Utilities.List import uniqueElements, fromChar
-from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
-
+from DIRAC.Core.Utilities.List import fromChar, uniqueElements
 
 gBaseResourcesSection = "/Resources"
 

src/DIRAC/WorkloadManagementSystem/Utilities/JobModel.py

@@ -152,7 +152,7 @@ def checkSites(cls, v: set[str]):
             res = getSites()
             if not res["OK"]:
                 raise ValueError(res["Message"])
-            invalidSites = v - set(res["Value"])
+            invalidSites = v - set(res["Value"]).union({"ANY"})
             if invalidSites:
                 raise ValueError(f"Invalid sites: {' '.join(invalidSites)}")
         return v