Merge pull request #8126 from chrisburr/get-it-working

[9.0] Remove platform validation

Author: chrisburr

src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py

@@ -8,6 +8,7 @@
 import sys
 import re
 import time
+from pathlib import Path
 
 from diraccfg import CFG
 
@@ -17,6 +18,7 @@
 from DIRAC.Core.Base.AgentModule import AgentModule
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
 from DIRAC.Core.Security import Properties
+from DIRAC.Core.Security.ProxyFile import writeChainToTemporaryFile
 from DIRAC.Core.Utilities import DErrno
 from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
@@ -626,13 +628,15 @@ def _submitJob(
 
         self.log.info("Submitting JobWrapper", f"{os.path.basename(wrapperFile)} to {self.ceName}CE")
 
-        # Pass proxy to the CE
-        proxy = proxyChain.dumpAllToString()
-        if not proxy["OK"]:
-            self.log.error("Invalid proxy", proxy)
-            return S_ERROR("Payload Proxy Not Found")
+        # Pass proxy to the CE, writing it to a temporary file to ensure the DiracX token is included
+        retVal = writeChainToTemporaryFile(proxyChain)
+        if not retVal["OK"]:
+            self.log.error("Invalid proxy", retVal["Message"])
+            return S_ERROR("Failed to write proxy to temporary file")
+        proxyLocation = Path(retVal["Value"])
+        payloadProxy = proxyLocation.read_text()
+        proxyLocation.unlink()
 
-        payloadProxy = proxy["Value"]
         try:
             result = self.computingElement.submitJob(
                 wrapperFile,

src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_JobAgent.py

@@ -611,7 +611,7 @@ def test_submitJob(mocker, mockJWInput, expected):
         ("Pool/Singularity", jobScript % "1", (["Failed to find singularity"], []), ([], [])),
     ],
 )
-def test_submitAndCheckJob(mocker, manageJobFiles, localCE, job, expectedResult1, expectedResult2):
+def test_submitAndCheckJob(mocker, manageJobFiles, localCE, job, expectedResult1, expectedResult2, tmp_path):
     """Test the submission and the management of the job status."""
     jobID = "123"
     jobExecutablePath, jobWrapperPath, jobWrapperConfigPath = manageJobFiles
@@ -635,7 +635,12 @@ def test_submitAndCheckJob(mocker, manageJobFiles, localCE, job, expectedResult1
         ),
     )
     mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobAgent.JobAgent._sendFailoverRequest", return_value=S_OK())
-    mocker.patch("DIRAC.Core.Security.X509Chain.X509Chain.dumpAllToString", return_value=S_OK())
+    empty_file_path = tmp_path / "empty_file"
+    empty_file_path.touch()
+    mocker.patch(
+        "DIRAC.WorkloadManagementSystem.Agent.JobAgent.writeChainToTemporaryFile",
+        return_value=S_OK(str(empty_file_path)),
+    )
     mocker.patch(
         "DIRAC.Resources.Computing.SingularityComputingElement.SingularityComputingElement.submitJob",
         return_value=S_ERROR("Failed to find singularity"),
@@ -712,7 +717,7 @@ def test_submitAndCheckJob(mocker, manageJobFiles, localCE, job, expectedResult1
     assert len(jobAgent.computingElement.taskResults) == 0
 
 
-def test_submitAndCheck2Jobs(mocker):
+def test_submitAndCheck2Jobs(mocker, tmp_path):
     """Test the submission and the management of the job status.
 
     This time, a first job is successfully submitted, but the second submission fails.
@@ -728,7 +733,17 @@ def test_submitAndCheck2Jobs(mocker):
         ),
     )
     mocker.patch("DIRAC.WorkloadManagementSystem.Agent.JobAgent.JobAgent._sendFailoverRequest", return_value=S_OK())
-    mocker.patch("DIRAC.Core.Security.X509Chain.X509Chain.dumpAllToString", return_value=S_OK())
+
+    def make_empty_file(*args, **kwargs):
+        """Create an empty file and return its path."""
+        empty_file_path = tmp_path / "empty_file"
+        empty_file_path.touch()
+        return S_OK(str(empty_file_path))
+
+    mocker.patch(
+        "DIRAC.WorkloadManagementSystem.Agent.JobAgent.writeChainToTemporaryFile",
+        make_empty_file,
+    )
     mocker.patch(
         "DIRAC.Resources.Computing.InProcessComputingElement.InProcessComputingElement.submitJob",
         side_effect=[S_OK(), S_ERROR("ComputingElement error")],

src/DIRAC/WorkloadManagementSystem/Utilities/JobModel.py

@@ -184,16 +184,6 @@ def checkThatSitesAndBannedSitesAreNotMutuallyExclusive(self) -> Self:
                 raise ValueError("sites and bannedSites are mutually exclusive")
         return self
 
-    @field_validator("platform")
-    def checkPlatform(cls, v: str):
-        if v:
-            res = getDIRACPlatforms()
-            if not res["OK"]:
-                raise ValueError(res["Message"])
-            if v not in res["Value"]:
-                raise ValueError("Invalid platform")
-        return v
-
     @field_validator("priority")
     def checkPriorityBounds(cls, v):
         minPriority = Operations().getValue("JobDescription/MinPriority", 0)

src/DIRAC/WorkloadManagementSystem/Utilities/test/Test_JobModel.py

@@ -183,16 +183,6 @@ def test_platformValidator_valid():
     assert job.platform == "x86_64-slc6-gcc62-opt"
 
 
-def test_platformValidator_invalid():
-    """Test the platform validator with invalid input."""
-    with patch(
-        "DIRAC.WorkloadManagementSystem.Utilities.JobModel.getDIRACPlatforms",
-        return_value=S_OK(["x86_64-slc6-gcc62-opt"]),
-    ):
-        with pytest.raises(ValidationError):
-            BaseJobDescriptionModel(executable=EXECUTABLE, platform="x86_64-slc6-gcc62-opt2")
-
-
 @pytest.mark.parametrize(
     "validSites, selectedSites",
     [