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
# 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
# thierry - just to not break the rest of this code
- self.oar = OARapi()
+ #self.oar = OARapi()
+ self.oar = OARrestapi()
self.ldap = LDAPapi()
self.users = SenslabImportUsers()
self.time_format = "%Y-%m-%d %H:%M:%S"
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', {})
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
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.
#return slices
# get data from db
- slices = self.GetSlices({'peer_id': None}, ['name'])
- slice_hrns = [slicename_to_hrn(self.hrn, slice['name']) for slice in slices]
+ 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
acceptable_fields=['url', 'instantiation', 'name', 'description']
for key in pl_record.keys():
if key not in acceptable_fields:
- pl_record.pop(key)
+ 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)
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):
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)
return return_person_list
-
+
+
+ def GetJobs(self,job_id= None, resources=True,return_fields=None, details = 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:
+ job_info = self.oar.parser.SendRequest("GET_jobs_id", job_id)
+ print>>sys.stderr, "\r\n \r\n \t\t GetJobs resources is False job_info %s" %(job_info)
+
+ if job_id and resources :
+ job_info = self.oar.parser.SendRequest("GET_jobs_id_resources", job_id)
+ print>>sys.stderr, "\r\n \r\n \t\t GetJobs job_info %s" %(job_info)
+
+ if job_info['state'] == 'Terminated':
+ print>>sys.stderr, "\r\n \r\n \t\t GetJobs TERMINELEBOUSIN "
+ return None
+ else:
+ return job_info
+
+
+
def GetNodes(self,node_filter= None, return_fields=None):
- self.oar.parser.SendRequest("GET_resources_full")
- node_dict = self.oar.parser.GetNodesFromOARParse()
- return_node_list = []
+ node_dict =self.oar.parser.SendRequest("GET_resources_full")
+ 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)
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
+ #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
+ #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):
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
+ sliceslist = self.db.find('slice',columns = ['oar_job_id', 'slice_hrn', 'record_id_slice','record_id_user'], record_filter=slice_filter)
+
+ print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slices %s slice_filter %s " %(sliceslist,slice_filter)
+
+
+
+ if not (slice_filter or return_fields) and sliceslist:
+ for sl in sliceslist:
+ if sl['oar_job_id'] is not -1:
+ rslt = self.GetJobs( sl['oar_job_id'],resources=False)
+ print >>sys.stderr, " \r\n \r\n \tSLABRIVER.PY GetSlices rslt %s" %(rslt)
+
+ if rslt :
+ sl.update(rslt)
+ sl.update({'hrn':str(sl['slice_hrn'])})
+ print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slice SL %s" %(sl)
+ #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'])})
+ print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices TERMINATEDDFDDDDD %s" %(sl)
+ self.db.update_senslab_slice(sl)
+
+
+ return_slice_list = sliceslist
+ print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list)
+ return return_slice_list
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)
+
+
+ for sl in return_slice_list:
+ if sl['oar_job_id'] is not -1:
+ print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices sl %s" %(sl)
+ rslt =self.GetJobs( sl['oar_job_id'],resources=False)
+ print >>sys.stderr, " \r\n \r\n SLABRIVER.PY GetSlices rslt %s" %(rslt)
+ if rslt :
+ sl.update(rslt)
+ sl.update({'hrn':str(sl['slice_hrn'])})
+ print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slice SL %s" %(sl)
+ #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'])})
+ print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices TERMINATEDDFDDDDD %s" %(sl)
+ self.db.update_senslab_slice(sl)
+
+
+ #print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list)
return return_slice_list
def testbed_name (self): return "senslab2"
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['script_path'] = "/bin/sleep 320"
+ #reqdict['type'] = "deploy"
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)
+ 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)
return
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)