ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/DLSInfo.py
(Generate patch)

Comparing COMP/CRAB/python/DLSInfo.py (file contents):
Revision 1.24 by spiga, Tue Nov 18 11:06:20 2008 UTC vs.
Revision 1.25 by spiga, Tue Dec 2 11:18:31 2008 UTC

# Line 38 | Line 38 | class DLSInfo:
38      def __init__(self, type, cfg_params):
39          self.cfg_params = cfg_params
40          self.showCAF = False
41 +
42 +        phedexURL='http://cmsweb.cern.ch/phedex/datasvc/xml/prod/'
43 +        global_url="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
44 +        caf_url = "http://cmsdbsprod.cern.ch/cms_dbs_caf_analysis_01/servlet/DBSServlet"
45 +        dbs_url_map  =   {'glite':    global_url,
46 +                          'glitecoll':global_url,\
47 +                          'condor':   global_url,\
48 +                          'condor_g': global_url,\
49 +                          'glidein':  global_url,\
50 +                          'lsf':      global_url,\
51 +                          'caf':      caf_url,\
52 +                          'sge':      global_url
53 +                          }
54 +        dbs_url_default = dbs_url_map[(common.scheduler.name()).lower()]
55 +
56          if type=="DLS_TYPE_DBS":
57              # use dbs_url as dls_endpoint if dls_type is dbs
58 <            try:
44 <                endpoint=self.cfg_params['CMSSW.dbs_url']
45 <            except KeyError:
46 <                endpoint="http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet"
58 >            endpoint=self.cfg_params.get('CMSSW.dbs_url', dbs_url_default)
59          elif type=="DLS_TYPE_PHEDEX":
60 <            try:
49 <                endpoint=self.cfg_params['CMSSW.dls_phedex_url']
50 <            except KeyError:
51 <                endpoint='http://cmsweb.cern.ch/phedex/datasvc/xml/prod/'
60 >            endpoint=self.cfg_params.get('CMSSW.dls_phedex_url',phedexURL)
61              if self.cfg_params['CRAB.scheduler'].upper() == 'CAF':  self.showCAF = True
62          else:
63              msg = "DLS type %s not among the supported DLS ( DLS_TYPE_DLI and DLS_TYPE_MYSQL ) "%type
# Line 68 | Line 77 | class DLSInfo:
77          """
78          ##
79          try:
80 <            entryList=self.api.getLocations(fileblocks,longList=True)
80 >            entryList=self.api.getLocations(fileblocks,longList=True,showCAF=self.showCAF)
81          except dlsApi.DlsApiError, inst:
82              raise DLSNoReplicas(fileblocks)
83          results = {}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines