ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/SchedulerGlite.py

Comparing COMP/CRAB/python/SchedulerGlite.py (file contents):
Revision 1.65 by ewv, Mon Dec 8 17:53:32 2008 UTC vs.
Revision 1.68 by spiga, Tue May 26 16:53:23 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 *
#	Line 32 | 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 94 | 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, ','.join(ce_white_list), ','.join(ce_black_list)
103	>	return req, retWL, retBL
104
105		def se_list(self, dest):
106		"""

Diff Legend

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