Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DIRAC/ConfigurationSystem/Client/PathFinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def useLegacyAdapter(system, service=None) -> bool:
:return: bool -- True if DiracX should be used
"""
system, service = divideFullName(system, service)
value = gConfigurationData.extractOptionFromCFG(f"/DiracX/LegacyClientEnabled/{system}/{service}")
value = gConfigurationData.extractOptionFromCFG(f"/DiracX/FutureClientEnabled/{system}/{service}")
return (value or "no").lower() in ("y", "yes", "true", "1")


Expand Down
8 changes: 4 additions & 4 deletions tests/Jenkins/dirac-cfg-setup-diracx.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,16 @@ def main(url: str, disabled_vos: list[str], legacy_adapted_services: list[str]):
returnValueOrRaise(csAPI.mergeCFGUnderSection("/DiracX/", csSyncCFG))

# Add service with legacy adaptors.
legacy = {"LegacyClientEnabled": {}}
legacy = {"FutureClientEnabled": {}}
for service in legacy_adapted_services:
print(f"Adding legacy adaptor for service {service}")
# Service name such as: system/name
system, name = service.split("/")

if not system in legacy["LegacyClientEnabled"]:
legacy["LegacyClientEnabled"][system] = {}
if not system in legacy["FutureClientEnabled"]:
legacy["FutureClientEnabled"][system] = {}

legacy["LegacyClientEnabled"][system][name] = "yes"
legacy["FutureClientEnabled"][system][name] = "yes"

legacyCFG = CFG().loadFromDict(legacy)
returnValueOrRaise(csAPI.mergeCFGUnderSection("/DiracX/", legacyCFG))
Expand Down
Loading