X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2Fslabdriver.py;h=724a34402dad5f4d3fddb385a4b3e729e15ccb84;hb=23666284b256845f8c04b287b9560f87f8629bc9;hp=f009aa40927bab53bff3284e5aa1f9ece9437fce;hpb=948ad94acbc4605754e9d46680dc5a42d3bf2f6d;p=sfa.git diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index f009aa40..724a3440 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -1,14 +1,13 @@ import subprocess from datetime import datetime -from time import gmtime from sfa.util.faults import SliverDoesNotExist, UnknownSfaType from sfa.util.sfalogging import logger from sfa.storage.alchemy import dbsession -from sfa.storage.model import RegRecord, RegUser - +from sfa.storage.model import RegRecord, RegUser, RegSlice +from sqlalchemy.orm import joinedload from sfa.trust.credential import Credential @@ -16,7 +15,7 @@ from sfa.managers.driver import Driver from sfa.rspecs.version_manager import VersionManager from sfa.rspecs.rspec import RSpec -from sfa.util.xrn import hrn_to_urn, urn_to_sliver_id, get_leaf +from sfa.util.xrn import hrn_to_urn, get_authority ## thierry: everything that is API-related (i.e. handling incoming requests) @@ -27,7 +26,8 @@ from sfa.util.xrn import hrn_to_urn, urn_to_sliver_id, get_leaf from sfa.senslab.OARrestapi import OARrestapi from sfa.senslab.LDAPapi import LDAPapi -from sfa.senslab.slabpostgres import SlabDB, slab_dbsession, SliceSenslab +from sfa.senslab.slabpostgres import SlabDB, slab_dbsession, SenslabXP + from sfa.senslab.slabaggregate import SlabAggregate, slab_xrn_to_hostname, \ slab_xrn_object @@ -35,25 +35,28 @@ from sfa.senslab.slabslices import SlabSlices - - # thierry : note # this inheritance scheme is so that the driver object can receive # GetNodes or GetSites sorts of calls directly # and thus minimize the differences in the managers with the pl version -class SlabDriver(Driver): + + +class SlabDriver(Driver): + """ Senslab Driver class inherited from Driver generic class. + + Contains methods compliant with the SFA standard and the testbed + infrastructure (calls to LDAP and OAR). + """ def __init__(self, config): Driver.__init__ (self, config) self.config = config self.hrn = config.SFA_INTERFACE_HRN - self.root_auth = config.SFA_REGISTRY_ROOT_AUTH - self.oar = OARrestapi() self.ldap = LDAPapi() self.time_format = "%Y-%m-%d %H:%M:%S" - self.db = SlabDB(config,debug = True) + self.db = SlabDB(config, debug = True) self.cache = None @@ -76,33 +79,36 @@ class SlabDriver(Driver): #Slice has the same slice hrn for each slice in the slice/lease list #So fetch the info on the user once one_slice = slice_list[0] - recuser = dbsession.query(RegRecord).filter_by(record_id = \ - one_slice['record_id_user']).first() + #recuser = dbsession.query(RegRecord).filter_by(record_id = \ + #one_slice['record_id_user']).first() #Make a list of all the nodes hostnames in use for this slice slice_nodes_list = [] - for sl in slice_list: - for node in sl['node_ids']: + for single_slice in slice_list: + for node in single_slice['node_ids']: slice_nodes_list.append(node['hostname']) #Get all the corresponding nodes details nodes_all = self.GetNodes({'hostname':slice_nodes_list}, ['node_id', 'hostname','site','boot_state']) - nodeall_byhostname = dict([(n['hostname'], n) for n in nodes_all]) + nodeall_byhostname = dict([(one_node['hostname'], one_node) \ + for one_node in nodes_all]) - for sl in slice_list: + for single_slice in slice_list: #For compatibility top_level_status = 'empty' result = {} - result.fromkeys(['geni_urn','pl_login','geni_status','geni_resources'],None) - result['pl_login'] = recuser.hrn - logger.debug("Slabdriver - sliver_status Sliver status urn %s hrn %s sl\ - %s \r\n " %(slice_urn, slice_hrn, sl)) + result.fromkeys(\ + ['geni_urn','pl_login','geni_status','geni_resources'], None) + result['pl_login'] = one_slice['reg_researchers']['hrn'] + logger.debug("Slabdriver - sliver_status Sliver status \ + urn %s hrn %s single_slice %s \r\n " \ + %(slice_urn, slice_hrn, single_slice)) try: - nodes_in_slice = sl['node_ids'] + nodes_in_slice = single_slice['node_ids'] except KeyError: #No job in the slice result['geni_status'] = top_level_status @@ -125,19 +131,23 @@ class SlabDriver(Driver): #gmtime(float(timestamp))) resources = [] - for node in sl['node_ids']: + for node in single_slice['node_ids']: res = {} #res['slab_hostname'] = node['hostname'] #res['slab_boot_state'] = node['boot_state'] res['pl_hostname'] = node['hostname'] - res['pl_boot_state'] = nodeall_byhostname[node['hostname']]['boot_state'] + res['pl_boot_state'] = \ + nodeall_byhostname[node['hostname']]['boot_state'] #res['pl_last_contact'] = strftime(self.time_format, \ #gmtime(float(timestamp))) - sliver_id = urn_to_sliver_id(slice_urn, sl['record_id_slice'], \ - nodeall_byhostname[node['hostname']]['node_id']) + sliver_id = Xrn(slice_urn, type='slice', \ + id=nodeall_byhostname[node['hostname']]['node_id'], \ + authority=self.hrn).urn + res['geni_urn'] = sliver_id - if nodeall_byhostname[node['hostname']]['boot_state'] == 'Alive': + node_name = node['hostname'] + if nodeall_byhostname[node_name]['boot_state'] == 'Alive': res['geni_status'] = 'ready' else: @@ -154,7 +164,10 @@ class SlabDriver(Driver): %(resources,res)) return result - + def get_user(self, hrn): + return dbsession.query(RegRecord).filter_by(hrn = hrn).first() + + def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, \ users, options): aggregate = SlabAggregate(self) @@ -168,61 +181,70 @@ class SlabDriver(Driver): creds = [creds] if users: - slice_record = users[0].get('slice_record', {}) - + slice_record = users[0].get('slice_record', {}) + logger.debug("SLABDRIVER.PY \t create_sliver \t\ + slice_record %s \r\n \r\n users %s" \ + %(slice_record, users)) + slice_record['user'] = {'keys':users[0]['keys'], \ + 'email':users[0]['email'], \ + 'hrn':slice_record['reg-researchers'][0]} # parse rspec rspec = RSpec(rspec_string) - logger.debug("SLABDRIVER.PY \t create_sliver \tr spec.version %s slice_record %s " \ - %(rspec.version,slice_record)) - - #self.synchronize_oar_and_slice_table(slice_hrn) + logger.debug("SLABDRIVER.PY \t create_sliver \trspec.version \ + %s slice_record %s users %s" \ + %(rspec.version,slice_record, users)) + + # ensure site record exists? # ensure slice record exists #Removed options to verify_slice SA 14/08/12 sfa_slice = slices.verify_slice(slice_hrn, slice_record, peer, \ sfa_peer) + # ensure person records exists + #verify_persons returns added persons but since the return value + #is not used + slices.verify_persons(slice_hrn, sfa_slice, users, peer, \ + sfa_peer, options=options) #requested_attributes returned by rspec.version.get_slice_attributes() #unused, removed SA 13/08/12 rspec.version.get_slice_attributes() logger.debug("SLABDRIVER.PY create_sliver slice %s " %(sfa_slice)) - - # ensure person records exists - #verify_persons returns added persons but since the return value - #is not used - slices.verify_persons(slice_hrn, sfa_slice, users, peer, \ - sfa_peer, options=options) - - # add/remove slice from nodes - requested_slivers = [node.get('component_name') \ - for node in rspec.version.get_nodes_with_slivers()] + requested_slivers = [node.get('component_id') \ + for node in rspec.version.get_nodes_with_slivers()\ + if node.get('authority_id') is self.root_auth] l = [ node for node in rspec.version.get_nodes_with_slivers() ] logger.debug("SLADRIVER \tcreate_sliver requested_slivers \ requested_slivers %s listnodes %s" \ %(requested_slivers,l)) #verify_slice_nodes returns nodes, but unused here. Removed SA 13/08/12. - slices.verify_slice_nodes(sfa_slice, requested_slivers, peer) + #slices.verify_slice_nodes(sfa_slice, requested_slivers, peer) # add/remove leases requested_lease_list = [] - kept_leases = [] + + logger.debug("SLABDRIVER.PY \tcreate_sliver AVANTLEASE " ) + rspec_requested_leases = rspec.version.get_leases() for lease in rspec.version.get_leases(): single_requested_lease = {} logger.debug("SLABDRIVER.PY \tcreate_sliver lease %s " %(lease)) + if not lease.get('lease_id'): - single_requested_lease['hostname'] = \ - slab_xrn_to_hostname(lease.get('component_id').strip()) - single_requested_lease['start_time'] = lease.get('start_time') - single_requested_lease['duration'] = lease.get('duration') - else: - kept_leases.append(int(lease['lease_id'])) - if single_requested_lease.get('hostname'): - requested_lease_list.append(single_requested_lease) + if get_authority(lease['component_id']) == self.root_auth: + single_requested_lease['hostname'] = \ + slab_xrn_to_hostname(\ + lease.get('component_id').strip()) + single_requested_lease['start_time'] = \ + lease.get('start_time') + single_requested_lease['duration'] = lease.get('duration') + + requested_lease_list.append(single_requested_lease) + logger.debug("SLABDRIVER.PY \tcreate_sliver APRESLEASE" ) #dCreate dict of leases by start_time, regrouping nodes reserved #at the same #time, for the same amount of time = one job on OAR @@ -247,11 +269,12 @@ class SlabDriver(Driver): - logger.debug("SLABDRIVER.PY \tcreate_sliver requested_job_dict %s " %(requested_job_dict)) + logger.debug("SLABDRIVER.PY \tcreate_sliver requested_job_dict %s "\ + %(requested_job_dict)) #verify_slice_leases returns the leases , but the return value is unused #here. Removed SA 13/08/12 slices.verify_slice_leases(sfa_slice, \ - requested_job_dict, kept_leases, peer) + requested_job_dict, peer) return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) @@ -281,24 +304,50 @@ class SlabDriver(Driver): try: if peer: self.UnBindObjectFromPeer('slice', \ - sfa_slice['record_id_slice'], peer,None) + sfa_slice['record_id_slice'], \ + peer, None) self.DeleteSliceFromNodes(sfa_slice) finally: if peer: - self.BindObjectToPeer('slice', sfa_slice['record_id_slice'], \ - peer, sfa_slice['peer_slice_id']) + self.BindObjectToPeer('slice', \ + sfa_slice['record_id_slice'], \ + peer, sfa_slice['peer_slice_id']) return 1 - def AddSlice(self, slice_record): - slab_slice = SliceSenslab( slice_hrn = slice_record['slice_hrn'], \ - record_id_slice= slice_record['record_id_slice'] , \ - record_id_user= slice_record['record_id_user'], \ - peer_authority = slice_record['peer_authority']) - logger.debug("SLABDRIVER.PY \tAddSlice slice_record %s slab_slice %s" \ - %(slice_record,slab_slice)) - slab_dbsession.add(slab_slice) - slab_dbsession.commit() + def AddSlice(self, slice_record, user_record): + """Add slice to the sfa tables and senslab table only if the user + already exists in senslab database(user already registered in LDAP). + There is no way to separate adding the slice to the tesbed + and then importing it from the testbed to SFA because of + senslab's architecture. Therefore, sfa tables are updated here. + """ + + sfa_record = RegSlice(hrn=slice_record['slice_hrn'], + gid=slice_record['gid'], + pointer=slice_record['slice_id'], + authority=slice_record['authority']) + + logger.debug("SLABDRIVER.PY AddSlice sfa_record %s user_record %s" \ + %(sfa_record, user_record)) + sfa_record.just_created() + dbsession.add(sfa_record) + dbsession.commit() + #Update the reg-researcher dependance table + sfa_record.reg_researchers = [user_record] + dbsession.commit() + + #Update the senslab table with the new slice + #slab_slice = SenslabXP( slice_hrn = slice_record['slice_hrn'], \ + #record_id_slice = sfa_record.record_id , \ + #record_id_user = slice_record['record_id_user'], \ + #peer_authority = slice_record['peer_authority']) + + #logger.debug("SLABDRIVER.PY \tAddSlice slice_record %s \ + #slab_slice %s sfa_record %s" \ + #%(slice_record,slab_slice, sfa_record)) + #slab_dbsession.add(slab_slice) + #slab_dbsession.commit() return # first 2 args are None in case of resource discovery @@ -315,6 +364,14 @@ class SlabDriver(Driver): if options.get('info'): version_string = version_string + "_" + \ options.get('info', 'default') + + # Adding the list_leases option to the caching key + if options.get('list_leases'): + version_string = version_string + "_"+options.get('list_leases', 'default') + + # Adding geni_available to caching key + if options.get('geni_available'): + version_string = version_string + "_" + str(options.get('geni_available')) # look in cache first #if cached_requested and self.cache and not slice_hrn: @@ -326,8 +383,8 @@ class SlabDriver(Driver): #panos: passing user-defined options aggregate = SlabAggregate(self) - origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn() - options.update({'origin_hrn':origin_hrn}) + #origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn() + #options.update({'origin_hrn':origin_hrn}) rspec = aggregate.get_rspec(slice_xrn=slice_urn, \ version=rspec_version, options=options) @@ -351,9 +408,8 @@ class SlabDriver(Driver): slices = self.GetSlices() logger.debug("SLABDRIVER.PY \tlist_slices hrn %s \r\n \r\n" %(slices)) - slice_hrns = [slab_slice['slice_hrn'] for slab_slice in slices] - #slice_hrns = [slicename_to_hrn(self.hrn, slab_slice['slice_hrn']) \ - #for slab_slice in slices] + slice_hrns = [slab_slice['hrn'] for slab_slice in slices] + slice_urns = [hrn_to_urn(slice_hrn, 'slice') \ for slice_hrn in slice_hrns] @@ -364,60 +420,23 @@ class SlabDriver(Driver): return slice_urns - #No site or node register supported + def register (self, sfa_record, hrn, pub_key): - record_type = sfa_record['type'] - slab_record = self.sfa_fields_to_slab_fields(record_type, hrn, \ - sfa_record) - - - if record_type == 'slice': - acceptable_fields = ['url', 'instantiation', 'name', 'description'] - for key in slab_record.keys(): - if key not in acceptable_fields: - slab_record.pop(key) - logger.debug("SLABDRIVER.PY register") - slices = self.GetSlices(slice_filter=slab_record['hrn'], \ - slice_filter_type = 'slice_hrn') - if not slices: - pointer = self.AddSlice(slab_record) - else: - pointer = slices[0]['slice_id'] - - elif record_type == 'user': - persons = self.GetPersons([sfa_record]) - #persons = self.GetPersons([sfa_record['hrn']]) - if not persons: - sfa_record['enabled'] = False - #For Senslab LDAP, if the user is a new one, disable the - #account so that admins have to acknowledge the user first. - pointer = self.AddPerson(dict(sfa_record)) - #add in LDAP - else: - pointer = persons[0]['person_id'] - - #Does this make sense to senslab ? - #if 'enabled' in sfa_record and sfa_record['enabled']: - #self.UpdatePerson(pointer, \ - #{'enabled': sfa_record['enabled']}) - - #TODO register Change this AddPersonToSite stuff 05/07/2012 SA - #No site in senslab 28/08/12 SA - - - # What roles should this user have? - #No user roles in Slab/SFA 28/08/12 SA: roles are handled in LDAP - # Add the user's key - if pub_key: - self.AddPersonKey(pointer, {'key_type' : 'ssh', \ - 'key' : pub_key}) - - #No node adding outside OAR - - return pointer + """ + Adding new user, slice, node or site should not be handled + by SFA. + + Adding nodes = OAR + Adding users = LDAP Senslab + Adding slice = Import from LDAP users + Adding site = OAR + """ + return -1 - #No site or node record update allowed + def update (self, old_sfa_record, new_sfa_record, hrn, new_key): + """No site or node record update allowed in Senslab.""" + pointer = old_sfa_record['pointer'] old_sfa_record_type = old_sfa_record['type'] @@ -505,16 +524,12 @@ class SlabDriver(Driver): logger.debug("SLABDRIVER \tGetPeers auth = %s, peer_filter %s, \ return_field %s " %(auth , peer_filter, return_fields_list)) all_records = dbsession.query(RegRecord).filter(RegRecord.type.like('%authority%')).all() + for record in all_records: existing_records[(record.hrn, record.type)] = record if record.type not in existing_hrns_by_types: existing_hrns_by_types[record.type] = [record.hrn] - logger.debug("SLABDRIVER \tGetPeer\t NOT IN \ - existing_hrns_by_types %s " %( existing_hrns_by_types)) else: - - logger.debug("SLABDRIVER \tGetPeer\t \INNN type %s hrn %s " \ - %(record.type,record.hrn)) existing_hrns_by_types[record.type].append(record.hrn) @@ -566,7 +581,13 @@ class SlabDriver(Driver): #add a filter for make_ldap_filters_from_record person = self.ldap.LdapFindUser(searched_attributes, \ is_user_enabled=True) - person_list.append(person) + #If a person was found, append it to the list + if person: + person_list.append(person) + + #If the list is empty, return None + if len(person_list) is 0: + person_list = None else: #Get only enabled user accounts in senslab LDAP : @@ -576,6 +597,8 @@ class SlabDriver(Driver): return person_list def GetTimezone(self): + """ Get the OAR servier time and timezone. + Unused SA 16/11/12""" server_timestamp, server_tz = self.oar.parser.\ SendRequest("GET_timezone") return server_timestamp, server_tz @@ -698,16 +721,15 @@ class SlabDriver(Driver): for node in full_nodes_dict_list: oar_id_node_dict[node['oar_id']] = node - logger.debug("SLABDRIVER \t __get_hostnames_from_oar_node_ids\ - oar_id_node_dict %s" %(oar_id_node_dict)) + #logger.debug("SLABDRIVER \t __get_hostnames_from_oar_node_ids\ + #oar_id_node_dict %s" %(oar_id_node_dict)) hostname_dict_list = [] for resource_id in resource_id_list: #Because jobs requested "asap" do not have defined resources if resource_id is not "Undefined": - hostname_dict_list.append({'hostname' : \ - oar_id_node_dict[resource_id]['hostname'], - 'site_id' : oar_id_node_dict[resource_id]['site']}) + hostname_dict_list.append(\ + oar_id_node_dict[resource_id]['hostname']) #hostname_list.append(oar_id_node_dict[resource_id]['hostname']) return hostname_dict_list @@ -715,7 +737,8 @@ class SlabDriver(Driver): def GetReservedNodes(self,username = None): #Get the nodes in use and the reserved nodes reservation_dict_list = \ - self.oar.parser.SendRequest("GET_reserved_nodes", username = username) + self.oar.parser.SendRequest("GET_reserved_nodes", \ + username = username) for resa in reservation_dict_list: @@ -734,7 +757,8 @@ class SlabDriver(Driver): """ node_dict_by_id = self.oar.parser.SendRequest("GET_resources_full") node_dict_list = node_dict_by_id.values() - + logger.debug (" SLABDRIVER GetNodes node_filter_dict %s \ + return_fields_list %s "%(node_filter_dict, return_fields_list)) #No filtering needed return the list directly if not (node_filter_dict or return_fields_list): return node_dict_list @@ -789,10 +813,87 @@ class SlabDriver(Driver): return return_site_list - + def _sql_get_slice_info( self, slice_filter ): + #DO NOT USE RegSlice - reg_researchers to get the hrn + #of the user otherwise will mess up the RegRecord in + #Resolve, don't know why - SA 08/08/2012 + + #Only one entry for one user = one slice in slab_xp table + #slicerec = dbsession.query(RegRecord).filter_by(hrn = slice_filter).first() + raw_slicerec = dbsession.query(RegSlice).options(joinedload('reg_researchers')).filter_by(hrn = slice_filter).first() + #raw_slicerec = dbsession.query(RegRecord).filter_by(hrn = slice_filter).first() + if raw_slicerec: + #load_reg_researcher + #raw_slicerec.reg_researchers + raw_slicerec = raw_slicerec.__dict__ + logger.debug(" SLABDRIVER \t get_slice_info slice_filter %s raw_slicerec %s"%(slice_filter,raw_slicerec)) + slicerec = raw_slicerec + #only one researcher per slice so take the first one + #slicerec['reg_researchers'] = raw_slicerec['reg_researchers'] + #del slicerec['reg_researchers']['_sa_instance_state'] + return slicerec + + else : + return None + + + def _sql_get_slice_info_from_user( self, slice_filter ): + #slicerec = dbsession.query(RegRecord).filter_by(record_id = slice_filter).first() + raw_slicerec = dbsession.query(RegUser).options(joinedload('reg_slices_as_researcher')).filter_by(record_id = slice_filter).first() + #raw_slicerec = dbsession.query(RegRecord).filter_by(record_id = slice_filter).first() + #Put it in correct order + user_needed_fields = ['peer_authority', 'hrn', 'last_updated', 'classtype', 'authority', 'gid', 'record_id', 'date_created', 'type', 'email', 'pointer'] + slice_needed_fields = ['peer_authority', 'hrn', 'last_updated', 'classtype', 'authority', 'gid', 'record_id', 'date_created', 'type', 'pointer'] + if raw_slicerec: + #raw_slicerec.reg_slices_as_researcher + raw_slicerec = raw_slicerec.__dict__ + slicerec = {} + slicerec = dict([(k,raw_slicerec['reg_slices_as_researcher'][0].__dict__[k]) for k in slice_needed_fields]) + slicerec['reg_researchers'] = dict([(k, raw_slicerec[k]) for k in user_needed_fields]) + #TODO Handle multiple slices for one user SA 10/12/12 + #for now only take the first slice record associated to the rec user + ##slicerec = raw_slicerec['reg_slices_as_researcher'][0].__dict__ + #del raw_slicerec['reg_slices_as_researcher'] + #slicerec['reg_researchers'] = raw_slicerec + ##del slicerec['_sa_instance_state'] + + return slicerec + + else: + return None + + def _get_slice_records(self, slice_filter = None, \ + slice_filter_type = None): + + login = None + #Get list of slices based on the slice hrn + if slice_filter_type == 'slice_hrn': + + if get_authority(slice_filter) == self.root_auth: + login = slice_filter.split(".")[1].split("_")[0] + + slicerec = self._sql_get_slice_info(slice_filter) + + if slicerec is None: + return login, None + + #Get slice based on user id + if slice_filter_type == 'record_id_user': + + slicerec = self._sql_get_slice_info_from_user(slice_filter) + + if slicerec: + fixed_slicerec_dict = slicerec + #At this point if the there is no login it means + #record_id_user filter has been used for filtering + if login is None : + #If theslice record is from senslab + if fixed_slicerec_dict['peer_authority'] is None: + login = fixed_slicerec_dict['hrn'].split(".")[1].split("_")[0] + return login, fixed_slicerec_dict + + def GetSlices(self, slice_filter = None, slice_filter_type = None): - #def GetSlices(self, slice_filter = None, slice_filter_type = None, \ - #return_fields_list = None): """ Get the slice records from the slab db. Returns a slice ditc if slice_filter and slice_filter_type are specified. @@ -801,118 +902,110 @@ class SlabDriver(Driver): """ login = None - return_slice_list = [] - slicerec = {} - slicerec_dict = {} authorized_filter_types_list = ['slice_hrn', 'record_id_user'] - slicerec_dictlist = [] + return_slicerec_dictlist = [] - + #First try to get information on the slice based on the filter provided if slice_filter_type in authorized_filter_types_list: - - - def __get_slice_records(slice_filter = None, slice_filter_type = None): - - login = None - #Get list of slices based on the slice hrn - if slice_filter_type == 'slice_hrn': - - login = slice_filter.split(".")[1].split("_")[0] - - #DO NOT USE RegSlice - reg_researchers to get the hrn of the user - #otherwise will mess up the RegRecord in Resolve, don't know - #why - SA 08/08/2012 - - #Only one entry for one user = one slice in slice_senslab table - slicerec = slab_dbsession.query(SliceSenslab).filter_by(slice_hrn = slice_filter).first() - - #Get slice based on user id - if slice_filter_type == 'record_id_user': - slicerec = slab_dbsession.query(SliceSenslab).filter_by(record_id_user = slice_filter).first() - - if slicerec is None: - return login, [] - else: - fixed_slicerec_dict = slicerec.dump_sqlalchemyobj_to_dict() - - if login is None : - login = fixed_slicerec_dict['slice_hrn'].split(".")[1].split("_")[0] - return login, fixed_slicerec_dict - - - - - login, fixed_slicerec_dict = __get_slice_records(slice_filter, slice_filter_type) + + login, fixed_slicerec_dict = \ + self._get_slice_records(slice_filter, slice_filter_type) logger.debug(" SLABDRIVER \tGetSlices login %s \ - slice record %s" \ - %(login, fixed_slicerec_dict)) - - + slice record %s slice_filter %s slice_filter_type %s "\ + %(login, fixed_slicerec_dict,slice_filter, slice_filter_type)) - #One slice can have multiple jobs - leases_list = self.GetReservedNodes(username = login) - #If no job is running or no job scheduled - if leases_list == [] : - return [fixed_slicerec_dict] - - #Several jobs for one slice + #Now we have the slice record fixed_slicerec_dict, get the + #jobs associated to this slice + #leases_list = self.GetReservedNodes(username = login) + leases_list = self.GetLeases(login = login) + #If no job is running or no job scheduled + #return only the slice record + if leases_list == [] and fixed_slicerec_dict: + return_slicerec_dictlist.append(fixed_slicerec_dict) + + #If several jobs for one slice , put the slice record into + # each lease information dict for lease in leases_list : slicerec_dict = {} - - #Check with OAR the status of the job if a job id is in - #the slice record + reserved_list = lease['reserved_nodes'] - - - slicerec_dict['oar_job_id'] = lease['lease_id'] + slicerec_dict['oar_job_id']= lease['lease_id'] + slicerec_dict.update({'list_node_ids':{'hostname':reserved_list}}) slicerec_dict.update({'node_ids':lease['reserved_nodes']}) - slicerec_dict.update(fixed_slicerec_dict) - slicerec_dict.update({'hrn':\ - str(fixed_slicerec_dict['slice_hrn'])}) + + #Update lease dict with the slice record + if fixed_slicerec_dict: + fixed_slicerec_dict['oar_job_id'].append(slicerec_dict['oar_job_id']) + slicerec_dict.update(fixed_slicerec_dict) + #slicerec_dict.update({'hrn':\ + #str(fixed_slicerec_dict['slice_hrn'])}) - slicerec_dictlist.append(slicerec_dict) - logger.debug("SLABDRIVER.PY \tGetSlices slicerec_dict %s slicerec_dictlist %s" %(slicerec_dict, slicerec_dictlist)) + return_slicerec_dictlist.append(slicerec_dict) + logger.debug("SLABDRIVER.PY \tGetSlices \ + slicerec_dict %s return_slicerec_dictlist %s \ + lease['reserved_nodes'] \ + %s" %(slicerec_dict, return_slicerec_dictlist, \ + lease['reserved_nodes'] )) - logger.debug("SLABDRIVER.PY \tGetSlices RETURN slicerec_dictlist %s"\ - %(slicerec_dictlist)) + logger.debug("SLABDRIVER.PY \tGetSlices RETURN \ + return_slicerec_dictlist %s" \ + %(return_slicerec_dictlist)) - return slicerec_dictlist + return return_slicerec_dictlist else: - - slice_list = slab_dbsession.query(SliceSenslab).all() + #Get all slices from the senslab sfa database , + #put them in dict format + #query_slice_list = dbsession.query(RegRecord).all() + query_slice_list = dbsession.query(RegSlice).options(joinedload('reg_researchers')).all() + #query_slice_list = dbsession.query(RegRecord).filter_by(type='slice').all() + #query_slice_list = slab_dbsession.query(SenslabXP).all() + return_slicerec_dictlist = [] + for record in query_slice_list: + tmp = record.__dict__ + tmp['reg_researchers'] = tmp['reg_researchers'].__dict__ + #del tmp['reg_researchers']['_sa_instance_state'] + return_slicerec_dictlist.append(tmp) + #return_slicerec_dictlist.append(record.__dict__) + + #Get all the jobs reserved nodes leases_list = self.GetReservedNodes() - - slicerec_dictlist = [] - return_slice_list = [] - for record in slice_list: - return_slice_list.append(record.dump_sqlalchemyobj_to_dict()) - - for fixed_slicerec_dict in return_slice_list: + + for fixed_slicerec_dict in return_slicerec_dictlist: slicerec_dict = {} - owner = fixed_slicerec_dict['slice_hrn'].split(".")[1].split("_")[0] + #Check if the slice belongs to a senslab user + if fixed_slicerec_dict['peer_authority'] is None: + owner = fixed_slicerec_dict['hrn'].split(".")[1].split("_")[0] + else: + owner = None for lease in leases_list: if owner == lease['user']: slicerec_dict['oar_job_id'] = lease['lease_id'] + + #for reserved_node in lease['reserved_nodes']: + logger.debug("SLABDRIVER.PY \tGetSlices lease %s "\ + %(lease )) + + reserved_list = lease['reserved_nodes'] + slicerec_dict.update({'node_ids':lease['reserved_nodes']}) + slicerec_dict.update({'list_node_ids':{'hostname':reserved_list}}) slicerec_dict.update(fixed_slicerec_dict) - slicerec_dict.update({'hrn':\ - str(fixed_slicerec_dict['slice_hrn'])}) - slicerec_dictlist.append(slicerec_dict) - - logger.debug("SLABDRIVER.PY \tGetSlices RETURN slices %s \ - slice_filter %s " %(return_slice_list, slice_filter)) - - #if return_fields_list: - #return_slice_list = parse_filter(sliceslist, \ - #slice_filter,'slice', return_fields_list) + #slicerec_dict.update({'hrn':\ + #str(fixed_slicerec_dict['slice_hrn'])}) + #return_slicerec_dictlist.append(slicerec_dict) + fixed_slicerec_dict.update(slicerec_dict) + + logger.debug("SLABDRIVER.PY \tGetSlices RETURN \ + return_slicerec_dictlist %s \slice_filter %s " \ + %(return_slicerec_dictlist, slice_filter)) - return slicerec_dictlist + return return_slicerec_dictlist def testbed_name (self): return self.hrn @@ -933,10 +1026,7 @@ class SlabDriver(Driver): 'geni_ad_rspec_versions': ad_rspec_versions, } - - - - + ## # Convert SFA fields to PLC fields for use when registering up updating @@ -959,7 +1049,8 @@ class SlabDriver(Driver): if not "instantiation" in slab_record: slab_record["instantiation"] = "senslab-instantiated" #slab_record["hrn"] = hrn_to_pl_slicename(hrn) - #Unused hrn_to_pl_slicename because Slab's hrn already in the appropriate form SA 23/07/12 + #Unused hrn_to_pl_slicename because Slab's hrn already + #in the appropriate form SA 23/07/12 slab_record["hrn"] = hrn logger.debug("SLABDRIVER.PY sfa_fields_to_slab_fields \ slab_record %s " %(slab_record['hrn'])) @@ -1029,6 +1120,7 @@ class SlabDriver(Driver): lease_dict['slice_user'] = slice_user lease_dict['grain'] = self.GetLeaseGranularity() lease_dict['time_format'] = self.time_format + def __create_job_structure_request_for_OAR(lease_dict): """ Creates the structure needed for a correct POST on OAR. @@ -1046,8 +1138,8 @@ class SlabDriver(Driver): reqdict['resource'] = "{network_address in (" for node in lease_dict['added_nodes']: - logger.debug("\r\n \r\n OARrestapi \t __create_job_structure_request_for_OAR \ - node %s" %(node)) + logger.debug("\r\n \r\n OARrestapi \t \ + __create_job_structure_request_for_OAR node %s" %(node)) # Get the ID of the node nodeid = node @@ -1068,10 +1160,10 @@ class SlabDriver(Driver): # First put the walltime in seconds oarAdditionalDelay = 20; # additional delay for /bin/sleep command to # take in account prologue and epilogue scripts execution - # int walltimeAdditionalDelay = 120; additional delay + # int walltimeAdditionalDelay = 240; additional delay desired_walltime = duration - total_walltime = desired_walltime + 140#+2 min 20 - sleep_walltime = desired_walltime + 20 #+20 sec + total_walltime = desired_walltime + 240 #+4 min Update SA 23/10/12 + sleep_walltime = desired_walltime # 0 sec added Update SA 23/10/12 walltime = [] #Put the walltime back in str form #First get the hours @@ -1130,7 +1222,7 @@ class SlabDriver(Driver): except KeyError: logger.log_exc("SLABDRIVER \tLaunchExperimentOnOAR \ Impossible to create job %s " %(answer)) - return + return None def __configure_experiment(jobid, added_nodes): @@ -1153,8 +1245,7 @@ class SlabDriver(Driver): javacmdline = "/usr/bin/java" jarname = \ "/opt/senslabexperimentwrapper/sfa-1.0-jar-with-dependencies.jar" - #ret=subprocess.check_output(["/usr/bin/java", "-jar", ", \ - #str(jobid), slice_user]) + output = subprocess.Popen([javacmdline, "-jar", jarname, str(jobid), \ slice_user],stdout=subprocess.PIPE).communicate()[0] @@ -1172,18 +1263,27 @@ class SlabDriver(Driver): __configure_experiment(jobid, added_nodes) __launch_senslab_experiment(jobid) - return + return jobid - def AddLeases(self, hostname_list, slice_record, lease_start_time, lease_duration): + + def AddLeases(self, hostname_list, slice_record, \ + lease_start_time, lease_duration): logger.debug("SLABDRIVER \r\n \r\n \t AddLeases hostname_list %s \ slice_record %s lease_start_time %s lease_duration %s "\ %( hostname_list, slice_record , lease_start_time, \ lease_duration)) - tmp = slice_record['PI'][0].split(".") + tmp = slice_record['reg-researchers'][0].split(".") username = tmp[(len(tmp)-1)] - self.LaunchExperimentOnOAR(hostname_list, slice_record['name'], lease_start_time, lease_duration, username) + job_id = self.LaunchExperimentOnOAR(hostname_list, slice_record['hrn'], \ + lease_start_time, lease_duration, username) start_time = datetime.fromtimestamp(int(lease_start_time)).strftime(self.time_format) + end_time = lease_start_time + lease_duration + slab_ex_row = SenslabXP(slice_record['hrn'], job_id, end_time) + logger.debug("SLABDRIVER \r\n \r\n \t slab_ex_row %s" %(slab_ex_row)) + slab_dbsession.add(slab_ex_row) + slab_dbsession.commit() + logger.debug("SLABDRIVER \t AddLeases hostname_list start_time %s " %(start_time)) return @@ -1198,71 +1298,138 @@ class SlabDriver(Driver): def GetLeaseGranularity(self): """ Returns the granularity of Senslab testbed. + OAR returns seconds for experiments duration. Defined in seconds. """ grain = 60 return grain - def GetLeases(self, lease_filter_dict=None): - unfiltered_reservation_list = self.GetReservedNodes() + def update_jobs_in_slabdb(self, job_oar_list, jobs_psql): + #Get all the entries in slab_xp table - ##Synchronize slice_table of sfa senslab db - #self.synchronize_oar_and_slice_table(unfiltered_reservation_list) + + jobs_psql = set(jobs_psql) + kept_jobs = set(job_oar_list).intersection(jobs_psql) + + deleted_jobs = set(jobs_psql).difference(kept_jobs) + deleted_jobs = list(deleted_jobs) + if len(deleted_jobs) > 0: + slab_dbsession.query(SenslabXP).filter(SenslabXP.job_id.in_(deleted_jobs)).delete(synchronize_session='fetch') + slab_dbsession.commit() + return + + + + def GetLeases(self, lease_filter_dict=None, login=None): + + + unfiltered_reservation_list = self.GetReservedNodes(login) + reservation_list = [] #Find the slice associated with this user senslab ldap uid - logger.debug(" SLABDRIVER.PY \tGetLeases ") - #Create user dict first to avoir looking several times for + logger.debug(" SLABDRIVER.PY \tGetLeases unfiltered_reservation_list %s " %(unfiltered_reservation_list)) + #Create user dict first to avoid looking several times for #the same user in LDAP SA 27/07/12 resa_user_dict = {} + job_oar_list = [] + + jobs_psql_query = slab_dbsession.query(SenslabXP).all() + jobs_psql_dict = [ (row.job_id, row.__dict__ )for row in jobs_psql_query ] + jobs_psql_dict = dict(jobs_psql_dict) + logger.debug("SLABDRIVER \r\n \r\n \tGetLeases jobs_psql_dict %s"\ + %(jobs_psql_dict)) + jobs_psql_id_list = [ row.job_id for row in jobs_psql_query ] + + + for resa in unfiltered_reservation_list: logger.debug("SLABDRIVER \tGetLeases USER %s"\ - %(resa['user'])) - if resa['user'] not in resa_user_dict: - logger.debug("SLABDRIVER \tGetLeases userNOTIN ") - ldap_info = self.ldap.LdapSearch('(uid='+resa['user']+')') - ldap_info = ldap_info[0][1] - user = dbsession.query(RegUser).filter_by(email = \ - ldap_info['mail'][0]).first() - #Separated in case user not in database : record_id not defined SA 17/07//12 - query_slice_info = slab_dbsession.query(SliceSenslab).filter_by(record_id_user = user.record_id) - if query_slice_info: - slice_info = query_slice_info.first() - else: - slice_info = None + %(resa['user'])) + #Cosntruct list of jobs (runing, waiting..) in oar + job_oar_list.append(resa['lease_id']) + if resa['lease_id'] in jobs_psql_dict: + job_info = jobs_psql_dict[resa['lease_id']] + + #if resa['user'] not in resa_user_dict: + #logger.debug("SLABDRIVER \tGetLeases userNOTIN ") + #ldap_info = self.ldap.LdapSearch('(uid='+resa['user']+')') + #if ldap_info: + #ldap_info = ldap_info[0][1] + ##Get the backref :relationship table reg-researchers + #user = dbsession.query(RegUser).options(joinedload('reg_slices_as_researcher')).filter_by(email = \ + #ldap_info['mail'][0]) + #if user: + #user = user.first() + #user = user.__dict__ + #slice_info = user['reg_slices_as_researcher'][0].__dict__ + ##Separated in case user not in database : + ##record_id not defined SA 17/07//12 - resa_user_dict[resa['user']] = {} - resa_user_dict[resa['user']]['ldap_info'] = user - resa_user_dict[resa['user']]['slice_info'] = slice_info - + ##query_slice_info = slab_dbsession.query(SenslabXP).filter_by(record_id_user = user.record_id) + ##if query_slice_info: + ##slice_info = query_slice_info.first() + ##else: + ##slice_info = None + + #resa_user_dict[resa['user']] = {} + #resa_user_dict[resa['user']]['ldap_info'] = user + #resa_user_dict[resa['user']]['slice_info'] = slice_info + + #resa['slice_hrn'] = resa_user_dict[resa['user']]['slice_info']['hrn'] + #resa['slice_id'] = hrn_to_urn(resa['slice_hrn'], 'slice') + + resa['slice_hrn'] = job_info['slice_hrn'] + resa['slice_id'] = hrn_to_urn(resa['slice_hrn'], 'slice') + + resa['component_id_list'] = [] + #Transform the hostnames into urns (component ids) + for node in resa['reserved_nodes']: + #resa['component_id_list'].append(hostname_to_urn(self.hrn, \ + #self.root_auth, node['hostname'])) + slab_xrn = slab_xrn_object(self.root_auth, node) + resa['component_id_list'].append(slab_xrn.urn) + + if lease_filter_dict: + if lease_filter_dict['name'] == resa['slice_hrn']: + reservation_list.append(resa) + + if lease_filter_dict is None: + reservation_list = unfiltered_reservation_list + #else: + #del unfiltered_reservation_list[unfiltered_reservation_list.index(resa)] + + + self.update_jobs_in_slabdb(job_oar_list, jobs_psql_id_list) logger.debug("SLABDRIVER \tGetLeases resa_user_dict %s"\ %(resa_user_dict)) - for resa in unfiltered_reservation_list: + #for resa in unfiltered_reservation_list: - #Put the slice_urn - resa['slice_hrn'] = resa_user_dict[resa['user']]['slice_info'].slice_hrn - resa['slice_id'] = hrn_to_urn(resa['slice_hrn'], 'slice') - #Put the slice_urn - #resa['slice_id'] = hrn_to_urn(slice_info.slice_hrn, 'slice') - resa['component_id_list'] = [] - #Transform the hostnames into urns (component ids) - for node in resa['reserved_nodes']: - #resa['component_id_list'].append(hostname_to_urn(self.hrn, \ - #self.root_auth, node['hostname'])) - slab_xrn = slab_xrn_object(self.root_auth, node['hostname']) - resa['component_id_list'].append(slab_xrn.urn) - - #Filter the reservation list if necessary - #Returns all the leases associated with a given slice - if lease_filter_dict: - logger.debug("SLABDRIVER \tGetLeases lease_filter_dict %s"\ - %(lease_filter_dict)) - for resa in unfiltered_reservation_list: - if lease_filter_dict['name'] == resa['slice_hrn']: - reservation_list.append(resa) - else: - reservation_list = unfiltered_reservation_list + ##Put the slice_urn + #if resa['user'] in resa_user_dict: + #resa['slice_hrn'] = resa_user_dict[resa['user']]['slice_info']['hrn'] + #resa['slice_id'] = hrn_to_urn(resa['slice_hrn'], 'slice') + ##Put the slice_urn + ##resa['slice_id'] = hrn_to_urn(slice_info.slice_hrn, 'slice') + #resa['component_id_list'] = [] + ##Transform the hostnames into urns (component ids) + #for node in resa['reserved_nodes']: + ##resa['component_id_list'].append(hostname_to_urn(self.hrn, \ + ##self.root_auth, node['hostname'])) + #slab_xrn = slab_xrn_object(self.root_auth, node) + #resa['component_id_list'].append(slab_xrn.urn) + + ##Filter the reservation list if necessary + ##Returns all the leases associated with a given slice + #if lease_filter_dict: + #logger.debug("SLABDRIVER \tGetLeases lease_filter_dict %s"\ + #%(lease_filter_dict)) + #for resa in unfiltered_reservation_list: + #if lease_filter_dict['name'] == resa['slice_hrn']: + #reservation_list.append(resa) + #else: + #reservation_list = unfiltered_reservation_list logger.debug(" SLABDRIVER.PY \tGetLeases reservation_list %s"\ %(reservation_list)) @@ -1287,26 +1454,48 @@ class SlabDriver(Driver): #about the user of this slice. This kind of #information is in the Senslab's DB. if str(record['type']) == 'slice': - #Get slab slice record. - recslice_list = self.GetSlices(slice_filter = \ - str(record['hrn']),\ - slice_filter_type = 'slice_hrn') - - recuser = dbsession.query(RegRecord).filter_by(record_id = \ - recslice_list[0]['record_id_user']).first() - logger.debug("SLABDRIVER \tfill_record_info TYPE SLICE RECUSER %s " %(recuser)) - record.update({'PI':[recuser.hrn], - 'researcher': [recuser.hrn], + if 'reg_researchers' in record and isinstance(record['reg_researchers'],list) : + record['reg_researchers'] = record['reg_researchers'][0].__dict__ + record.update({'PI':[record['reg_researchers']['hrn']], + 'researcher': [record['reg_researchers']['hrn']], 'name':record['hrn'], - 'oar_job_id':[rec['oar_job_id'] for rec in recslice_list], + 'oar_job_id':[], 'node_ids': [], - 'person_ids':[recslice_list[0]['record_id_user']], + 'person_ids':[record['reg_researchers']['record_id']], 'geni_urn':'', #For client_helper.py compatibility 'keys':'', #For client_helper.py compatibility 'key_ids':''}) #For client_helper.py compatibility + + + #Get slab slice record. + recslice_list = self.GetSlices(slice_filter = \ + str(record['hrn']),\ + slice_filter_type = 'slice_hrn') + + #recuser = recslice_list[0]['reg_researchers'] + ##recuser = dbsession.query(RegRecord).filter_by(record_id = \ + ##recslice_list[0]['record_id_user']).first() + + #record.update({'PI':[recuser['hrn']], + #'researcher': [recuser['hrn']], + #'name':record['hrn'], + #'oar_job_id':[], + #'node_ids': [], + #'person_ids':[recslice_list[0]['reg_researchers']['record_id']], + #'geni_urn':'', #For client_helper.py compatibility + #'keys':'', #For client_helper.py compatibility + #'key_ids':''}) #For client_helper.py compatibility + logger.debug("SLABDRIVER \tfill_record_info TYPE SLICE RECUSER record['hrn'] %s ecord['oar_job_id'] %s " %(record['hrn'],record['oar_job_id'])) + try: + for rec in recslice_list: + logger.debug("SLABDRIVER\r\n \t \t fill_record_info oar_job_id %s " %(rec['oar_job_id'])) + #record['oar_job_id'].append(rec['oar_job_id']) + del record['_sa_instance_state'] + del record['reg_researchers'] + record['node_ids'] = [ self.root_auth + hostname for hostname in rec['node_ids']] + except KeyError: + pass - #for rec in recslice_list: - #record['oar_job_id'].append(rec['oar_job_id']) logger.debug( "SLABDRIVER.PY \t fill_record_info SLICE \ recslice_list %s \r\n \t RECORD %s \r\n \r\n" %(recslice_list,record)) if str(record['type']) == 'user': @@ -1322,22 +1511,28 @@ class SlabDriver(Driver): #Append slice record in records list, #therefore fetches user and slice info again(one more loop) #Will update PIs and researcher for the slice - recuser = dbsession.query(RegRecord).filter_by(record_id = \ - recslice_list[0]['record_id_user']).first() + #recuser = dbsession.query(RegRecord).filter_by(record_id = \ + #recslice_list[0]['record_id_user']).first() + recuser = recslice_list[0]['reg_researchers'] logger.debug( "SLABDRIVER.PY \t fill_record_info USER \ recuser %s \r\n \r\n" %(recuser)) recslice = {} recslice = recslice_list[0] - recslice.update({'PI':[recuser.hrn], - 'researcher': [recuser.hrn], + recslice.update({'PI':[recuser['hrn']], + 'researcher': [recuser['hrn']], 'name':record['hrn'], 'node_ids': [], - 'oar_job_id': [rec['oar_job_id'] for rec in recslice_list], - 'person_ids':[recslice_list[0]['record_id_user']]}) + 'oar_job_id': [], + 'person_ids':[recuser['record_id']]}) + try: + for rec in recslice_list: + recslice['oar_job_id'].append(rec['oar_job_id']) + except KeyError: + pass + recslice.update({'type':'slice', \ - 'hrn':recslice_list[0]['slice_hrn']}) - #for rec in recslice_list: - #recslice['oar_job_id'].append(rec['oar_job_id']) + 'hrn':recslice_list[0]['hrn']}) + #GetPersons takes [] as filters #user_slab = self.GetPersons([{'hrn':recuser.hrn}]) @@ -1353,8 +1548,9 @@ class SlabDriver(Driver): logger.debug("SLABDRIVER.PY \tfill_record_info ADDING SLICE\ INFO TO USER records %s" %(record_list)) + logger.debug("SLABDRIVER.PY \tfill_record_info END \ - #record %s \r\n \r\n " %(record)) + record %s \r\n \r\n " %(record)) except TypeError, error: logger.log_exc("SLABDRIVER \t fill_record_info EXCEPTION %s"\ @@ -1485,7 +1681,7 @@ class SlabDriver(Driver): return #TODO UpdatePerson 04/07/2012 SA - def UpdatePerson(self, auth, person_id_or_email, person_fields=None): + def UpdatePerson(self, slab_hrn, federated_hrn, person_fields=None): """Updates a person. Only the fields specified in person_fields are updated, all other fields are left untouched. Users and techs can only update themselves. PIs can only update @@ -1494,7 +1690,11 @@ class SlabDriver(Driver): FROM PLC API DOC """ - logger.warning("SLABDRIVER UpdatePerson EMPTY - DO NOTHING \r\n ") + #new_row = FederatedToSenslab(slab_hrn, federated_hrn) + #slab_dbsession.add(new_row) + #slab_dbsession.commit() + + logger.debug("SLABDRIVER UpdatePerson EMPTY - DO NOTHING \r\n ") return #TODO GetKeys 04/07/2012 SA @@ -1569,8 +1769,8 @@ class SlabDriver(Driver): """ ret = self.ldap.LdapAddUser(record) - logger.warning("SLABDRIVER AddPerson return code %s \r\n ", ret) - return + logger.debug("SLABDRIVER AddPerson return code %s \r\n "%(ret)) + return ret['uid'] #TODO AddPersonToSite 04/07/2012 SA def AddPersonToSite (self, auth, person_id_or_email, \