-import os
import sys
-import datetime
-import time
from sfa.util.config import Config
-from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
-from sfa.util.plxrn import PlXrn, slicename_to_hrn, email_to_hrn, hrn_to_pl_slicename
+from sfa.util.xrn import get_authority, hrn_to_urn
+from sfa.planetlab.plxrn import PlXrn
-from sfa.senslab.LDAPapi import LDAPapi
from sfa.senslab.slabdriver import SlabDriver
-from sfa.senslab.slabpostgres import SlabSliceDB, slab_dbsession
+from sfa.senslab.slabpostgres import SliceSenslab, slab_dbsession
from sfa.trust.certificate import Keypair,convert_public_key
from sfa.trust.gid import create_uuid
from sfa.storage.alchemy import dbsession
from sfa.storage.model import RegRecord, RegAuthority, RegSlice, RegNode, RegUser, RegKey
-from sfa.storage.dbschema import DBSchema
+
def _get_site_hrn(site):
- hrn = site['login_base']
+ hrn = site['name']
return hrn
class SlabImporter:
def hostname_to_hrn(self,root_auth,login_base,hostname):
- return PlXrn(auth=root_auth,hostname=login_base+'_'+hostname).get_hrn()
+ return PlXrn(auth=root_auth,hostname = hostname).get_hrn()
def slicename_to_hrn(self, person_hrn):
return (person_hrn +'_slice')
if not slabdriver.db.exists('slice_senslab'):
slabdriver.db.createtable('slice_senslab')
- print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES CREATETABLE YAAAAAAAAAAY"
- ######## retrieve all existing SFA objects
+ self.logger.info ("SlabImporter.run: slice_senslab table created ")
+
+ #retrieve all existing SFA objects
all_records = dbsession.query(RegRecord).all()
- #print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES all_records %s" %(all_records)
+
#create hash by (type,hrn)
#used to know if a given record is already known to SFA
# create hash by (type,pointer)
self.records_by_type_pointer = \
dict ( [ ( (str(record.type),record.pointer) , record ) for record in all_records if record.pointer != -1] )
- print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES self.records_by_type_pointer %s" %( 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
try:
slices_by_userid = dict ( [ (slice.record_id_user, slice ) for slice in slices_listdict ] )
except TypeError:
- print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES slices_listdict EMPTY "
+ self.logger.log_exc("SlabImporter: failed to create list of slices by user id.")
pass
- #print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES slices_by_userid %s" %( slices_by_userid)
+
for site in sites_listdict:
site_hrn = _get_site_hrn(site)
site_record = self.find_record_by_type_hrn ('authority', site_hrn)
self.logger.warning ("SlabImporter: cannot find node_id %s - ignored"%node_id)
continue
site_auth = get_authority(site_hrn)
- site_name = site['login_base']
+ site_name = site['name']
hrn = self.hostname_to_hrn(slabdriver.root_auth, site_name, node['hostname'])
# xxx this sounds suspicious
if len(hrn) > 64: hrn = hrn[:64]
node_record = self.find_record_by_type_hrn( 'node', hrn )
- #print >>sys.stderr, " \r\n \r\n SLAB IMPORTER node_record %s " %(node_record)
if not node_record:
try:
pkey = Keypair(create=True)
urn = hrn_to_urn(hrn, 'node')
- #print>>sys.stderr, "\r\n \r\n SLAB IMPORTER NODE IMPORT urn %s hrn %s" %(urn, hrn)
node_gid = self.auth_hierarchy.create_gid(urn, create_uuid(), pkey)
node_record = RegNode (hrn=hrn, gid=node_gid,
- pointer =node['node_id'],
+ pointer = '-1',
authority=get_authority(hrn))
node_record.just_created()
dbsession.add(node_record)
user_record = self.find_record_by_type_hrn( 'user', person_hrn)
slice_record = self.find_record_by_type_hrn ('slice', slice_hrn)
- print>>sys.stderr, "\r\n \r\n SLAB IMPORTER FROM LDAP LIST PERSON IMPORT user_record %s " %(user_record)
-
# return a tuple pubkey (a plc key object) and pkey (a Keypair object)
def init_person_key (person, slab_key):
# 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
- #def key_in_list (key,sfa_keys):
- #for reg_key in sfa_keys:
- #if reg_key.key==key['key']: return True
- #return False
- # is there a new key in myplc ?
- new_keys=False
+
+ new_key=False
if slab_key is not sfa_keys :
- new_keys = True
- if new_keys:
+ new_key = True
+ if new_key:
(pubkey,pkey) = init_person_key (person, slab_key)
person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
if not pubkey:
#Get it
sl_rec = dbsession.query(RegSlice).filter(RegSlice.hrn.match(slice_hrn)).all()
- slab_slice = SlabSliceDB( slice_hrn = slice_hrn, record_id_slice=sl_rec[0].record_id, record_id_user= user_record.record_id)
+ 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.update_just_added_records_dict ( slice_record )
except:
self.logger.log_exc("SlabImporter: failed to import slice")
+
+ #No slice update upon import in senslab
else:
# xxx update the record ...
self.logger.warning ("Slice update not yet implemented")
dbsession.commit()
-
\ No newline at end of file
+
git://git.onelab.eu / sfa.git / blobdiff