Import script using OARapi and LDAPapi

[sfa.git] / sfa / senslab / slab-import.py

diff --git a/sfa/senslab/slab-import.py b/sfa/senslab/slab-import.py
index 9d17757..2f13157 100644 (file)
--- a/sfa/senslab/slab-import.py
+++ b/sfa/senslab/slab-import.py
@@ -100,7 +100,7 @@ def main():
        table.create()
 
     # create root authority 
-    SenslabImporter.create_top_level_auth_records(root_auth)
+    create_top_level_auth_records(root_auth)
     
     # create s user record for the slice manager
     #Do we need this?
@@ -122,13 +122,14 @@ def main():
         existing_hrns.append(result['hrn'])   
         
          #Get Senslab nodes 
-    nodes_dict  = OARImporter.GetNodes()
+    Driver = SlabDriver(OARapi(),SenslabUsers())
+    nodes_dict  = Driver.GetNodes()
     print "\r\n NODES8DICT ",nodes_dict
     
-    persons_list = SenslabUsers.GetPersons()
+    persons_list = Driver.GetPersons()
     print "\r\n PERSONS_LIST ",persons_list
 
-    keys_list = SenslabUsers.GetKeys()
+    keys_list = Driver.GetKeys()
     print "\r\n KEYSS_LIST ",keys_list
     
     #slices_list = SenslabUsers.GetSlices()
@@ -171,7 +172,7 @@ def main():
    # import persons
     for person in persons_list:
         print >>sys.stderr, "\r\n\r\n^^^^^^^^^^^^^PERSON hrn %s person %s site hrn %s" %(hrn,person)    
-        SenslabImporter.import_person( site_hrn, person,keys_list)
+        import_person( site_hrn, person,keys_list)
         if hrn not in existing_hrns or \
             (hrn, 'user') not in existing_records or update_record:
             import_person(site_hrn, person)