From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Wed, 25 Jan 2012 14:42:17 +0000 (+0100)
Subject: Cleaned GetJobs.
X-Git-Tag: sfa-2.1-24~3^2~225
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=758537d4d7ad82e0544098c157d24e31c3410cc7;p=sfa.git

Cleaned GetJobs.
---

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index efa62382..fe9762c6 100644
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -366,31 +366,36 @@ class SlabDriver(Driver):
         #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)
-            try :
-                for n in job_info['assigned_network_address']:
-                    n = str(self.root_auth) + str(n)
-                print>>sys.stderr, "\r\n \r\n \t\t GetJobs resources is False job_info %s" %(job_info)
-            except KeyError:
-                print>>sys.stderr, "\r\n \r\n \t\t GetJobs KEYERROR " 
-                
-        if job_id and resources :	
-            job_info = self.oar.parser.SendRequest("GET_jobs_id_resources", job_id) 
-            try :
-                for n in job_info['reserverd_resources']:
-                    n = str(self.root_auth) + str(n)
-                print>>sys.stderr, "\r\n \r\n \t\t GetJobs job_info %s" %(job_info)
-            except KeyError:
-                print>>sys.stderr, "\r\n \r\n \t\t GetJobs KEYERROR " 
-            
+            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 " 
+            
+  
+            
+            
+       
+       
+