bug-fix
[sfa.git] / sfa / plc / sfaImport.py
index da071e2..f429cee 100644 (file)
@@ -52,9 +52,8 @@ class sfaImport:
 
     def __init__(self):
         self.AuthHierarchy = Hierarchy()
-        self.TrustedRoots = TrustedRootList()
-
         self.config = Config()
+        self.TrustedRoots = TrustedRootList(Config.get_trustedroots_dir(self.config))
         self.plc_auth = self.config.get_plc_auth()
         self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH
         self.level1_auth = self.config.SFA_REGISTRY_LEVEL1_AUTH
@@ -95,6 +94,7 @@ class sfaImport:
 
         if not auth_record:
             auth_record = GeniRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=-1)
+            auth_record['authority'] = get_authority(auth_record['hrn'])
             trace("  inserting authority record for " + hrn)
             table.insert(auth_record)
 
@@ -126,15 +126,16 @@ class sfaImport:
             pkey = Keypair(create=True)
 
         # create the gid
-        print "*", hrn
         person_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey)
         table = GeniTable()
         person_record = GeniRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id'])
-        try:
+        person_record['authority'] = get_authority(person_record['hrn'])
+        existing_records = table.find({'hrn': hrn, 'type': 'user', 'pointer': person['person_id']})
+        if not existing_records:
             table.insert(person_record)
-        except:
+        else:
             trace("Import: %s exists, updating " % hrn)
-            existing_record = table.find(person_record)
+            existing_record = existing_records[0]
             person_record['record_id'] = existing_record['record_id']
             table.update(person_record)
 
@@ -153,12 +154,14 @@ class sfaImport:
         pkey = Keypair(create=True)
         slice_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey)
         slice_record = GeniRecord(hrn=hrn, gid=slice_gid, type="slice", pointer=slice['slice_id'])
+        slice_record['authority'] = get_authority(slice_record['hrn'])
         table = GeniTable()
-        try:
+        existing_records = table.find({'hrn': hrn, 'type': 'slice', 'pointer': slice['slice_id']})
+        if not existing_records:
             table.insert(slice_record)
-        except:
+        else:
             trace("Import: %s exists, updating " % hrn)
-            existing_record = table.find(slice_record)
+            existing_record = existing_records[0]
             slice_record['record_id'] = existing_record['record_id']
             table.update(slice_record)
 
@@ -182,11 +185,13 @@ class sfaImport:
         pkey = Keypair(create=True)
         node_gid = AuthHierarchy.create_gid(hrn, create_uuid(), pkey)
         node_record = GeniRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id'])
-        try:
+        node_record['authority'] = get_authority(node_record['hrn'])
+        existing_records = table.find({'hrn': hrn, 'type': 'node', 'pointer': node['node_id']})
+        if not existing_records:
             table.insert(node_record)
-        except:
+        else:
             trace("Import: %s exists, updating " % hrn)
-            existing_record = table.find(node_record)
+            existing_record = existing_records[0]
             node_record['record_id'] = existing_record['record_id']
             table.update(node_record)
 
@@ -221,65 +226,20 @@ class sfaImport:
 
         table = GeniTable()
         auth_record = GeniRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=site['site_id'])
-        try:
+        auth_record['authority'] = get_authority(auth_record['hrn'])
+        existing_records = table.find({'hrn': hrn, 'type': 'authority', 'pointer': site['site_id']})
+        if not existing_records:
             table.insert(auth_record)
-        except:
+        else:
             trace("Import: %s exists, updating " % hrn)
-            existing_record = table.find(auth_record)
+            existing_record = existing_record[0]
             auth_record['record_id'] = existing_record['record_id']
             table.update(auth_record)
 
-        #if 'person_ids' in site:
-        #    for person_id in site['person_ids']:
-        #        persons = shell.GetPersons(plc_auth, [person_id])
-        #        if persons:
-        #            try:
-        #                self.import_person(hrn, persons[0])
-        #            except Exception, e:
-        #                trace("Failed to import: %s (%s)" % (persons[0], e))
-        #if 'slice_ids' in site:
-        #    for slice_id in site['slice_ids']:
-        #        slices = shell.GetSlices(plc_auth, [slice_id])
-        #        if slices:
-        #            try:
-        #                self.import_slice(hrn, slices[0])
-        #            except Exception, e:
-        #                trace("Failed to import: %s (%s)" % (slices[0], e))
-        #if 'node_ids' in site:
-        #    for node_id in site['node_ids']:
-        #        nodes = shell.GetNodes(plc_auth, [node_id])
-        #        if nodes:
-        #            try:
-        #                self.import_node(hrn, nodes[0])
-        #            except Exception, e:
-        #                trace("Failed to import: %s (%s)" % (nodes[0], e))     
-
-    def delete_record(self, parent_hrn, object, type):
-        # get the hrn
-        table = GeniTable()
-        hrn = None
-        if type in ['slice'] and 'name' in object and object['name']:
-            slice_name = object['name'].split("_")[0]
-            hrn = parent_hrn + "." + slice_name
-        elif type in ['user'] and 'email' in object and object['email']:
-            person_name = object['email'].split('@')[0]
-            hrn = parent_hrn + "." + person_name
-        elif type in ['node'] and 'hostname' in object and object['hostname']:
-            node_name =  object['hostname'].replace('.','_')  
-            hrn = parent_hrn + "." + node_name
-        elif type in ['site'] and 'login_base' in object and object['login_base']:
-            site_name = object['login_base']
-            hrn = parent_hrn
-            parent_hrn = get_authority(hrn)
-            type = "authority"
-            # delete all records whos authority is this site
-            records = table.find({'authority': hrn})
-            for record in records:
-                table.remove(record)
-        else:
-            return
-        
+
+    def delete_record(self, hrn, type):
         # delete the record
+        table = GeniTable()
         record_list = table.find({'type': type, 'hrn': hrn})
         for record in record_list:
             table.remove(record)