From d7e809ecf42b5d2b1fee91c30473b98bf886c7fa Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 16 Oct 2011 22:14:30 -0400 Subject: [PATCH] create a user record for the slice manager. --- sfa/plc/sfa-import-plc.py | 14 ++++++++++---- sfa/plc/sfaImport.py | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/sfa/plc/sfa-import-plc.py b/sfa/plc/sfa-import-plc.py index 352486cb..3c005881 100755 --- a/sfa/plc/sfa-import-plc.py +++ b/sfa/plc/sfa-import-plc.py @@ -89,6 +89,9 @@ def main(): if not root_auth == interface_hrn: sfaImporter.create_top_level_auth_records(interface_hrn) + # create s user record for the slice manager + sfaImporter.create_sm_client_record() + # create interface records sfaImporter.logger.info("Import: creating interface records") sfaImporter.create_interface_records() @@ -207,14 +210,17 @@ def main(): (hrn, 'user') not in existing_records or update_record: sfaImporter.import_person(site_hrn, person) + # remove stale records + system_records = [interface_hrn, root_auth, interface_hrn + '.slicemanager'] for (record_hrn, type) in existing_records.keys(): + if record_hrn in system_records: + continue + record = existing_records[(record_hrn, type)] - # if this is the interface name dont do anything - if record_hrn == interface_hrn or \ - record_hrn == root_auth or \ - record['peer_authority']: + if 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 interface_hrn and interface_hrn.endswith('vini') and \ diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py index cadefd71..1effe718 100644 --- a/sfa/plc/sfaImport.py +++ b/sfa/plc/sfaImport.py @@ -96,6 +96,24 @@ class sfaImport: self.logger.info("Import: inserting authority record for %s"%hrn) table.insert(auth_record) + def create_sm_client_record(self): + """ + Create a user record for the Slicemanager service. + """ + hrn = self.config.SFA_INTERFACE_HRN + '.slicemanager' + urn = hrn_to_urn(hrn, 'user') + if not self.AuthHierarchy.auth_exists(urn): + self.logger.info("Import: creating Slice Manager user") + self.AuthHierarchy.create_auth(urn) + + auth_info = self.AuthHierarchy.get_auth_info(hrn) + table = SfaTable() + sm_user_record = table.find({'type': 'user', 'hrn': hrn}) + if not sm_user_record: + record = SfaRecord(hrn=hrn, gid=auth_info.get_gid_object(), type="user", pointer=-1) + record['authority'] = get_authority(record['hrn']) + table.insert(record) + def create_interface_records(self): """ Create a record for each SFA interface @@ -116,7 +134,9 @@ class sfaImport: 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): """ Register a user record -- 2.45.2