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.3 by slacapra, Mon Oct 9 15:30:41 2006 UTC vs.
Revision 1.6 by slacapra, Thu Oct 12 14:51:12 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+';\n'
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 77 | Line 90 | class SchedulerGlite(SchedulerEdg):
90              param_file = open(common.work_space.shareDir()+'/'+self.param, 'w')
91  
92              itr4=self.findSites_(first[i])
93 <            req1=[]  
93 >            reqSites=''
94 >            reqtmp=[]  
95              j = 0
96              concString = '||'
97              for arg in itr4:
98                  #############
99                  # MC Changed matching syntax to avoid gang matching
100                  #############
101 <                req1.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
102 <            if len(req1): req = req + " && (" + concString.join(req1) + ')'
103 <            req = req + ';\n'
104 <            param_file.write('Requirements = ' + req )
101 >                reqtmp.append(' Member("'+arg+'" , other.GlueCESEBindGroupSEUniqueID) ')
102 >            if len(reqtmp): reqSites = reqSites + " && (" + concString.join(reqtmp) + ')'
103 >            reqSites = reqSites + ';\n'
104 >            param_file.write('Requirements = ' + req + reqSites )
105    
106 <            if (self.edg_config and self.edg_config_vo != ''):
107 <                param_file.write('RBconfig = "'+self.edg_config+'";\n')  
108 <                param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
106 > #            if (self.edg_config and self.edg_config_vo != ''):
107 > #               param_file.write('RBconfig = "'+self.edg_config+'";\n')  
108 > #                param_file.write('RBconfigVO = "'+self.edg_config_vo+'";')
109 >
110 >            if (self.rb_param_file != ''):
111 >                param_file.write(self.rb_param_file)  
112 >
113  
114              param_file.close()  
115  

Diff Legend

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