git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plimporter: use Site/Slice/Person HRN tags instead of calculating the HRN
[sfa.git]
/
sfa
/
importer
/
plimporter.py
diff --git
a/sfa/importer/plimporter.py
b/sfa/importer/plimporter.py
index
1a296e1
..
c320482
100644
(file)
--- a/
sfa/importer/plimporter.py
+++ b/
sfa/importer/plimporter.py
@@
-147,12
+147,12
@@
class PlImporter:
# Get all plc sites
# retrieve only required stuf
sites = shell.GetSites({'peer_id': None, 'enabled' : True},
# 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', 'name'])
+ ['site_id','login_base','node_ids','slice_ids','person_ids', 'name'
, 'hrn'
])
# 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
persons = shell.GetPersons({'peer_id': None, 'enabled': True},
# 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
persons = shell.GetPersons({'peer_id': None, 'enabled': True},
- ['person_id', 'email', 'key_ids', 'site_ids', 'role_ids'])
+ ['person_id', 'email', 'key_ids', 'site_ids', 'role_ids'
, 'hrn'
])
# create a hash of persons by person_id
persons_by_id = dict ( [ ( person['person_id'], person) for person in persons ] )
# also gather non-enabled user accounts so as to issue relevant warnings
# create a hash of persons by person_id
persons_by_id = dict ( [ ( person['person_id'], person) for person in persons ] )
# also gather non-enabled user accounts so as to issue relevant warnings
@@
-185,13
+185,17
@@
class PlImporter:
# create hash by node_id
nodes_by_id = dict ( [ ( node['node_id'], node, ) for node in nodes ] )
# Get all plc slices
# create hash by node_id
nodes_by_id = dict ( [ ( node['node_id'], node, ) for node in nodes ] )
# Get all plc slices
- slices = shell.GetSlices( {'peer_id': None}, ['slice_id', 'name', 'person_ids'])
+ slices = shell.GetSlices( {'peer_id': None}, ['slice_id', 'name', 'person_ids'
, 'hrn'
])
# create hash by slice_id
slices_by_id = dict ( [ (slice['slice_id'], slice ) for slice in slices ] )
# isolate special vini case in separate method
self.create_special_vini_record (interface_hrn)
# create hash by slice_id
slices_by_id = dict ( [ (slice['slice_id'], slice ) for slice in slices ] )
# isolate special vini case in separate method
self.create_special_vini_record (interface_hrn)
+ # Get top authority record
+ top_auth_record=self.locate_by_type_hrn ('authority', root_auth)
+ admins = []
+
# start importing
for site in sites:
try:
# start importing
for site in sites:
try:
@@
-201,7
+205,8
@@
class PlImporter:
if site['name'].startswith('sfa:') or site_sfa_created == 'True':
continue
if site['name'].startswith('sfa:') or site_sfa_created == 'True':
continue
- site_hrn = _get_site_hrn(interface_hrn, site)
+ #site_hrn = _get_site_hrn(interface_hrn, site)
+ site_hrn = site['hrn']
# import if hrn is not in list of existing hrns or if the hrn exists
# but its not a site record
site_record=self.locate_by_type_hrn ('authority', site_hrn)
# import if hrn is not in list of existing hrns or if the hrn exists
# but its not a site record
site_record=self.locate_by_type_hrn ('authority', site_hrn)
@@
-277,7
+282,8
@@
class PlImporter:
# make sure to NOT run this if anything is wrong
if not proceed: continue
# make sure to NOT run this if anything is wrong
if not proceed: continue
- person_hrn = email_to_hrn(site_hrn, person['email'])
+ #person_hrn = email_to_hrn(site_hrn, person['email'])
+ person_hrn = person['hrn']
# xxx suspicious again
if len(person_hrn) > 64: person_hrn = person_hrn[:64]
person_urn = hrn_to_urn(person_hrn, 'user')
# xxx suspicious again
if len(person_hrn) > 64: person_hrn = person_hrn[:64]
person_urn = hrn_to_urn(person_hrn, 'user')
@@
-372,6
+378,11
@@
class PlImporter:
# PI is coded with role_id==20
if 20 in person['role_ids']:
site_pis.append (user_record)
# PI is coded with role_id==20
if 20 in person['role_ids']:
site_pis.append (user_record)
+
+ # PL Admins need to marked as PI of the top authority record
+ if 10 in person['role_ids'] and user_record not in top_auth_record.reg_pis:
+ admins.append(user_record)
+
except:
self.logger.log_exc("PlImporter: failed to import person %d %s"%(person['person_id'],person['email']))
except:
self.logger.log_exc("PlImporter: failed to import person %d %s"%(person['person_id'],person['email']))
@@
-391,7
+402,9
@@
class PlImporter:
slice = slices_by_id[slice_id]
except:
self.logger.warning ("PlImporter: cannot locate slice_id %s - ignored"%slice_id)
slice = slices_by_id[slice_id]
except:
self.logger.warning ("PlImporter: cannot locate slice_id %s - ignored"%slice_id)
- slice_hrn = slicename_to_hrn(interface_hrn, slice['name'])
+ continue
+ #slice_hrn = slicename_to_hrn(interface_hrn, slice['name'])
+ slice_hrn = slice['hrn']
slice_record = self.locate_by_type_hrn ('slice', slice_hrn)
if not slice_record:
try:
slice_record = self.locate_by_type_hrn ('slice', slice_hrn)
if not slice_record:
try:
@@
-419,6
+432,12
@@
class PlImporter:
global_dbsession.commit()
slice_record.stale=False
global_dbsession.commit()
slice_record.stale=False
+ # Set PL Admins as PI's of the top authority
+ if admins:
+ top_auth_record.reg_pis = list(set(admins))
+ global_dbsession.commit()
+ self.logger.info('PlImporter: set PL admins %s as PIs of %s'%(admins,top_auth_record.hrn))
+
### remove stale records
# special records must be preserved
system_hrns = [interface_hrn, root_auth, interface_hrn + '.slicemanager']
### remove stale records
# special records must be preserved
system_hrns = [interface_hrn, root_auth, interface_hrn + '.slicemanager']