X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2Fslabdriver.py;h=2f68bc98880a2fba5af064b83a4a02cac6bbb6bc;hb=f0991937bc0af0f4fbdc72c71f972ab44ab1aac6;hp=4ca3d4b8645c7fa1d561a5706a47b45f27c8a7d1;hpb=e2ef4deef52e26ff204fd13aa5345a7c257031c7;p=sfa.git diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index 4ca3d4b8..2f68bc98 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -1,14 +1,12 @@ import subprocess from datetime import datetime -from dateutil import tz -from time import strftime, 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, RegSlice +from sfa.storage.model import RegRecord, RegUser from sfa.trust.credential import Credential @@ -17,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 ## thierry: everything that is API-related (i.e. handling incoming requests) @@ -29,7 +27,9 @@ from sfa.senslab.OARrestapi import OARrestapi from sfa.senslab.LDAPapi import LDAPapi from sfa.senslab.slabpostgres import SlabDB, slab_dbsession, SliceSenslab -from sfa.senslab.slabaggregate import SlabAggregate, slab_xrn_to_hostname, slab_xrn_object + +from sfa.senslab.slabaggregate import SlabAggregate, slab_xrn_to_hostname, \ + slab_xrn_object from sfa.senslab.slabslices import SlabSlices @@ -41,18 +41,20 @@ from sfa.senslab.slabslices import SlabSlices # GetNodes or GetSites sorts of calls directly # and thus minimize the differences in the managers with the pl version 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 @@ -66,58 +68,79 @@ class SlabDriver(Driver): """ #First get the slice with the slice hrn - sl = self.GetSlices(slice_filter = slice_hrn, \ + slice_list = self.GetSlices(slice_filter = slice_hrn, \ slice_filter_type = 'slice_hrn') - if len(sl) is 0: + + if len(slice_list) is 0: raise SliverDoesNotExist("%s slice_hrn" % (slice_hrn)) - top_level_status = 'unknown' - nodes_in_slice = sl['node_ids'] + #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 = \ - sl['record_id_user']).first() - sl.update({'user':recuser.hrn}) - if len(nodes_in_slice) is 0: - raise SliverDoesNotExist("No slivers allocated ") - else: - top_level_status = 'ready' + one_slice['record_id_user']).first() - logger.debug("Slabdriver - sliver_status Sliver status urn %s hrn %s sl\ - %s \r\n " %(slice_urn, slice_hrn, sl)) - - if sl['oar_job_id'] is not -1: - #A job is running on Senslab for this slice - # report about the local nodes that are in the slice only - - nodes_all = self.GetNodes({'hostname':nodes_in_slice}, - ['node_id', 'hostname','site','boot_state']) - nodeall_byhostname = dict([(n['hostname'], n) for n in nodes_all]) + #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']: + 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]) + + + + for sl 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)) + try: + nodes_in_slice = sl['node_ids'] + except KeyError: + #No job in the slice + result['geni_status'] = top_level_status + result['geni_resources'] = [] + return result + + top_level_status = 'ready' + + #A job is running on Senslab for this slice + # report about the local nodes that are in the slice only + result['geni_urn'] = slice_urn - result['pl_login'] = sl['user'] #For compatibility + - timestamp = float(sl['startTime']) + float(sl['walltime']) - result['pl_expires'] = strftime(self.time_format, \ - gmtime(float(timestamp))) + #timestamp = float(sl['startTime']) + float(sl['walltime']) + #result['pl_expires'] = strftime(self.time_format, \ + #gmtime(float(timestamp))) #result['slab_expires'] = strftime(self.time_format,\ - #gmtime(float(timestamp))) + #gmtime(float(timestamp))) resources = [] - for node in nodeall_byhostname: + for node in sl['node_ids']: res = {} #res['slab_hostname'] = node['hostname'] #res['slab_boot_state'] = node['boot_state'] - res['pl_hostname'] = nodeall_byhostname[node]['hostname'] - res['pl_boot_state'] = nodeall_byhostname[node]['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]['node_id']) + res['pl_hostname'] = node['hostname'] + res['pl_boot_state'] = nodeall_byhostname[node['hostname']]['boot_state'] + #res['pl_last_contact'] = strftime(self.time_format, \ + #gmtime(float(timestamp))) + 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]['boot_state'] == 'Alive': + if nodeall_byhostname[node['hostname']]['boot_state'] == 'Alive': res['geni_status'] = 'ready' else: @@ -131,10 +154,10 @@ class SlabDriver(Driver): result['geni_status'] = top_level_status result['geni_resources'] = resources logger.debug("SLABDRIVER \tsliver_statusresources %s res %s "\ - %(resources,res)) + %(resources,res)) return result - - + + def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, \ users, options): aggregate = SlabAggregate(self) @@ -152,20 +175,25 @@ class SlabDriver(Driver): # parse rspec rspec = RSpec(rspec_string) - logger.debug("SLABDRIVER.PY \tcreate_sliver \trspec.version %s " \ - %(rspec.version)) - - + logger.debug("SLABDRIVER.PY \t create_sliver \tr spec.version %s slice_record %s " \ + %(rspec.version,slice_record)) + # 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, options=options) - requested_attributes = rspec.version.get_slice_attributes() + sfa_peer) + + #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 - persons = slices.verify_persons(slice_hrn, sfa_slice, users, peer, \ + #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) @@ -176,13 +204,15 @@ class SlabDriver(Driver): for node in rspec.version.get_nodes_with_slivers()] 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)) - - nodes = slices.verify_slice_nodes(sfa_slice, requested_slivers, peer) + 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) # add/remove leases requested_lease_list = [] kept_leases = [] + logger.debug("SLABDRIVER.PY \tcreate_sliver AVANTLEASE " ) for lease in rspec.version.get_leases(): single_requested_lease = {} logger.debug("SLABDRIVER.PY \tcreate_sliver lease %s " %(lease)) @@ -196,7 +226,9 @@ class SlabDriver(Driver): if single_requested_lease.get('hostname'): requested_lease_list.append(single_requested_lease) - #dCreate dict of leases by start_time, regrouping nodes reserved at the same + 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 requested_job_dict = {} for lease in requested_lease_list: @@ -220,8 +252,9 @@ class SlabDriver(Driver): logger.debug("SLABDRIVER.PY \tcreate_sliver requested_job_dict %s " %(requested_job_dict)) - - leases = slices.verify_slice_leases(sfa_slice, \ + #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) return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) @@ -229,27 +262,36 @@ class SlabDriver(Driver): def delete_sliver (self, slice_urn, slice_hrn, creds, options): - sfa_slice = self.GetSlices(slice_filter = slice_hrn, \ + sfa_slice_list = self.GetSlices(slice_filter = slice_hrn, \ slice_filter_type = 'slice_hrn') - logger.debug("SLABDRIVER.PY delete_sliver slice %s" %(sfa_slice)) - if not sfa_slice: + + if not sfa_slice_list: + return 1 + + #Delete all in the slice + for sfa_slice in sfa_slice_list: + + + logger.debug("SLABDRIVER.PY delete_sliver slice %s" %(sfa_slice)) + slices = SlabSlices(self) + # determine if this is a peer slice + + peer = slices.get_peer(slice_hrn) + #TODO delete_sliver SA : UnBindObjectFromPeer should be + #used when there is another + #senslab testbed, which is not the case 14/08/12 . + + logger.debug("SLABDRIVER.PY delete_sliver peer %s" %(peer)) + try: + if peer: + self.UnBindObjectFromPeer('slice', \ + 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']) return 1 - - slices = SlabSlices(self) - # determine if this is a peer slice - - peer = slices.get_peer(slice_hrn) - logger.debug("SLABDRIVER.PY delete_sliver peer %s" %(peer)) - try: - if peer: - self.UnBindObjectFromPeer('slice', \ - sfa_slice['record_id_slice'], peer) - self.DeleteSliceFromNodes(sfa_slice) - finally: - if peer: - self.BindObjectToPeer('slice', sfa_slice['record_id_slice'], \ - peer, sfa_slice['peer_slice_id']) - return 1 def AddSlice(self, slice_record): @@ -326,62 +368,18 @@ 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: - 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 - # add this person to the site only if - # she is being added for the first - # time by sfa and doesnt already exist in plc - if not persons or not persons[0]['site_ids']: - login_base = get_leaf(sfa_record['authority']) - self.AddPersonToSite(pointer, login_base) - - # What roles should this user have? - #TODO : DElete this AddRoleToPerson 04/07/2012 SA - #Function prototype is : - #AddRoleToPerson(self, auth, role_id_or_name, person_id_or_email) - #what's the pointer doing here? - self.AddRoleToPerson('user', pointer) - # 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): @@ -441,7 +439,6 @@ class SlabDriver(Driver): def remove (self, sfa_record): sfa_record_type = sfa_record['type'] hrn = sfa_record['hrn'] - record_id = sfa_record['record_id'] if sfa_record_type == 'user': #get user from senslab ldap @@ -455,7 +452,7 @@ class SlabDriver(Driver): elif sfa_record_type == 'slice': if self.GetSlices(slice_filter = hrn, \ slice_filter_type = 'slice_hrn'): - self.DeleteSlice(sfa_record_type) + self.DeleteSlice(sfa_record) #elif type == 'authority': #if self.GetSites(pointer): @@ -500,7 +497,7 @@ class SlabDriver(Driver): logger.debug("SLABDRIVER \tGetPeer \trecords_list %s " \ %(records_list)) - except: + except KeyError: pass return_records = records_list @@ -516,7 +513,7 @@ class SlabDriver(Driver): #TODO : Handling OR request in make_ldap_filters_from_records #instead of the for loop #over the records' list - def GetPersons(self, person_filter=None, return_fields_list=None): + def GetPersons(self, person_filter=None): """ person_filter should be a list of dictionnaries when not set to None. Returns a list of users whose accounts are enabled found in ldap. @@ -557,10 +554,11 @@ class SlabDriver(Driver): reqdict['method'] = "delete" reqdict['strval'] = str(job_id) + answer = self.oar.POSTRequestToOARRestAPI('DELETE_jobs_id', \ reqdict,username) - logger.debug("SLABDRIVER \tDeleteJobs jobid %s \r\n answer %s username %s" \ - %(job_id,answer, username)) + logger.debug("SLABDRIVER \tDeleteJobs jobid %s \r\n answer %s \ + username %s" %(job_id,answer, username)) return answer @@ -612,7 +610,7 @@ class SlabDriver(Driver): #assigned_n = ['node', 'node_uri'] req = "GET_jobs_id_resources" - node_list_k = 'reserved_resources' + #Get job resources list from OAR node_id_list = self.oar.parser.SendRequest(req, job_id, username) @@ -621,8 +619,7 @@ class SlabDriver(Driver): hostname_list = \ self.__get_hostnames_from_oar_node_ids(node_id_list) - #parsed_job_info = self.get_info_on_reserved_nodes(job_info, \ - #node_list_k) + #Replaces the previous entry "assigned_network_address" / #"reserved_resources" #with "node_ids" @@ -666,24 +663,23 @@ 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)) - hostname_list = [] + #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 - def GetReservedNodes(self): + def GetReservedNodes(self,username = None): #Get the nodes in use and the reserved nodes reservation_dict_list = \ - self.oar.parser.SendRequest("GET_reserved_nodes") + self.oar.parser.SendRequest("GET_reserved_nodes", username = username) for resa in reservation_dict_list: @@ -702,7 +698,7 @@ 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 @@ -755,7 +751,9 @@ class SlabDriver(Driver): return return_site_list - #warning return_fields_list paramr emoved (Not used) + + + def GetSlices(self, slice_filter = None, slice_filter_type = None): #def GetSlices(self, slice_filter = None, slice_filter_type = None, \ #return_fields_list = None): @@ -771,74 +769,118 @@ class SlabDriver(Driver): slicerec = {} slicerec_dict = {} authorized_filter_types_list = ['slice_hrn', 'record_id_user'] + slicerec_dictlist = [] + if slice_filter_type in authorized_filter_types_list: - #Get list of slices based on the slice hrn - if slice_filter_type == 'slice_hrn': - #There can be several jobs running for one slices - 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 - - slicerec = slab_dbsession.query(SliceSenslab).filter_by(slice_hrn = slice_filter).all() - - #Get list of slices base on user id - if slice_filter_type == 'record_id_user': - slicerec = slab_dbsession.query(SliceSenslab).filter_by(record_id_user = slice_filter).all() - - if slicerec is []: - return [] - slicerec_dictlist = [] - for record in slicerec: - slicerec_dictlist.append(record.dump_sqlalchemyobj_to_dict()) - if login is None : - login = slicerec_dictlist[0]['slice_hrn'].split(".")[1].split("_")[0] - + + 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': - - logger.debug("\r\n SLABDRIVER \tGetSlices login %s \ + 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) + logger.debug(" SLABDRIVER \tGetSlices login %s \ slice record %s" \ - %(login, slicerec_dictlist)) - for slicerec_dict in slicerec_dictlist : - if slicerec_dict['oar_job_id'] is not -1: - #Check with OAR the status of the job if a job id is in - #the slice record - rslt = self.GetJobsResources(slicerec_dict['oar_job_id'], \ - username = login) - - if rslt : - slicerec_dict.update(rslt) - slicerec_dict.update({'hrn':\ - str(slicerec_dict['slice_hrn'])}) - #If GetJobsResources is empty, this means the job is - #now in the 'Terminated' state - #Update the slice record - else : - self.db.update_job(slice_filter, job_id = -1) - slicerec_dict['oar_job_id'] = -1 - slicerec_dict.\ - update({'hrn':str(slicerec_dict['slice_hrn'])}) + %(login, fixed_slicerec_dict)) + - try: - slicerec_dict['node_ids'] = slicerec_dict['node_list'] - except KeyError: - pass + + #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 + for lease in leases_list : + slicerec_dict = {} + - logger.debug("SLABDRIVER.PY \tGetSlices RETURN slicerec_dictlist %s"\ - %(slicerec_dictlist)) - + #Check with OAR the status of the job if a job id is in + #the slice record + + + + slicerec_dict['oar_job_id'] = lease['lease_id'] + #reserved_list = [] + #for reserved_node in lease['reserved_nodes']: + #reserved_list.append(reserved_node['hostname']) + reserved_list = lease['reserved_nodes'] + #slicerec_dict.update({'node_ids':[lease['reserved_nodes'][n]['hostname'] for n in lease['reserved_nodes']]}) + 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'])}) + + + slicerec_dictlist.append(slicerec_dict) + logger.debug("SLABDRIVER.PY \tGetSlices slicerec_dict %s slicerec_dictlist %s lease['reserved_nodes'] %s" %(slicerec_dict, slicerec_dictlist,lease['reserved_nodes'] )) + + logger.debug("SLABDRIVER.PY \tGetSlices RETURN slicerec_dictlist %s"\ + %(slicerec_dictlist)) + return slicerec_dictlist else: + slice_list = slab_dbsession.query(SliceSenslab).all() + 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: + slicerec_dict = {} + owner = fixed_slicerec_dict['slice_hrn'].split(".")[1].split("_")[0] + for lease in leases_list: + if owner == lease['user']: + slicerec_dict['oar_job_id'] = lease['lease_id'] + reserved_list = [] + for reserved_node in lease['reserved_nodes']: + reserved_list.append(reserved_node['hostname']) + #slicerec_dict.update({'node_ids':{'hostname':reserved_list}}) + #slicerec_dict.update({'node_ids':[lease['reserved_nodes'][n]['hostname'] for n in 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)) @@ -846,10 +888,7 @@ class SlabDriver(Driver): #return_slice_list = parse_filter(sliceslist, \ #slice_filter,'slice', return_fields_list) - return return_slice_list - - - + return slicerec_dictlist def testbed_name (self): return self.hrn @@ -886,10 +925,6 @@ class SlabDriver(Driver): def sfa_fields_to_slab_fields(self, sfa_type, hrn, record): - def convert_ints(tmpdict, int_fields): - for field in int_fields: - if field in tmpdict: - tmpdict[field] = int(tmpdict[field]) slab_record = {} #for field in record: @@ -978,10 +1013,8 @@ class SlabDriver(Driver): added_nodes. """ - - site_list = [] + nodeid_list = [] - resource = "" reqdict = {} @@ -1110,7 +1143,7 @@ class SlabDriver(Driver): if jobid : logger.debug("SLABDRIVER \tLaunchExperimentOnOAR jobid %s \ added_nodes %s slice_user %s" %(jobid, added_nodes, slice_user)) - self.db.update_job( slice_name, jobid, added_nodes) + __configure_experiment(jobid, added_nodes) __launch_senslab_experiment(jobid) @@ -1123,35 +1156,36 @@ class SlabDriver(Driver): %( 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) + self.LaunchExperimentOnOAR(hostname_list, slice_record['slice_hrn'], lease_start_time, lease_duration, username) start_time = datetime.fromtimestamp(int(lease_start_time)).strftime(self.time_format) logger.debug("SLABDRIVER \t AddLeases hostname_list start_time %s " %(start_time)) return - #Delete the jobs and updates the job id in the senslab table - #to set it to -1 - #Does not clear the node list + #Delete the jobs from job_senslab table def DeleteSliceFromNodes(self, slice_record): - # Get user information - + self.DeleteJobs(slice_record['oar_job_id'], slice_record['hrn']) - self.db.update_job(slice_record['hrn'], job_id = -1) return 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, return_fields_list=None): + def GetLeases(self, lease_filter_dict=None): unfiltered_reservation_list = self.GetReservedNodes() + + ##Synchronize slice_table of sfa senslab db + #self.synchronize_oar_and_slice_table(unfiltered_reservation_list) + reservation_list = [] #Find the slice associated with this user senslab ldap uid logger.debug(" SLABDRIVER.PY \tGetLeases ") @@ -1173,6 +1207,7 @@ class SlabDriver(Driver): 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 @@ -1181,15 +1216,7 @@ class SlabDriver(Driver): %(resa_user_dict)) for resa in unfiltered_reservation_list: - #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() + #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') @@ -1200,7 +1227,7 @@ class SlabDriver(Driver): 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']) + slab_xrn = slab_xrn_object(self.root_auth, node) resa['component_id_list'].append(slab_xrn.urn) #Filter the reservation list if necessary @@ -1248,15 +1275,19 @@ class SlabDriver(Driver): record.update({'PI':[recuser.hrn], 'researcher': [recuser.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']], 'geni_urn':'', #For client_helper.py compatibility 'keys':'', #For client_helper.py compatibility 'key_ids':''}) #For client_helper.py compatibility + + try: + for rec in recslice_list: + record['oar_job_id'].append(rec['oar_job_id']) + 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': @@ -1282,12 +1313,17 @@ class SlabDriver(Driver): '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':[recslice_list[0]['record_id_user']]}) + 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']) + #GetPersons takes [] as filters #user_slab = self.GetPersons([{'hrn':recuser.hrn}]) @@ -1314,8 +1350,8 @@ class SlabDriver(Driver): return #self.fill_record_slab_info(records) - - + + @@ -1504,13 +1540,13 @@ class SlabDriver(Driver): """ self.DeleteSliceFromNodes(slice_record) - self.db.update_job(slice_record['hrn'], job_id = -1) logger.warning("SLABDRIVER DeleteSlice %s "%(slice_record)) return #TODO AddPerson 04/07/2012 SA - def AddPerson(self, auth, person_fields=None): - """Adds a new account. Any fields specified in person_fields are used, + #def AddPerson(self, auth, person_fields=None): + def AddPerson(self, record):#TODO fixing 28/08//2012 SA + """Adds a new account. Any fields specified in records are used, otherwise defaults are used. Accounts are disabled by default. To enable an account, use UpdatePerson(). @@ -1518,7 +1554,8 @@ class SlabDriver(Driver): FROM PLC API DOC """ - logger.warning("SLABDRIVER AddPerson EMPTY - DO NOTHING \r\n ") + ret = self.ldap.LdapAddUser(record) + logger.warning("SLABDRIVER AddPerson return code %s \r\n ", ret) return #TODO AddPersonToSite 04/07/2012 SA @@ -1561,5 +1598,6 @@ class SlabDriver(Driver): for job_id in leases_id_list: self.DeleteJobs(job_id, slice_hrn) - logger.debug("SLABDRIVER DeleteLeases leases_id_list %s slice_hrn %s \r\n " %(leases_id_list, slice_hrn)) + logger.debug("SLABDRIVER DeleteLeases leases_id_list %s slice_hrn %s \ + \r\n " %(leases_id_list, slice_hrn)) return