from sfa.util.xrn import Xrn, get_authority, hrn_to_urn
from sfa.senslab.slabdriver import SlabDriver
-from sfa.senslab.slabpostgres import SliceSenslab, slab_dbsession
-from sfa.trust.certificate import Keypair,convert_public_key
+from sfa.trust.certificate import Keypair, convert_public_key
from sfa.trust.gid import create_uuid
from sfa.storage.alchemy import dbsession
self.logger.setLevelDebug()
def hostname_to_hrn_escaped(self, root_auth, hostname):
- return '.'.join( [root_auth,Xrn.escape(hostname)] )
+ return '.'.join( [root_auth, Xrn.escape(hostname)] )
# we don't have any options for now
pass
- def find_record_by_type_hrn(self,type,hrn):
- return self.records_by_type_hrn.get ( (type, hrn), None)
+ def find_record_by_type_hrn(self, record_type, hrn):
+ return self.records_by_type_hrn.get ( (record_type, hrn), None)
- def locate_by_type_pointer (self, type, pointer):
- print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES locate_by_type_pointer .........................."
- ret = self.records_by_type_pointer.get ( (type, pointer), None)
- print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES locate_by_type_pointer "
+ def locate_by_type_pointer (self, record_type, pointer):
+ print >>sys.stderr, " \r\n \r\n \t SLABPOSTGRES locate_by_type_pointer .........................."
+ ret = self.records_by_type_pointer.get ( (record_type, pointer), None)
+ print >>sys.stderr, " \r\n \r\n \t SLABPOSTGRES locate_by_type_pointer "
return ret
def update_just_added_records_dict (self, record):
- tuple = (record.type, record.hrn)
- if tuple in self.records_by_type_hrn:
- self.logger.warning ("SlabImporter.update_just_added_records_dict: duplicate (%s,%s)"%tuple)
+ rec_tuple = (record.type, record.hrn)
+ if rec_tuple in self.records_by_type_hrn:
+ self.logger.warning ("SlabImporter.update_just_added_records_dict: duplicate (%s,%s)"%rec_tuple)
return
- self.records_by_type_hrn [ tuple ] = record
+ self.records_by_type_hrn [ rec_tuple ] = record
def run (self, options):
config = Config()
#Create special slice table for senslab
- if not slabdriver.db.exists('slice_senslab'):
+ if not slabdriver.db.exists('slab_xp'):
slabdriver.db.createtable()
- self.logger.info ("SlabImporter.run: slice_senslab table created ")
+ self.logger.info ("SlabImporter.run: slab_xp table created ")
#retrieve all existing SFA objects
all_records = dbsession.query(RegRecord).all()
self.records_by_type_hrn = \
dict ( [ ( (record.type,record.hrn) , record ) for record in all_records ] )
+ print>>sys.stderr,"\r\n SLABIMPORT \t all_records[0] %s all_records[0].email %s \r\n" %(all_records[0].type, all_records[0])
+ self.users_rec_by_email = \
+ dict ( [ (record.email, record) for record in all_records if record.type == 'user' ] )
# create hash by (type,pointer)
self.records_by_type_pointer = \
# initialize record.stale to True by default, then mark stale=False on the ones that are in use
for record in all_records:
- record.stale=True
+ record.stale = True
- nodes_listdict = slabdriver.GetNodes()
+ nodes_listdict = slabdriver.slab_api.GetNodes()
nodes_by_id = dict([(node['node_id'],node) for node in nodes_listdict])
- sites_listdict = slabdriver.GetSites()
+ sites_listdict = slabdriver.slab_api.GetSites()
- ldap_person_listdict = slabdriver.GetPersons()
+ ldap_person_listdict = slabdriver.slab_api.GetPersons()
print>>sys.stderr,"\r\n SLABIMPORT \t ldap_person_listdict %s \r\n" %(ldap_person_listdict)
- slices_listdict = slabdriver.GetSlices()
+ slices_listdict = slabdriver.slab_api.GetSlices()
try:
- slices_by_userid = dict ( [ (one_slice['record_id_user'], one_slice ) for one_slice in slices_listdict ] )
+ slices_by_userid = dict ( [ (one_slice['reg_researchers']['record_id'], one_slice ) for one_slice in slices_listdict ] )
except TypeError:
- self.logger.log_exc("SlabImporter: failed to create list of slices by user id.")
- pass
+ self.logger.log_exc("SlabImporter: failed to create list of slices by user id.")
+ pass
for site in sites_listdict:
site_hrn = _get_site_hrn(site)
else:
# xxx update the record ...
pass
- site_record.stale=False
+ site_record.stale = False
# import node records in site
for node_id in site['node_ids']:
continue
site_auth = get_authority(site_hrn)
site_name = site['name']
- escaped_hrn = self.hostname_to_hrn_escaped(slabdriver.root_auth, node['hostname'])
+ escaped_hrn = self.hostname_to_hrn_escaped(slabdriver.slab_api.root_auth, node['hostname'])
print>>sys.stderr, "\r\n \r\n SLABIMPORTER node %s " %(node)
hrn = node['hrn']
node_record.just_created()
dbsession.add(node_record)
dbsession.commit()
- self.logger.info("SlabImporter: imported node: %s" % node_record)
+ #self.logger.info("SlabImporter: imported node: %s" % node_record)
self.update_just_added_records_dict(node_record)
except:
self.logger.log_exc("SlabImporter: failed to import node")
# import persons
for person in ldap_person_listdict :
- print>>sys.stderr,"SlabImporter: person: %s" %(person['hrn'])
+
+
+ print>>sys.stderr,"SlabImporter: person: %s" %(person)
if 'ssh-rsa' not in person['pkey']:
#people with invalid ssh key (ssh-dss, empty, bullshit keys...)
#won't be imported
# xxx suspicious again
if len(person_hrn) > 64: person_hrn = person_hrn[:64]
person_urn = hrn_to_urn(person_hrn, 'user')
-
+
+
+ print>>sys.stderr," \r\n SlabImporter: HEYYYYYYYYYY" , self.users_rec_by_email
+
+ #Check if user using person['email'] form LDAP is already registered
+ #in SFA. One email = one person. Inb this case, do not create another
+ #record for this person
+ #person_hrn returned by GetPErson based on senslab root auth + uid ldap
user_record = self.find_record_by_type_hrn('user', person_hrn)
+ if not user_record and person['email'] in self.users_rec_by_email:
+ user_record = self.users_rec_by_email[person['email']]
+ person_hrn = user_record.hrn
+ person_urn = hrn_to_urn(person_hrn, 'user')
+
+
slice_record = self.find_record_by_type_hrn ('slice', slice_hrn)
# return a tuple pubkey (a plc key object) and pkey (a Keypair object)
# if user's primary key has changed then we need to update the
# users gid by forcing an update here
sfa_keys = user_record.reg_keys
- print>>sys.stderr,"SlabImporter: \t \t USER UPDATE person: %s" %(person['hrn'])
+
new_key=False
if slab_key is not sfa_keys :
new_key = True
if new_key:
+ print>>sys.stderr,"SlabImporter: \t \t USER UPDATE person: %s" %(person['hrn'])
(pubkey,pkey) = init_person_key (person, slab_key)
person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
if not pubkey:
user_record.email = person['email']
dbsession.commit()
- user_record.stale=False
+
+ user_record.stale = False
except:
self.logger.log_exc("SlabImporter: failed to import person %s"%(person) )
try:
- slice = slices_by_userid[user_record.record_id]
+ single_slice = slices_by_userid[user_record.record_id]
except:
self.logger.warning ("SlabImporter: cannot locate slices_by_userid[user_record.record_id] %s - ignored"%user_record)
#Get it
sl_rec = dbsession.query(RegSlice).filter(RegSlice.hrn.match(slice_hrn)).all()
- slab_slice = SliceSenslab( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id)
- print>>sys.stderr, "\r\n \r\n SLAB IMPORTER SLICE IMPORT NOTslice_record %s \r\n slab_slice %s" %(sl_rec,slab_slice)
- slab_dbsession.add(slab_slice)
- slab_dbsession.commit()
- self.logger.info("SlabImporter: imported slice: %s" % slice_record)
+ #slab_slice = SenslabXP( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id)
+ #print>>sys.stderr, "\r\n \r\n SLAB IMPORTER SLICE IMPORT NOTslice_record %s \r\n slab_slice %s" %(sl_rec,slab_slice)
+ #slab_dbsession.add(slab_slice)
+ #slab_dbsession.commit()
+ #self.logger.info("SlabImporter: imported slice: %s" % slice_record)
self.update_just_added_records_dict ( slice_record )
except:
### remove stale records
# special records must be preserved
- system_hrns = [slabdriver.hrn, slabdriver.root_auth, slabdriver.hrn+ '.slicemanager']
+ system_hrns = [slabdriver.hrn, slabdriver.slab_api.root_auth, \
+ slabdriver.hrn+ '.slicemanager']
for record in all_records:
if record.hrn in system_hrns:
record.stale=False
record.stale=False
- for record in all_records:
+ for record in all_records:
+ if record.type == 'user':
+ print>>sys.stderr,"SlabImporter: stale records: hrn %s %s" \
+ %(record.hrn,record.stale)
try:
stale=record.stale
except:
self.logger.warning("stale not found with %s"%record)
if stale:
self.logger.info("SlabImporter: deleting stale record: %s" % record)
+ #if record.type == 'user':
+ #rec = slab_dbsession.query(SenslabXP).filter_by(record_id_user = record.record_id).first()
+ #slab_dbsession.delete(rec)
+ #slab_dbsession.commit()
dbsession.delete(record)
dbsession.commit()
git://git.onelab.eu / sfa.git / blobdiff