Merge pull request #5932 from DIRACGridBot/cherry-pick-2-795b4587c-integration

[sweep:integration] Add SourceSE filter to RMS ReplicateAndRegister

Author: fstagni

src/DIRAC/DataManagementSystem/Agent/RequestOperations/ReplicateAndRegister.py

@@ -47,7 +47,7 @@
 from DIRAC.MonitoringSystem.Client.MonitoringReporter import MonitoringReporter
 
 
-def filterReplicas(opFile, logger=None, dataManager=None):
+def filterReplicas(opFile, logger=None, dataManager=None, opSources=None):
     """filter out banned/invalid source SEs"""
 
     if logger is None:
@@ -71,6 +71,11 @@ def filterReplicas(opFile, logger=None, dataManager=None):
         return S_ERROR(failed)
 
     replicas = replicas["Successful"].get(opFile.LFN, {})
+
+    # If user set sourceSEs, only consider those replicas
+    if opSources:
+        replicas = {x: y for (x, y) in replicas.items() if x in opSources}
+
     noReplicas = False
     if not replicas:
         allReplicas = dataManager.getReplicas(opFile.LFN, getUrl=False)
@@ -286,7 +291,7 @@ def _addMetadataToFiles(self, toSchedule):
 
     def _filterReplicas(self, opFile):
         """filter out banned/invalid source SEs"""
-        return filterReplicas(opFile, logger=self.log, dataManager=self.dm)
+        return filterReplicas(opFile, logger=self.log, dataManager=self.dm, opSources=self.operation.sourceSEList)
 
     def _checkExistingFTS3Operations(self):
         """

src/DIRAC/DataManagementSystem/Agent/RequestOperations/test/Test_CheckMigration.py

@@ -41,6 +41,7 @@ def checkRequestAndOp(listOfLFNs):
     req.RequestName = "MyRequest"
     op = Operation()
     op.Type = "CheckMigration"
+    op.TargetSE = "Foo-SE"
     for index, lfn in enumerate(listOfLFNs):
         oFile = File()
         oFile.LFN = lfn
@@ -89,7 +90,7 @@ def test_run_NotMigrated(checkMigration, seMock, multiRetVal):
     seClassMock.getFileMetadata = MagicMock(side_effect=functools.partial(multiRetVal, Migrated=0))
     checkMigration._run()
     assert len(checkMigration.waitingFiles) == N_FILES
-    seModMock.assert_called_with("")
+    seModMock.assert_called_with("Foo-SE")
     for opFile in checkMigration.operation:
         assert opFile.Status == "Waiting"
 

src/DIRAC/RequestManagementSystem/Client/Operation.py

@@ -210,12 +210,12 @@ def __len__(self):
     @property
     def sourceSEList(self):
         """helper property returning source SEs as a list"""
-        return self.SourceSE.split(",") if self.SourceSE else [""]
+        return self.SourceSE.split(",") if self.SourceSE else []
 
     @property
     def targetSEList(self):
         """helper property returning target SEs as a list"""
-        return self.TargetSE.split(",") if self.TargetSE else [""]
+        return self.TargetSE.split(",") if self.TargetSE else []
 
     @property
     def Arguments(self):