X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fimporter%2F__init__.py;h=bc6c7f224a9f64f8f0d623b9f6419ac0cf166b9f;hb=32fd3b54c69e1ee484bb3712b474ab9c24ffe01e;hp=84e59924b03a7e56c19a7f6395829f07e4d1669d;hpb=b3b806b28dc902af069a560b6e5d517ca76f354e;p=sfa.git

diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py
index 84e59924..bc6c7f22 100644
--- a/sfa/importer/__init__.py
+++ b/sfa/importer/__init__.py
@@ -3,12 +3,11 @@
 import sys
 
 from sfa.util.xrn import get_authority, hrn_to_urn
-from sfa.util.plxrn import email_to_hrn
 from sfa.generic import Generic
 from sfa.util.config import Config
 from sfa.util.sfalogging import _SfaLogger
 from sfa.trust.hierarchy import Hierarchy
-from sfa.trust.trustedroots import TrustedRoots
+#from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.gid import create_uuid
 from sfa.storage.alchemy import dbsession
 from sfa.storage.model import RegRecord, RegAuthority, RegUser
@@ -16,12 +15,19 @@ from sfa.trust.certificate import convert_public_key, Keypair
 
 
 class Importer:
-    def __init__(self):
+
+    def __init__(self,auth_hierarchy=None,logger=None):
         self.config = Config()
-        self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
-        self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL)
-        self.auth_hierarchy = Hierarchy ()
-        self.TrustedRoots = TrustedRoots(self.config.get_trustedroots_dir())    
+        if auth_hierarchy is not None:
+            self.auth_hierarchy=auth_hierarchy
+        else:
+            self.auth_hierarchy = Hierarchy ()
+        if logger is not None:
+            self.logger=logger
+        else:
+            self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
+            self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL)
+#        self.TrustedRoots = TrustedRoots(self.config.get_trustedroots_dir())    
    
     # check before creating a RegRecord entry as we run this over and over
     def record_exists (self, type, hrn):
@@ -77,9 +83,9 @@ class Importer:
         """
         # just create certs for all sfa interfaces even if they
         # aren't enabled
-        auth_info = self.auth_hierarchy.get_auth_info(self.interface_hrn)
+        auth_info = self.auth_hierarchy.get_auth_info(self.config.SFA_INTERFACE_HRN)
         pkey = auth_info.get_pkey_object()
-        hrn=self.interface_hrn
+        hrn=self.config.SFA_INTERFACE_HRN
         for type in  [ 'authority+sa', 'authority+am', 'authority+sm', ]:
             urn = hrn_to_urn(hrn, type)
             gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
@@ -112,5 +118,3 @@ class Importer:
             if testbed_importer:
                 testbed_importer.add_options(options)
                 testbed_importer.run (options)
-
-