X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fimporter%2F__init__.py;h=90e15e40820fa17ada2a7ef2bd6df8c88ef1258f;hb=31cc4fa991896f000abb106916662923f37bc3a6;hp=baccfcb46ca23f6d3b512e44ec17a55cc9c346da;hpb=d6c87dd13f9e38d997264912a2f0b2e7802e4604;p=sfa.git diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py index baccfcb4..90e15e40 100644 --- a/sfa/importer/__init__.py +++ b/sfa/importer/__init__.py @@ -1,45 +1,58 @@ -#!/usr/bin/python +#!/usr/bin/env python2 + +# pylint: disable=c0111, w1201, w0622 -import sys from datetime import datetime from sfa.util.xrn import get_authority, hrn_to_urn from sfa.generic import Generic from sfa.util.config import Config -from sfa.util.sfalogging import _SfaLogger +from sfa.util.sfalogging import init_logger, logger as default_logger 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 +# using global alchemy.session() here is fine +# as importer is on standalone one-shot process +from sfa.storage.alchemy import global_dbsession from sfa.storage.model import RegRecord, RegAuthority, RegUser -from sfa.trust.certificate import convert_public_key, Keypair +# note on logging +# it is doubtful that anyone ever used the ability to +# pass a logger to this class, and that can probably be +# thrown away. +# However a quick attempt showed that it seems to +# also require changes in the Generic layer class Importer: - def __init__(self,auth_hierarchy=None,logger=None): + def __init__(self, auth_hierarchy=None, logger=None): self.config = Config() if auth_hierarchy is not None: - self.auth_hierarchy=auth_hierarchy + self.auth_hierarchy = auth_hierarchy else: - self.auth_hierarchy = Hierarchy () - if logger is not None: - self.logger=logger + self.auth_hierarchy = Hierarchy() + if logger is None: + # redirect in sfa-import.log + self.logger = default_logger + init_logger('import') else: - self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog') - self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL) + self.logger = logger + self.logger.setLevelFromOptVerbose(self.config.SFA_API_LOGLEVEL) # ugly side effect so that other modules get it right import sfa.util.sfalogging - sfa.util.sfalogging.logger=logger -# self.TrustedRoots = TrustedRoots(self.config.get_trustedroots_dir()) - + sfa.util.sfalogging.logger = logger +# 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 + @staticmethod + def record_exists(type, hrn): + return (global_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) + Create top level db records + includes root and sub authorities (local/remote) """ # make sure parent exists parent_hrn = get_authority(hrn) @@ -51,35 +64,15 @@ class Importer: # 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): + 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) - + global_dbsession.add(auth_record) + global_dbsession.commit() + self.logger.info( + "SfaImporter: imported authority (parent) %s " % auth_record) def create_interface_records(self): """ @@ -87,42 +80,49 @@ class Importer: """ # just create certs for all sfa interfaces even if they # aren't enabled - auth_info = self.auth_hierarchy.get_auth_info(self.config.SFA_INTERFACE_HRN) + auth_info = self.auth_hierarchy.get_auth_info( + self.config.SFA_INTERFACE_HRN) pkey = auth_info.get_pkey_object() - hrn=self.config.SFA_INTERFACE_HRN - for type in [ 'authority+sa', 'authority+am', 'authority+sm', ]: + 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) # for now we have to preserve the authority+<> stuff - if self.record_exists (type,hrn): continue + 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)) - + global_dbsession.add(interface_record) + global_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") + self.logger.critical( + "Importer: need SFA_REGISTRY_ENABLED to run import") # testbed-neutral : create local certificates and the like - auth_hierarchy = Hierarchy () + auth_hierarchy = Hierarchy() self.create_top_level_auth_records(self.config.SFA_INTERFACE_HRN) self.create_interface_records() - + # testbed-specific testbed_importer = None - generic=Generic.the_flavour() + generic = Generic.the_flavour() importer_class = generic.importer_class() if importer_class: - beg_time=datetime.now() - self.logger.info ("Starting import on %s, using class %s from flavour %s"%\ - (beg_time,importer_class.__name__,generic.flavour)) - testbed_importer = importer_class (auth_hierarchy, self.logger) + begin_time = datetime.utcnow() + self.logger.info(30 * '=') + self.logger.info( + "Starting import on %s, using class %s from flavour %s" % + (begin_time, importer_class.__name__, generic.flavour)) + testbed_importer = importer_class(auth_hierarchy, self.logger) if testbed_importer: testbed_importer.add_options(options) - testbed_importer.run (options) - end_time=datetime.now() - duration=end_time-begin_time - self.logger.info("Import took %s"%duration) + testbed_importer.run(options) + end_time = datetime.utcnow() + duration = end_time - begin_time + self.logger.info("Import took %s" % duration) + self.logger.info(30 * '=')