GetReservedNodes implementation change for OAR api 2.5

[sfa.git] / sfa / senslab / slabdriver.py

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index e0d9784..36f9d22 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -21,7 +21,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
 from sfa.util.xrn import hrn_to_urn, urn_to_sliver_id
-from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
+from sfa.planetlab.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename
 
 ## thierry: everything that is API-related (i.e. handling incoming requests) 
 # is taken care of 
@@ -547,15 +547,7 @@ 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_reserved_nodes") 
-       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):
         """