Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sweep:integration] feat: pilot submission with tokens in a multi-VO setup #7250

Merged
merged 1 commit into from
Oct 20, 2023
Merged

[sweep:integration] feat: pilot submission with tokens in a multi-VO setup #7250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from DIRAC.MonitoringSystem.Client.MonitoringReporter import MonitoringReporter
from DIRAC.ResourceStatusSystem.Client.ResourceStatus import ResourceStatus
from DIRAC.ResourceStatusSystem.Client.SiteStatus import SiteStatus
from DIRAC.Resources.Computing.ComputingElement import ComputingElement
from DIRAC.WorkloadManagementSystem.Client import PilotStatus
from DIRAC.WorkloadManagementSystem.Client.PilotScopes import PILOT_SCOPES

Expand Down Expand Up @@ -446,7 +447,7 @@ def submitPilots(self):
ce.setProxy(proxy, lifetime_secs)

# Get valid token if needed
if "Token" in ce.ceParameters.get("Tag", []):
if self.__supportToken(ce):
result = self.__getPilotToken(audience=ce.audienceName)
if not result["OK"]:
return result
Expand All @@ -467,6 +468,14 @@ 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:<VO> should be included in the CE parameters.
"""
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):
"""Get the token corresponding to the pilot user identity

Expand Down Expand Up @@ -1234,7 +1243,7 @@ def _updatePilotStatusPerQueue(self, queue, proxy):
ce.setProxy(proxy, 23300)

# Get valid token if needed
if "Token" in ce.ceParameters.get("Tag", []):
if self.__supportToken(ce):
result = self.__getPilotToken(audience=ce.audienceName)
if not result["OK"]:
self.log.error("Failed to get token", f"{ceName}: {result['Message']}")
Expand Down
Loading