From b342c10c19f5ad57ad9ec93b6080f8022972c388 Mon Sep 17 00:00:00 2001 From: Andre Sailer Date: Fri, 21 Jun 2024 10:47:52 +0200 Subject: [PATCH] doc(Token): move docstring to something that is visible in readthedocs --- src/DIRAC/Resources/Computing/ComputingElement.py | 6 ++++++ src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/DIRAC/Resources/Computing/ComputingElement.py b/src/DIRAC/Resources/Computing/ComputingElement.py index 39dcaded75d..4b73626eba9 100755 --- a/src/DIRAC/Resources/Computing/ComputingElement.py +++ b/src/DIRAC/Resources/Computing/ComputingElement.py @@ -30,6 +30,12 @@ (the submission of a job is blocking the execution until its completion). It deals with one job at a time. - Inner Pool ComputingElement: includes methods to locally interact with Inner ComputingElements asynchronously. It can manage a pool of jobs running simultaneously. + + To configure the use of Tokens for CEs: + + * the CE is able to receive any token. Validation: 'Tag = Token' should be included in the CE parameters. + * the CE is able to receive VO-specifc tokens. Validation: 'Tag = Token:' should be included in the CE parameters. + """ import os diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py index 2c775686723..08a45ee4f8e 100644 --- a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py +++ b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py @@ -469,11 +469,7 @@ def submitPilots(self): return S_OK() def __supportToken(self, ce: ComputingElement) -> bool: - """Check whether the SiteDirector is able to submit pilots with tokens. - - * the CE is able to receive any token. Validation: Tag = Token should be included in the CE parameters. - * the CE is able to receive VO-specifc tokens. Validation: Tag = Token: should be included in the CE parameters. - """ + """Check whether the SiteDirector is able to submit pilots with tokens.""" return "Token" in ce.ceParameters.get("Tag", []) or f"Token:{self.vo}" in ce.ceParameters.get("Tag", []) def __getPilotToken(self, audience: str, scope: list[str] = None):