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.3 by slacapra, Mon Oct 9 15:30:41 2006 UTC vs.
Revision 1.4 by fanzago, Wed Oct 11 15:45:53 2006 UTC

#	Line 3 | Line 3 | from SchedulerEdg import SchedulerEdg
3		from crab_logger import Logger
4		from crab_exceptions import *
5		from crab_util import *
6	<	from EdgConfig import *
6	>	#from EdgConfig import *
7	>	from GliteConfig import *
8		import common
9
10		import os, sys, time
#	Line 12 | Line 13 | class SchedulerGlite(SchedulerEdg):
13		def __init__(self):
14		SchedulerEdg.__init__(self)
15
16	+	def rb_configure(self, RB):
17	+	self.glite_config = ''
18	+	self.rb_param_file = ''
19	+
20	+	gliteConfig = GliteConfig(RB)
21	+	self.glite_config = gliteConfig.config()
22	+
23	+	if (self.glite_config != ''):
24	+	self.rb_param_file = 'WMSconfig = '+self.glite_config+';'
25	+	#print "rb_param_file = ", self.rb_param_file
26	+	return self.rb_param_file
27	+
28		def sched_parameter(self):
29		"""
30		Returns file with requirements and scheduler-specific parameters
#	Line 89 | Line 102 | class SchedulerGlite(SchedulerEdg):
102		req = req + ';\n'
103		param_file.write('Requirements = ' + req )
104
105	<	if (self.edg_config and self.edg_config_vo != ''):
106	<	param_file.write('RBconfig = "'+self.edg_config+'";\n')
107	<	param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
105	>	#            if (self.edg_config and self.edg_config_vo != ''):
106	>	#               param_file.write('RBconfig = "'+self.edg_config+'";\n')
107	>	#                param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
108	>
109	>	if (self.rb_param_file != ''):
110	>	param_file.write(self.rb_param_file)
111	>
112
113		param_file.close()
114

Diff Legend

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