#assigned_res = ['resource_id', 'resource_uri']
#assigned_n = ['node', 'node_uri']
-
+
if job_id and resources is False:
- job_info = self.oar.parser.SendRequest("GET_jobs_id", job_id)
- print>>sys.stderr, "\r\n \r\n \t\t GetJobs resources is False job_info %s" %(job_info)
-
- if job_id and resources :
- job_info = self.oar.parser.SendRequest("GET_jobs_id_resources", job_id)
- print>>sys.stderr, "\r\n \r\n \t\t GetJobs job_info %s" %(job_info)
+ req = "GET_jobs_id"
+ node_list = 'assigned_network_address'
+ if job_id and resources :
+ req = "GET_jobs_id_resources"
+ node_list = 'reserverd_resources'
+ #Get job info from OAR
+ job_info = self.oar.parser.SendRequest(req, job_id)
if job_info['state'] == 'Terminated':
print>>sys.stderr, "\r\n \r\n \t\t GetJobs TERMINELEBOUSIN "
return None
- else:
+
+ try :
+
+ for n in job_info[node_list]:
+ n = str(self.root_auth) + str(n)
+ print>>sys.stderr, "\r\n \r\n \t\t GetJobs resources job_info %s" %(job_info)
return job_info
+
+ except KeyError:
+ print>>sys.stderr, "\r\n \r\n \t\t GetJobs KEYERROR "
+
+
+
+
+
+
+
return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
return return_node_list
- #def GetSites(self, auth, site_filter = None, return_fields=None):
- #self.oar.parser.SendRequest("GET_resources_full")
- #site_dict = self.oar.parser.GetSitesFromOARParse()
- #return_site_list = []
- #site = site_dict.values()[0]
- #if not (site_filter or return_fields):
- #return_site_list = site_dict.values()
- #return return_site_list
-
- #return_site_list = parse_filter(site_dict.values(),site_filter ,'site', return_fields)
- #return return_site_list
+
def GetSlices(self,slice_filter = None, return_fields=None):
- return_slice_list =[]
+
sliceslist = self.db.find('slice',columns = ['oar_job_id', 'slice_hrn', 'record_id_slice','record_id_user'], record_filter=slice_filter)
print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slices %s slice_filter %s " %(sliceslist,slice_filter)
-
+ return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields)
- if not (slice_filter or return_fields) and sliceslist:
- for sl in sliceslist:
+ if return_slice_list:
+ for sl in return_slice_list:
if sl['oar_job_id'] is not -1:
rslt = self.GetJobs( sl['oar_job_id'],resources=False)
- print >>sys.stderr, " \r\n \r\n \tSLABRIVER.PY GetSlices rslt %s" %(rslt)
if rslt :
sl.update(rslt)
sl.update({'hrn':str(sl['slice_hrn'])})
- print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slice SL %s" %(sl)
#If GetJobs is empty, this means the job is now in the 'Terminated' state
#Update the slice record
else :
sl['oar_job_id'] = '-1'
-
sl.update({'hrn':str(sl['slice_hrn'])})
- print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices TERMINATEDDFDDDDD %s" %(sl)
self.db.update_senslab_slice(sl)
- return_slice_list = sliceslist
+
print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list)
return return_slice_list
+
- return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields)
-
-
- for sl in return_slice_list:
- if sl['oar_job_id'] is not -1:
- print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices sl %s" %(sl)
- rslt =self.GetJobs( sl['oar_job_id'],resources=False)
- print >>sys.stderr, " \r\n \r\n SLABRIVER.PY GetSlices rslt %s" %(rslt)
- if rslt :
- sl.update(rslt)
- sl.update({'hrn':str(sl['slice_hrn'])})
- print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slice SL %s" %(sl)
- #If GetJobs is empty, this means the job is now in the 'Terminated' state
- #Update the slice record
- else :
- sl['oar_job_id'] = '-1'
-
- sl.update({'hrn':str(sl['slice_hrn'])})
- print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices TERMINATEDDFDDDDD %s" %(sl)
- self.db.update_senslab_slice(sl)
-
-
- #print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list)
- return return_slice_list
def testbed_name (self): return "senslab2"