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

Comparing COMP/CRAB/python/SchedulerGlite.py (file contents):
Revision 1.64 by spiga, Sat Nov 8 11:57:03 2008 UTC vs.
Revision 1.70 by spiga, Wed Jun 24 21:13:45 2009 UTC

# Line 6 | Line 6 | __revision__ = "$Id$"
6   __version__ = "$Revision$"
7  
8   from SchedulerGrid import SchedulerGrid
9 – from crab_logger import Logger
9   from crab_exceptions import *
10   from crab_util import *
11   from GliteConfig import *
12   import EdgLoggingInfo
13   import common
14 + from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
15  
16   import os, sys, time
17  
# Line 31 | Line 31 | class SchedulerGlite(SchedulerGrid):
31          with real scheduler
32          """
33          self.rb_param_file=''
34 <        if (not cfg_params.has_key('EDG.rb')):
35 <            cfg_params['EDG.rb']='CERN'
36 <        self.rb_param_file=common.scheduler.rb_configure(cfg_params.get("EDG.rb"))
37 <        self.wms_service=cfg_params.get("EDG.wms_service",'')
38 <        self.skipWMSAuth=cfg_params.get("EDG.skipwmsauth",1)
34 >        if (not cfg_params.has_key('GRID.rb')):
35 >            cfg_params['GRID.rb']='CERN'
36 >        self.rb_param_file=common.scheduler.rb_configure(cfg_params.get("GRID.rb"))
37 >        self.wms_service=cfg_params.get("GRID.wms_service",'')
38 >        self.skipWMSAuth=cfg_params.get("GRID.skipwmsauth",1)
39          params = { 'service' : self.wms_service, \
40                     'config' : self.rb_param_file, \
41                     'skipWMSAuth' : self.skipWMSAuth
# Line 59 | Line 59 | class SchedulerGlite(SchedulerGrid):
59          """
60          Returns string with requirement CE related
61          """
62 +        ceParser = CEBlackWhiteListParser(self.EDG_ce_white_list,
63 +                                          self.EDG_ce_black_list, common.logger())
64          req = ''
65 +        ce_white_list = []
66 +        ce_black_list = []
67          if self.EDG_ce_white_list:
68 <            ce_white_list = self.EDG_ce_white_list
68 >            ce_white_list = ceParser.whiteList()
69              tmpCe=[]
70              concString = '&&'
71              for ce in ce_white_list:
# Line 80 | Line 84 | class SchedulerGlite(SchedulerGrid):
84                      req += ") "
85  
86          if self.EDG_ce_black_list:
87 <            ce_black_list = self.EDG_ce_black_list
87 >            ce_black_list = ceParser.blackList()
88              tmpCe=[]
89              concString = '&&'
90              for ce in ce_black_list:
# Line 89 | Line 93 | class SchedulerGlite(SchedulerGrid):
93  
94          # requirement added to skip gliteCE
95          req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
96 +        retWL = ','.join(ce_white_list)
97 +        retBL = ','.join(ce_black_list)
98 +        if not retWL:
99 +            retWL = None
100 +        if not retBL:
101 +            retBL = None
102  
103 <        return req,self.EDG_ce_white_list,self.EDG_ce_black_list
103 >        return req, retWL, retBL
104  
105      def se_list(self, dest):
106          """
# Line 174 | Line 184 | class SchedulerGlite(SchedulerGrid):
184              itr4 = replicas
185          return itr4
186  
187 +    def delegateProxy(self):
188 +        self.boss().delegateProxy()  
189 +        return
190  
191      def wsExitFunc(self):
192          """

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines