feat: add more SD tests

aldbr · Sep 22, 2023 · 5c87e00 · 5c87e00
1 parent 9e0c9a4
commit 5c87e00
Show file tree

Hide file tree

Showing 14 changed files with 499 additions and 369 deletions.
diff --git a/src/DIRAC/Resources/Computing/AREXComputingElement.py b/src/DIRAC/Resources/Computing/AREXComputingElement.py
@@ -608,7 +608,11 @@ def getCEStatus(self):
             self.log.error("Failed getting the status of the CE.", result["Message"])
             return S_ERROR("Failed getting the status of the CE")
         response = result["Value"]
-        ceData = response.json()
+        try:
+            ceData = response.json()
+        except requests.JSONDecodeError:
+            self.log.exception("Failed decoding the status of the CE")
+            return S_ERROR(f"Failed decoding the status of the CE")
 
         # Look only in the relevant section out of the headache
         queueInfo = ceData["Domains"]["AdminDomain"]["Services"]["ComputingService"]["ComputingShare"]

diff --git a/src/DIRAC/Resources/Computing/CloudComputingElement.py b/src/DIRAC/Resources/Computing/CloudComputingElement.py
@@ -340,7 +340,7 @@ def _getMetadata(self, executableFile, pilotStamp=""):
             template = yaml.safe_load(template_fd)
         for filedef in template["write_files"]:
             if filedef["content"] == "PROXY_STR":
-                filedef["content"] = self.proxy
+                filedef["content"] = self.proxy.dumpAllToString()["Value"]
             elif filedef["content"] == "EXECUTABLE_STR":
                 filedef["content"] = exe_str
             elif "STAMP_STR" in filedef["content"]:
@@ -383,11 +383,7 @@ def _renewCloudProxy(self):
         if not res["OK"]:
             self.log.error("Could not download proxy", res["Message"])
             return False
-        resdump = res["Value"].dumpAllToString()
-        if not resdump["OK"]:
-            self.log.error("Failed to dump proxy to string", resdump["Message"])
-            return False
-        self.proxy = resdump["Value"]
+        self.proxy = res["Value"]
         self.valid = datetime.datetime.utcnow() + proxyLifetime * datetime.timedelta(seconds=1)
         return True
 

diff --git a/src/DIRAC/Resources/Computing/ComputingElement.py b/src/DIRAC/Resources/Computing/ComputingElement.py
@@ -263,6 +263,7 @@ def available(self):
         self.log.verbose("Max Number of Jobs:", maxTotalJobs)
         self.log.verbose("Max Waiting Jobs:", maxWaitingJobs)
 
+        result["CEInfoDict"] = ceInfoDict
         # If we reached the maximum number of total jobs, then the CE is not available
         totalJobs = runningJobs + waitingJobs
         if totalJobs >= maxTotalJobs:
@@ -283,8 +284,6 @@ def available(self):
         if availableProcessors is not None:
             additionalJobs = min(additionalJobs, availableProcessors)
         result["Value"] = additionalJobs
-
-        result["CEInfoDict"] = ceInfoDict
         return result
 
     #############################################################################