added Importer class (replaces sfa.importer.sfaimporter

diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py
index e69de29..969cc5b 100644 (file)
--- a/sfa/importer/__init__.py
+++ b/sfa/importer/__init__.py
@@ -0,0 +1,115 @@
+#!/usr/bin/python
+
+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.gid import create_uuid
+from sfa.storage.alchemy import dbsession
+from sfa.storage.model import RegRecord, RegAuthority, RegUser
+from sfa.trust.certificate import convert_public_key, Keypair
+
+
+class Importer:
+    def __init__(self):
+        self.config = Config()
+        self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
+        self.logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
+        self.auth_hierarchy = Hierarchy ()
+        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):
+       return dbsession.query(RegRecord).filter_by(hrn=hrn,type=type).count()!=0 
+
+    def create_top_level_auth_records(self, hrn):
+        """
+        Create top level db records (includes root and sub authorities (local/remote)
+        """
+        # make sure parent exists
+        parent_hrn = get_authority(hrn)
+        if not parent_hrn:
+            parent_hrn = hrn
+        if not parent_hrn == hrn:
+            self.create_top_level_auth_records(parent_hrn)
+
+        # ensure key and cert exists:
+        self.auth_hierarchy.create_top_level_auth(hrn)
+        # create the db record if it doesnt already exist
+        if not self.record_exists ('authority',hrn):
+            auth_info = self.auth_hierarchy.get_auth_info(hrn)
+            auth_record = RegAuthority(hrn=hrn, gid=auth_info.get_gid_object(),
+                                       authority=get_authority(hrn))
+            auth_record.just_created()
+            dbsession.add (auth_record)
+            dbsession.commit()
+            self.logger.info("SfaImporter: imported authority (parent) %s " % auth_record)     
+   
+
+    def create_sm_client_record(self):
+        """
+        Create a user record for the Slicemanager service.
+        """
+        hrn = self.interface_hrn + '.slicemanager'
+        urn = hrn_to_urn(hrn, 'user')
+        if not self.auth_hierarchy.auth_exists(urn):
+            self.logger.info("SfaImporter: creating Slice Manager user")
+            self.auth_hierarchy.create_auth(urn)
+
+        if self.record_exists ('user',hrn): return
+        auth_info = self.auth_hierarchy.get_auth_info(hrn)
+        user_record = RegUser(hrn=hrn, gid=auth_info.get_gid_object(),
+                              authority=get_authority(hrn))
+        user_record.just_created()
+        dbsession.add (user_record)
+        dbsession.commit()
+        self.logger.info("SfaImporter: importing user (slicemanager) %s " % user_record)
+
+
+    def create_interface_records(self):
+        """
+        Create a record for each SFA interface
+        """
+        # just create certs for all sfa interfaces even if they
+        # aren't enabled
+        auth_info = self.auth_hierarchy.get_auth_info(self.interface_hrn)
+        pkey = auth_info.get_pkey_object()
+        hrn=self.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)
+            # for now we have to preserve the authority+<> stuff
+            if self.record_exists (type,hrn): continue
+            interface_record = RegAuthority(type=type, hrn=hrn, gid=gid,
+                                            authority=get_authority(hrn))
+            interface_record.just_created()
+            dbsession.add (interface_record)
+            dbsession.commit()
+            self.logger.info("SfaImporter: imported authority (%s) %s " % (type,interface_record))
+ 
+    def run(self, options=None):
+        if not self.config.SFA_REGISTRY_ENABLED:
+            self.logger.critical("Importer: need SFA_REGISTRY_ENABLED to run import")
+
+        # testbed-neutral : create local certificates and the like
+        auth_hierarchy = Hierarchy ()
+        self.create_top_level_auth_records(self.config.SFA_INTERFACE_HRN)
+        
+        # testbed-specific
+        testbed_importer = None
+        generic=Generic.the_flavour()
+        importer_class = generic.importer_class()
+        if importer_class:
+            logger.info ("Using flavour %s for importing (class %s)"%\
+                         (generic.flavour,importer_class.__name__))
+            testbed_importer = importer_class (auth_hierarchy, logger)
+            if testbed_importer:
+                testbed_importer.add_options(options)
+                testbed_importer.run (parser)
+
+