From 673845596b46128dcf0df9205bf7e5589dd652e3 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 7 May 2010 00:49:28 +0000 Subject: [PATCH] remove all refrences to level1_auth --- config/default_config.xml | 9 +-------- config/sfa-config-tty | 1 - sfa/plc/sfa-import-plc.py | 39 ++++++++++++++++----------------------- sfa/plc/sfaImport.py | 22 ++++++---------------- 4 files changed, 23 insertions(+), 48 deletions(-) diff --git a/config/default_config.xml b/config/default_config.xml index 79d6955e..d40fd6d1 100644 --- a/config/default_config.xml +++ b/config/default_config.xml @@ -76,14 +76,7 @@ $URL$ The hrn of the registry's root auth. - - Level1 Authority - - The hrn of the registry's level1 auth (sub - authority). The full name of this interface (only secify if - this interface is a sub authority). - - + diff --git a/config/sfa-config-tty b/config/sfa-config-tty index ed77fb1e..9b2c439e 100755 --- a/config/sfa-config-tty +++ b/config/sfa-config-tty @@ -15,7 +15,6 @@ def validator(validated_variables): usual_variables = [ "SFA_INTERFACE_HRN", "SFA_REGISTRY_ROOT_AUTH", - "SFA_REGISTRY_LEVEL1_AUTH", "SFA_REGISTRY_HOST", "SFA_AGGREGATE_HOST", "SFA_SM_HOST", diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py index 160ce77c..603f2960 100755 --- a/sfa/plc/sfa-import-plc.py +++ b/sfa/plc/sfa-import-plc.py @@ -74,7 +74,7 @@ def main(): if not config.SFA_REGISTRY_ENABLED: sys.exit(0) root_auth = config.SFA_REGISTRY_ROOT_AUTH - level1_auth = config.SFA_REGISTRY_LEVEL1_AUTH + interface_hrn = config.SFA_INTERFACE_HRN keys_filename = config.config_path + os.sep + 'person_keys.py' sfaImporter = sfaImport(logger) shell = sfaImporter.shell @@ -85,27 +85,20 @@ def main(): if not table.exists(): table.create() - if not level1_auth or level1_auth in ['']: - level1_auth = None - - if not level1_auth: - sfaImporter.create_top_level_auth_records(root_auth) - import_auth = root_auth - else: - if not AuthHierarchy.auth_exists(level1_auth): - AuthHierarchy.create_auth(level1_auth) - sfaImporter.create_top_level_auth_records(level1_auth) - import_auth = level1_auth + # create root authority + sfaImporter.create_top_level_auth_records(root_auth) + if not root_auth == interface_hrn + sfaImporter.create_top_level_auth_records(interface_hrn) - trace("Import: adding " + import_auth + " to trusted list", logger) - authority = AuthHierarchy.get_auth_info(import_auth) + trace("Import: adding " + interface_hrn + " to trusted list", logger) + authority = AuthHierarchy.get_auth_info(interface_hrn) TrustedRoots.add_gid(authority.get_gid_object()) - if ".vini" in import_auth and import_auth.endswith('vini'): + if ".vini" in interface_hrn and interface_hrn.endswith('vini'): # create a fake internet2 site first i2site = {'name': 'Internet2', 'abbreviated_name': 'I2', 'login_base': 'internet2', 'site_id': -1} - sfaImporter.import_site(import_auth, i2site) + sfaImporter.import_site(interface_hrn, i2site) # create dict of all existing sfa records existing_records = {} @@ -158,19 +151,19 @@ def main(): # start importing for site in sites: - site_hrn = import_auth + "." + site['login_base'] + site_hrn = interface_hrn + "." + site['login_base'] # import if hrn is not in list of existing hrns or if the hrn exists # but its not a site record if site_hrn not in existing_hrns or \ (site_hrn, 'authority') not in existing_records: - site_hrn = sfaImporter.import_site(import_auth, site) + site_hrn = sfaImporter.import_site(interface_hrn, site) # import node records for node_id in site['node_ids']: if node_id not in nodes_dict: continue node = nodes_dict[node_id] - hrn = hostname_to_hrn(import_auth, site['login_base'], node['hostname']) + hrn = hostname_to_hrn(interface_hrn, site['login_base'], node['hostname']) if hrn not in existing_hrns or \ (hrn, 'node') not in existing_records: sfaImporter.import_node(site_hrn, node) @@ -180,7 +173,7 @@ def main(): if slice_id not in slices_dict: continue slice = slices_dict[slice_id] - hrn = slicename_to_hrn(import_auth, slice['name']) + hrn = slicename_to_hrn(interface_hrn, slice['name']) if hrn not in existing_hrns or \ (hrn, 'slice') not in existing_records: sfaImporter.import_slice(site_hrn, slice) @@ -210,11 +203,11 @@ def main(): for (record_hrn, type) in existing_records.keys(): record = existing_records[(record_hrn, type)] # if this is the interface name dont do anything - if record_hrn == import_auth or record['peer_authority']: + if record_hrn == interface_hrn or record['peer_authority']: continue # dont delete vini's internet2 placeholdder record # normally this would be deleted becuase it does not have a plc record - if ".vini" in import_auth and import_auth.endswith('vini') and \ + if ".vini" in interface_hrn and interface_hrn.endswith('vini') and \ record_hrn.endswith("internet2"): continue @@ -222,7 +215,7 @@ def main(): if type == 'authority': for site in sites: - site_hrn = import_auth + "." + site['login_base'] + site_hrn = interface_hrn + "." + site['login_base'] if site_hrn == record_hrn and site['site_id'] == record['pointer']: found = True break diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py index 8bcf4205..a749f325 100644 --- a/sfa/plc/sfaImport.py +++ b/sfa/plc/sfaImport.py @@ -56,9 +56,6 @@ class sfaImport: 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 @@ -71,25 +68,18 @@ class sfaImport: def create_top_level_auth_records(self, hrn): + # create the authority if it doesnt already exist AuthHierarchy = self.AuthHierarchy urn = hrn_to_urn(hrn, 'authority') - # if auth records for this hrn dont exist, create it if not AuthHierarchy.auth_exists(urn): trace("Import: creating top level authorites", self.logger) 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 = get_authority(hrn) + if not parent_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) - + auth_info = AuthHierarchy.get_auth_info(parent_hrn) + + # create the db record if it doesnt already exist table = SfaTable() auth_record = table.find({'type': 'authority', 'hrn': hrn}) -- 2.43.0