-from types import StringTypes
-from collections import defaultdict
-import sys
-from sfa.util.xrn import get_leaf, get_authority, urn_to_hrn
-from sfa.planetlab.plxrn import hrn_to_pl_slicename
-from sfa.util.policy import Policy
-from sfa.rspecs.rspec import RSpec
-
-from sfa.util.xrn import Xrn
+from sfa.util.xrn import get_authority, urn_to_hrn
from sfa.util.sfalogging import logger
-from sqlalchemy import Column, Integer, String, DateTime
-from sqlalchemy import Table, Column, MetaData, join, ForeignKey
-from sfa.storage.model import RegRecord
-from sfa.storage.alchemy import dbsession,engine
MAXINT = 2L**31-1
def __init__(self, driver):
self.driver = driver
-
- def get_slivers(self, xrn, node=None):
- hrn, type = urn_to_hrn(xrn)
+ ##Used in SFACE?
+ #def get_slivers(self, xrn, node=None):
+ #hrn, hrn_type = urn_to_hrn(xrn)
- slice_name = hrn_to_pl_slicename(hrn)
- # XX Should we just call PLCAPI.GetSliceTicket(slice_name) instead
- # of doing all of this?
- #return self.api.driver.GetSliceTicket(self.auth, slice_name)
+ #slice_name = hrn_to_pl_slicename(hrn)
+ ## XX Should we just call PLCAPI.GetSliceTicket(slice_name) instead
+ ## of doing all of this?
+ ##return self.api.driver.GetSliceTicket(self.auth, slice_name)
- slice = self.driver.GetSlices(slice_filter = slice_name, slice_filter_type = 'slice_hrn')
+ #sfa_slice = self.driver.GetSlices(slice_filter = slice_name, \
+ # slice_filter_type = 'slice_hrn')
- # Get user information
- #TODO
- alchemy_person = dbsession.query(RegRecord).filter_by(record_id = slice['record_id_user']).first()
+ ## Get user information
+ ##TODO
+ #alchemy_person = dbsession.query(RegRecord).filter_by(record_id = \
+ #sfa_slice['record_id_user']).first()
- slivers = []
- sliver_attributes = []
+ #slivers = []
+ #sliver_attributes = []
- if slice['oar_job_id'] is not -1:
- nodes_all = self.GetNodes({'hostname':slice['node_ids']},
- ['node_id', 'hostname','site','boot_state'])
- nodeall_byhostname = dict([(n['hostname'], n) for n in nodes_all])
- nodes = slice['node_ids']
+ #if sfa_slice['oar_job_id'] is not -1:
+ #nodes_all = self.driver.GetNodes({'hostname': \
+ #sfa_slice['node_ids']},
+ #['node_id', 'hostname','site','boot_state'])
+ #nodeall_byhostname = dict([(n['hostname'], n) for n in nodes_all])
+ #nodes = sfa_slice['node_ids']
- for node in nodes:
- #for sliver_attribute in filter(lambda a: a['node_id'] == node['node_id'], slice_tags):
- sliver_attribute['tagname'] = 'slab-tag'
- sliver_attribute['value'] = 'slab-value'
- sliver_attributes.append(sliver_attribute['tagname'])
- attributes.append({'tagname': sliver_attribute['tagname'],
- 'value': sliver_attribute['value']})
-
- # set nodegroup slice attributes
- for slice_tag in filter(lambda a: a['nodegroup_id'] in node['nodegroup_ids'], slice_tags):
- # Do not set any nodegroup slice attributes for
- # which there is at least one sliver attribute
- # already set.
- if slice_tag not in slice_tags:
- attributes.append({'tagname': slice_tag['tagname'],
- 'value': slice_tag['value']})
-
- for slice_tag in filter(lambda a: a['node_id'] is None, slice_tags):
- # Do not set any global slice attributes for
- # which there is at least one sliver attribute
- # already set.
- if slice_tag['tagname'] not in sliver_attributes:
- attributes.append({'tagname': slice_tag['tagname'],
- 'value': slice_tag['value']})
-
- # XXX Sanity check; though technically this should be a system invariant
- # checked with an assertion
- if slice['expires'] > MAXINT: slice['expires']= MAXINT
+ #for node in nodes:
+ ##for sliver_attribute in filter(lambda a: a['node_id'] == \
+ #node['node_id'], slice_tags):
+ #sliver_attribute['tagname'] = 'slab-tag'
+ #sliver_attribute['value'] = 'slab-value'
+ #sliver_attributes.append(sliver_attribute['tagname'])
+ #attributes.append({'tagname': sliver_attribute['tagname'],
+ #'value': sliver_attribute['value']})
+
+ ## set nodegroup slice attributes
+ #for slice_tag in filter(lambda a: a['nodegroup_id'] \
+ #in node['nodegroup_ids'], slice_tags):
+ ## Do not set any nodegroup slice attributes for
+ ## which there is at least one sliver attribute
+ ## already set.
+ #if slice_tag not in slice_tags:
+ #attributes.append({'tagname': slice_tag['tagname'],
+ #'value': slice_tag['value']})
+
+ #for slice_tag in filter(lambda a: a['node_id'] is None, \
+ #slice_tags):
+ ## Do not set any global slice attributes for
+ ## which there is at least one sliver attribute
+ ## already set.
+ #if slice_tag['tagname'] not in sliver_attributes:
+ #attributes.append({'tagname': slice_tag['tagname'],
+ #'value': slice_tag['value']})
+
+ ## XXX Sanity check; though technically this should
+ ## be a system invariant
+ ## checked with an assertion
+ #if sfa_slice['expires'] > MAXINT: sfa_slice['expires']= MAXINT
- slivers.append({
- 'hrn': hrn,
- 'name': slice['name'],
- 'slice_id': slice['slice_id'],
- 'instantiation': slice['instantiation'],
- 'expires': slice['expires'],
- 'keys': keys,
- 'attributes': attributes
- })
-
- return slivers
+ #slivers.append({
+ #'hrn': hrn,
+ #'name': sfa_slice['name'],
+ #'slice_id': sfa_slice['slice_id'],
+ #'instantiation': sfa_slice['instantiation'],
+ #'expires': sfa_slice['expires'],
+ #'keys': keys,
+ #'attributes': attributes
+ #})
+
+ #return slivers
#return slivers
def get_peer(self, xrn):
- hrn, type = urn_to_hrn(xrn)
+ hrn, hrn_type = urn_to_hrn(xrn)
#Does this slice belong to a local site or a peer senslab site?
peer = None
site_authority = slice_authority
# get this site's authority (sfa root authority or sub authority)
#site_authority = get_authority(slice_authority).lower()
- print>>sys.stderr, " \r\n \r\n \t slices.py get_peer slice_authority %s site_authority %s hrn %s" %(slice_authority, site_authority, hrn)
+ logger.debug("SLABSLICES \ get_peer slice_authority %s \
+ site_authority %s hrn %s" %(slice_authority, \
+ site_authority, hrn))
# check if we are already peered with this site_authority, if so
#peers = self.driver.GetPeers({})
peers = self.driver.GetPeers(peer_filter = slice_authority)
if site_authority == peer_record.hrn:
peer = peer_record
- print>>sys.stderr, " \r\n \r\n \t slices.py get_peerAPRES Mpeer %s " %(peer)
+ logger.debug(" SLABSLICES \tget_peer peer %s " %(peer))
return peer
def get_sfa_peer(self, xrn):
- hrn, type = urn_to_hrn(xrn)
+ hrn, hrn_type = urn_to_hrn(xrn)
# return the authority for this hrn or None if we are the authority
sfa_peer = None
sfa_peer = site_authority
return sfa_peer
-
- def verify_slice_nodes(self, slice, requested_slivers, peer):
+
+
+ def verify_slice_leases(self, sfa_slice, requested_leases, kept_leases, \
+ peer):
+
+ leases = self.driver.GetLeases({'name':sfa_slice['name']}, ['lease_id'])
+ if leases :
+ current_leases = [lease['lease_id'] for lease in leases]
+ deleted_leases = list(set(current_leases).difference(kept_leases))
+
+ try:
+ if peer:
+ self.driver.UnBindObjectFromPeer('slice', \
+ sfa_slice['slice_id'], peer['shortname'])
+ deleted = self.driver.DeleteLeases(deleted_leases)
+ for lease in requested_leases:
+ added = self.driver.AddLeases(lease['hostname'], \
+ sfa_slice['name'], int(lease['t_from']), \
+ int(lease['t_until']))
+ #TODO : catch other exception?
+ except KeyError:
+ logger.log_exc('Failed to add/remove slice leases')
+
+ return leases
+
+ def verify_slice_nodes(self, sfa_slice, requested_slivers, peer):
current_slivers = []
deleted_nodes = []
- if slice['node_ids']:
- nodes = self.driver.GetNodes(slice['node_ids'], ['hostname'])
+ if sfa_slice['node_ids']:
+ nodes = self.driver.GetNodes(sfa_slice['node_ids'], ['hostname'])
current_slivers = [node['hostname'] for node in nodes]
# remove nodes not in rspec
- deleted_nodes = list(set(current_slivers).difference(requested_slivers))
+ deleted_nodes = list(set(current_slivers).\
+ difference(requested_slivers))
# add nodes from rspec
- added_nodes = list(set(requested_slivers).difference(current_slivers))
+ added_nodes = list(set(requested_slivers).difference(current_slivers))
try:
#if peer:
- #self.driver.UnBindObjectFromPeer('slice', slice['slice_id'], peer['shortname'])
+ #self.driver.UnBindObjectFromPeer('slice', slice['slice_id'], \
+ #peer['shortname'])
#PI is a list, get the only username in this list
- #so that the OAR/LDAP knows the user: remove the authority from the name
- tmp= slice['PI'][0].split(".")
+ #so that the OAR/LDAP knows the user:
+ #remove the authority from the name
+ tmp = sfa_slice['PI'][0].split(".")
username = tmp[(len(tmp)-1)]
#Update the table with the nodes that populate the slice
- self.driver.db.update_job(slice['name'],nodes = added_nodes)
- print>>sys.stderr, "\r\n \\r\n \r\n \t\t\t VERIFY_SLICE_NODES slice %s \r\n \r\n \r\n " %(slice)
+ self.driver.db.update_job(sfa_slice['name'], nodes = added_nodes)
+ logger.debug("SLABSLICES \tverify_slice_nodes slice %s "\
+ %(sfa_slice))
#If there is a timeslot specified, then a job can be launched
try:
- slot = slice['timeslot']
- self.driver.LaunchExperimentOnOAR(slice, added_nodes, username)
+ #slot = sfa_slice['timeslot']
+ self.driver.LaunchExperimentOnOAR(sfa_slice, added_nodes, \
+ username)
except KeyError:
- logger.log_exc("SLABSLICES \tVERIFY_SLICE_NODES KeyError slice %s " %(slice))
- pass
+ logger.log_exc("SLABSLICES \verify_slice_nodes KeyError \
+ sfa_slice %s " %(sfa_slice))
+
-
if deleted_nodes:
- self.driver.DeleteSliceFromNodes(slice['name'], deleted_nodes)
+ self.driver.DeleteSliceFromNodes(sfa_slice['name'], \
+ deleted_nodes)
except:
logger.log_exc('Failed to add/remove slice from nodes')
def free_egre_key(self):
used = set()
for tag in self.driver.GetSliceTags({'tagname': 'egre_key'}):
- used.add(int(tag['value']))
+ used.add(int(tag['value']))
for i in range(1, 256):
if i not in used:
- def handle_peer(self, site, slice, persons, peer):
+ def handle_peer(self, site, sfa_slice, persons, peer):
if peer:
# bind site
try:
if site:
- self.driver.BindObjectToPeer('site', site['site_id'], peer['shortname'], slice['site_id'])
- except Exception,e:
+ self.driver.BindObjectToPeer('site', site['site_id'], \
+ peer['shortname'], sfa_slice['site_id'])
+ except Exception, error:
self.driver.DeleteSite(site['site_id'])
- raise e
+ raise error
# bind slice
try:
- if slice:
- self.driver.BindObjectToPeer('slice', slice['slice_id'], peer['shortname'], slice['slice_id'])
- except Exception,e:
- self.driver.DeleteSlice(slice['slice_id'])
- raise e
+ if sfa_slice:
+ self.driver.BindObjectToPeer('slice', slice['slice_id'], \
+ peer['shortname'], sfa_slice['slice_id'])
+ except Exception, error:
+ self.driver.DeleteSlice(sfa_slice['slice_id'])
+ raise error
# bind persons
for person in persons:
try:
- self.driver.BindObjectToPeer('person',
- person['person_id'], peer['shortname'], person['peer_person_id'])
+ self.driver.BindObjectToPeer('person', \
+ person['person_id'], peer['shortname'], \
+ person['peer_person_id'])
- for (key, remote_key_id) in zip(person['keys'], person['key_ids']):
+ for (key, remote_key_id) in zip(person['keys'], \
+ person['key_ids']):
try:
- self.driver.BindObjectToPeer( 'key', key['key_id'], peer['shortname'], remote_key_id)
+ self.driver.BindObjectToPeer( 'key', \
+ key['key_id'], peer['shortname'], \
+ remote_key_id)
except:
self.driver.DeleteKey(key['key_id'])
- logger("failed to bind key: %s to peer: %s " % (key['key_id'], peer['shortname']))
- except Exception,e:
+ 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'])
- raise e
+ raise error
- return slice
+ return sfa_slice
- #def verify_site(self, slice_xrn, slice_record={}, peer=None, sfa_peer=None, options={}):
+ #def verify_site(self, slice_xrn, slice_record={}, peer=None, \
+ #sfa_peer=None, options={}):
#(slice_hrn, type) = urn_to_hrn(slice_xrn)
#site_hrn = get_authority(slice_hrn)
## login base can't be longer than 20 characters
##slicename = hrn_to_pl_slicename(slice_hrn)
#authority_name = slice_hrn.split('.')[0]
#login_base = authority_name[:20]
- #print >>sys.stderr, " \r\n \r\n \t\t SLABSLICES.PY verify_site authority_name %s login_base %s slice_hrn %s" %(authority_name,login_base,slice_hrn)
+ #logger.debug(" SLABSLICES.PY \tverify_site authority_name %s \
+ #login_base %s slice_hrn %s" \
+ #%(authority_name,login_base,slice_hrn)
#sites = self.driver.GetSites(login_base)
#if not sites:
#site['peer_site_id'] = slice_record.get('site_id', None)
#site['site_id'] = self.driver.AddSite(site)
## exempt federated sites from monitor policies
- #self.driver.AddSiteTag(site['site_id'], 'exempt_site_until', "20200101")
+ #self.driver.AddSiteTag(site['site_id'], 'exempt_site_until', \
+ #"20200101")
### is this still necessary?
### add record to the local registry
##if sfa_peer and slice_record:
##peer_dict = {'type': 'authority', 'hrn': site_hrn, \
- ##'peer_authority': sfa_peer, 'pointer': site['site_id']}
+ ##'peer_authority': sfa_peer, 'pointer': \
+ #site['site_id']}
##self.registry.register_peer_object(self.credential, peer_dict)
#else:
#site = sites[0]
#if peer:
- ## unbind from peer so we can modify if necessary. Will bind back later
- #self.driver.UnBindObjectFromPeer('site', site['site_id'], peer['shortname'])
+ ## unbind from peer so we can modify if necessary.
+ ## Will bind back later
+ #self.driver.UnBindObjectFromPeer('site', site['site_id'], \
+ #peer['shortname'])
#return site
- def verify_slice(self, slice_hrn, slice_record, peer, sfa_peer, options={} ):
+ def verify_slice(self, slice_hrn, slice_record, peer, sfa_peer, options={}):
- login_base = slice_hrn.split(".")[0]
+ #login_base = slice_hrn.split(".")[0]
slicename = slice_hrn
- sl = self.driver.GetSlices(slice_filter=slicename, slice_filter_type = 'slice_hrn')
+ sl = self.driver.GetSlices(slice_filter = slicename, \
+ slice_filter_type = 'slice_hrn')
if sl:
- print>>sys.stderr, " \r\n \r\rn Slices.py verify_slice slicename %s sl %s slice_record %s"%(slicename ,sl, slice_record)
- slice = sl
- slice.update(slice_record)
+ logger.debug("SLABSLICE \tverify_slice slicename %s sl %s \
+ slice_record %s"%(slicename, sl, slice_record))
+ sfa_slice = sl
+ sfa_slice.update(slice_record)
#del slice['last_updated']
#del slice['date_created']
#if peer:
#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', slice['slice_id'], peer['shortname'])
- #Update existing record (e.g. expires field) it with the latest info.
+ ## unbind from peer so we can modify if necessary.
+ ## Will bind back later
+ #self.driver.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' : slice_record['expires']})
+ ##self.driver.UpdateSlice( slice['slice_id'], {'expires' : \
+ #slice_record['expires']})
else:
- print>>sys.stderr, " \r\n \r\rn Slices.py verify_slice UH-Oh...slice_record %s peer %s sfa_peer %s "%(slice_record, peer,sfa_peer)
- slice = {'slice_hrn': slicename,
+ logger.debug(" SLABSLICES \tverify_slice Oups \
+ slice_record %s peer %s sfa_peer %s "\
+ %(slice_record, peer,sfa_peer))
+ sfa_slice = {'slice_hrn': slicename,
#'url': slice_record.get('url', slice_hrn),
#'description': slice_record.get('description', slice_hrn)
'node_list' : [],
}
# add the slice
- self.driver.AddSlice(slice)
+ self.driver.AddSlice(sfa_slice)
#slice['slice_id'] = self.driver.AddSlice(slice)
- print>>sys.stderr, " \r\n \r\rn Slices.py verify_slice ADDSLICE OHYEEEEEEEEEEAH! "
+ logger.debug("SLABSLICES \tverify_slice ADDSLICE OK")
#slice['node_ids']=[]
#slice['person_ids'] = []
#if peer:
# mark this slice as an sfa peer record
#if sfa_peer:
#peer_dict = {'type': 'slice', 'hrn': slice_hrn,
- #'peer_authority': sfa_peer, 'pointer': slice['slice_id']}
+ #'peer_authority': sfa_peer, 'pointer': \
+ #slice['slice_id']}
#self.registry.register_peer_object(self.credential, peer_dict)
- return slice
+ return sfa_slice
- def verify_persons(self, slice_hrn, slice_record, users, peer, sfa_peer, options={}):
+ def verify_persons(self, slice_hrn, slice_record, users, peer, sfa_peer, \
+ options={}):
users_by_id = {}
users_by_hrn = {}
users_dict = {}
for user in users:
if 'urn' in user and (not 'hrn' in user ) :
- user['hrn'],user['type'] = urn_to_hrn(user['urn'])
+ 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_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']}
+ users_dict[user['hrn']] = {'person_id':user['person_id'], \
+ 'hrn':user['hrn']}
- logger.debug( "\r\n \r\n SLABSLICE.PY \tverify_person users_dict %s \r\n user_by_hrn %s \r\n \tusers_by_id %s " %( users_dict,users_by_hrn, users_by_id) )
+ logger.debug( "SLABSLICE.PY \tverify_person \
+ users_dict %s \r\n user_by_hrn %s \r\n \
+ \tusers_by_id %s " \
+ %(users_dict,users_by_hrn, users_by_id))
existing_user_ids = []
existing_user_hrns = []
- existing_users= []
+ existing_users = []
#Check if user is in LDAP using its hrn.
- #Assuming Senslab is centralised : one LDAP for all sites, user_id unknown from LDAP
+ #Assuming Senslab is centralised : one LDAP for all sites,
+ # user_id unknown from LDAP
# LDAP does not provide users id, therfore we rely on hrns
if users_by_hrn:
#Construct the list of filters for GetPersons
for hrn in users_by_hrn:
#filter_user.append ( {'hrn':hrn})
filter_user.append (users_by_hrn[hrn])
- logger.debug(" SLABSLICE.PY \tverify_person filter_user %s " %(filter_user) )
+ logger.debug(" SLABSLICE.PY \tverify_person filter_user %s " \
+ %(filter_user))
existing_users = self.driver.GetPersons(filter_user)
- #existing_users = self.driver.GetPersons({'hrn': users_by_hrn.keys()})
- #existing_users = self.driver.GetPersons({'hrn': users_by_hrn.keys()},
- #['hrn','pkey'])
+ #existing_users = self.driver.GetPersons({'hrn': \
+ #users_by_hrn.keys()})
+ #existing_users = self.driver.GetPersons({'hrn': \
+ #users_by_hrn.keys()}, \
+ #['hrn','pkey'])
if existing_users:
for user in existing_users :
#for k in users_dict[user['hrn']] :
- existing_user_hrns.append (users_dict[user['hrn']]['hrn'])
- existing_user_ids.append (users_dict[user['hrn']]['person_id'])
+ existing_user_hrns.append(users_dict[user['hrn']]['hrn'])
+ existing_user_ids.\
+ append(users_dict[user['hrn']]['person_id'])
- #User from another federated site , does not have a senslab account yet?
+ #User from another federated site ,
+ #does not have a senslab account yet?
#or have multiple SFA accounts
#Check before adding them to LDAP
else:
- if isinstance(users,list):
+ if isinstance(users, list):
ldap_reslt = self.driver.ldap.LdapSearch(users[0])
else:
ldap_reslt = self.driver.ldap.LdapSearch(users)
- if ldap_result:
+ if ldap_reslt:
existing_users = ldap_reslt[0]
- existing_user_hrns.append (users_dict[user['hrn']]['hrn'])
- existing_user_ids.append (users_dict[user['hrn']]['person_id'])
+ existing_user_hrns.append(users_dict[user['hrn']]['hrn'])
+ existing_user_ids.\
+ append(users_dict[user['hrn']]['person_id'])
else:
#User not existing in LDAP
- logger.debug(" SLABSLICE.PY \tverify_person users HUMHUMHUMHUM ... %s \r\n \t ldap_reslt %s " %(users, ldap_reslt))
+ logger.debug(" SLABSLICE.PY \tverify_person users \
+ not in ldap ... %s \r\n \t ldap_reslt %s " \
+ %(users, ldap_reslt))
# requested slice users
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))
+ logger.debug("SLABSLICE.PY \tverify_person requested_user_ids %s \
+ user_by_hrn %s " %(requested_user_ids, users_by_hrn))
# existing slice users
#existing_slice_users_filter = {'hrn': slice_record['PI'][0]}
- #logger.debug(" SLABSLICE.PY \tverify_person requested_user_ids %s existing_slice_users_filter %s slice_record %s" %(requested_user_ids,existing_slice_users_filter,slice_record))
+ #logger.debug(" SLABSLICE.PY \tverify_person requested_user_ids %s \
+ #existing_slice_users_filter %s slice_record %s" %(requested_user_ids,\
+ #existing_slice_users_filter,slice_record))
- #existing_slice_users = self.driver.GetPersons([existing_slice_users_filter])
- #existing_slice_users = self.driver.GetPersons(existing_slice_users_filter,['hrn','pkey'])
- #logger.debug(" SLABSLICE.PY \tverify_person existing_slice_users %s " %(existing_slice_users))
+ #existing_slice_users = \
+ #self.driver.GetPersons([existing_slice_users_filter])
+ #existing_slice_users = \
+ #self.driver.GetPersons(existing_slice_users_filter, \
+ #['hrn','pkey'])
+ #logger.debug("SLABSLICE.PY \tverify_person existing_slice_users %s " \
+ #%(existing_slice_users))
#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.PY \tverify_person requested_user_ids %s = slice_record['record_id_user'] %s" %(requested_user_ids,slice_record['record_id_user']))
+ 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']))
except KeyError:
- pass
+ pass
- #existing_slice_user_hrns = [user['hrn'] for user in existing_slice_users]
+ #existing_slice_user_hrns = [user['hrn'] for \
+ #user in existing_slice_users]
# users to be added, removed or updated
#One user in one senslab slice : there should be no need
#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_hrns = set(requested_user_hrns).\
+ difference(set(existing_user_hrns))
- #self.verify_keys(existing_slice_users, updated_users_list, peer, append)
+ #self.verify_keys(existing_slice_users, updated_users_list, \
+ #peer, append)
added_persons = []
# add new users
#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['key_id'] = self.driver.AddPersonKey(person['person_id'], \
+ # key)
#person['keys'].append(key)
# add the registry record
#if sfa_peer:
- #peer_dict = {'type': 'user', 'hrn': hrn, 'peer_authority': sfa_peer, \
- #'pointer': person['person_id']}
+ #peer_dict = {'type': 'user', 'hrn': hrn, 'peer_authority': \
+ #sfa_peer, \
+ #'pointer': person['person_id']}
#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, slice_record['name'])
- #for added_slice_user_id in added_slice_user_ids.union(added_user_ids):
+ #for added_slice_user_hrn in \
+ #added_slice_user_hrns.union(added_user_hrns):
+ #self.driver.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, slice_record['name'])
- # if this is a peer record then it should already be bound to a peer.
+ #self.driver.AddPersonToSlice(added_slice_user_id, \
+ #slice_record['name'])
+ # if this is a peer record then it
+ # should already be bound to a peer.
# no need to return worry about it getting bound later
return added_persons
-
+ #Unused
def verify_keys(self, persons, users, peer, options={}):
# existing keys
key_ids = []
try:
if peer:
person = persondict[user['email']]
- self.driver.UnBindObjectFromPeer('person', person['person_id'], peer['shortname'])
- key['key_id'] = self.driver.AddPersonKey(user['email'], key)
+ self.driver.UnBindObjectFromPeer('person', \
+ person['person_id'], peer['shortname'])
+ key['key_id'] = \
+ self.driver.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', key['key_id'], peer['shortname'], remote_key_id)
+ self.driver.BindObjectToPeer('key', \
+ key['key_id'], peer['shortname'], \
+ remote_key_id)
finally:
if peer:
- self.driver.BindObjectToPeer('person', person['person_id'], peer['shortname'], user['person_id'])
+ self.driver.BindObjectToPeer('person', \
+ person['person_id'], peer['shortname'], \
+ user['person_id'])
# remove old keys (only if we are not appending)
+ append = options.get('append', True)
if append == False:
removed_keys = set(existing_keys).difference(requested_keys)
for existing_key_id in keydict:
if keydict[existing_key_id] in removed_keys:
try:
if peer:
- self.driver.UnBindObjectFromPeer('key', existing_key_id, peer['shortname'])
+ self.driver.UnBindObjectFromPeer('key', \
+ existing_key_id, peer['shortname'])
self.driver.DeleteKey(existing_key_id)
except:
pass
- #def verify_slice_attributes(self, slice, requested_slice_attributes, append=False, admin=False):
+ #def verify_slice_attributes(self, slice, requested_slice_attributes, \
+ #append=False, admin=False):
## get list of attributes users ar able to manage
#filter = {'category': '*slice*'}
#if not admin:
#filter['|roles'] = ['user']
#slice_attributes = self.driver.GetTagTypes(filter)
- #valid_slice_attribute_names = [attribute['tagname'] for attribute in slice_attributes]
+ #valid_slice_attribute_names = [attribute['tagname'] \
+ #for attribute in slice_attributes]
## get sliver attributes
#added_slice_attributes = []
#removed_slice_attributes = []
#ignored_slice_attribute_names = []
- #existing_slice_attributes = self.driver.GetSliceTags({'slice_id': slice['slice_id']})
+ #existing_slice_attributes = self.driver.GetSliceTags({'slice_id': \
+ #slice['slice_id']})
## get attributes that should be removed
#for slice_tag in existing_slice_attributes:
#if slice_tag['tagname'] in ignored_slice_attribute_names:
- ## If a slice already has a admin only role it was probably given to them by an
+ ## If a slice already has a admin only role
+ ## it was probably given to them by an
## admin, so we should ignore it.
#ignored_slice_attribute_names.append(slice_tag['tagname'])
#else:
- ## If an existing slice attribute was not found in the request it should
+ ## If an existing slice attribute was not
+ ## found in the request it should
## be removed
#attribute_found=False
#for requested_attribute in requested_slice_attributes:
- #if requested_attribute['name'] == slice_tag['tagname'] and \
- #requested_attribute['value'] == slice_tag['value']:
+ #if requested_attribute['name'] == slice_tag['tagname'] \
+ #and requested_attribute['value'] == slice_tag['value']:
#attribute_found=True
#break
#if requested_attribute['name'] in valid_slice_attribute_names:
#attribute_found = False
#for existing_attribute in existing_slice_attributes:
- #if requested_attribute['name'] == existing_attribute['tagname'] and \
- #requested_attribute['value'] == existing_attribute['value']:
+ #if requested_attribute['name'] == \
+ #existing_attribute['tagname'] and \
+ #requested_attribute['value'] == \
+ #existing_attribute['value']:
#attribute_found=True
#break
#if not attribute_found:
#for attribute in removed_slice_attributes:
#try:
#self.driver.DeleteSliceTag(attribute['slice_tag_id'])
- #except Exception, e:
- #self.logger.warn('Failed to remove sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\
- #% (name, value, node_id, str(e)))
+ #except Exception, error:
+ #self.logger.warn('Failed to remove sliver attribute. name: \
+ #%s, value: %s, node_id: %s\nCause:%s'\
+ #% (name, value, node_id, str(error)))
## add requested_attributes
#for attribute in added_slice_attributes:
#try:
- #self.driver.AddSliceTag(slice['name'], attribute['name'], attribute['value'], attribute.get('node_id', None))
- #except Exception, e:
- #self.logger.warn('Failed to add sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\
- #% (name, value, node_id, str(e)))
+ #self.driver.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, \
+ #value: %s, node_id: %s\nCause:%s'\
+ #% (name, value, node_id, str(error)))
#def create_slice_aggregate(self, xrn, rspec):
#hrn, type = urn_to_hrn(xrn)
#registry = self.api.registries[self.api.hrn]
#credential = self.api.getCredential()
- #site_id, remote_site_id = self.verify_site(registry, credential, hrn, peer, sfa_peer)
- #slice = self.verify_slice(registry, credential, hrn, site_id, remote_site_id, peer, sfa_peer)
+ #site_id, remote_site_id = self.verify_site(registry, \
+ #credential, hrn, peer, sfa_peer)
+ #slice = self.verify_slice(registry, credential, \
+ #hrn, site_id, remote_site_id, peer, sfa_peer)
## find out where this slice is currently running
#nodelist = self.driver.GetNodes(slice['node_ids'], ['hostname'])
#rspec_attribute_value = nodespec[k]
#if (self.rspec_to_slice_tag.has_key(k)):
#slice_tag_name = self.rspec_to_slice_tag[k]
- #nodes[nodename][slice_tag_name] = rspec_attribute_value
+ #nodes[nodename][slice_tag_name] = \
+ #rspec_attribute_value
#elif isinstance(nodespec['name'], StringTypes):
#nodename = nodespec['name']
#nodes[nodename] = {}
#try:
#if peer:
- #self.driver.UnBindObjectFromPeer('slice', slice['slice_id'], peer)
+ #self.driver.UnBindObjectFromPeer('slice', \
+ #slice['slice_id'], peer)
#self.driver.LaunchExperimentOnOAR(slicename, added_nodes)
#if (isinstance(value, list)):
#value = value[0]
- #self.driver.AddSliceTag(slicename, slice_tag, value, node_name)
+ #self.driver.AddSliceTag(slicename, slice_tag, \
+ #value, node_name)
#self.driver.DeleteSliceFromNodes(slicename, deleted_nodes)
#finally:
#if peer:
- #self.driver.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
+ #self.driver.BindObjectToPeer('slice', slice['slice_id'], \
+ #peer, slice['peer_slice_id'])
#return 1
git://git.onelab.eu / sfa.git / commitdiff