From c2201124d0a9c59da98c2d1c61420be0b2d2b2e6 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 14 Nov 2011 17:48:21 +0100 Subject: [PATCH] Import script using OARapi and LDAPapi --- sfa/senslab/slab-import.py | 7 ++++--- sfa/senslab/slabdriver.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sfa/senslab/slab-import.py b/sfa/senslab/slab-import.py index 10cdd883..2f131573 100644 --- 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 40e56be9..94828a95 100644 --- 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 -- 2.47.0