X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fsenslab%2Fslabdriver.py;h=68b84828800faa6d1e7ee9451a6ca1eccbe5bee4;hb=3d51e29695f79b143974f5cf7b2e104d89626ba4;hp=de217ea5fb76c770b3733a1a9c4d6f83d46af229;hpb=e7e9113b7c18929a0c157dcddaeb5fab7c922773;p=sfa.git diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py index de217ea5..68b84828 100644 --- a/sfa/senslab/slabdriver.py +++ b/sfa/senslab/slabdriver.py @@ -1,14 +1,23 @@ import sys +import subprocess +import datetime +from time import gmtime, strftime -from sfa.util.faults import MissingSfaInfo +from sfa.util.faults import MissingSfaInfo , SliverDoesNotExist +#from sfa.util.sfatime import datetime_to_string from sfa.util.sfalogging import logger -from sfa.util.table import SfaTable +from sfa.storage.table import SfaTable from sfa.util.defaultdict import defaultdict +from sfa.trust.certificate import * +from sfa.trust.credential import * +from sfa.trust.gid import GID + 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 +from sfa.util.xrn import hrn_to_urn, urn_to_sliver_id from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, hrn_to_pl_login_base ## thierry: everything that is API-related (i.e. handling incoming requests) @@ -16,11 +25,13 @@ from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicenam # SlabDriver should be really only about talking to the senslab testbed ## thierry : please avoid wildcard imports :) -from sfa.senslab.OARrestapi import OARapi, OARrestapi +from sfa.senslab.OARrestapi import OARrestapi from sfa.senslab.LDAPapi import LDAPapi from sfa.senslab.SenslabImportUsers import SenslabImportUsers from sfa.senslab.parsing import parse_filter from sfa.senslab.slabpostgres import SlabDB +from sfa.senslab.slabaggregate import SlabAggregate +from sfa.senslab.slabslices import SlabSlices def list_to_dict(recs, key): """ @@ -48,9 +59,10 @@ class SlabDriver(Driver): print >>sys.stderr, "\r\n_____________ SFA SENSLAB DRIVER \r\n" # thierry - just to not break the rest of this code + + #self.oar = OARapi() - #self.users = SenslabImportUsers() - self.oar = OARapi() + self.oar = OARrestapi() self.ldap = LDAPapi() self.users = SenslabImportUsers() self.time_format = "%Y-%m-%d %H:%M:%S" @@ -59,14 +71,85 @@ class SlabDriver(Driver): self.cache=None + def sliver_status(self,slice_urn,slice_hrn): + # receive a status request for slice named urn/hrn urn:publicid:IDN+senslab+nturro_slice hrn senslab.nturro_slice + # shall return a structure as described in + # http://groups.geni.net/geni/wiki/GAPI_AM_API_V2#SliverStatus + # NT : not sure if we should implement this or not, but used by sface. + slices = self.GetSlices([slice_hrn]) + if len(slices) is 0: + raise SliverDoesNotExist("%s slice_hrn" % (slice_hrn)) + sl = slices[0] + print >>sys.stderr, "\r\n \r\n_____________ Sliver status urn %s hrn %s slices %s \r\n " %(slice_urn,slice_hrn,slices) + if sl['oar_job_id'] is not -1: + + # report about the local nodes only + nodes = self.GetNodes({'hostname':sl['node_ids']}, + ['node_id', 'hostname','site_login_base','boot_state']) + if len(nodes) is 0: + raise SliverDoesNotExist("No slivers allocated ") + + + site_logins = [node['site_login_base'] for node in nodes] + + result = {} + top_level_status = 'unknown' + if nodes: + top_level_status = 'ready' + result['geni_urn'] = slice_urn + result['pl_login'] = sl['job_user'] + + timestamp = float(sl['startTime']) + float(sl['walltime']) + result['pl_expires'] = strftime(self.time_format, gmtime(float(timestamp))) + resources = [] + for node in nodes: + res = {} + res['pl_hostname'] = node['hostname'] + res['pl_boot_state'] = node['boot_state'] + + sliver_id = urn_to_sliver_id(slice_urn, sl['record_id_slice'], node['node_id']) + res['geni_urn'] = sliver_id + if node['boot_state'] == 'Alive': + res['geni_status'] = 'ready' + else: + res['geni_status'] = 'failed' + top_level_status = 'failed' + + res['geni_error'] = '' + + resources.append(res) + + result['geni_status'] = top_level_status + result['geni_resources'] = resources + print >>sys.stderr, "\r\n \r\n_____________ Sliver status resources %s res %s \r\n " %(resources,res) + return result + + def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options): - aggregate = SlabAggregate(self) + #aggregate = SlabAggregate(self) slices = SlabSlices(self) peer = slices.get_peer(slice_hrn) sfa_peer = slices.get_sfa_peer(slice_hrn) - slice_record=None + slice_record=None + #print>>sys.stderr, " \r\n \r\n create_sliver creds %s \r\n \r\n users %s " %(creds,users) + + if not isinstance(creds, list): + creds = [creds] + + #for cred in creds: + #cred_obj=Credential(string=cred) + #print >>sys.stderr," \r\n \r\n create_sliver cred %s " %(cred) + #GIDcall = cred_obj.get_gid_caller() + #GIDobj = cred_obj.get_gid_object() + #print >>sys.stderr," \r\n \r\n create_sliver GIDobj pubkey %s hrn %s " %(GIDobj.get_pubkey().get_pubkey_string(), GIDobj.get_hrn()) + #print >>sys.stderr," \r\n \r\n create_sliver GIDcall pubkey %s hrn %s" %(GIDcall.get_pubkey().get_pubkey_string(),GIDobj.get_hrn()) + + + #tmpcert = GID(string = users[0]['gid']) + #print >>sys.stderr," \r\n \r\n create_sliver tmpcer pubkey %s hrn %s " %(tmpcert.get_pubkey().get_pubkey_string(), tmpcert.get_hrn()) + if users: slice_record = users[0].get('slice_record', {}) @@ -75,7 +158,7 @@ class SlabDriver(Driver): requested_attributes = rspec.version.get_slice_attributes() # ensure site record exists - site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer, options=options) + #site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer, options=options) # ensure slice record exists slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer, options=options) # ensure person records exists @@ -87,8 +170,7 @@ class SlabDriver(Driver): requested_slivers = [node.get('component_name') for node in rspec.version.get_nodes_with_slivers()] nodes = slices.verify_slice_nodes(slice, requested_slivers, peer) - # add/remove links links - #slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes) + # handle MyPLC peer association. # only used by plc and ple. @@ -144,6 +226,10 @@ class SlabDriver(Driver): #panos: passing user-defined options #print "manager options = ",options aggregate = SlabAggregate(self) + origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn() + print>>sys.stderr, " \r\n \r\n \t SLABDRIVER get_rspec origin_hrn %s" %(origin_hrn) + options.update({'origin_hrn':origin_hrn}) + print>>sys.stderr, " \r\n \r\n \t SLABDRIVER get_rspec options %s" %(options) rspec = aggregate.get_rspec(slice_xrn=slice_urn, version=rspec_version, options=options) @@ -153,7 +239,173 @@ class SlabDriver(Driver): #self.cache.add(version_string, rspec) return rspec + + + def list_slices (self, creds, options): + # look in cache first + #if self.cache: + #slices = self.cache.get('slices') + #if slices: + #logger.debug("PlDriver.list_slices returns from cache") + #return slices + + # get data from db + print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY list_slices" + slices = self.GetSlices() + slice_hrns = [slicename_to_hrn(self.hrn, slice['slice_hrn']) for slice in slices] + slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns] + # cache the result + #if self.cache: + #logger.debug ("SlabDriver.list_slices stores value in cache") + #self.cache.add('slices', slice_urns) + + return slice_urns + + #No site or node register supported + def register (self, sfa_record, hrn, pub_key): + type = sfa_record['type'] + pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record) + + #if type == 'authority': + #sites = self.shell.GetSites([pl_record['login_base']]) + #if not sites: + #pointer = self.shell.AddSite(pl_record) + #else: + #pointer = sites[0]['site_id'] + + if type == 'slice': + acceptable_fields=['url', 'instantiation', 'name', 'description'] + for key in pl_record.keys(): + if key not in acceptable_fields: + pl_record.pop(key) + print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY register" + slices = self.GetSlices([pl_record['hrn']]) + if not slices: + pointer = self.AddSlice(pl_record) + else: + pointer = slices[0]['slice_id'] + + elif type == 'user': + 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']}) + + # add this person to the site only if she is being added for the first + # time by sfa and doesont 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? + 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 + #elif type == 'node': + #login_base = hrn_to_pl_login_base(sfa_record['authority']) + #nodes = self.GetNodes([pl_record['hostname']]) + #if not nodes: + #pointer = self.AddNode(login_base, pl_record) + #else: + #pointer = nodes[0]['node_id'] + + return pointer + + #No site or node record update allowed + def update (self, old_sfa_record, new_sfa_record, hrn, new_key): + pointer = old_sfa_record['pointer'] + type = old_sfa_record['type'] + + # new_key implemented for users only + if new_key and type not in [ 'user' ]: + raise UnknownSfaType(type) + + #if (type == "authority"): + #self.shell.UpdateSite(pointer, new_sfa_record) + + if type == "slice": + pl_record=self.sfa_fields_to_pl_fields(type, hrn, new_sfa_record) + if 'name' in pl_record: + pl_record.pop('name') + self.UpdateSlice(pointer, pl_record) + + elif type == "user": + update_fields = {} + all_fields = new_sfa_record + for key in all_fields.keys(): + if key in ['first_name', 'last_name', 'title', 'email', + 'password', 'phone', 'url', 'bio', 'accepted_aup', + 'enabled']: + update_fields[key] = all_fields[key] + self.UpdatePerson(pointer, update_fields) + + if new_key: + # must check this key against the previous one if it exists + persons = self.GetPersons([pointer], ['key_ids']) + person = persons[0] + keys = person['key_ids'] + keys = self.GetKeys(person['key_ids']) + + # Delete all stale keys + key_exists = False + for key in keys: + if new_key != key['key']: + self.DeleteKey(key['key_id']) + else: + key_exists = True + if not key_exists: + self.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key}) + + #elif type == "node": + #self.UpdateNode(pointer, new_sfa_record) + + return True + + + def remove (self, sfa_record): + type=sfa_record['type'] + hrn=sfa_record['hrn'] + record_id= sfa_record['record_id'] + if type == 'user': + username = hrn.split(".")[len(hrn.split(".")) -1] + #get user in ldap + persons = self.GetPersons(username) + # only delete this person if he has site ids. if he doesnt, it probably means + # he was just removed from a site, not actually deleted + if persons and persons[0]['site_ids']: + self.DeletePerson(username) + elif type == 'slice': + if self.GetSlices(hrn): + self.DeleteSlice(hrn) + + #elif type == 'authority': + #if self.GetSites(pointer): + #self.DeleteSite(pointer) + + return True + + def GetPeers (self,auth = None, peer_filter=None, return_fields=None): + table = SfaTable() + return_records = [] + records_list = table.findObjects({'type':'authority+sa'}) + if not peer_filter and not return_fields: + return records_list + return_records = parse_filter(records_list,peer_filter, 'peers', return_fields) + + return return_records + + + def GetPersons(self, person_filter=None, return_fields=None): person_list = self.ldap.ldapFind({'authority': self.root_auth }) @@ -166,15 +418,89 @@ class SlabDriver(Driver): return_person_list = parse_filter(person_list,person_filter ,'persons', return_fields) if return_person_list: - print>>sys.stderr, " \r\n GetPersons person_filter %s return_fields %s return_person_list %s " %(person_filter,return_fields,return_person_list) + print>>sys.stderr, " \r\n GetPersons person_filter %s return_fields %s " %(person_filter,return_fields) return return_person_list + + def GetTimezone(self): + time = self.oar.parser.SendRequest("GET_timezone") + return time + + def DeleteJobs(self, job_id, username): + if not job_id: + return + reqdict = {} + reqdict['method'] = "delete" + reqdict['strval'] = str(job_id) + answer = self.oar.POSTRequestToOARRestAPI('DELETE_jobs_id',reqdict,username) + print>>sys.stderr, "\r\n \r\n jobid DeleteJobs %s " %(answer) + + + def GetJobs(self,job_id= None, resources=True,return_fields=None, username = None): + #job_resources=['reserved_resources', 'assigned_resources','job_id', 'job_uri', 'assigned_nodes',\ + #'api_timestamp'] + #assigned_res = ['resource_id', 'resource_uri'] + #assigned_n = ['node', 'node_uri'] + + + if job_id and resources is False: + req = "GET_jobs_id" + node_list_k = 'assigned_network_address' + + if job_id and resources : + req = "GET_jobs_id_resources" + node_list_k = 'reserved_resources' + + + + #Get job info from OAR + job_info = self.oar.parser.SendRequest(req, job_id, username) + print>>sys.stderr, "\r\n \r\n \t\t GetJobs %s " %(job_info) + + if 'state' in job_info : + if job_info['state'] == 'Terminated': + print>>sys.stderr, "\r\n \r\n \t\t GetJobs TERMINELEBOUSIN " + return None + if job_info['state'] == 'Error': + print>>sys.stderr, "\r\n \r\n \t\t GetJobs ERROR message %s " %(job_info) + return None + + #Get a dict of nodes . Key :hostname of the node + node_list = self.GetNodes() + node_hostname_list = [] + for node in node_list: + node_hostname_list.append(node['hostname']) + node_dict = dict(zip(node_hostname_list,node_list)) + + #print>>sys.stderr, "\r\n \r\n \r\n \r\n \r\n \t\t GetJobs GetNODES %s " %(node_list) + try : + + #for n in job_info[node_list]: + #n = str(self.root_auth) + str(n) + + liste =job_info[node_list_k] + print>>sys.stderr, "\r\n \r\n \t\t GetJobs resources job_info liste%s" %(liste) + for k in range(len(liste)): + job_info[node_list_k][k] = node_dict[job_info[node_list_k][k]]['hostname'] + + print>>sys.stderr, "\r\n \r\n \t\t YYYYYYYYYYYYGetJobs resources job_info %s" %(job_info) + job_info.update({'node_ids':job_info[node_list_k]}) + del job_info[node_list_k] + return job_info + + except KeyError: + print>>sys.stderr, "\r\n \r\n \t\t GetJobs KEYERROR " + + + + + + def GetNodes(self,node_filter= None, return_fields=None): - self.oar.parser.SendRequest("GET_resources_full") - node_dict = self.oar.parser.GetNodesFromOARParse() + node_dict =self.oar.parser.SendRequest("GET_resources_full") + print>>sys.stderr, "\r\n \r\n \t\t SLABDRIVER.PY GetNodes " return_node_list = [] - if not (node_filter or return_fields): return_node_list = node_dict.values() return return_node_list @@ -182,31 +508,37 @@ class SlabDriver(Driver): return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields) return return_node_list - def GetSites(self, auth, site_filter = None, return_fields=None): - self.oar.parser.SendRequest("GET_resources_full") - site_dict = self.oar.parser.GetSitesFromOARParse() - return_site_list = [] - site = site_dict.values()[0] - if not (site_filter or return_fields): - return_site_list = site_dict.values() - return return_site_list - - return_site_list = parse_filter(site_dict.values(),site_filter ,'site', return_fields) - return return_site_list + def GetSlices(self,slice_filter = None, return_fields=None): + + sliceslist = self.db.find('slice',columns = ['oar_job_id', 'slice_hrn', 'record_id_slice','record_id_user'], record_filter=slice_filter) - return_slice_list =[] - sliceslist = self.db.find('slice',columns = ['slice_hrn', 'record_id_slice','record_id_user']) - print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices slices %s" %(sliceslist) - #slicesdict = sliceslist[0] - if not (slice_filter or return_fields): - return_slice_list = sliceslist - return return_slice_list - + print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slices %s slice_filter %s " %(sliceslist,slice_filter) + return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields) - print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list) - return return_slice_list + + if return_slice_list: + for sl in return_slice_list: + login = sl['slice_hrn'].split(".")[1].split("_")[0] + print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices sl %s " %(sl) + if sl['oar_job_id'] is not -1: + rslt = self.GetJobs( sl['oar_job_id'],resources=False, username = login ) + print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices GetJobs %s " %(rslt) + if rslt : + sl.update(rslt) + sl.update({'hrn':str(sl['slice_hrn'])}) + #If GetJobs is empty, this means the job is now in the 'Terminated' state + #Update the slice record + else : + sl['oar_job_id'] = '-1' + sl.update({'hrn':str(sl['slice_hrn'])}) + self.db.update_senslab_slice(sl) + + print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list) + return return_slice_list + + def testbed_name (self): return "senslab2" @@ -252,125 +584,49 @@ class SlabDriver(Driver): # pl_record[field] = record[field] if type == "slice": + #instantion used in get_slivers ? if not "instantiation" in pl_record: - pl_record["instantiation"] = "plc-instantiated" - pl_record["name"] = hrn_to_pl_slicename(hrn) + pl_record["instantiation"] = "senslab-instantiated" + pl_record["hrn"] = hrn_to_pl_slicename(hrn) if "url" in record: pl_record["url"] = record["url"] if "description" in record: pl_record["description"] = record["description"] if "expires" in record: pl_record["expires"] = int(record["expires"]) + + #nodes added by OAR only and then imported to SFA + #elif type == "node": + #if not "hostname" in pl_record: + #if not "hostname" in record: + #raise MissingSfaInfo("hostname") + #pl_record["hostname"] = record["hostname"] + #if not "model" in pl_record: + #pl_record["model"] = "geni" + + #One authority only + #elif type == "authority": + #pl_record["login_base"] = hrn_to_pl_login_base(hrn) - elif type == "node": - if not "hostname" in pl_record: - if not "hostname" in record: - raise MissingSfaInfo("hostname") - pl_record["hostname"] = record["hostname"] - if not "model" in pl_record: - pl_record["model"] = "geni" - - elif type == "authority": - pl_record["login_base"] = hrn_to_pl_login_base(hrn) - - if not "name" in pl_record: - pl_record["name"] = hrn + #if not "name" in pl_record: + #pl_record["name"] = hrn - if not "abbreviated_name" in pl_record: - pl_record["abbreviated_name"] = hrn + #if not "abbreviated_name" in pl_record: + #pl_record["abbreviated_name"] = hrn - if not "enabled" in pl_record: - pl_record["enabled"] = True + #if not "enabled" in pl_record: + #pl_record["enabled"] = True - if not "is_public" in pl_record: - pl_record["is_public"] = True + #if not "is_public" in pl_record: + #pl_record["is_public"] = True return pl_record - def fill_record_pl_info(self, records): - """ - Fill in the planetlab specific fields of a SFA record. This - involves calling the appropriate PLC method to retrieve the - database record for the object. - - PLC data is filled into the pl_info field of the record. - - @param record: record to fill in field (in/out param) - """ - # get ids by type - #print>>sys.stderr, "\r\n \r\rn \t\t >>>>>>>>>>fill_record_pl_info records %s : "%(records) - node_ids, site_ids, slice_ids = [], [], [] - person_ids, key_ids = [], [] - type_map = {'node': node_ids, 'authority': site_ids, - 'slice': slice_ids, 'user': person_ids} - - for record in records: - for type in type_map: - #print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : type %s. record['pointer'] %s "%(type,record['pointer']) - if type == record['type']: - type_map[type].append(record['pointer']) - #print>>sys.stderr, "\r\n \t\t \t fill_record_pl_info : records %s... \r\n \t\t \t fill_record_pl_info : type_map %s"%(records,type_map) - # get pl records - nodes, sites, slices, persons, keys = {}, {}, {}, {}, {} - if node_ids: - node_list = self.GetNodes( node_ids) - #print>>sys.stderr, " \r\n \t\t\t BEFORE LIST_TO_DICT_NODES node_ids : %s" %(node_ids) - nodes = list_to_dict(node_list, 'node_id') - if site_ids: - site_list = self.oar.GetSites( site_ids) - sites = list_to_dict(site_list, 'site_id') - #print>>sys.stderr, " \r\n \t\t\t site_ids %s sites : %s" %(site_ids,sites) - if slice_ids: - slice_list = self.users.GetSlices( slice_ids) - slices = list_to_dict(slice_list, 'slice_id') - if person_ids: - #print>>sys.stderr, " \r\n \t\t \t fill_record_pl_info BEFORE GetPersons person_ids: %s" %(person_ids) - person_list = self.GetPersons( person_ids) - persons = list_to_dict(person_list, 'person_id') - #print>>sys.stderr, "\r\n fill_record_pl_info persons %s \r\n \t\t person_ids %s " %(persons, person_ids) - for person in persons: - key_ids.extend(persons[person]['key_ids']) - #print>>sys.stderr, "\r\n key_ids %s " %(key_ids) - - pl_records = {'node': nodes, 'authority': sites, - 'slice': slices, 'user': persons} - - if key_ids: - key_list = self.users.GetKeys( key_ids) - keys = list_to_dict(key_list, 'key_id') - # print>>sys.stderr, "\r\n fill_record_pl_info persons %s \r\n \t\t keys %s " %(keys) - # fill record info - for record in records: - # records with pointer==-1 do not have plc info. - # for example, the top level authority records which are - # authorities, but not PL "sites" - if record['pointer'] == -1: - continue - - for type in pl_records: - if record['type'] == type: - if record['pointer'] in pl_records[type]: - record.update(pl_records[type][record['pointer']]) - break - # fill in key info - if record['type'] == 'user': - if 'key_ids' not in record: - #print>>sys.stderr, " NO_KEY_IDS fill_record_pl_info key_ids record: %s" %(record) - logger.info("user record has no 'key_ids' - need to import ?") - else: - pubkeys = [keys[key_id]['key'] for key_id in record['key_ids'] if key_id in keys] - record['keys'] = pubkeys - - #print>>sys.stderr, "\r\n \r\rn \t\t <<<<<<<<<<<<<<<<<< fill_record_pl_info records %s : "%(records) - # fill in record hrns - records = self.fill_record_hrns(records) - - return records - + def AddSliceToNodes(self, slice_name, added_nodes, slice_user=None): - print>>sys.stderr, "\r\n \r\n AddSliceToNodes slice_name %s added_nodes %s username %s" %(slice_name,added_nodes,slice_user ) + site_list = [] nodeid_list =[] resource = "" @@ -378,24 +634,62 @@ class SlabDriver(Driver): reqdict['property'] ="network_address in (" for node in added_nodes: #Get the ID of the node : remove the root auth and put the site in a separate list - tmp = node.strip(self.root_auth+".") - l = tmp.split("_") - - nodeid= (l[len(l)-1]) + s=node.split(".") + # NT: it's not clear for me if the nodenames will have the senslab prefix + # so lets take the last part only, for now. + lastpart=s[-1] + #if s[0] == self.root_auth : + # Again here it's not clear if nodes will be prefixed with _, lets split and tanke the last part for now. + s=lastpart.split("_") + nodeid=s[-1] reqdict['property'] += "'"+ nodeid +"', " nodeid_list.append(nodeid) - site_list.append( l[0] ) - + #site_list.append( l[0] ) reqdict['property'] = reqdict['property'][0: len( reqdict['property'])-2] +")" reqdict['resource'] ="network_address="+ str(len(nodeid_list)) - reqdict['resource']+= ",walltime=" + str(00) + ":" + str(05) + ":" + str(00) - reqdict['script_path'] = "/bin/sleep " - + reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20 + reqdict['script_path'] = "/bin/sleep 620" #+20 sec + reqdict['type'] = "deploy" + reqdict['directory']= "" + reqdict['name']= "TestSandrine" + timestamp = self.GetTimezone() + print>>sys.stderr, "\r\n \r\n AddSliceToNodes slice_name %s added_nodes %s username %s reqdict %s " %(slice_name,added_nodes,slice_user, reqdict) + readable_time = strftime(self.time_format, gmtime(float(timestamp))) + print >>sys.stderr," \r\n \r\n \t\t\t\t AVANT ParseTimezone readable_time %s timestanp %s " %(readable_time, timestamp ) + timestamp = timestamp+ 3620 #Add 3 min to server time + readable_time = strftime(self.time_format, gmtime(float(timestamp))) + + print >>sys.stderr," \r\n \r\n \t\t\t\tAPRES ParseTimezone readable_time %s timestanp %s " %(readable_time , timestamp) + reqdict['reservation'] = readable_time + + # first step : start the OAR job print>>sys.stderr, "\r\n \r\n AddSliceToNodes reqdict %s \r\n site_list %s" %(reqdict,site_list) #OAR = OARrestapi() - #answer = OAR.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user) - #print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s " %(answer) - #self.db.update('slice',['oar_job_id'], [answer['id']], 'slice_hrn', slice_name) + answer = self.oar.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user) + print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s " %(answer) + self.db.update('slice',['oar_job_id'], [answer['id']], 'slice_hrn', slice_name) + + jobid=answer['id'] + print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s added_nodes %s slice_user %s" %(jobid,added_nodes,slice_user) + # second step : configure the experiment + # we need to store the nodes in a yaml (well...) file like this : + # [1,56,23,14,45,75] with name /tmp/sfa.json + f=open('/tmp/sfa/'+str(jobid)+'.json','w') + f.write('[') + f.write(str(added_nodes[0].strip('node'))) + for node in added_nodes[1:len(added_nodes)] : + f.write(','+node.strip('node')) + f.write(']') + f.close() + + # third step : call the senslab-experiment wrapper + #command= "java -jar target/sfa-1.0-jar-with-dependencies.jar "+str(jobid)+" "+slice_user + 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] + + print>>sys.stderr, "\r\n \r\n AddSliceToNodes wrapper returns %s " %(output) return @@ -404,84 +698,7 @@ class SlabDriver(Driver): def DeleteSliceFromNodes(self, slice_name, deleted_nodes): return - def fill_record_hrns(self, records): - """ - convert pl ids to hrns - """ - #print>>sys.stderr, "\r\n \r\rn \t\t \t >>>>>>>>>>>>>>>>>>>>>> fill_record_hrns records %s : "%(records) - # get ids - slice_ids, person_ids, site_ids, node_ids = [], [], [], [] - for record in records: - #print>>sys.stderr, "\r\n \r\rn \t\t \t record %s : "%(record) - if 'site_id' in record: - site_ids.append(record['site_id']) - if 'site_ids' in records: - site_ids.extend(record['site_ids']) - if 'person_ids' in record: - person_ids.extend(record['person_ids']) - if 'slice_ids' in record: - slice_ids.extend(record['slice_ids']) - if 'node_ids' in record: - node_ids.extend(record['node_ids']) - - # get pl records - slices, persons, sites, nodes = {}, {}, {}, {} - if site_ids: - site_list = self.oar.GetSites( site_ids, ['site_id', 'login_base']) - sites = list_to_dict(site_list, 'site_id') - #print>>sys.stderr, " \r\n \r\n \t\t ____ site_list %s \r\n \t\t____ sites %s " % (site_list,sites) - if person_ids: - person_list = self.GetPersons( person_ids, ['person_id', 'email']) - #print>>sys.stderr, " \r\n \r\n \t\t____ person_lists %s " %(person_list) - persons = list_to_dict(person_list, 'person_id') - if slice_ids: - slice_list = self.users.GetSlices( slice_ids, ['slice_id', 'name']) - slices = list_to_dict(slice_list, 'slice_id') - if node_ids: - node_list = self.GetNodes( node_ids, ['node_id', 'hostname']) - nodes = list_to_dict(node_list, 'node_id') - - # convert ids to hrns - for record in records: - - # get all relevant data - type = record['type'] - pointer = record['pointer'] - auth_hrn = self.hrn - login_base = '' - if pointer == -1: - continue - - #print>>sys.stderr, " \r\n \r\n \t\t fill_record_hrns : sites %s \r\n \t\t record %s " %(sites, record) - if 'site_id' in record: - site = sites[record['site_id']] - #print>>sys.stderr, " \r\n \r\n \t\t \t fill_record_hrns : sites %s \r\n \t\t\t site sites[record['site_id']] %s " %(sites,site) - login_base = site['login_base'] - record['site'] = ".".join([auth_hrn, login_base]) - if 'person_ids' in record: - emails = [persons[person_id]['email'] for person_id in record['person_ids'] \ - if person_id in persons] - usernames = [email.split('@')[0] for email in emails] - person_hrns = [".".join([auth_hrn, login_base, username]) for username in usernames] - #print>>sys.stderr, " \r\n \r\n \t\t ____ person_hrns : %s " %(person_hrns) - record['persons'] = person_hrns - if 'slice_ids' in record: - slicenames = [slices[slice_id]['name'] for slice_id in record['slice_ids'] \ - if slice_id in slices] - slice_hrns = [slicename_to_hrn(auth_hrn, slicename) for slicename in slicenames] - record['slices'] = slice_hrns - if 'node_ids' in record: - hostnames = [nodes[node_id]['hostname'] for node_id in record['node_ids'] \ - if node_id in nodes] - node_hrns = [hostname_to_hrn(auth_hrn, login_base, hostname) for hostname in hostnames] - record['nodes'] = node_hrns - if 'site_ids' in record: - login_bases = [sites[site_id]['login_base'] for site_id in record['site_ids'] \ - if site_id in sites] - site_hrns = [".".join([auth_hrn, lbase]) for lbase in login_bases] - record['sites'] = site_hrns - #print>>sys.stderr, "\r\n \r\rn \t\t \t <<<<<<<<<<<<<<<<<<<<<<<< fill_record_hrns records %s : "%(records) - return records + def fill_record_sfa_info(self, records): @@ -606,85 +823,100 @@ class SlabDriver(Driver): Given a SFA record, fill in the senslab specific and SFA specific fields in the record. """ - print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records) - if isinstance(records, list): - records = records[0] + print >>sys.stderr, "\r\n \t\t BEFORE fill_record_info %s" %(records) + if not isinstance(records, list): + records = [records] #print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records) + parkour = records + try: + for record in parkour: + + if str(record['type']) == 'slice': + print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info record %s" %(record) + sfatable = SfaTable() + recslice = self.db.find('slice',str(record['hrn'])) + if isinstance(recslice,list) and len(recslice) == 1: + recslice = recslice[0] + recuser = sfatable.find( recslice['record_id_user'], ['hrn']) + + print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info %s" %(recuser) + + if isinstance(recuser,list) and len(recuser) == 1: + recuser = recuser[0] + record.update({'PI':[recuser['hrn']], + 'researcher': [recuser['hrn']], + 'name':record['hrn'], + 'oar_job_id':recslice['oar_job_id'], + 'node_ids': [], + 'person_ids':[recslice['record_id_user']]}) + + elif str(record['type']) == 'user': + recslice = self.db.find('slice', record_filter={'record_id_user':record['record_id']}) + for rec in recslice: + rec.update({'type':'slice'}) + rec.update({'hrn':rec['slice_hrn'], 'record_id':rec['record_id_slice']}) + records.append(rec) + print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info ADDING SLIC EINFO recslice %s" %(recslice) + + + except TypeError: + print >>sys.stderr, "\r\n \t\t SLABDRIVER fill_record_info EXCEPTION RECORDS : %s" %(records) + return - - if records['type'] == 'slice': - - sfatable = SfaTable() - recslice = self.db.find('slice',str(records['hrn'])) - if isinstance(recslice,list) and len(recslice) == 1: - recslice = recslice[0] - recuser = sfatable.find( recslice['record_id_user'], ['hrn']) - - print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info %s" %(recuser) - records['type'] - if isinstance(recuser,list) and len(recuser) == 1: - recuser = recuser[0] - records.update({'PI':[recuser['hrn']], - 'researcher': [recuser['hrn']], - 'name':records['hrn'], 'oar_job_id':recslice['oar_job_id'], - - 'node_ids': [], - 'person_ids':[recslice['record_id_user']]}) - #self.fill_record_pl_info(records) ##print >>sys.stderr, "\r\n \t\t after fill_record_pl_info %s" %(records) #self.fill_record_sfa_info(records) #print >>sys.stderr, "\r\n \t\t after fill_record_sfa_info" - def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc): - # get a list of the HRNs tht are members of the old and new records - if oldRecord: - oldList = oldRecord.get(listName, []) - else: - oldList = [] - newList = record.get(listName, []) - - # if the lists are the same, then we don't have to update anything - if (oldList == newList): - return - - # build a list of the new person ids, by looking up each person to get - # their pointer - newIdList = [] - table = SfaTable() - records = table.find({'type': 'user', 'hrn': newList}) - for rec in records: - newIdList.append(rec['pointer']) - - # build a list of the old person ids from the person_ids field - if oldRecord: - oldIdList = oldRecord.get("person_ids", []) - containerId = oldRecord.get_pointer() - else: - # if oldRecord==None, then we are doing a Register, instead of an - # update. - oldIdList = [] - containerId = record.get_pointer() - - # add people who are in the new list, but not the oldList - for personId in newIdList: - if not (personId in oldIdList): - addFunc(self.plauth, personId, containerId) - - # remove people who are in the old list, but not the new list - for personId in oldIdList: - if not (personId in newIdList): - delFunc(self.plauth, personId, containerId) - - def update_membership(self, oldRecord, record): - print >>sys.stderr, " \r\n \r\n ***SLABDRIVER.PY update_membership record ", record - if record.type == "slice": - self.update_membership_list(oldRecord, record, 'researcher', - self.users.AddPersonToSlice, - self.users.DeletePersonFromSlice) - elif record.type == "authority": - # xxx TODO - pass + #def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc): + ## get a list of the HRNs tht are members of the old and new records + #if oldRecord: + #oldList = oldRecord.get(listName, []) + #else: + #oldList = [] + #newList = record.get(listName, []) + + ## if the lists are the same, then we don't have to update anything + #if (oldList == newList): + #return + + ## build a list of the new person ids, by looking up each person to get + ## their pointer + #newIdList = [] + #table = SfaTable() + #records = table.find({'type': 'user', 'hrn': newList}) + #for rec in records: + #newIdList.append(rec['pointer']) + + ## build a list of the old person ids from the person_ids field + #if oldRecord: + #oldIdList = oldRecord.get("person_ids", []) + #containerId = oldRecord.get_pointer() + #else: + ## if oldRecord==None, then we are doing a Register, instead of an + ## update. + #oldIdList = [] + #containerId = record.get_pointer() + + ## add people who are in the new list, but not the oldList + #for personId in newIdList: + #if not (personId in oldIdList): + #addFunc(self.plauth, personId, containerId) + + ## remove people who are in the old list, but not the new list + #for personId in oldIdList: + #if not (personId in newIdList): + #delFunc(self.plauth, personId, containerId) + + #def update_membership(self, oldRecord, record): + #print >>sys.stderr, " \r\n \r\n ***SLABDRIVER.PY update_membership record ", record + #if record.type == "slice": + #self.update_membership_list(oldRecord, record, 'researcher', + #self.users.AddPersonToSlice, + #self.users.DeletePersonFromSlice) + #elif record.type == "authority": + ## xxx TODO + #pass ### thierry # I don't think you plan on running a component manager at this point