From: Mohamed Larabi Date: Fri, 4 Oct 2013 14:19:23 +0000 (+0200) Subject: PL importer: do not import external sites, persons and slices into the registry X-Git-Tag: sfa-2.1-27~11 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=10dd436c0702b4db6d45c33cca6e3d83a84a338b PL importer: do not import external sites, persons and slices into the registry --- diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py index 7994c8c9..26d1ccdc 100644 --- a/sfa/importer/plimporter.py +++ b/sfa/importer/plimporter.py @@ -145,7 +145,7 @@ class PlImporter: # Get all plc sites # retrieve only required stuf sites = shell.GetSites({'peer_id': None, 'enabled' : True}, - ['site_id','login_base','node_ids','slice_ids','person_ids',]) + ['site_id','login_base','node_ids','slice_ids','person_ids', 'name']) # create a hash of sites by login_base # sites_by_login_base = dict ( [ ( site['login_base'], site ) for site in sites ] ) # Get all plc users @@ -192,6 +192,9 @@ class PlImporter: # start importing for site in sites: + if site['name'].startswith('sfa.'): + continue + site_hrn = _get_site_hrn(interface_hrn, site) # import if hrn is not in list of existing hrns or if the hrn exists # but its not a site record