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.64 by spiga, Sat Nov 8 11:57:03 2008 UTC vs.
Revision 1.65 by ewv, Mon Dec 8 17:53:32 2008 UTC

#	Line 12 | Line 12 | from crab_util import *
12		from GliteConfig import *
13		import EdgLoggingInfo
14		import common
15	+	from WMCore.SiteScreening.BlackWhiteListParser import CEBlackWhiteListParser
16
17		import os, sys, time
18
#	Line 59 | Line 60 | class SchedulerGlite(SchedulerGrid):
60		"""
61		Returns string with requirement CE related
62		"""
63	+	ceParser = CEBlackWhiteListParser(self.EDG_ce_white_list,
64	+	self.EDG_ce_black_list, common.logger)
65		req = ''
66	+	ce_white_list = []
67	+	ce_black_list = []
68		if self.EDG_ce_white_list:
69	<	ce_white_list = self.EDG_ce_white_list
69	>	ce_white_list = ceParser.whiteList()
70		tmpCe=[]
71		concString = '&&'
72		for ce in ce_white_list:
#	Line 80 | Line 85 | class SchedulerGlite(SchedulerGrid):
85		req += ") "
86
87		if self.EDG_ce_black_list:
88	<	ce_black_list = self.EDG_ce_black_list
88	>	ce_black_list = ceParser.blackList()
89		tmpCe=[]
90		concString = '&&'
91		for ce in ce_black_list:
#	Line 90 | Line 95 | class SchedulerGlite(SchedulerGrid):
95		# requirement added to skip gliteCE
96		req += '&& (!RegExp("blah", other.GlueCEUniqueId))'
97
98	<	return req,self.EDG_ce_white_list,self.EDG_ce_black_list
98	>	return req, ','.join(ce_white_list), ','.join(ce_black_list)
99
100		def se_list(self, dest):
101		"""

Diff Legend

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