fix: removed premature backports from 8.1

Author: atsareg

src/DIRAC/WorkloadManagementSystem/Service/SandboxStoreHandler.py

@@ -358,39 +358,47 @@ def __copyToExternalSE(self, localFilePath, sbPath):
 
     types_assignSandboxesToEntities = [dict]
 
-    def export_assignSandboxesToEntities(self, enDict, ownerName="", ownerGroup=""):
+    def export_assignSandboxesToEntities(self, enDict, ownerName="", ownerGroup="", entitySetup=False):
         """
         Assign sandboxes to jobs.
         Expects a dict of { entityId : [ ( SB, SBType ), ... ] }
         """
+        if not entitySetup:
+            entitySetup = self.serviceInfoDict["clientSetup"]
         credDict = self.getRemoteCredentials()
         return self.sandboxDB.assignSandboxesToEntities(
-            enDict, credDict["username"], credDict["group"], ownerName, ownerGroup
+            enDict, credDict["username"], credDict["group"], entitySetup, ownerName, ownerGroup
         )
 
     ##################
     # Unassign sbs to jobs
 
     types_unassignEntities = [(list, tuple)]
 
-    def export_unassignEntities(self, entitiesList):
+    def export_unassignEntities(self, entitiesList, entitiesSetup=False):
         """
         Unassign a list of jobs
         """
+        if not entitiesSetup:
+            entitiesSetup = self.serviceInfoDict["clientSetup"]
         credDict = self.getRemoteCredentials()
-        return self.sandboxDB.unassignEntities(entitiesList, credDict["username"], credDict["group"])
+        return self.sandboxDB.unassignEntities({entitiesSetup: entitiesList}, credDict["username"], credDict["group"])
 
     ##################
     # Getting assigned sandboxes
 
     types_getSandboxesAssignedToEntity = [str]
 
-    def export_getSandboxesAssignedToEntity(self, entityId):
+    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"]
         credDict = self.getRemoteCredentials()
-        result = self.sandboxDB.getSandboxesAssignedToEntity(entityId, credDict["username"], credDict["group"])
+        result = self.sandboxDB.getSandboxesAssignedToEntity(
+            entityId, entitySetup, credDict["username"], credDict["group"]
+        )
         if not result["OK"]:
             return result
         sbDict = {}