# get this slice's authority (site)
slice_authority = get_authority(hrn)
- site_authority = slice_authority
+ #Senslab stuff
+ #This slice belongs to the current site
+ if slice_authority == self.driver.slab_api.root_auth:
+ site_authority = slice_authority
+ return None
+
+ site_authority = get_authority(slice_authority).lower()
# get this site's authority (sfa root authority or sub authority)
- #site_authority = get_authority(slice_authority).lower()
+
logger.debug("SLABSLICES \ get_peer slice_authority %s \
site_authority %s hrn %s" %(slice_authority, \
site_authority, hrn))
- #This slice belongs to the current site
- if site_authority == self.driver.root_auth :
- return None
+
+
# check if we are already peered with this site_authority, if so
- #peers = self.driver.GetPeers({})
- peers = self.driver.GetPeers(peer_filter = slice_authority)
+ #peers = self.driver.slab_api.GetPeers({})
+ peers = self.driver.slab_api.GetPeers(peer_filter = site_authority)
for peer_record in peers:
if site_authority == peer_record.hrn:
def verify_slice_leases(self, sfa_slice, requested_jobs_dict, peer):
-
+ logger.debug("SLABSLICES verify_slice_leases sfa_slice %s \
+ "%( sfa_slice))
#First get the list of current leases from OAR
- leases = self.driver.GetLeases({'name':sfa_slice['slice_hrn']})
+ leases = self.driver.slab_api.GetLeases({'name':sfa_slice['hrn']})
logger.debug("SLABSLICES verify_slice_leases requested_jobs_dict %s \
leases %s "%(requested_jobs_dict, leases ))
else:
#New lease
- job = requested_jobs_dict[str(start_time)]
- logger.debug("SLABSLICES \
- NEWLEASE slice %s job %s"\
- %(sfa_slice, job))
- self.driver.AddLeases(job['hostname'], \
- sfa_slice, int(job['start_time']), \
- int(job['duration']))
+ job = requested_jobs_dict[str(start_time)]
+ logger.debug("SLABSLICES \
+ NEWLEASE slice %s job %s"\
+ %(sfa_slice, job))
+ self.driver.slab_api.AddLeases(job['hostname'], \
+ sfa_slice, int(job['start_time']), \
+ int(job['duration']))
#Deleted leases are the ones with lease id not declared in the Rspec
if deleted_leases:
- self.driver.DeleteLeases(deleted_leases, sfa_slice['slice_hrn'])
+ self.driver.slab_api.DeleteLeases(deleted_leases, sfa_slice['hrn'])
logger.debug("SLABSLICES \
verify_slice_leases slice %s deleted_leases %s"\
%(sfa_slice, deleted_leases))
if reschedule_jobs_dict :
for start_time in reschedule_jobs_dict:
job = reschedule_jobs_dict[start_time]
- self.driver.AddLeases(job['hostname'], \
+ self.driver.slab_api.AddLeases(job['hostname'], \
sfa_slice, int(job['start_time']), \
int(job['duration']))
return leases
deleted_nodes = []
if 'node_ids' in sfa_slice:
- nodes = self.driver.GetNodes(sfa_slice['list_node_ids'], \
+ nodes = self.driver.slab_api.GetNodes(sfa_slice['list_node_ids'], \
['hostname'])
current_slivers = [node['hostname'] for node in nodes]
if deleted_nodes:
#Delete the entire experience
- self.driver.DeleteSliceFromNodes(sfa_slice)
+ self.driver.slab_api.DeleteSliceFromNodes(sfa_slice)
#self.driver.DeleteSliceFromNodes(sfa_slice['slice_hrn'], \
#deleted_nodes)
return nodes
def free_egre_key(self):
used = set()
- for tag in self.driver.GetSliceTags({'tagname': 'egre_key'}):
+ for tag in self.driver.slab_api.GetSliceTags({'tagname': 'egre_key'}):
used.add(int(tag['value']))
for i in range(1, 256):
# bind site
try:
if site:
- self.driver.BindObjectToPeer('site', site['site_id'], \
+ self.driver.slab_api.BindObjectToPeer('site', site['site_id'], \
peer['shortname'], sfa_slice['site_id'])
except Exception, error:
- self.driver.DeleteSite(site['site_id'])
+ self.driver.slab_api.DeleteSite(site['site_id'])
raise error
# bind slice
try:
if sfa_slice:
- self.driver.BindObjectToPeer('slice', slice['slice_id'], \
+ self.driver.slab_api.BindObjectToPeer('slice', slice['slice_id'], \
peer['shortname'], sfa_slice['slice_id'])
except Exception, error:
- self.driver.DeleteSlice(sfa_slice['slice_id'])
+ self.driver.slab_api.DeleteSlice(sfa_slice['slice_id'])
raise error
# bind persons
for person in persons:
try:
- self.driver.BindObjectToPeer('person', \
+ self.driver.slab_api.BindObjectToPeer('person', \
person['person_id'], peer['shortname'], \
person['peer_person_id'])
for (key, remote_key_id) in zip(person['keys'], \
person['key_ids']):
try:
- self.driver.BindObjectToPeer( 'key', \
+ self.driver.slab_api.BindObjectToPeer( 'key', \
key['key_id'], peer['shortname'], \
remote_key_id)
except:
- self.driver.DeleteKey(key['key_id'])
+ self.driver.slab_api.DeleteKey(key['key_id'])
logger.log_exc("failed to bind key: %s \
to peer: %s " % (key['key_id'], \
peer['shortname']))
except Exception, error:
- self.driver.DeletePerson(person['person_id'])
+ self.driver.slab_api.DeletePerson(person['person_id'])
raise error
return sfa_slice
#login_base %s slice_hrn %s" \
#%(authority_name,login_base,slice_hrn)
- #sites = self.driver.GetSites(login_base)
+ #sites = self.driver.slab_api.GetSites(login_base)
#if not sites:
## create new site record
#site = {'name': 'geni.%s' % authority_name,
#'peer_site_id': None}
#if peer:
#site['peer_site_id'] = slice_record.get('site_id', None)
- #site['site_id'] = self.driver.AddSite(site)
+ #site['site_id'] = self.driver.slab_api.AddSite(site)
## exempt federated sites from monitor policies
- #self.driver.AddSiteTag(site['site_id'], 'exempt_site_until', \
+ #self.driver.slab_api.AddSiteTag(site['site_id'], 'exempt_site_until', \
#"20200101")
### is this still necessary?
#if peer:
## unbind from peer so we can modify if necessary.
## Will bind back later
- #self.driver.UnBindObjectFromPeer('site', site['site_id'], \
+ #self.driver.slab_api.UnBindObjectFromPeer('site', site['site_id'], \
#peer['shortname'])
#return site
#login_base = slice_hrn.split(".")[0]
slicename = slice_hrn
- slices_list = self.driver.GetSlices(slice_filter = slicename, \
+ slices_list = self.driver.slab_api.GetSlices(slice_filter = slicename, \
slice_filter_type = 'slice_hrn')
+ sfa_slice = None
if slices_list:
for sl in slices_list:
#slice['peer_slice_id'] = slice_record.get('slice_id', None)
## unbind from peer so we can modify if necessary.
## Will bind back later
- #self.driver.UnBindObjectFromPeer('slice', \
+ #self.driver.slab_api.UnBindObjectFromPeer('slice', \
#slice['slice_id'], \
#peer['shortname'])
#Update existing record (e.g. expires field)
#it with the latest info.
##if slice_record and slice['expires'] != slice_record['expires']:
- ##self.driver.UpdateSlice( slice['slice_id'], {'expires' : \
+ ##self.driver.slab_api.UpdateSlice( slice['slice_id'], {'expires' : \
#slice_record['expires']})
else:
+ #Search for user in ldap based on email SA 14/11/12
+ ldap_user = self.driver.slab_api.ldap.LdapFindUser(slice_record['user'])
logger.debug(" SLABSLICES \tverify_slice Oups \
- slice_record %s peer %s sfa_peer %s "\
- %(slice_record, peer,sfa_peer))
- sfa_slice = {'slice_hrn': slicename,
+ slice_record %s peer %s sfa_peer %s ldap_user %s"\
+ %(slice_record, peer,sfa_peer ,ldap_user ))
+ #User already registered in ldap, meaning user should be in SFA db
+ #and hrn = sfa_auth+ uid
+ sfa_slice = {'hrn': slicename,
#'url': slice_record.get('url', slice_hrn),
#'description': slice_record.get('description', slice_hrn)
'node_list' : [],
- 'record_id_user' : slice_record['person_ids'][0],
- 'record_id_slice': slice_record['record_id'],
- 'peer_authority':str(peer.hrn)
+ 'authority' : slice_record['authority'],
+ 'gid':slice_record['gid'],
+ #'record_id_user' : user.record_id,
+ 'slice_id' : slice_record['record_id'],
+ 'reg-researchers':slice_record['reg-researchers'],
+ #'record_id_slice': slice_record['record_id'],
+ 'peer_authority':str(sfa_peer)
+
+ }
+ if ldap_user :
+ hrn = self.driver.slab_api.root_auth +'.'+ ldap_user['uid']
+
+ user = self.driver.get_user_record(hrn)
+
+ logger.debug(" SLABSLICES \tverify_slice hrn %s USER %s" %(hrn, user))
+ #sfa_slice = {'slice_hrn': slicename,
+ ##'url': slice_record.get('url', slice_hrn),
+ ##'description': slice_record.get('description', slice_hrn)
+ #'node_list' : [],
+ #'authority' : slice_record['authority'],
+ #'gid':slice_record['gid'],
+ ##'record_id_user' : user.record_id,
+ #'slice_id' : slice_record['record_id'],
+ #'reg-researchers':slice_record['reg-researchers'],
+ ##'record_id_slice': slice_record['record_id'],
+ #'peer_authority':str(peer.hrn)
- }
- # add the slice
- self.driver.AddSlice(sfa_slice)
- #slice['slice_id'] = self.driver.AddSlice(slice)
+ #}
+ # add the slice
+ if sfa_slice :
+ self.driver.slab_api.AddSlice(sfa_slice, user)
+
+ if peer:
+ sfa_slice['slice_id'] = slice_record['record_id']
+
+ #slice['slice_id'] = self.driver.slab_api.AddSlice(slice)
logger.debug("SLABSLICES \tverify_slice ADDSLICE OK")
#slice['node_ids']=[]
#slice['person_ids'] = []
#if peer:
- #slice['peer_slice_id'] = slice_record.get('slice_id', None)
+ #sfa_slice['peer_slice_id'] = slice_record.get('slice_id', None)
# mark this slice as an sfa peer record
#if sfa_peer:
#peer_dict = {'type': 'slice', 'hrn': slice_hrn,
"""
#TODO SA 21/08/12 verify_persons Needs review
-
+ logger.debug("SLABSLICES \tverify_persons \tslice_hrn %s \t slice_record %s\r\n users %s \t peer %s "%( slice_hrn, slice_record, users, peer))
users_by_id = {}
- users_by_hrn = {}
+ #users_by_hrn = {}
+ users_by_email = {}
#users_dict : dict whose keys can either be the user's hrn or its id.
#Values contains only id and hrn
users_dict = {}
#First create dicts by hrn and id for each user in the user record list:
- for user in users:
+ for info in users:
- if 'urn' in user and (not 'hrn' in user ) :
- user['hrn'], user['type'] = urn_to_hrn(user['urn'])
-
- if 'person_id' in user and 'hrn' in user:
- users_by_id[user['person_id']] = user
- users_dict[user['person_id']] = {'person_id':\
- user['person_id'], 'hrn':user['hrn']}
-
- users_by_hrn[user['hrn']] = user
- users_dict[user['hrn']] = {'person_id':user['person_id'], \
- 'hrn':user['hrn']}
+ if 'slice_record' in info :
+ slice_rec = info['slice_record']
+ user = slice_rec['user']
+
+ if 'email' in user:
+ users_by_email[user['email']] = user
+ users_dict[user['email']] = user
+ #if 'hrn' in user:
+ #users_by_hrn[user['hrn']] = user
+ #users_dict[user['hrn']] = user
logger.debug( "SLABSLICE.PY \t verify_person \
- users_dict %s \r\n user_by_hrn %s \r\n \
+ users_dict %s \r\n user_by_email %s \r\n \
\tusers_by_id %s " \
- %(users_dict,users_by_hrn, users_by_id))
+ %(users_dict,users_by_email, users_by_id))
existing_user_ids = []
- existing_user_hrns = []
+ #existing_user_hrns = []
+ existing_user_emails = []
existing_users = []
# Check if user is in Senslab LDAP using its hrn.
# Assuming Senslab is centralised : one LDAP for all sites,
# LDAP does not provide users id, therefore we rely on hrns containing
# the login of the user.
# If the hrn is not a senslab hrn, the user may not be in LDAP.
- if users_by_hrn:
+ #if users_by_hrn:
+ if users_by_email :
#Construct the list of filters (list of dicts) for GetPersons
filter_user = []
- for hrn in users_by_hrn:
- filter_user.append (users_by_hrn[hrn])
- logger.debug(" SLABSLICE.PY \tverify_person filter_user %s " \
- %(filter_user))
+ #for hrn in users_by_hrn:
+ for email in users_by_email :
+ #filter_user.append (users_by_hrn[hrn])
+ filter_user.append (users_by_email[email])
#Check user's in LDAP with GetPersons
#Needed because what if the user has been deleted in LDAP but
#is still in SFA?
- existing_users = self.driver.GetPersons(filter_user)
-
+ existing_users = self.driver.slab_api.GetPersons(filter_user)
+ logger.debug(" \r\n SLABSLICE.PY \tverify_person filter_user %s existing_users %s " \
+ %(filter_user, existing_users))
#User's in senslab LDAP
if existing_users:
for user in existing_users :
- existing_user_hrns.append(users_dict[user['hrn']]['hrn'])
- existing_user_ids.\
- append(users_dict[user['hrn']]['person_id'])
+ users_dict[user['email']].update(user)
+ existing_user_emails.append(users_dict[user['email']]['email'])
+
+ #existing_user_hrns.append(users_dict[user['hrn']]['hrn'])
+ #existing_user_ids.\
+ #append(users_dict[user['hrn']]['person_id'])
# User from another known trusted federated site. Check
# if a senslab account matching the email has already been created.
else:
req += users['email']
- ldap_reslt = self.driver.ldap.LdapSearch(req)
+ ldap_reslt = self.driver.slab_api.ldap.LdapSearch(req)
if ldap_reslt:
logger.debug(" SLABSLICE.PY \tverify_person users \
USER already in Senslab \t ldap_reslt %s \
else:
#User not existing in LDAP
#TODO SA 21/08/12 raise smthg to add user or add it auto ?
+ #new_record = {}
+ #new_record['pkey'] = users[0]['keys'][0]
+ #new_record['mail'] = users[0]['email']
+
logger.debug(" SLABSLICE.PY \tverify_person users \
not in ldap ...NEW ACCOUNT NEEDED %s \r\n \t \
ldap_reslt %s " %(users, ldap_reslt))
- requested_user_ids = users_by_id.keys()
- requested_user_hrns = users_by_hrn.keys()
- logger.debug("SLABSLICE.PY \tverify_person requested_user_ids %s \
- user_by_hrn %s " %(requested_user_ids, users_by_hrn))
+ #requested_user_ids = users_by_id.keys()
+ #requested_user_hrns = users_by_hrn.keys()
+ requested_user_emails = users_by_email.keys()
+ logger.debug("SLABSLICE.PY \tverify_person \
+ users_by_email %s " %( users_by_email))
+ #logger.debug("SLABSLICE.PY \tverify_person \
+ #user_by_hrn %s " %( users_by_hrn))
#Check that the user of the slice in the slice record
#matches the existing users
try:
- if slice_record['record_id_user'] in requested_user_ids and \
- slice_record['PI'][0] in requested_user_hrns:
- logger.debug(" SLABSLICE \tverify_person \
- requested_user_ids %s = \
- slice_record['record_id_user'] %s" \
- %(requested_user_ids,slice_record['record_id_user']))
+ if slice_record['PI'][0] in requested_user_hrns:
+ #if slice_record['record_id_user'] in requested_user_ids and \
+ #slice_record['PI'][0] in requested_user_hrns:
+ logger.debug(" SLABSLICE \tverify_person ['PI'] slice_record %s" \
+ %(slice_record))
except KeyError:
pass
#to remove/ add any user from/to a slice.
#However a user from SFA which is not registered in Senslab yet
#should be added to the LDAP.
-
- added_user_hrns = set(requested_user_hrns).\
- difference(set(existing_user_hrns))
+ added_user_emails = set(requested_user_emails).\
+ difference(set(existing_user_emails))
+ #added_user_hrns = set(requested_user_hrns).\
+ #difference(set(existing_user_hrns))
#self.verify_keys(existing_slice_users, updated_users_list, \
#peer, append)
added_persons = []
# add new users
- for added_user_hrn in added_user_hrns:
- added_user = users_dict[added_user_hrn]
+
+ #requested_user_email is in existing_user_emails
+ if len(added_user_emails) == 0:
+
+ slice_record['login'] = users_dict[requested_user_emails[0]]['uid']
+ logger.debug(" SLABSLICE \tverify_person QUICK DIRTY %s" \
+ %(slice_record))
+
+ #for added_user_hrn in added_user_hrns:
+ #added_user = users_dict[added_user_hrn]
+
+
+ for added_user_email in added_user_emails:
#hrn, type = urn_to_hrn(added_user['urn'])
- person = {
- #'first_name': added_user.get('first_name', hrn),
- #'last_name': added_user.get('last_name', hrn),
- 'first_name': added_user['first_name'],
- 'last_name': added_user['last_name'],
- 'person_id': added_user['person_id'],
- 'peer_person_id': None,
- 'keys': [],
- 'key_ids': added_user.get('key_ids', []),
-
- }
- person['person_id'] = self.driver.AddPerson(person)
- if peer:
- person['peer_person_id'] = added_user['person_id']
+ added_user = users_dict[added_user_email]
+ logger.debug(" SLABSLICE \r\n \r\n \t THE SECOND verify_person added_user %s" %(added_user))
+ person = {}
+ person['peer_person_id'] = None
+ k_list = ['first_name','last_name','person_id']
+ for k in k_list:
+ if k in added_user:
+ person[k] = added_user[k]
+
+ person['pkey'] = added_user['keys'][0]
+ person['mail'] = added_user['email']
+ person['email'] = added_user['email']
+ person['key_ids'] = added_user.get('key_ids', [])
+ #person['urn'] = added_user['urn']
+
+ #person['person_id'] = self.driver.slab_api.AddPerson(person)
+ person['uid'] = self.driver.slab_api.AddPerson(person)
+
+ logger.debug(" SLABSLICE \r\n \r\n \t THE SECOND verify_person ppeersonne %s" %(person))
+ #Update slice_Record with the id now known to LDAP
+ slice_record['login'] = person['uid']
+ #slice_record['reg_researchers'] = [self.driver.slab_api.root_auth + '.' + person['uid']]
+ #slice_record['reg-researchers'] = slice_record['reg_researchers']
+
+ #if peer:
+ #person['peer_person_id'] = added_user['person_id']
added_persons.append(person)
# enable the account
- self.driver.UpdatePerson(person['person_id'], {'enabled': True})
+ #self.driver.slab_api.UpdatePerson(slice_record['reg_researchers'][0], added_user_email)
# add person to site
- #self.driver.AddPersonToSite(added_user_id, login_base)
+ #self.driver.slab_api.AddPersonToSite(added_user_id, login_base)
#for key_string in added_user.get('keys', []):
#key = {'key':key_string, 'key_type':'ssh'}
- #key['key_id'] = self.driver.AddPersonKey(person['person_id'], \
+ #key['key_id'] = self.driver.slab_api.AddPersonKey(person['person_id'], \
# key)
#person['keys'].append(key)
#self.registry.register_peer_object(self.credential, peer_dict)
#for added_slice_user_hrn in \
#added_slice_user_hrns.union(added_user_hrns):
- #self.driver.AddPersonToSlice(added_slice_user_hrn, \
+ #self.driver.slab_api.AddPersonToSlice(added_slice_user_hrn, \
#slice_record['name'])
#for added_slice_user_id in \
#added_slice_user_ids.union(added_user_ids):
# add person to the slice
- #self.driver.AddPersonToSlice(added_slice_user_id, \
+ #self.driver.slab_api.AddPersonToSlice(added_slice_user_id, \
#slice_record['name'])
# if this is a peer record then it
# should already be bound to a peer.
key_ids = []
for person in persons:
key_ids.extend(person['key_ids'])
- keylist = self.driver.GetKeys(key_ids, ['key_id', 'key'])
+ keylist = self.driver.slab_api.GetKeys(key_ids, ['key_id', 'key'])
keydict = {}
for key in keylist:
keydict[key['key']] = key['key_id']
try:
if peer:
person = persondict[user['email']]
- self.driver.UnBindObjectFromPeer('person', \
+ self.driver.slab_api.UnBindObjectFromPeer('person', \
person['person_id'], peer['shortname'])
key['key_id'] = \
- self.driver.AddPersonKey(user['email'], key)
+ self.driver.slab_api.AddPersonKey(user['email'], key)
if peer:
key_index = user_keys.index(key['key'])
remote_key_id = user['key_ids'][key_index]
- self.driver.BindObjectToPeer('key', \
+ self.driver.slab_api.BindObjectToPeer('key', \
key['key_id'], peer['shortname'], \
remote_key_id)
finally:
if peer:
- self.driver.BindObjectToPeer('person', \
+ self.driver.slab_api.BindObjectToPeer('person', \
person['person_id'], peer['shortname'], \
user['person_id'])
if keydict[existing_key_id] in removed_keys:
if peer:
- self.driver.UnBindObjectFromPeer('key', \
+ self.driver.slab_api.UnBindObjectFromPeer('key', \
existing_key_id, peer['shortname'])
- self.driver.DeleteKey(existing_key_id)
+ self.driver.slab_api.DeleteKey(existing_key_id)
#def verify_slice_attributes(self, slice, requested_slice_attributes, \
#filter = {'category': '*slice*'}
#if not admin:
#filter['|roles'] = ['user']
- #slice_attributes = self.driver.GetTagTypes(filter)
+ #slice_attributes = self.driver.slab_api.GetTagTypes(filter)
#valid_slice_attribute_names = [attribute['tagname'] \
#for attribute in slice_attributes]
#added_slice_attributes = []
#removed_slice_attributes = []
#ignored_slice_attribute_names = []
- #existing_slice_attributes = self.driver.GetSliceTags({'slice_id': \
+ #existing_slice_attributes = self.driver.slab_api.GetSliceTags({'slice_id': \
#slice['slice_id']})
## get attributes that should be removed
## remove stale attributes
#for attribute in removed_slice_attributes:
#try:
- #self.driver.DeleteSliceTag(attribute['slice_tag_id'])
+ #self.driver.slab_api.DeleteSliceTag(attribute['slice_tag_id'])
#except Exception, error:
#self.logger.warn('Failed to remove sliver attribute. name: \
#%s, value: %s, node_id: %s\nCause:%s'\
## add requested_attributes
#for attribute in added_slice_attributes:
#try:
- #self.driver.AddSliceTag(slice['name'], attribute['name'], \
+ #self.driver.slab_api.AddSliceTag(slice['name'], attribute['name'], \
#attribute['value'], attribute.get('node_id', None))
#except Exception, error:
#self.logger.warn('Failed to add sliver attribute. name: %s, \
git://git.onelab.eu / sfa.git / blobdiff