Removed ParseSites calls in OARrestapi, since we only have one site for all nodes.

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

diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index 942f2bf..5271243 100644 (file)
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@ -93,8 +93,8 @@ class OARGETParser:
        
        def AddNodeNetworkAddr(self,tuplelist,value):
                #tuplelist.append(('hostname',str(value)))
-               tuplelist.append(('hostname',str(value)+'.demolab.fr'))
-               tuplelist.append(('site_id',3)) 
+               tuplelist.append(('hostname',str(value)))
+                       
                
        def AddNodeSite(self,tuplelist,value):
                tuplelist.append(('site_login_base',str(value)))        
@@ -154,7 +154,7 @@ class OARGETParser:
                #resources are listed inside the 'items' list from the json
                self.raw_json = self.raw_json['items']
                self.ParseNodes()
-               self.ParseSites()
+               #self.ParseSites()
                
                
                
@@ -165,7 +165,7 @@ class OARGETParser:
                if self.version_json_dict['apilib_version'] != "0.2.10" :
                        self.raw_json = self.raw_json['items']
                self.ParseNodes()
-               self.ParseSites()
+               #self.ParseSites()
                
                
        #Parse nodes properties from OAR
@@ -277,18 +277,18 @@ class OARapi:
                self.server = OARrestapi()
                self.parser = OARGETParser(self.server)
 
-       def GetNodes(self,node_filter= None, return_fields=None):
-               #print>>sys.stderr, " \r\n GetNodes node_filter %s return_fields %s" %(node_filter,return_fields) 
-               self.parser.SendRequest("GET_resources_full")
-               node_dict = self.parser.GetNodesFromOARParse()
-               return_node_list = []
-               #print>>sys.stderr, " \r\n GetNodes   node_dict %s" %(node_dict) 
-               if not (node_filter or return_fields):
-                       return_node_list = node_dict.values()
-                       return return_node_list
+       #def GetNodes(self,node_filter= None, return_fields=None):
+               ##print>>sys.stderr, " \r\n GetNodes node_filter %s return_fields %s" %(node_filter,return_fields) 
+               #self.parser.SendRequest("GET_resources_full")
+               #node_dict = self.parser.GetNodesFromOARParse()
+               #return_node_list = []
+               ##print>>sys.stderr, " \r\n GetNodes   node_dict %s" %(node_dict) 
+               #if not (node_filter or return_fields):
+                       #return_node_list = node_dict.values()
+                       #return return_node_list
 
-               return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
-               return return_node_list
+               #return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
+               #return return_node_list
 
                
        def GetSites(self, site_filter= None, return_fields=None):