dbs api change listFiles -> listFileArray

etc/dbsFix.py

@@ -83,7 +83,7 @@ def connectToDB():
     print "%s:" % blockName
     blockFiles = []
     try:
-        dbsFiles = dbsApi.listFiles(blockName = blockName)
+        dbsFiles = dbsApi.listFileArray(blockName = blockName)
     except Exception, ex:
         dbsFiles = []
 

etc/dbsVerify.py

@@ -69,7 +69,7 @@ def connectToDB():
     print "%s:" % blockName
     blockFiles = []
     try:
-        dbsFiles = dbsApi.listFiles(blockName = blockName)
+        dbsFiles = dbsApi.listFileArray(blockName = blockName)
     except Exception, ex:
         dbsFiles = []
 
@@ -92,7 +92,7 @@ def connectToDB():
 
 for badFile in badFiles:
     try:
-        dbsFile = dbsApi.listFiles(patternLFN = badFile)[0]
+        dbsFile = dbsApi.listFileArray(patternLFN = badFile)[0]
         if dbsFile["Block"]["Name"] not in badBlocks:
             badBlocks.append(dbsFile["Block"]["Name"])
     except Exception, ex:

etc/harvestingInjector.py

@@ -103,7 +103,7 @@ def injectFilesFromDBS(inputFileset, datasetPath, runsWhiteList=[]):
     args["version"] = "DBS_2_1_1"
     args["mode"] = "GET"
     dbsApi = DbsApi(args)
