X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2FsfaImport.py;h=320730d49bf2ca779a0b2a7220ac0168c185a168;hb=0cf0d31c313a366e3f272f830bdb4f2a7308e11f;hp=8bcf4205e7c4fd3960bcad1e0576f84094a0f300;hpb=256e32eb6cdcecc9b983f2bba4fc3bcb2fbd34f8;p=sfa.git diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py index 8bcf4205..320730d4 100644 --- a/sfa/plc/sfaImport.py +++ b/sfa/plc/sfaImport.py @@ -12,24 +12,24 @@ import getopt import sys import tempfile +from sfa.util.sfalogging import sfa_import_logger from sfa.util.record import * from sfa.util.table import SfaTable from sfa.util.namespace import * from sfa.util.config import Config -from sfa.util.report import trace, error from sfa.trust.certificate import convert_public_key, Keypair from sfa.trust.trustedroot import * from sfa.trust.hierarchy import * from sfa.trust.gid import create_uuid -def un_unicode(str): +def _un_unicode(str): if isinstance(str, unicode): return str.encode("ascii", "ignore") else: return str -def cleanup_string(str): +def _cleanup_string(str): # pgsql has a fit with strings that have high ascii in them, so filter it # out when generating the hrns. tmp = "" @@ -38,7 +38,7 @@ def cleanup_string(str): tmp = tmp + c str = tmp - str = un_unicode(str) + str = _un_unicode(str) str = str.replace(" ", "_") str = str.replace(".", "_") str = str.replace("(", "_") @@ -49,16 +49,13 @@ def cleanup_string(str): class sfaImport: - def __init__(self, logger=None): - self.logger = logger + 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 - self.level1_auth = self.config.SFA_REGISTRY_LEVEL1_AUTH - if not self.level1_auth or self.level1_auth in ['']: - self.level1_auth = None # connect to planetlab self.shell = None @@ -73,30 +70,27 @@ class sfaImport: def create_top_level_auth_records(self, hrn): AuthHierarchy = self.AuthHierarchy urn = hrn_to_urn(hrn, 'authority') - # if auth records for this hrn dont exist, create it + # 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) + + # create the authority if it doesnt already exist if not AuthHierarchy.auth_exists(urn): - trace("Import: creating top level authorites", self.logger) + self.logger.info("Import: creating top level authorites") AuthHierarchy.create_auth(urn) - - # get the auth info of the newly created root auth (parent) - # or level1_auth if it exists - if self.level1_auth: - auth_info = AuthHierarchy.get_auth_info(hrn) - parent_hrn = hrn - else: - parent_hrn = get_authority(hrn) - if not parent_hrn: - parent_hrn = hrn - auth_info = AuthHierarchy.get_auth_info(parent_hrn) - + # create the db record if it doesnt already exist + auth_info = 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']) - trace("Import: inserting authority record for " + hrn, self.logger) + self.logger.info("Import: inserting authority record for " + hrn) table.insert(auth_record) @@ -108,7 +102,7 @@ class sfaImport: if len(hrn) > 64: hrn = hrn[:64] - trace("Import: importing person " + hrn, self.logger) + self.logger.info("Import: importing person " + hrn) key_ids = [] if 'key_ids' in person and person['key_ids']: key_ids = person["key_ids"] @@ -121,7 +115,7 @@ class sfaImport: pkey = Keypair(create=True) else: # the user has no keys - trace(" person " + hrn + " does not have a PL public key", self.logger) + self.logger.info(" person " + hrn + " does not have a PL public key") # 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) @@ -136,7 +130,7 @@ class sfaImport: if not existing_records: table.insert(person_record) else: - trace("Import: %s exists, updating " % hrn, self.logger) + self.logger.info("Import: %s exists, updating " % hrn) existing_record = existing_records[0] person_record['record_id'] = existing_record['record_id'] table.update(person_record) @@ -144,14 +138,14 @@ class sfaImport: def import_slice(self, parent_hrn, slice): AuthHierarchy = self.AuthHierarchy slicename = slice['name'].split("_",1)[-1] - slicename = cleanup_string(slicename) + slicename = _cleanup_string(slicename) if not slicename: - error("Import_Slice: failed to parse slice name " + slice['name'], self.logger) + self.logger.error("Import_Slice: failed to parse slice name " + slice['name']) return hrn = parent_hrn + "." + slicename - trace("Import: importing slice " + hrn, self.logger) + self.logger.info("Import: importing slice " + hrn) pkey = Keypair(create=True) urn = hrn_to_urn(hrn, 'slice') @@ -163,7 +157,7 @@ class sfaImport: if not existing_records: table.insert(slice_record) else: - trace("Import: %s exists, updating " % hrn, self.logger) + self.logger.info("Import: %s exists, updating " % hrn) existing_record = existing_records[0] slice_record['record_id'] = existing_record['record_id'] table.update(slice_record) @@ -171,14 +165,14 @@ class sfaImport: def import_node(self, parent_hrn, node): AuthHierarchy = self.AuthHierarchy nodename = node['hostname'].split(".")[0] - nodename = cleanup_string(nodename) + nodename = _cleanup_string(nodename) if not nodename: - error("Import_node: failed to parse node name " + node['hostname'], self.logger) + self.logger.error("Import_node: failed to parse node name " + node['hostname']) return hrn = parent_hrn + "." + nodename - trace("Import: importing node " + hrn, self.logger) + self.logger.info("Import: importing node " + hrn) # ASN.1 will have problems with hrn's longer than 64 characters if len(hrn) > 64: hrn = hrn[:64] @@ -194,7 +188,7 @@ class sfaImport: if not existing_records: table.insert(node_record) else: - trace("Import: %s exists, updating " % hrn, self.logger) + self.logger.info("Import: %s exists, updating " % hrn) existing_record = existing_records[0] node_record['record_id'] = existing_record['record_id'] table.update(node_record) @@ -205,9 +199,9 @@ class sfaImport: shell = self.shell plc_auth = self.plc_auth sitename = site['login_base'] - sitename = cleanup_string(sitename) + sitename = _cleanup_string(sitename) + print 'importing site %s' % sitename hrn = parent_hrn + "." + sitename - urn = hrn_to_urn(hrn, 'authority') # Hardcode 'internet2' into the hrn for sites hosting # internet2 nodes. This is a special operation for some vini # sites only @@ -219,7 +213,8 @@ class sfaImport: #sitename = sitename.replace("nlr", "") hrn = ".".join([parent_hrn, "internet2", sitename]) - trace("Import: importing site " + hrn, self.logger) + urn = hrn_to_urn(hrn, 'authority') + self.logger.info("Import: importing site " + hrn) # create the authority if not AuthHierarchy.auth_exists(urn): @@ -234,7 +229,7 @@ class sfaImport: if not existing_records: table.insert(auth_record) else: - trace("Import: %s exists, updating " % hrn, self.logger) + self.logger.info("Import: %s exists, updating " % hrn) existing_record = existing_records[0] auth_record['record_id'] = existing_record['record_id'] table.update(auth_record) @@ -247,5 +242,5 @@ class sfaImport: table = SfaTable() record_list = table.find({'type': type, 'hrn': hrn}) for record in record_list: - trace("Import: Removing record %s %s" % (type, hrn), self.logger) + self.logger.info("Import: Removing record %s %s" % (type, hrn)) table.remove(record)