Import script using OARapi and LDAPapi

diff --git a/sfa/senslab/slab-import.py b/sfa/senslab/slab-import.py
index 10cdd88..2f13157 100644 (file)
--- a/sfa/senslab/slab-import.py
+++ b/sfa/senslab/slab-import.py
@@ -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()

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index 40e56be..94828a9 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -42,7 +42,7 @@ class SlabDriver (OARapi, SenslabImportUsers):
        self.users = self
         self.time_format = "%Y-%m-%d %H:%M:%S"
         #self.logger=sfa_logger()
-        #print >>sys.stderr, "\r\n \t\t___________PSFA SENSLAN /API.PY  __init__ STOP ",self.interface #dir(self)
+      
        
     ##
     # Convert SFA fields to PLC fields for use when registering up updating