From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 26 Jun 2012 08:45:42 +0000 (+0200)
Subject: Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~150
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e8fc48e051df886018a44560a746db08e564cd73;p=sfa.git

Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2

Conflicts:
	sfa/senslab/OARrestapi.py
	sfa/senslab/slabdriver.py
---

e8fc48e051df886018a44560a746db08e564cd73
diff --cc sfa/senslab/OARrestapi.py
index 3aa158ab,3a32efe8..d5e3570c
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@@ -16,21 -16,8 +16,25 @@@ from sfa.util.sfalogging import logge
  
  OARIP ='194.199.16.161'
  
+ 
 +OARrequests_get_uri_dict = { 'GET_version': '/oarapi/version.json',
 +			'GET_timezone':'/oarapi/timezone.json' ,
 +			'GET_jobs': '/oarapi/jobs.json',
 +                        'GET_jobs_id': '/oarapi/jobs/id.json',
 +                        'GET_jobs_id_resources': '/oarapi/jobs/id/resources.json',
 +                        'GET_resources_id': '/oarapi/resources/id.json',
 +			'GET_jobs_table': '/oarapi/jobs/table.json',
 +			'GET_jobs_details': '/oarapi/jobs/details.json',
 +                        'GET_reserved_nodes': '/oarapi/jobs/details.json?state=Running,Waiting,Launching',
 +                        'GET_running_jobs':  '/oarapi/jobs/details.json?state=Running',
 +			'GET_resources_full': '/oarapi/resources/full.json',
 +			'GET_resources':'/oarapi/resources.json',
 +                        'GET_sites' : '/oarapi/resources/full.json',
 +                        }
 +
++
++
+ 
  OARrequest_post_uri_dict = { 'POST_job':{'uri': '/oarapi/jobs.json'},
                              'DELETE_jobs_id':{'uri':'/oarapi/jobs/id.json'},
                              }
@@@ -274,14 -262,12 +279,18 @@@ class OARGETParser
      def ParseReservedNodes(self):
          print>>sys.stderr, " \r\n  \t\t\t ParseReservedNodes__________________________ " 
          #resources are listed inside the 'items' list from the json
-         return self.raw_json
+         nodes=[]
+         for job in  self.raw_json['items']:
+             for node in job['nodes']:
+                 nodes.append(node['network_address'])
+         return nodes
      
 +    def ParseRunningJobs(self): 
 +        print>>sys.stderr, " \r\n  \t\t\t ParseRunningJobs__________________________ " 
 +        #resources are listed inside the 'items' list from the json
 +        return self.raw_json
 +        
 +        
      def ParseDeleteJobs(self):
          return  
              
diff --cc sfa/senslab/slabdriver.py
index fc509624,36f9d22c..562f5d5b
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@@ -547,16 -547,7 +547,20 @@@ class SlabDriver(Driver)
                
      def GetReservedNodes(self):
          # this function returns a list of all the nodes already involved in an oar job
-        jobs = self.oar.parser.SendRequest("GET_running_jobs") 
-        print>>sys.stderr, "\r\n \r\n GetReservedNodes jobs %s" %(jobs)
-        #jobs=self.oar.parser.SendRequest("GET_jobs_details") 
-        nodes = []
-        if jobs['total'] == 0:
-            return []
++
++
++
++
++
++
++
 +      
-        for j in jobs :
-           nodes = j['assigned_network_address']+nodes
-        return nodes
++
++
++
++
+        return self.oar.parser.SendRequest("GET_reserved_nodes") 
++
       
      def GetNodes(self,node_filter_dict = None, return_fields_list = None):
          """