Cleaning.

diff --git a/sfa/senslab/OARrestapi.py b/sfa/senslab/OARrestapi.py
index 5271243..816d09d 100644 (file)
--- a/sfa/senslab/OARrestapi.py
+++ b/sfa/senslab/OARrestapi.py
@@ -92,7 +92,6 @@ class OARGETParser:
                return node_id
        
        def AddNodeNetworkAddr(self,tuplelist,value):
-               #tuplelist.append(('hostname',str(value)))
                tuplelist.append(('hostname',str(value)))
                        
                
@@ -165,7 +164,7 @@ class OARGETParser:
                if self.version_json_dict['apilib_version'] != "0.2.10" :
                        self.raw_json = self.raw_json['items']
                self.ParseNodes()
-               #self.ParseSites()
+
                
                
        #Parse nodes properties from OAR
@@ -277,19 +276,7 @@ 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
-
-               #return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
-               #return return_node_list
-
+       #GetNodes moved to slabdriver.py
                
        def GetSites(self, site_filter= None, return_fields=None):
                print>>sys.stderr, " \r\n GetSites+++++++++++++++++" 
@@ -308,10 +295,7 @@ class OARapi:
                        #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 --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

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index d24aec3..ca92531 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -11,8 +11,9 @@ from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicenam
 # SlabDriver should be really only about talking to the senslab testbed
 
 ## thierry : please avoid wildcard imports :)
-from sfa.senslab.OARrestapi import *
-from sfa.senslab.LDAPapi import *
+from sfa.senslab.OARrestapi import OARapi
+from sfa.senslab.LDAPapi import LDAPapi
+from sfa.senslab.SenslabImportUsers import SenslabImportUsers
 
 def list_to_dict(recs, key):
     """
@@ -44,6 +45,7 @@ class SlabDriver ():
        #self.users = SenslabImportUsers()
        self.oar = OARapi()
        self.ldap = LDAPapi()
+        self.users = SenslabImportUsers()
         self.time_format = "%Y-%m-%d %H:%M:%S"
         #self.logger=sfa_logger()
       
@@ -59,7 +61,7 @@ class SlabDriver ():
         self.oar.parser.SendRequest("GET_resources_full")
         node_dict = self.oar.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
@@ -161,7 +163,7 @@ class SlabDriver ():
             slices = list_to_dict(slice_list, 'slice_id')
         if person_ids:
             #print>>sys.stderr, " \r\n \t\t \t fill_record_pl_info BEFORE GetPersons  person_ids: %s" %(person_ids)
-            person_list = self.users.GetPersons( person_ids)
+            person_list = self.ldap.GetPersons( person_ids)
             persons = list_to_dict(person_list, 'person_id')
            #print>>sys.stderr, "\r\n  fill_record_pl_info persons %s \r\n \t\t person_ids %s " %(persons, person_ids) 
             for person in persons:
@@ -230,7 +232,7 @@ class SlabDriver ():
             sites = list_to_dict(site_list, 'site_id')
            #print>>sys.stderr, " \r\n \r\n \t\t ____ site_list %s \r\n \t\t____ sites %s " % (site_list,sites)
         if person_ids:
-            person_list = self.users.GetPersons( person_ids, ['person_id', 'email'])
+            person_list = self.ldap.GetPersons( person_ids, ['person_id', 'email'])
            #print>>sys.stderr, " \r\n \r\n   \t\t____ person_lists %s " %(person_list) 
             persons = list_to_dict(person_list, 'person_id')
         if slice_ids:
@@ -304,7 +306,7 @@ class SlabDriver ():
         site_pis = {}
         if site_ids:
             pi_filter = {'|roles': ['pi'], '|site_ids': site_ids} 
-            pi_list = SenslabUsers.GetPersons( pi_filter, ['person_id', 'site_ids'])
+            pi_list = self.ldap.GetPersons( pi_filter, ['person_id', 'site_ids'])
            #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ GetPersons ['person_id', 'site_ids'] pi_ilist %s" %(pi_list)
 
             for pi in pi_list:
@@ -336,7 +338,7 @@ class SlabDriver ():
 
         # get the pl records
         pl_person_list, pl_persons = [], {}
-        pl_person_list = SenslabUsers.GetPersons(person_ids, ['person_id', 'roles'])
+        pl_person_list = self.ldap.GetPersons(person_ids, ['person_id', 'roles'])
         pl_persons = list_to_dict(pl_person_list, 'person_id')
         #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___  _list %s \r\n \t\t SenslabUsers.GetPersons ['person_id', 'roles'] pl_persons %s \r\n records %s" %(pl_person_list, pl_persons,records) 
         # fill sfa info