rephrase import messages

diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index d5d3d3b..a902d93 100644 (file)
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -51,8 +51,6 @@ class PlImporter:
 
     def run (self, options):
         # we don't have any options for now
-        self.logger.info ("PlImporter.run : to do")
-
         config = Config ()
         interface_hrn = config.SFA_INTERFACE_HRN
         root_auth = config.SFA_REGISTRY_ROOT_AUTH
@@ -130,7 +128,7 @@ class PlImporter:
                 auth_record.authority=get_authority(site_hrn)
                 dbsession.add(auth_record)
                 dbsession.commit()
-                self.logger.info("Import: Imported authority (vini site) %s"%auth_record)
+                self.logger.info("PlImporter: Imported authority (vini site) %s"%auth_record)
 
         # start importing 
         for site in sites:
@@ -153,11 +151,11 @@ class PlImporter:
                     auth_record.authority=get_authority(site_hrn)
                     dbsession.add(auth_record)
                     dbsession.commit()
-                    self.logger.info("Import: imported authority (site) : %s" % auth_record)  
+                    self.logger.info("PlImporter: imported authority (site) : %s" % auth_record)  
                 except:
                     # if the site import fails then there is no point in trying to import the
                     # site's child records (node, slices, persons), so skip them.
-                    self.logger.log_exc("Import: failed to import site. Skipping child records") 
+                    self.logger.log_exc("PlImporter: failed to import site. Skipping child records") 
                     continue 
              
             # import node records
@@ -184,9 +182,9 @@ class PlImporter:
                         node_record.authority=get_authority(hrn)
                         dbsession.add(node_record)
                         dbsession.commit()
-                        self.logger.info("Import: imported node: %s" % node_record)  
+                        self.logger.info("PlImporter: imported node: %s" % node_record)  
                     except:
-                        self.logger.log_exc("Import: failed to import node") 
+                        self.logger.log_exc("PlImporter: failed to import node") 
                     
 
             # import slices
@@ -209,9 +207,9 @@ class PlImporter:
                         slice_record.authority=get_authority(hrn)
                         dbsession.add(slice_record)
                         dbsession.commit()
-                        self.logger.info("Import: imported slice: %s" % slice_record)  
+                        self.logger.info("PlImporter: imported slice: %s" % slice_record)  
                     except:
-                        self.logger.log_exc("Import: failed to  import slice")
+                        self.logger.log_exc("PlImporter: failed to  import slice")
 
             # import persons
             for person_id in site['person_ids']:
@@ -247,7 +245,7 @@ class PlImporter:
                                 pkey = Keypair(create=True)
                         else:
                             # the user has no keys. Creating a random keypair for the user's gid
-                            self.logger.warn("Import: person %s does not have a PL public key"%hrn)
+                            self.logger.warn("PlImporter: person %s does not have a PL public key"%hrn)
                             pkey = Keypair(create=True) 
                         urn = hrn_to_urn(hrn, 'user')
                         person_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
@@ -259,9 +257,9 @@ class PlImporter:
                         person_record.authority=get_authority(hrn)
                         dbsession.add (person_record)
                         dbsession.commit()
-                        self.logger.info("Import: imported person: %s" % person_record)
+                        self.logger.info("PlImporter: imported person: %s" % person_record)
                     except:
-                        self.logger.log_exc("Import: failed to import person.") 
+                        self.logger.log_exc("PlImporter: failed to import person.") 
     
         # remove stale records    
         system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
@@ -328,11 +326,11 @@ class PlImporter:
             if not found:
                 try:
                     record_object = existing_records[(record_hrn, type)]
-                    self.logger.info("Import: deleting record: %s" % record)
+                    self.logger.info("PlImporter: deleting record: %s" % record)
                     dbsession.delete(record_object)
                     dbsession.commit()
                 except:
-                    self.logger.log_exc("Import: failded to delete record")                    
+                    self.logger.log_exc("PlImporter: failded to delete record")                    
 
         # save pub keys
         self.logger.info('Import: saving current pub keys')

diff --git a/sfa/importer/sfaimporter.py b/sfa/importer/sfaimporter.py
index 00e9908..a337655 100644 (file)
--- a/sfa/importer/sfaimporter.py
+++ b/sfa/importer/sfaimporter.py
@@ -68,14 +68,14 @@ class SfaImporter:
         self.create_sm_client_record()
 
         # create interface records
-        self.logger.info("Import: creating interface records")
+        self.logger.info("SfaImporter: creating interface records")
 # xxx authority+ turning off the creation of authority+*
 # in fact his is required - used in SfaApi._getCredentialRaw
 # that tries to locate 'authority+sa'
         self.create_interface_records()
 
         # add local root authority's cert  to trusted list
-        self.logger.info("Import: adding " + interface_hrn + " to trusted list")
+        self.logger.info("SfaImporter: adding " + interface_hrn + " to trusted list")
         authority = self.auth_hierarchy.get_auth_info(interface_hrn)
         self.TrustedRoots.add_gid(authority.get_gid_object())
 
@@ -102,7 +102,7 @@ class SfaImporter:
         auth_record.just_created()
         dbsession.add (auth_record)
         dbsession.commit()
-        self.logger.info("Import: imported authority (parent) %s " % auth_record)
+        self.logger.info("SfaImporter: imported authority (parent) %s " % auth_record)
 
     def create_sm_client_record(self):
         """
@@ -111,7 +111,7 @@ class SfaImporter:
         hrn = self.config.SFA_INTERFACE_HRN + '.slicemanager'
         urn = hrn_to_urn(hrn, 'user')
         if not self.auth_hierarchy.auth_exists(urn):
-            self.logger.info("Import: creating Slice Manager user")
+            self.logger.info("SfaImporter: creating Slice Manager user")
             self.auth_hierarchy.create_auth(urn)
 
         auth_info = self.auth_hierarchy.get_auth_info(hrn)
@@ -123,7 +123,7 @@ class SfaImporter:
         user_record.just_created()
         dbsession.add (user_record)
         dbsession.commit()
-        self.logger.info("Import: importing user (slicemanager) %s " % user_record)
+        self.logger.info("SfaImporter: importing user (slicemanager) %s " % user_record)
 
     def create_interface_records(self):
         """
@@ -147,7 +147,7 @@ class SfaImporter:
             interface_record.just_created()
             dbsession.add (interface_record)
             dbsession.commit()
-            self.logger.info("Import: imported authority (%s) %s " % (type,interface_record))
+            self.logger.info("SfaImporter: imported authority (%s) %s " % (type,interface_record))
              
     def delete_record(self, hrn, type):
         # delete the record