Change the default OAR server to contact. NT.

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

diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index 326e12f..942f2bf 100644 (file)
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@ -5,7 +5,9 @@ import json
 from sfa.senslab.parsing import *
 from sfa.senslab.SenslabImportUsers import *
 
-OARIP='10.127.255.254'
+#OARIP='10.127.255.254'
+OARIP='192.168.0.109'
+
 
 OARrequests_list = ["GET_version", "GET_timezone", "GET_jobs", "GET_jobs_table", "GET_jobs_details",
 "GET_resources_full", "GET_resources"]
@@ -118,11 +120,20 @@ class OARGETParser:
        
        def ParseVersion(self) : 
                print self.raw_json
-               self.version_json_dict.update(api_version=self.raw_json['oar_version'] ,
-                                   apilib_version=self.raw_json['apilib_version'],
-                                   api_timezone=self.raw_json['api_timezone'],
-                                   api_timestamp=self.raw_json['api_timestamp'],
-                                   oar_version=self.raw_json['oar_version'] )
+               #print >>sys.stderr, self.raw_json
+               if 'oar_version' in self.raw_json :
+                       self.version_json_dict.update(api_version=self.raw_json['api_version'] ,
+                                       apilib_version=self.raw_json['apilib_version'],
+                                       api_timezone=self.raw_json['api_timezone'],
+                                       api_timestamp=self.raw_json['api_timestamp'],
+                                       oar_version=self.raw_json['oar_version'] )
+               else :
+                       self.version_json_dict.update(api_version=self.raw_json['api'] ,
+                                       apilib_version=self.raw_json['apilib'],
+                                       api_timezone=self.raw_json['api_timezone'],
+                                       api_timestamp=self.raw_json['api_timestamp'],
+                                       oar_version=self.raw_json['oar'] )
+                                       
                print self.version_json_dict['apilib_version']
                
        def ParseTimezone(self) : 
@@ -209,11 +220,11 @@ class OARGETParser:
                                                                        ('date_created', None), ('peer_id', None),]
                                self.site_dict[node['site_login_base']] = dict(self.site_dict[node['site_login_base']])
                                
-               print>>sys.stderr, "\r\n \r\n =============\t\t ParseSites site dict %s \r\n"%(self.site_dict)
+               #print>>sys.stderr, "\r\n \r\n =============\t\t ParseSites site dict %s \r\n"%(self.site_dict)
                
                
        def GetNodesFromOARParse(self):
-               print>>sys.stderr, " \r\n =========GetNodesFromOARParse: node_dictlist %s "%(self.node_dictlist)
+               #print>>sys.stderr, " \r\n =========GetNodesFromOARParse: node_dictlist %s "%(self.node_dictlist)
                return self.node_dictlist
 
        def GetSitesFromOARParse(self):
@@ -267,11 +278,11 @@ class OARapi:
                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) 
+               #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) 
+               #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
@@ -288,19 +299,19 @@ class OARapi:
                site = site_dict.values()[0]
                Users = SenslabImportUsers()
                        
-               print>>sys.stderr, " \r\n  GetSites sites_dict %s site_filter %s  \r\n \r\n  \r\n \r\n------site %s" %(site_dict,site_filter,site ) 
+               #print>>sys.stderr, " \r\n  GetSites sites_dict %s site_filter %s  \r\n \r\n  \r\n \r\n------site %s" %(site_dict,site_filter,site ) 
                admins_dict ={'person_ids': Users.GetPIs(site['site_id'])}
                site.update(admins_dict)        
                
                slice_list = Users.GetSlices()
                for sl in slice_list:
-                       print>>sys.stderr, " \r\n  GetSites sl %s" %(sl)
+                       #print>>sys.stderr, " \r\n  GetSites sl %s" %(sl)
                        if sl['site_id'] == site['site_id']:
                                site['slice_ids'].append(sl['slice_id'])
-               print>>sys.stderr, " \r\n  GetSites -site['site_id'] %s --slice_list %s" %(site['site_id'],slice_list ) 
+               #print>>sys.stderr, " \r\n  GetSites -site['site_id'] %s --slice_list %s" %(site['site_id'],slice_list ) 
                
                
-               print>>sys.stderr, " \r\n  GetSites -site['site_id'] %s --admins_dict %s---site %s" %(site['site_id'],admins_dict,site )                
+               #print>>sys.stderr, " \r\n  GetSites -site['site_id'] %s --admins_dict %s---site %s" %(site['site_id'],admins_dict,site )               
                if not (site_filter or return_fields):
                        return_site_list = site_dict.values()
                        return return_site_list