X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2FsfaImport.py;h=238b5e1bbfb1d515e30d30e3baf41a9d1c1f3153;hb=b4da5d08a4312962ed4ec9e7fb679ab1e9309b0d;hp=320730d49bf2ca779a0b2a7220ac0168c185a168;hpb=0cf0d31c313a366e3f272f830bdb4f2a7308e11f;p=sfa.git diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py index 320730d4..238b5e1b 100644 --- a/sfa/plc/sfaImport.py +++ b/sfa/plc/sfaImport.py @@ -12,10 +12,12 @@ import getopt import sys import tempfile -from sfa.util.sfalogging import sfa_import_logger +from sfa.util.sfalogging import sfa_logger_goes_to_import,sfa_logger + from sfa.util.record import * from sfa.util.table import SfaTable -from sfa.util.namespace import * +from sfa.util.xrn import get_authority, hrn_to_urn +from sfa.util.plxrn import email_to_hrn from sfa.util.config import Config from sfa.trust.certificate import convert_public_key, Keypair from sfa.trust.trustedroot import * @@ -50,25 +52,27 @@ def _cleanup_string(str): class sfaImport: def __init__(self): - self.logger = sfa_import_logger - self.AuthHierarchy = Hierarchy() - 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 + sfa_logger_goes_to_import() + self.logger = sfa_logger() + self.AuthHierarchy = Hierarchy() + 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 - # connect to planetlab - self.shell = None - if "Url" in self.plc_auth: - from sfa.plc.remoteshell import RemoteShell - self.shell = RemoteShell() - else: - import PLC.Shell - self.shell = PLC.Shell.Shell(globals = globals()) - + # connect to planetlab + self.shell = None + if "Url" in self.plc_auth: + from sfa.plc.remoteshell import RemoteShell + self.shell = RemoteShell(self.logger) + else: + import PLC.Shell + self.shell = PLC.Shell.Shell(globals = globals()) def create_top_level_auth_records(self, hrn): - AuthHierarchy = self.AuthHierarchy + """ + Create top level records (includes root and sub authorities (local/remote) + """ urn = hrn_to_urn(hrn, 'authority') # make sure parent exists parent_hrn = get_authority(hrn) @@ -78,31 +82,53 @@ class sfaImport: self.create_top_level_auth_records(parent_hrn) # create the authority if it doesnt already exist - if not AuthHierarchy.auth_exists(urn): - self.logger.info("Import: creating top level authorites") - AuthHierarchy.create_auth(urn) + if not self.AuthHierarchy.auth_exists(urn): + self.logger.info("Import: creating top level authorities") + self.AuthHierarchy.create_auth(urn) # create the db record if it doesnt already exist - auth_info = AuthHierarchy.get_auth_info(hrn) + auth_info = self.AuthHierarchy.get_auth_info(hrn) table = SfaTable() auth_record = table.find({'type': 'authority', 'hrn': hrn}) if not auth_record: auth_record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=-1) auth_record['authority'] = get_authority(auth_record['hrn']) - self.logger.info("Import: inserting authority record for " + hrn) + self.logger.info("Import: inserting authority record for %s"%hrn) table.insert(auth_record) + def create_interface_records(self): + """ + Create a record for each SFA interface + """ + # just create certs for all sfa interfaces even if they + # arent enabled + interface_hrn = self.config.SFA_INTERFACE_HRN + interfaces = ['authority+sa', 'authority+am', 'authority+sm'] + table = SfaTable() + auth_info = self.AuthHierarchy.get_auth_info(interface_hrn) + pkey = auth_info.get_pkey_object() + for interface in interfaces: + interface_record = table.find({'type': interface, 'hrn': interface_hrn}) + if not interface_record: + self.logger.info("Import: interface %s %s " % (interface_hrn, interface)) + urn = hrn_to_urn(interface_hrn, interface) + gid = self.AuthHierarchy.create_gid(urn, create_uuid(), pkey) + record = SfaRecord(hrn=interface_hrn, gid=gid, type=interface, pointer=-1) + record['authority'] = get_authority(interface_hrn) + table.insert(record) def import_person(self, parent_hrn, person): - AuthHierarchy = self.AuthHierarchy + """ + Register a user record + """ hrn = email_to_hrn(parent_hrn, person['email']) # ASN.1 will have problems with hrn's longer than 64 characters if len(hrn) > 64: hrn = hrn[:64] - self.logger.info("Import: importing person " + hrn) + self.logger.info("Import: person %s"%hrn) key_ids = [] if 'key_ids' in person and person['key_ids']: key_ids = person["key_ids"] @@ -115,14 +141,14 @@ class sfaImport: pkey = Keypair(create=True) else: # the user has no keys - self.logger.info(" person " + hrn + " does not have a PL public key") + self.logger.warning("Import: person %s does not have a PL public key"%hrn) # if a key is unavailable, then we still need to put something in the # user's GID. So make one up. pkey = Keypair(create=True) # create the gid urn = hrn_to_urn(hrn, 'user') - person_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey) + person_gid = self.AuthHierarchy.create_gid(urn, create_uuid(), pkey) table = SfaTable() person_record = SfaRecord(hrn=hrn, gid=person_gid, type="user", pointer=person['person_id']) person_record['authority'] = get_authority(person_record['hrn']) @@ -136,20 +162,19 @@ class sfaImport: table.update(person_record) def import_slice(self, parent_hrn, slice): - AuthHierarchy = self.AuthHierarchy slicename = slice['name'].split("_",1)[-1] slicename = _cleanup_string(slicename) if not slicename: - self.logger.error("Import_Slice: failed to parse slice name " + slice['name']) + self.logger.error("Import: failed to parse slice name %s" %slice['name']) return hrn = parent_hrn + "." + slicename - self.logger.info("Import: importing slice " + hrn) + self.logger.info("Import: slice %s"%hrn) pkey = Keypair(create=True) urn = hrn_to_urn(hrn, 'slice') - slice_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey) + slice_gid = self.AuthHierarchy.create_gid(urn, create_uuid(), pkey) slice_record = SfaRecord(hrn=hrn, gid=slice_gid, type="slice", pointer=slice['slice_id']) slice_record['authority'] = get_authority(slice_record['hrn']) table = SfaTable() @@ -162,17 +187,8 @@ class sfaImport: slice_record['record_id'] = existing_record['record_id'] table.update(slice_record) - def import_node(self, parent_hrn, node): - AuthHierarchy = self.AuthHierarchy - nodename = node['hostname'].split(".")[0] - nodename = _cleanup_string(nodename) - - if not nodename: - self.logger.error("Import_node: failed to parse node name " + node['hostname']) - return - - hrn = parent_hrn + "." + nodename - self.logger.info("Import: importing node " + hrn) + def import_node(self, hrn, node): + self.logger.info("Import: node %s" % hrn) # ASN.1 will have problems with hrn's longer than 64 characters if len(hrn) > 64: hrn = hrn[:64] @@ -181,7 +197,7 @@ class sfaImport: node_record = table.find({'type': 'node', 'hrn': hrn}) pkey = Keypair(create=True) urn = hrn_to_urn(hrn, 'node') - node_gid = AuthHierarchy.create_gid(urn, create_uuid(), pkey) + node_gid = self.AuthHierarchy.create_gid(urn, create_uuid(), pkey) node_record = SfaRecord(hrn=hrn, gid=node_gid, type="node", pointer=node['node_id']) node_record['authority'] = get_authority(node_record['hrn']) existing_records = table.find({'hrn': hrn, 'type': 'node', 'pointer': node['node_id']}) @@ -195,12 +211,10 @@ class sfaImport: def import_site(self, parent_hrn, site): - AuthHierarchy = self.AuthHierarchy shell = self.shell plc_auth = self.plc_auth sitename = site['login_base'] sitename = _cleanup_string(sitename) - print 'importing site %s' % sitename hrn = parent_hrn + "." + sitename # Hardcode 'internet2' into the hrn for sites hosting # internet2 nodes. This is a special operation for some vini @@ -214,13 +228,13 @@ class sfaImport: hrn = ".".join([parent_hrn, "internet2", sitename]) urn = hrn_to_urn(hrn, 'authority') - self.logger.info("Import: importing site " + hrn) + self.logger.info("Import: site %s"%hrn) # create the authority - if not AuthHierarchy.auth_exists(urn): - AuthHierarchy.create_auth(urn) + if not self.AuthHierarchy.auth_exists(urn): + self.AuthHierarchy.create_auth(urn) - auth_info = AuthHierarchy.get_auth_info(urn) + auth_info = self.AuthHierarchy.get_auth_info(urn) table = SfaTable() auth_record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="authority", pointer=site['site_id']) @@ -242,5 +256,5 @@ class sfaImport: table = SfaTable() record_list = table.find({'type': type, 'hrn': hrn}) for record in record_list: - self.logger.info("Import: Removing record %s %s" % (type, hrn)) + self.logger.info("Import: removing record %s %s" % (type, hrn)) table.remove(record)