feat: use uuid instead of makeGuid for diracstamp

Author: fstagni

src/DIRAC/Resources/Computing/ARCComputingElement.py

@@ -48,11 +48,11 @@
 import os
 import stat
 import sys
+import uuid
 
 import arc  # Has to work if this module is called #pylint: disable=import-error
-from DIRAC import S_OK, S_ERROR, gConfig
+from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Utilities.Subprocess import shellCall
-from DIRAC.Core.Utilities.File import makeGuid
 from DIRAC.Core.Utilities.List import breakListIntoChunks
 from DIRAC.Core.Security.ProxyInfo import getVOfromProxyGroup
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
@@ -188,7 +188,7 @@ def _writeXRSL(self, executableFile, inputs, outputs):
         :param list inputs: path of the dependencies to include along with the executable
         :param list outputs: path of the outputs that we want to get at the end of the execution
         """
-        diracStamp = makeGuid()[:32]
+        diracStamp = uuid.uuid4().hex
         # Evaluate the number of processors to allocate
         nProcessors = self.ceParameters.get("NumberOfProcessors", 1)
 

src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py

@@ -52,6 +52,7 @@
 import errno
 import threading
 import textwrap
+import uuid
 
 from DIRAC import S_OK, S_ERROR, gConfig
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
@@ -60,7 +61,6 @@
 from DIRAC.Core.Utilities.List import breakListIntoChunks
 from DIRAC.WorkloadManagementSystem.Client import PilotStatus
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
-from DIRAC.Core.Utilities.File import makeGuid
 from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import writeToTokenFile
 from DIRAC.Core.Security.Locations import getCAsLocation
 from DIRAC.Resources.Computing.BatchSystems.Condor import parseCondorStatus
@@ -300,9 +300,9 @@ def submitJob(self, executableFile, proxy, numberOfJobs=1):
         # The submitted pilots are going to have a common part of the stamp to construct a path to retrieve results
         # Then they also have an individual part to make them unique
         jobStamps = []
-        commonJobStampPart = makeGuid()[:3]
+        commonJobStampPart = uuid.uuid4().hex[:3]
         for _i in range(numberOfJobs):
-            jobStamp = commonJobStampPart + makeGuid()[:29]
+            jobStamp = commonJobStampPart + uuid.uuid4().hex[:29]
             jobStamps.append(jobStamp)
 
         # We randomize the location of the pilot output and log, because there are just too many of them

src/DIRAC/Resources/Computing/LocalComputingElement.py

@@ -37,15 +37,14 @@
 import tempfile
 import getpass
 import errno
+import uuid
 from urllib.parse import urlparse
 
 from DIRAC import S_OK, S_ERROR
-from DIRAC import gConfig
 
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
 from DIRAC.Resources.Computing.PilotBundle import bundleProxy, writeScript
 from DIRAC.Core.Utilities.List import uniqueElements
-from DIRAC.Core.Utilities.File import makeGuid
 from DIRAC.Core.Utilities.Subprocess import systemCall
 
 
@@ -170,7 +169,7 @@ def submitJob(self, executableFile, proxy=None, numberOfJobs=1):
 
         jobStamps = []
         for _i in range(numberOfJobs):
-            jobStamps.append(makeGuid()[:32])
+            jobStamps.append(uuid.uuid4().hex)
 
         batchDict = {
             "Executable": submitFile,

src/DIRAC/Resources/Computing/SSHComputingElement.py

@@ -65,14 +65,16 @@
 import errno
 import json
 import os
-import pexpect
 import shutil
 import stat
+import uuid
 from urllib.parse import urlparse
 from urllib.parse import quote
 from urllib.parse import unquote
 from shlex import quote as shlex_quote
 
+import pexpect
+
 import DIRAC
 from DIRAC import S_OK, S_ERROR
 from DIRAC import gLogger
@@ -81,7 +83,6 @@
 from DIRAC.Resources.Computing.PilotBundle import bundleProxy, writeScript
 from DIRAC.Resources.Computing.BatchSystems.executeBatch import executeBatchContent
 from DIRAC.Core.Utilities.List import uniqueElements
-from DIRAC.Core.Utilities.File import makeGuid
 from DIRAC.Core.Utilities.List import breakListIntoChunks
 
 
@@ -563,7 +564,7 @@ def _submitJobToHost(self, executableFile, numberOfJobs, host=None):
 
         jobStamps = []
         for _i in range(numberOfJobs):
-            jobStamps.append(makeGuid()[:32])
+            jobStamps.append(uuid.uuid4().hex)
 
         numberOfProcessors = self.ceParameters.get("NumberOfProcessors", 1)
         wholeNode = self.ceParameters.get("WholeNode", False)

src/DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py

@@ -2,11 +2,11 @@
 """
 tests for HTCondorCEComputingElement module
 """
+import uuid
 import pytest
 
 from DIRAC.Resources.Computing import HTCondorCEComputingElement as HTCE
 from DIRAC.Resources.Computing.BatchSystems import Condor
-from DIRAC.Core.Utilities.File import makeGuid
 from DIRAC import S_OK
 
 MODNAME = "DIRAC.Resources.Computing.HTCondorCEComputingElement"
@@ -127,9 +127,9 @@ def test__writeSub(mocker, localSchedd, optionsNotExpected, optionsExpected):
     mocker.patch(MODNAME + ".mkDir")
 
     jobStamps = []
-    commonJobStampPart = makeGuid()[:3]
+    commonJobStampPart = uuid.uuid4().hex[:3]
     for _i in range(42):
-        jobStamp = commonJobStampPart + makeGuid()[:29]
+        jobStamp = commonJobStampPart + uuid.uuid4().hex[:29]
         jobStamps.append(jobStamp)
 
     htce._HTCondorCEComputingElement__writeSub("dirac-install", 42, "", 1, jobStamps)  # pylint: disable=E1101