fix: minor fixes to keep in 8.0

Author: atsareg

src/DIRAC/WorkloadManagementSystem/Service/SandboxStoreHandler.py

@@ -46,7 +46,7 @@ def initializeHandler(cls, serviceInfoDict):
             return S_ERROR(f"Can't connect to DB: {repr(excp)}")
         return S_OK()
 
-    def initialize(self):
+    def initializeRequest(self):
         self.__backend = self.getCSOption("Backend", "local")
         self.__localSEName = self.getCSOption("LocalSE", "SandboxSE")
         self._maxUploadBytes = self.getCSOption("MaxSandboxSizeMiB", 10) * 1048576
@@ -64,9 +64,6 @@ def initialize(self):
         if SandboxStoreHandler.__purgeCount == 0:
             threading.Thread(target=self.purgeUnusedSandboxes).start()
 
-    def initializeRequest(self):
-        self.initialize()
-
     def __getSandboxPath(self, md5):
         """Generate the sandbox path"""
         # prefix = self.getCSOption( "SandboxPrefix", "SandBox" )
@@ -364,7 +361,7 @@ def export_assignSandboxesToEntities(self, enDict, ownerName="", ownerGroup="",
         Expects a dict of { entityId : [ ( SB, SBType ), ... ] }
         """
         if not entitySetup:
-            entitySetup = self.serviceInfoDict["clientSetup"]
+            entitySetup = self.diracSetup
         credDict = self.getRemoteCredentials()
         return self.sandboxDB.assignSandboxesToEntities(
             enDict, credDict["username"], credDict["group"], entitySetup, ownerName, ownerGroup
@@ -380,7 +377,7 @@ def export_unassignEntities(self, entitiesList, entitiesSetup=False):
         Unassign a list of jobs
         """
         if not entitiesSetup:
-            entitiesSetup = self.serviceInfoDict["clientSetup"]
+            entitiesSetup = self.diracSetup
         credDict = self.getRemoteCredentials()
         return self.sandboxDB.unassignEntities({entitiesSetup: entitiesList}, credDict["username"], credDict["group"])
 
@@ -394,7 +391,7 @@ def export_getSandboxesAssignedToEntity(self, entityId, entitySetup=False):
         Get the sandboxes associated to a job and the association type
         """
         if not entitySetup:
-            entitySetup = self.serviceInfoDict["clientSetup"]
+            entitySetup = self.diracSetup
         credDict = self.getRemoteCredentials()
         result = self.sandboxDB.getSandboxesAssignedToEntity(
             entityId, entitySetup, credDict["username"], credDict["group"]
@@ -581,4 +578,7 @@ def __deleteSandboxFromExternalBackend(self, SEName, SEPFN):
 
 
 class SandboxStoreHandler(SandboxStoreHandlerMixin, RequestHandler):
-    pass
+    def initialize(self):
+        # we need it still in 8.0
+        self.diracSetup = self.serviceInfoDict["clientSetup"]
+        return self.initializeRequest()

src/DIRAC/WorkloadManagementSystem/Service/TornadoSandboxStoreHandler.py

@@ -14,6 +14,9 @@
 
 class TornadoSandboxStoreHandler(SandboxStoreHandlerMixin, TornadoService):
     def initializeRequest(self):
+        self.diracSetup = self.get_argument("clientSetup")
+        # Ugly, but makes DIPS and HTTPS handlers compatible, TBD properly
+        self.serviceInfoDict = self._serviceInfoDict
         return SandboxStoreHandlerMixin.initializeRequest(self)
 
     def export_streamFromClient(self, fileId, token, fileSize, data):