-    dbsResults = dbsApi.listFiles(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
+    dbsResults = dbsApi.listFileArray(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
     print "  found %d files, inserting into wmbs..." % (len(dbsResults))
 
     for dbsResult in dbsResults:

etc/injectAnalysisWorkflow.py

@@ -140,7 +140,7 @@ def injectFilesFromDBS(inputFileset, datasetPath):
     args["version"] = "DBS_2_0_9"
     args["mode"] = "GET"
     dbsApi = DbsApi(args)
-    dbsResults = dbsApi.listFiles(path = datasetPath, retriveList = ["retrive_block","retrive_lumi", "retrive_run"])
+    dbsResults = dbsApi.listFileArray(path = datasetPath, retriveList = ["retrive_block","retrive_lumi", "retrive_run"])
 
     # NOTE : this is to limit the number of jobs to create ... simply using first 10 files get for the needed dataset
     dbsResults =dbsResults[0:2]

etc/injectReRecoWorkflow.py

@@ -68,7 +68,7 @@ def injectFilesFromDBS(inputFileset, datasetPath):
     args["version"] = "DBS_2_0_9"
     args["mode"] = "GET"
     dbsApi = DbsApi(args)
-    dbsResults = dbsApi.listFiles(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
+    dbsResults = dbsApi.listFileArray(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
     dbsResults = dbsResults[0:10]
     print "  found %d files, inserting into wmbs..." % (len(dbsResults))
 

etc/injectStoreResults.py

@@ -79,7 +79,7 @@ def injectFilesFromDBS(inputFileset, datasetPath):
     args["url"] = "https://cmsweb.cern.ch/dbs/prod/global/DBSReader"
     args["mode"] = "GET"
     dbsApi = DbsApi(args)
-    dbsResults = dbsApi.listFiles(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
+    dbsResults = dbsApi.listFileArray(path = datasetPath, retriveList = ["retrive_lumi", "retrive_run"])
     # Limiter on number of files
     dbsResults = dbsResults[0:20]
     print "  found %d files, inserting into wmbs..." % (len(dbsResults))

src/python/WMCore/ACDC/AnalysisCollectionService.py

@@ -72,7 +72,7 @@ def createFilesetFromDBS(self, collection, filesetName, dbsURL, dataset, mask=No
 
         dbsReader = DBSReader(dbsURL, version="DBS_2_0_9", mode="GET")
 
-        dbsResults = dbsReader.dbs.listFiles(path=dataset, retriveList=["retrive_lumi", "retrive_run"])
+        dbsResults = dbsReader.dbs.listFileArray(path=dataset, retriveList=["retrive_lumi", "retrive_run"])
         logging.info('Found %s files from DBS' % len(dbsResults))
 
         for dbsResult in dbsResults:

src/python/WMCore/Services/DBS/DBS3Reader.py

@@ -215,7 +215,7 @@ def listDatasetFiles(self, datasetPath):
         Get list of files for dataset
 
         """
-        return [ x['logical_file_name'] for x in self.dbs.listFiles(dataset = datasetPath)]
+        return [ x['logical_file_name'] for x in self.dbs.listFileArray(dataset = datasetPath)]
 
 
     def listDatasetFileDetails(self, datasetPath, getParents=False):
@@ -238,7 +238,7 @@ def listDatasetFileDetails(self, datasetPath, getParents=False):
             }
 
         """
-        fileDetails = self.dbs.listFiles(dataset = datasetPath, validFileOnly = 1, detail=True)
+        fileDetails = self.dbs.listFileArray(dataset = datasetPath, validFileOnly = 1, detail=True)
         blocks = set() #the set of blocks of the dataset
         #Iterate over the files and prepare the set of blocks and a dict where the keys are the files
         files = {}
@@ -278,7 +278,7 @@ def crossCheck(self, datasetPath, *lfns):
         Return the list of lfns that are in the dataset
 
         """
-        allLfns = self.dbs.listFiles(dataset = datasetPath, validFileOnly = 1, detail = False)
+        allLfns = self.dbs.listFileArray(dataset = datasetPath, validFileOnly = 1, detail = False)
         setOfAllLfns = set(allLfns)
         setOfKnownLfns = set(lfns)
         return list(setOfAllLfns.intersection(setOfKnownLfns))
@@ -291,7 +291,7 @@ def crossCheckMissing(self, datasetPath, *lfns):
         are *not* known by DBS
 
         """
-        allLfns = self.dbs.listFiles(dataset = datasetPath, validFileOnly = 1, detail = False)
+        allLfns = self.dbs.listFileArray(dataset = datasetPath, validFileOnly = 1, detail = False)
         setOfAllLfns = set(allLfns)
         setOfKnownLfns = set(lfns)
         knownFiles = setOfAllLfns.intersection(setOfKnownLfns)
@@ -449,7 +449,7 @@ def listFilesInBlock(self, fileBlockName, lumis = True):
             raise DBSReaderError(msg % fileBlockName)
 
         try:
-            files = self.dbs.listFiles(block_name = fileBlockName, validFileOnly = 1, detail = True)
+            files = self.dbs.listFileArray(block_name = fileBlockName, validFileOnly = 1, detail = True)
         except dbsClientException, ex:
             msg = "Error in "
             msg += "DBSReader.listFilesInBlock(%s)\n" % fileBlockName
@@ -497,7 +497,7 @@ def listFilesInBlockWithParents(self, fileBlockName, lumis = True):
         for f in files:
             #TODO: this need to be multiple parents update when dbs api changes
             for parentLFN in f['parent_logical_file_name']:
-                parentFileInfo =  self.dbs.listFiles(logical_file_name = parentLFN, detail = True)
+                parentFileInfo =  self.dbs.listFileArray(logical_file_name = parentLFN, detail = True)
                 # should return  only one but in case it supports multiple lfns as input.
                 parentList = []
                 for pf in parentFileInfo:
@@ -525,7 +525,7 @@ def lfnsInBlock(self, fileBlockName):
             raise DBSReaderError(msg % fileBlockName)
 
         try:
-            lfns =  self.dbs.listFiles(block_name = fileBlockName, validFileOnly = 1, detail = False)
+            lfns =  self.dbs.listFileArray(block_name = fileBlockName, validFileOnly = 1, detail = False)
             return lfns
         except dbsClientException, ex:
             msg = "Error in "

src/python/WMCore/WorkQueue/Policy/Start/Block.py

@@ -219,7 +219,7 @@ def getMaskedBlocks(self, task, dbs, datasetPath):
         # fill block lfn part of maskedBlocks
 
         for run, lumis in lumiMask.items():
-            files = dbs.dbs.listFiles(dataset=datasetPath, run_num=run,
+            files = dbs.dbs.listFileArray(dataset=datasetPath, run_num=run,
                                       lumi_list=lumis, detail=True)
             for file in files:
                 blockName = file['block_name']

src/python/WMQuality/Emulators/DBSClient/DBS3Reader.py

@@ -21,7 +21,7 @@ def __init__(self, args, **contact):
         self.args = args
         self.dbg = DataBlockGenerator3()
 
-    def listFiles(self, dataset = None, block_name = None, run_num = None, lumi_list = [], detail = False):
+    def listFileArray(self, dataset = None, block_name = None, run_num = None, lumi_list = [], detail = False):
         res = []
 
         if dataset:
@@ -86,7 +86,7 @@ def listFileSummaries(self, block_name = None, dataset = None, run_num = None, v
             raise NotImplementedError
 
         if block_name:
-            files = self.listFiles(block_name = block_name)
+            files = self.listFileArray(block_name = block_name)
             summary = {'num_files' : 0, 'num_lumi' : 0, 'num_block' : 1, 'num_event' : 0, 'file_size' : 0}
             for file in files:
                 summary['num_files'] += 1

test/python/WMComponent_t/DBS3Buffer_t/DBSUpload_t.py

@@ -263,7 +263,7 @@ def verifyData(self, datasetName, files):
             self.assertEqual(result["open_for_writing"], 0,
                              "Error: Block should be closed.")
 
-        results = self.dbsApi.listFiles(dataset = datasetName, detail = True)
+        results = self.dbsApi.listFileArray(dataset = datasetName, detail = True)
         for result in results:
             file = None
             for file in files: