from sfa.storage.alchemy import dbsession
from sfa.storage.model import RegRecord
-
-from sfa.trust.certificate import *
-from sfa.trust.credential import *
+from sfa.trust.credential import Credential
from sfa.trust.gid import GID
from sfa.managers.driver import Driver
# is taken care of
# SlabDriver should be really only about talking to the senslab testbed
-## thierry : please avoid wildcard imports :)
+
from sfa.senslab.OARrestapi import OARrestapi
from sfa.senslab.LDAPapi import LDAPapi
-from sfa.senslab.parsing import parse_filter
from sfa.senslab.slabpostgres import SlabDB, slab_dbsession,SliceSenslab
from sfa.senslab.slabaggregate import SlabAggregate
from sfa.senslab.slabslices import SlabSlices
-def list_to_dict(recs, key):
- """
- convert a list of dictionaries into a dictionary keyed on the
- specified dictionary key
- """
- keys = [rec[key] for rec in recs]
- return dict(zip(keys, recs))
# thierry : note
# this inheritance scheme is so that the driver object can receive
self.root_auth = config.SFA_REGISTRY_ROOT_AUTH
-
- print >>sys.stderr, "\r\n_____________ SFA SENSLAB DRIVER \r\n"
-
self.oar = OARrestapi()
self.ldap = LDAPapi()
self.time_format = "%Y-%m-%d %H:%M:%S"
self.db = SlabDB(config)
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.
+ """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.
-
+ """
+
+ #First get the slice with the slice hrn
sl = self.GetSlices(slice_filter= slice_hrn, filter_type = 'slice_hrn')
if len(sl) is 0:
raise SliverDoesNotExist("%s slice_hrn" % (slice_hrn))
-
- print >>sys.stderr, "\r\n \r\n_____________ Sliver status urn %s hrn %s sl %s \r\n " %(slice_urn,slice_hrn,sl)
+
+ nodes_in_slice = sl['node_ids']
+ if len(nodes_in_slice) is 0:
+ raise SliverDoesNotExist("No slivers allocated ")
+
+ 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:
-
- # report about the local nodes only
- nodes_all = self.GetNodes({'hostname':sl['node_ids']},
+ #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])
- nodes = sl['node_ids']
- if len(nodes) is 0:
- raise SliverDoesNotExist("No slivers allocated ")
-
+
result = {}
top_level_status = 'unknown'
if nodes:
top_level_status = 'ready'
result['geni_urn'] = slice_urn
- result['pl_login'] = sl['job_user']
- #result['slab_login'] = sl['job_user']
+ result['pl_login'] = sl['job_user'] #For compatibility
+
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)))
+ result['pl_expires'] = strftime(self.time_format, \
+ gmtime(float(timestamp)))
+ #result['slab_expires'] = strftime(self.time_format,\
+ #gmtime(float(timestamp)))
resources = []
for node in nodes:
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_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['geni_urn'] = sliver_id
if nodeall_byhostname[node]['boot_state'] == 'Alive':
if requested_attributes:
for attrib_dict in requested_attributes:
- if 'timeslot' in attrib_dict:
+ if 'timeslot' in attrib_dict and attrib_dict['timeslot'] is not None:
slice.update({'timeslot':attrib_dict['timeslot']})
print >>sys.stderr, "\r\n \r\n \t=============================== SLABDRIVER.PY create_sliver ..... slice %s " %(slice)
# ensure person records exists
self.BindObjectToPeer('slice', slice['slice_id'], peer, 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'])
+ print>>sys.stderr, "\r\n \r\n \t\t\t =======SLABDRIVER.PY AddSlice slice_record %s slab_slice %s" %(slice_record,slab_slice)
+ slab_dbsession.add(slab_slice)
+ slab_dbsession.commit()
+ return
+
# first 2 args are None in case of resource discovery
def list_resources (self, slice_urn, slice_hrn, creds, options):
#cached_requested = options.get('cached', True)
aggregate = SlabAggregate(self)
origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
- #print>>sys.stderr, " \r\n \r\n \t SLABDRIVER list_resources origin_hrn %s" %(origin_hrn)
options.update({'origin_hrn':origin_hrn})
- #print>>sys.stderr, " \r\n \r\n \t SLABDRIVER list_resources options %s" %(options)
rspec = aggregate.get_rspec(slice_xrn=slice_urn, version=rspec_version,
options=options)
print>>sys.stderr, " \r\n \r\n \t SLABDRIVER list_resources rspec "
return True
- def GetPeers (self,auth = None, peer_filter=None, return_fields=None):
+ def GetPeers (self,auth = None, peer_filter=None, return_fields_list=None):
existing_records = {}
existing_hrns_by_types= {}
- print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers auth = %s, peer_filter %s, return_field %s " %(auth , peer_filter, return_fields)
+ print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers 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
+ existing_records[(record.hrn,record.type)] = record
if record.type not in existing_hrns_by_types:
existing_hrns_by_types[record.type] = [record.hrn]
print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers \t NOT IN existing_hrns_by_types %s " %( existing_hrns_by_types)
else:
print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers \t INNN type %s hrn %s " %( record.type,record.hrn )
- existing_hrns_by_types.update({record.type:(existing_hrns_by_types[record.type].append(record.hrn))})
+ existing_hrns_by_types[record.type].append(record.hrn)
+ print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers \t INNN existing_hrns_by_types %s " %( existing_hrns_by_types)
+ #existing_hrns_by_types.update({record.type:(existing_hrns_by_types[record.type].append(record.hrn))})
print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers existing_hrns_by_types %s " %( existing_hrns_by_types)
records_list= []
- try:
- for hrn in existing_hrns_by_types['authority+sa']:
- records_list.append(existing_records[hrn])
- print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers records_list %s " %(records_list)
+ try:
+ print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers existing_hrns_by_types['authority+sa'] %s \t\t existing_records %s " %(existing_hrns_by_types['authority'],existing_records)
+ if peer_filter:
+ records_list.append(existing_records[(peer_filter,'authority')])
+ else :
+ for hrn in existing_hrns_by_types['authority']:
+ records_list.append(existing_records[(hrn,'authority')])
+
+ print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers records_list %s " %(records_list)
except:
pass
-
- if not peer_filter and not return_fields:
+
+ return_records = records_list
+ if not peer_filter and not return_fields_list:
return records_list
- return_records = parse_filter(records_list,peer_filter, 'peers', return_fields)
-
+
+
+ print >>sys.stderr, "\r\n \r\n SLABDRIVER GetPeers return_records %s " %(return_records)
return return_records
-
- def GetPersons(self, person_filter=None, return_fields=None):
-
- person_list = self.ldap.ldapFind({'authority': self.root_auth })
-
- #check = False
- #if person_filter and isinstance(person_filter, dict):
- #for k in person_filter.keys():
- #if k in person_list[0].keys():
- #check = True
+ #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):
+ """
+ person_filter should be a list of dictionnaries when not set to None.
+ Returns a list of users found.
+
+ """
+ print>>sys.stderr, "\r\n \r\n \t\t\t GetPersons person_filter %s" %(person_filter)
+ person_list = []
+ if person_filter and isinstance(person_filter,list):
+ #If we are looking for a list of users (list of dict records)
+ #Usually the list contains only one user record
+ for f in person_filter:
+ person = self.ldap.LdapFindUser(f)
+ person_list.append(person)
+
+ else:
+ person_list = self.ldap.LdapFindUser()
- 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 " %(person_filter,return_fields)
- return return_person_list
+ return person_list
+
def GetTimezone(self):
server_timestamp,server_tz = self.oar.parser.SendRequest("GET_timezone")
print>>sys.stderr, "\r\n \r\n jobid DeleteJobs %s " %(answer)
- def GetJobs(self,job_id= None, resources=True,return_fields=None, username = None):
+ def GetJobs(self,job_id= None, resources=True,return_fields_list=None, username = None):
#job_resources=['reserved_resources', 'assigned_resources','job_id', 'job_uri', 'assigned_nodes',\
#'api_timestamp']
#assigned_res = ['resource_id', 'resource_uri']
node_dict = dict(zip(node_hostname_list,node_list))
try :
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)
#Replaces the previous entry "assigned_network_address" / "reserved_resources"
#with "node_ids"
job_info.update({'node_ids':job_info[node_list_k]})
def GetReservedNodes(self):
# this function returns a list of all the nodes already involved in an oar job
-
+ #jobs=self.oar.parser.SendRequest("GET_reserved_nodes")
jobs=self.oar.parser.SendRequest("GET_jobs_details")
nodes=[]
for j in jobs :
nodes=j['assigned_network_address']+nodes
return nodes
- def GetNodes(self,node_filter= None, return_fields=None):
- node_dict =self.oar.parser.SendRequest("GET_resources_full")
-
+ def GetNodes(self,node_filter_dict = None, return_fields_list = None):
+ """
+ node_filter_dict : dictionnary of lists
+
+ """
+ node_dict_by_id = self.oar.parser.SendRequest("GET_resources_full")
+ node_dict_list = node_dict_by_id.values()
+
+ #No filtering needed return the list directly
+ if not (node_filter_dict or return_fields_list):
+ return node_dict_list
+
return_node_list = []
- if not (node_filter or return_fields):
- return_node_list = node_dict.values()
- return return_node_list
-
- return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
+ if node_filter_dict:
+ for filter_key in node_filter_dict:
+ try:
+ #Filter the node_dict_list by each value contained in the
+ #list node_filter_dict[filter_key]
+ for value in node_filter_dict[filter_key]:
+ for node in node_dict_list:
+ if node[filter_key] == value:
+ if return_fields_list :
+ tmp = {}
+ for k in return_fields_list:
+ tmp[k] = node[k]
+ return_node_list.append(tmp)
+ else:
+ return_node_list.append(node)
+ except KeyError:
+ logger.log_exc("GetNodes KeyError")
+ return
+
+
return return_node_list
- def GetSites(self, site_filter = None, return_fields=None):
- site_dict =self.oar.parser.SendRequest("GET_sites")
+ def GetSites(self, site_filter_name = None, return_fields_list = None):
+ site_dict = self.oar.parser.SendRequest("GET_sites")
+ #site_dict : dict where the key is the sit ename
return_site_list = []
- if not ( site_filter or return_fields):
+ if not ( site_filter_name or return_fields_list):
return_site_list = site_dict.values()
return return_site_list
-
- return_site_list = parse_filter(site_dict.values(), site_filter,'site', return_fields)
+
+ if site_filter_name in site_dict:
+ if return_fields_list:
+ for field in return_fields_list:
+ tmp = {}
+ Create
+ try:
+ tmp[field] = site_dict[site_filter_name][field]
+ except KeyError:
+ logger.error("GetSites KeyError %s "%(field))
+ return None
+ return_site_list.append(tmp)
+ else:
+ return_site_list.append( site_dict[site_filter_name])
+
+
return return_site_list
- def GetSlices(self,slice_filter = None, filter_type = None, return_fields=None):
+ def GetSlices(self,slice_filter = None, filter_type = None, return_fields_list=None):
return_slice_list = []
slicerec = {}
rec = {}
print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slices %s slice_filter %s " %(return_slice_list,slice_filter)
- #if return_fields:
- #return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields)
+ #if return_fields_list:
+ #return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields_list)
return slab_record
- def AddSliceToNodes(self, slice_dict, added_nodes, slice_user=None):
+ def LaunchExperimentOnOAR(self, slice_dict, added_nodes, slice_user=None):
site_list = []
nodeid_list =[]
reqdict = {}
slice_name = slice_dict['name']
try:
- slot = slice_dict['timeslot']
+ slot = slice_dict['timeslot']
+ print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR slot %s " %(slot)
except KeyError:
- slot = { 'time':None, 'duration':'00:10:00' }#10 min
- reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20
- reqdict['script_path'] = "/bin/sleep 620" #+20 sec
+ #Running on default parameters
+ #XP immediate , 10 mins
+ slot = {'date':None,'start_time':None, 'timezone':None,'duration':None }#10 min
+
reqdict['property'] ="network_address in ("
for node in added_nodes:
reqdict['property'] = reqdict['property'][0: len( reqdict['property'])-2] +")"
reqdict['resource'] ="network_address="+ str(len(nodeid_list))
-
- #In case of a scheduled experiment
- if slot['time']:
-
+ if slot['duration']:
walltime = slot['duration'].split(":")
# Fixing the walltime by adding a few delays. 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
+
desired_walltime = int(walltime[0])*3600 + int(walltime[1]) * 60 + int(walltime[2])
total_walltime = desired_walltime + 140 #+2 min 20
sleep_walltime = desired_walltime + 20 #+20 sec
- print>>sys.stderr, "\r\n \r\n \t\tAddSliceToNodes desired_walltime %s total_walltime %s sleep_walltime %s " %(desired_walltime,total_walltime,sleep_walltime)
+ print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR desired_walltime %s total_walltime %s sleep_walltime %s " %(desired_walltime,total_walltime,sleep_walltime)
#Put the walltime back in str form
#First get the hours
walltime[0] = str(total_walltime / 3600)
total_walltime = total_walltime - 60 * int(walltime[1])
#Get the seconds
walltime[2] = str(total_walltime)
- print>>sys.stderr, "\r\n \r\n \t\tAddSliceToNodes walltime %s " %(walltime)
+ print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR walltime %s " %(walltime)
reqdict['resource']+= ",walltime=" + str(walltime[0]) + ":" + str(walltime[1]) + ":" + str(walltime[2])
reqdict['script_path'] = "/bin/sleep " + str(sleep_walltime)
-
- #Get the reservation time
- parse_time = slot['time'].split(" ")
- date = ' '.join(parse_time[:-1])
- #Get zone of the user from the reservation time given in the rspec
- from_zone = tz.gettz(parse_time[2])
+ else:
+ reqdict['resource']+= ",walltime=" + str(00) + ":" + str(12) + ":" + str(20) #+2 min 20
+ reqdict['script_path'] = "/bin/sleep 620" #+20 sec
+ #In case of a scheduled experiment (not immediate)
+ #To run an XP immediately, don't specify date and time in RSpec
+ #They will be set to None.
+ if slot['date'] and slot['start_time']:
+ if slot['timezone'] is '' or slot['timezone'] is None:
+ #assume it is server timezone
+ server_timestamp,server_tz = self.GetTimezone()
+ from_zone=tz.gettz(server_tz)
+ print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR timezone not specified server_tz %s from_zone %s" %(server_tz,from_zone)
+ else:
+ #Get zone of the user from the reservation time given in the rspec
+ from_zone = tz.gettz(slot['timezone'])
+
+ date = str(slot['date']) + " " + str(slot['start_time'])
user_datetime = datetime.datetime.strptime(date, self.time_format)
user_datetime = user_datetime.replace(tzinfo = from_zone)
#Readable time accpeted by OAR
reqdict['reservation']= utc_date.strftime(self.time_format)
- print>>sys.stderr, "\r\n \r\n \t\tAddSliceToNodes reqdict['reservation'] %s " %(reqdict['reservation'])
+ print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR reqdict['reservation'] %s " %(reqdict['reservation'])
else:
# Immediate XP
utc_server= datetime.datetime.fromtimestamp(float(server_timestamp)+20,UTC_zone)
server_localtime=utc_server.astimezone(s_tz)
- print>>sys.stderr, "\r\n \r\n \t\tAddSliceToNodes server_timestamp %s server_tz %s slice_name %s added_nodes %s username %s reqdict %s " %(server_timestamp,server_tz,slice_name,added_nodes,slice_user, reqdict )
+ print>>sys.stderr, "\r\n \r\n \t\tLaunchExperimentOnOAR server_timestamp %s server_tz %s slice_name %s added_nodes %s username %s reqdict %s " %(server_timestamp,server_tz,slice_name,added_nodes,slice_user, reqdict )
readable_time = server_localtime.strftime(self.time_format)
print >>sys.stderr," \r\n \r\n \t\t\t\tAPRES ParseTimezone readable_time %s timestanp %s " %(readable_time ,server_timestamp)
# first step : start the OAR job and update the job
- print>>sys.stderr, "\r\n \r\n AddSliceToNodes reqdict %s \r\n site_list %s" %(reqdict,site_list)
+ print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR reqdict %s \r\n site_list %s" %(reqdict,site_list)
answer = self.oar.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user)
- print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s " %(answer)
+ print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR jobid %s " %(answer)
try:
jobid = answer['id']
except KeyError:
print>>sys.stderr, "\r\n AddSliceTonode Impossible to create job %s " %( answer)
return
- print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s added_nodes %s slice_user %s" %(jobid,added_nodes,slice_user)
+ print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR jobid %s added_nodes %s slice_user %s" %(jobid,added_nodes,slice_user)
self.db.update_job( slice_name, jobid ,added_nodes)
#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)
+ print>>sys.stderr, "\r\n \r\n LaunchExperimentOnOAR wrapper returns %s " %(output)
return
-
- #def AddSliceToNodes(self, slice_name, added_nodes, slice_user=None):
-
- #site_list = []
- #nodeid_list =[]
- #resource = ""
- #reqdict = {}
- #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
- #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 <site>_, 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] )
- #reqdict['property'] = reqdict['property'][0: len( reqdict['property'])-2] +")"
- #reqdict['resource'] ="network_address="+ str(len(nodeid_list))
- #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"
- ## reservations are performed in the oar server timebase, so :
- ## 1- we get the server time(in UTC tz )/server timezone
- ## 2- convert the server UTC time in its timezone
- ## 3- add a custom delay to this time
- ## 4- convert this time to a readable form and it for the reservation request.
- #server_timestamp,server_tz = self.GetTimezone()
- #s_tz=tz.gettz(server_tz)
- #UTC_zone = tz.gettz("UTC")
- ##weird... datetime.fromtimestamp should work since we do from datetime import datetime
- #utc_server= datetime.datetime.fromtimestamp(float(server_timestamp)+20,UTC_zone)
- #server_localtime=utc_server.astimezone(s_tz)
-
- #print>>sys.stderr, "\r\n \r\n \t\tAddSliceToNodes server_timestamp %s server_tz %s slice_name %s added_nodes %s username %s reqdict %s " %(server_timestamp,server_tz,slice_name,added_nodes,slice_user, reqdict )
- #readable_time = server_localtime.strftime(self.time_format)
-
- #print >>sys.stderr," \r\n \r\n \t\t\t\tAPRES ParseTimezone readable_time %s timestanp %s " %(readable_time ,server_timestamp)
- #reqdict['reservation'] = readable_time
-
- ## first step : start the OAR job and update the job
- #print>>sys.stderr, "\r\n \r\n AddSliceToNodes reqdict %s \r\n site_list %s" %(reqdict,site_list)
-
- #answer = self.oar.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user)
- #print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s " %(answer)
- #try:
- #jobid = answer['id']
- #except KeyError:
- #print>>sys.stderr, "\r\n AddSliceTonode Impossible to create job %s " %( answer)
- #return
-
- #print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s added_nodes %s slice_user %s" %(jobid,added_nodes,slice_user)
- #self.db.update_job( slice_name, jobid ,added_nodes)
-
-
- ## 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<jobid>.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
-
-
-
+
#Delete the jobs and updates the job id in the senslab table
#to set it to -1
#Does not clear the node list
- def fill_record_sfa_info(self, records):
-
- def startswith(prefix, values):
- return [value for value in values if value.startswith(prefix)]
-
- # get person ids
- person_ids = []
- site_ids = []
- for record in records:
- person_ids.extend(record.get("person_ids", []))
- site_ids.extend(record.get("site_ids", []))
- if 'site_id' in record:
- site_ids.append(record['site_id'])
-
- #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___person_ids %s \r\n \t\t site_ids %s " %(person_ids, site_ids)
-
- # get all pis from the sites we've encountered
- # and store them in a dictionary keyed on site_id
- site_pis = {}
- if site_ids:
- pi_filter = {'|roles': ['pi'], '|site_ids': site_ids}
- pi_list = self.GetPersons( pi_filter, ['person_id', 'site_ids'])
- #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ GetPersons ['person_id', 'site_ids'] pi_ilist %s" %(pi_list)
-
- for pi in pi_list:
- # we will need the pi's hrns also
- person_ids.append(pi['person_id'])
-
- # we also need to keep track of the sites these pis
- # belong to
- for site_id in pi['site_ids']:
- if site_id in site_pis:
- site_pis[site_id].append(pi)
- else:
- site_pis[site_id] = [pi]
-
- # get sfa records for all records associated with these records.
- # we'll replace pl ids (person_ids) with hrns from the sfa records
- # we obtain
-
- # get the sfa records
- #table = SfaTable()
- existing_records = {}
- all_records = dbsession.query(RegRecord).all()
- for record in all_records:
- existing_records[(record.type,record.pointer)] = record
-
- print >>sys.stderr, " \r\r\n SLABDRIVER fill_record_sfa_info existing_records %s " %(existing_records)
- person_list, persons = [], {}
- #person_list = table.find({'type': 'user', 'pointer': person_ids})
- try:
- for p_id in person_ids:
- person_list.append( existing_records.get(('user',p_id)))
- except KeyError:
- print >>sys.stderr, " \r\r\n SLABDRIVER fill_record_sfa_info ERRRRRRRRRROR"
-
- # create a hrns keyed on the sfa record's pointer.
- # Its possible for multiple records to have the same pointer so
- # the dict's value will be a list of hrns.
- persons = defaultdict(list)
- for person in person_list:
- persons[person['pointer']].append(person)
-
- # get the pl records
- slab_person_list, slab_persons = [], {}
- slab_person_list = self.GetPersons(person_ids, ['person_id', 'roles'])
- slab_persons = list_to_dict(slab_person_list, 'person_id')
- #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ _list %s \r\n \t\t SenslabUsers.GetPersons ['person_id', 'roles'] slab_persons %s \r\n records %s" %(slab_person_list, slab_persons,records)
- # fill sfa info
-
- for record in records:
- # skip records with no pl info (top level authorities)
- #Sandrine 24 oct 11 2 lines
- #if record['pointer'] == -1:
- #continue
- sfa_info = {}
- type = record['type']
- if (type == "slice"):
- # all slice users are researchers
- #record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') ? besoin ou pas ?
- record['PI'] = []
- record['researcher'] = []
- for person_id in record.get('person_ids', []):
- #Sandrine 24 oct 11 line
- #for person_id in record['person_ids']:
- hrns = [person['hrn'] for person in persons[person_id]]
- record['researcher'].extend(hrns)
-
- # pis at the slice's site
- slab_pis = site_pis[record['site_id']]
- pi_ids = [pi['person_id'] for pi in slab_pis]
- for person_id in pi_ids:
- hrns = [person['hrn'] for person in persons[person_id]]
- record['PI'].extend(hrns)
- record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice')
- record['geni_creator'] = record['PI']
-
- elif (type == "authority"):
- record['PI'] = []
- record['operator'] = []
- record['owner'] = []
- for pointer in record['person_ids']:
- if pointer not in persons or pointer not in slab_persons:
- # this means there is not sfa or pl record for this user
- continue
- hrns = [person['hrn'] for person in persons[pointer]]
- roles = slab_persons[pointer]['roles']
- if 'pi' in roles:
- record['PI'].extend(hrns)
- if 'tech' in roles:
- record['operator'].extend(hrns)
- if 'admin' in roles:
- record['owner'].extend(hrns)
- # xxx TODO: OrganizationName
- elif (type == "node"):
- sfa_info['dns'] = record.get("hostname", "")
- # xxx TODO: URI, LatLong, IP, DNS
-
- elif (type == "user"):
- sfa_info['email'] = record.get("email", "")
- sfa_info['geni_urn'] = hrn_to_urn(record['hrn'], 'user')
- sfa_info['geni_certificate'] = record['gid']
- # xxx TODO: PostalAddress, Phone
-
- #print>>sys.stderr, "\r\n \r\rn \t\t \t <<<<<<<<<<<<<<<<<<<<<<<< fill_record_sfa_info sfa_info %s \r\n record %s : "%(sfa_info,record)
- record.update(sfa_info)
+
def augment_records_with_testbed_info (self, sfa_records):
return self.fill_record_info (sfa_records)
#print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info \t\t HOY HOY reclise %s" %(recslice)
#if isinstance(recslice,list) and len(recslice) == 1:
#recslice = recslice[0]
-
+
recuser = dbsession.query(RegRecord).filter_by(record_id = recslice['record_id_user']).first()
#existing_records_by_id[recslice['record_id_user']]
#print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info \t\t recuser %s" %(recuser)
-
+
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']]})
+ 'person_ids':[recslice['record_id_user']],
+ 'geni_urn':'', #For client_helper.py compatibility
+ 'keys':'', #For client_helper.py compatibility
+ 'key_ids':''}) #For client_helper.py compatibility
elif str(record['type']) == 'user':
- #print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info USEEEEEEEEEERDESU!"
-
+ #Add the data about slice
rec = self.GetSlices(slice_filter = record['record_id'], filter_type = 'record_id_user')
+ print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info USEEEEEEEEEERDESU! rec %s \r\n \t rec['record_id_user'] %s " %(rec,rec['record_id_user'])
#Append record in records list, therfore 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 = rec['record_id_user']).first()
+ rec.update({'PI':[recuser.hrn],
+ 'researcher': [recuser.hrn],
+ 'name':record['hrn'],
+ 'oar_job_id':rec['oar_job_id'],
+ 'node_ids': [],
+ 'person_ids':[rec['record_id_user']]})
+ #retourne une liste 100512
+
+ #GetPersons takes [] as filters
+ user_slab = self.GetPersons([{'hrn':recuser.hrn}])
+
rec.update({'type':'slice','hrn':rec['slice_hrn']})
+ record.update(user_slab[0])
+ #For client_helper.py compatibility
+ record.update( { 'geni_urn':'',
+ 'keys':'',
+ 'key_ids':'' })
records.append(rec)
- #print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info ADDING SLIC EINFO rec %s" %(rec)
+
+ print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info ADDING SLICEINFO TO USER records %s" %(records)
print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info OKrecords %s" %(records)
except TypeError:
print >>sys.stderr, "\r\n \t\t SLABDRIVER fill_record_info EXCEPTION RECORDS : %s" %(records)
- return
+ return
#self.fill_record_slab_info(records)
##print >>sys.stderr, "\r\n \t\t after fill_record_slab_info %s" %(records)
git://git.onelab.eu / sfa.git / blobdiff