3 from sfa.util.faults import MissingSfaInfo
4 from sfa.util.sfalogging import logger
5 from sfa.storage.table import SfaTable
6 from sfa.util.defaultdict import defaultdict
8 from sfa.trust.certificate import *
9 from sfa.trust.credential import *
10 from sfa.trust.gid import GID
12 from sfa.managers.driver import Driver
13 from sfa.rspecs.version_manager import VersionManager
14 from sfa.rspecs.rspec import RSpec
16 from sfa.util.xrn import hrn_to_urn
17 from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, hrn_to_pl_login_base
19 ## thierry: everything that is API-related (i.e. handling incoming requests)
21 # SlabDriver should be really only about talking to the senslab testbed
23 ## thierry : please avoid wildcard imports :)
24 from sfa.senslab.OARrestapi import OARrestapi
25 from sfa.senslab.LDAPapi import LDAPapi
26 from sfa.senslab.SenslabImportUsers import SenslabImportUsers
27 from sfa.senslab.parsing import parse_filter
28 from sfa.senslab.slabpostgres import SlabDB
29 from sfa.senslab.slabaggregate import SlabAggregate
30 from sfa.senslab.slabslices import SlabSlices
32 def list_to_dict(recs, key):
34 convert a list of dictionaries into a dictionary keyed on the
35 specified dictionary key
37 # print>>sys.stderr, " \r\n \t\t 1list_to_dict : rec %s \r\n \t\t list_to_dict key %s" %(recs,key)
38 keys = [rec[key] for rec in recs]
39 #print>>sys.stderr, " \r\n \t\t list_to_dict : rec %s \r\n \t\t list_to_dict keys %s" %(recs,keys)
40 return dict(zip(keys, recs))
43 # this inheritance scheme is so that the driver object can receive
44 # GetNodes or GetSites sorts of calls directly
45 # and thus minimize the differences in the managers with the pl version
46 class SlabDriver(Driver):
48 def __init__(self, config):
49 Driver.__init__ (self, config)
51 self.hrn = config.SFA_INTERFACE_HRN
53 self.root_auth = config.SFA_REGISTRY_ROOT_AUTH
56 print >>sys.stderr, "\r\n_____________ SFA SENSLAB DRIVER \r\n"
57 # thierry - just to not break the rest of this code
61 self.oar = OARrestapi()
63 self.users = SenslabImportUsers()
64 self.time_format = "%Y-%m-%d %H:%M:%S"
66 #self.logger=sfa_logger()
71 def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options):
72 aggregate = SlabAggregate(self)
73 #aggregate = SlabAggregate(self)
74 slices = SlabSlices(self)
75 peer = slices.get_peer(slice_hrn)
76 sfa_peer = slices.get_sfa_peer(slice_hrn)
78 #print>>sys.stderr, " \r\n \r\n create_sliver creds %s \r\n \r\n users %s " %(creds,users)
80 if not isinstance(creds, list):
84 #cred_obj=Credential(string=cred)
85 #print >>sys.stderr," \r\n \r\n create_sliver cred %s " %(cred)
86 #GIDcall = cred_obj.get_gid_caller()
87 #GIDobj = cred_obj.get_gid_object()
88 #print >>sys.stderr," \r\n \r\n create_sliver GIDobj pubkey %s hrn %s " %(GIDobj.get_pubkey().get_pubkey_string(), GIDobj.get_hrn())
89 #print >>sys.stderr," \r\n \r\n create_sliver GIDcall pubkey %s hrn %s" %(GIDcall.get_pubkey().get_pubkey_string(),GIDobj.get_hrn())
92 #tmpcert = GID(string = users[0]['gid'])
93 #print >>sys.stderr," \r\n \r\n create_sliver tmpcer pubkey %s hrn %s " %(tmpcert.get_pubkey().get_pubkey_string(), tmpcert.get_hrn())
96 slice_record = users[0].get('slice_record', {})
99 rspec = RSpec(rspec_string)
100 requested_attributes = rspec.version.get_slice_attributes()
102 # ensure site record exists
103 #site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer, options=options)
104 # ensure slice record exists
105 slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer, options=options)
106 # ensure person records exists
107 persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer, options=options)
108 # ensure slice attributes exists
109 #slices.verify_slice_attributes(slice, requested_attributes, options=options)
111 # add/remove slice from nodes
112 requested_slivers = [node.get('component_name') for node in rspec.version.get_nodes_with_slivers()]
113 nodes = slices.verify_slice_nodes(slice, requested_slivers, peer)
117 # handle MyPLC peer association.
118 # only used by plc and ple.
119 #slices.handle_peer(site, slice, persons, peer)
121 return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version)
124 def delete_sliver (self, slice_urn, slice_hrn, creds, options):
126 slices = self.GetSlices({'slice_hrn': slice_hrn})
131 # determine if this is a peer slice
132 # xxx I wonder if this would not need to use PlSlices.get_peer instead
133 # in which case plc.peers could be deprecated as this here
134 # is the only/last call to this last method in plc.peers
135 peer = peers.get_peer(self, slice_hrn)
138 self.UnBindObjectFromPeer('slice', slice['slice_id'], peer)
139 self.DeleteSliceFromNodes(slice_hrn, slice['node_ids'])
142 self.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
148 # first 2 args are None in case of resource discovery
149 def list_resources (self, slice_urn, slice_hrn, creds, options):
150 #cached_requested = options.get('cached', True)
152 version_manager = VersionManager()
153 # get the rspec's return format from options
154 rspec_version = version_manager.get_version(options.get('geni_rspec_version'))
155 version_string = "rspec_%s" % (rspec_version)
157 #panos adding the info option to the caching key (can be improved)
158 if options.get('info'):
159 version_string = version_string + "_"+options.get('info', 'default')
161 # look in cache first
162 #if cached_requested and self.cache and not slice_hrn:
163 #rspec = self.cache.get(version_string)
165 #logger.debug("SlabDriver.ListResources: returning cached advertisement")
168 #panos: passing user-defined options
169 #print "manager options = ",options
170 aggregate = SlabAggregate(self)
171 rspec = aggregate.get_rspec(slice_xrn=slice_urn, version=rspec_version,
175 #if self.cache and not slice_hrn:
176 #logger.debug("Slab.ListResources: stores advertisement in cache")
177 #self.cache.add(version_string, rspec)
182 def list_slices (self, creds, options):
183 # look in cache first
185 #slices = self.cache.get('slices')
187 #logger.debug("PlDriver.list_slices returns from cache")
191 print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY list_slices"
192 slices = self.GetSlices()
193 slice_hrns = [slicename_to_hrn(self.hrn, slice['slice_hrn']) for slice in slices]
194 slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns]
198 #logger.debug ("SlabDriver.list_slices stores value in cache")
199 #self.cache.add('slices', slice_urns)
203 #No site or node register supported
204 def register (self, sfa_record, hrn, pub_key):
205 type = sfa_record['type']
206 pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record)
208 #if type == 'authority':
209 #sites = self.shell.GetSites([pl_record['login_base']])
211 #pointer = self.shell.AddSite(pl_record)
213 #pointer = sites[0]['site_id']
216 acceptable_fields=['url', 'instantiation', 'name', 'description']
217 for key in pl_record.keys():
218 if key not in acceptable_fields:
220 print>>sys.stderr, " \r\n \t\t SLABDRIVER.PY register"
221 slices = self.GetSlices([pl_record['hrn']])
223 pointer = self.AddSlice(pl_record)
225 pointer = slices[0]['slice_id']
228 persons = self.GetPersons([sfa_record['hrn']])
230 pointer = self.AddPerson(dict(sfa_record))
233 pointer = persons[0]['person_id']
235 #Does this make sense to senslab ?
236 #if 'enabled' in sfa_record and sfa_record['enabled']:
237 #self.UpdatePerson(pointer, {'enabled': sfa_record['enabled']})
239 # add this person to the site only if she is being added for the first
240 # time by sfa and doesont already exist in plc
241 if not persons or not persons[0]['site_ids']:
242 login_base = get_leaf(sfa_record['authority'])
243 self.AddPersonToSite(pointer, login_base)
245 # What roles should this user have?
246 self.AddRoleToPerson('user', pointer)
249 self.AddPersonKey(pointer, {'key_type' : 'ssh', 'key' : pub_key})
251 #No node adding outside OAR
252 #elif type == 'node':
253 #login_base = hrn_to_pl_login_base(sfa_record['authority'])
254 #nodes = self.GetNodes([pl_record['hostname']])
256 #pointer = self.AddNode(login_base, pl_record)
258 #pointer = nodes[0]['node_id']
262 #No site or node record update allowed
263 def update (self, old_sfa_record, new_sfa_record, hrn, new_key):
264 pointer = old_sfa_record['pointer']
265 type = old_sfa_record['type']
267 # new_key implemented for users only
268 if new_key and type not in [ 'user' ]:
269 raise UnknownSfaType(type)
271 #if (type == "authority"):
272 #self.shell.UpdateSite(pointer, new_sfa_record)
275 pl_record=self.sfa_fields_to_pl_fields(type, hrn, new_sfa_record)
276 if 'name' in pl_record:
277 pl_record.pop('name')
278 self.UpdateSlice(pointer, pl_record)
282 all_fields = new_sfa_record
283 for key in all_fields.keys():
284 if key in ['first_name', 'last_name', 'title', 'email',
285 'password', 'phone', 'url', 'bio', 'accepted_aup',
287 update_fields[key] = all_fields[key]
288 self.UpdatePerson(pointer, update_fields)
291 # must check this key against the previous one if it exists
292 persons = self.GetPersons([pointer], ['key_ids'])
294 keys = person['key_ids']
295 keys = self.GetKeys(person['key_ids'])
297 # Delete all stale keys
300 if new_key != key['key']:
301 self.DeleteKey(key['key_id'])
305 self.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key})
307 #elif type == "node":
308 #self.UpdateNode(pointer, new_sfa_record)
313 def remove (self, sfa_record):
314 type=sfa_record['type']
315 hrn=sfa_record['hrn']
316 record_id= sfa_record['record_id']
318 username = hrn.split(".")[len(hrn.split(".")) -1]
320 persons = self.GetPersons(username)
321 # only delete this person if he has site ids. if he doesnt, it probably means
322 # he was just removed from a site, not actually deleted
323 if persons and persons[0]['site_ids']:
324 self.DeletePerson(username)
325 elif type == 'slice':
326 if self.GetSlices(hrn):
327 self.DeleteSlice(hrn)
329 #elif type == 'authority':
330 #if self.GetSites(pointer):
331 #self.DeleteSite(pointer)
335 def GetPeers (self,auth = None, peer_filter=None, return_fields=None):
338 records_list = table.findObjects({'type':'authority+sa'})
339 if not peer_filter and not return_fields:
341 return_records = parse_filter(records_list,peer_filter, 'peers', return_fields)
343 return return_records
347 def GetPersons(self, person_filter=None, return_fields=None):
349 person_list = self.ldap.ldapFind({'authority': self.root_auth })
352 #if person_filter and isinstance(person_filter, dict):
353 #for k in person_filter.keys():
354 #if k in person_list[0].keys():
357 return_person_list = parse_filter(person_list,person_filter ,'persons', return_fields)
358 if return_person_list:
359 print>>sys.stderr, " \r\n GetPersons person_filter %s return_fields %s return_person_list %s " %(person_filter,return_fields,return_person_list)
360 return return_person_list
363 def GetJobs(self,job_id= None, resources=True,return_fields=None, details = None):
364 #job_resources=['reserved_resources', 'assigned_resources','job_id', 'job_uri', 'assigned_nodes',\
366 #assigned_res = ['resource_id', 'resource_uri']
367 #assigned_n = ['node', 'node_uri']
370 if job_id and resources is False:
372 node_list_k = 'assigned_network_address'
373 if job_id and resources :
374 req = "GET_jobs_id_resources"
375 node_list_k = 'reserverd_resources'
377 #Get job info from OAR
378 job_info = self.oar.parser.SendRequest(req, job_id)
379 if job_info['state'] == 'Terminated':
380 print>>sys.stderr, "\r\n \r\n \t\t GetJobs TERMINELEBOUSIN "
383 #Get a dict of nodes . Key :hostname of the node
384 node_list = self.GetNodes()
385 node_hostname_list = []
386 for node in node_list:
387 node_hostname_list.append(node['hostname'])
388 node_dict = dict(zip(node_hostname_list,node_list))
390 print>>sys.stderr, "\r\n \r\n \r\n \r\n \r\n \t\t GetJobs GetNODES %s " %(node_list)
393 #for n in job_info[node_list]:
394 #n = str(self.root_auth) + str(n)
396 liste =job_info[node_list_k]
397 print>>sys.stderr, "\r\n \r\n \t\t GetJobs resources job_info liste%s" %(liste)
398 for k in range(len(liste)):
399 job_info[node_list_k][k] = node_dict[job_info[node_list_k][k]]['hostname']
401 print>>sys.stderr, "\r\n \r\n \t\t YYYYYYYYYYYYGetJobs resources job_info %s" %(job_info)
402 job_info.update({'node_ids':job_info[node_list_k]})
403 del job_info[node_list_k]
407 print>>sys.stderr, "\r\n \r\n \t\t GetJobs KEYERROR "
414 def GetNodes(self,node_filter= None, return_fields=None):
416 node_dict =self.oar.parser.SendRequest("GET_resources_full")
418 return_node_list = []
419 if not (node_filter or return_fields):
420 return_node_list = node_dict.values()
421 return return_node_list
423 return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
424 return return_node_list
428 def GetSlices(self,slice_filter = None, return_fields=None):
431 sliceslist = self.db.find('slice',columns = ['oar_job_id', 'slice_hrn', 'record_id_slice','record_id_user'], record_filter=slice_filter)
433 print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices slices %s slice_filter %s " %(sliceslist,slice_filter)
435 return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields)
437 if return_slice_list:
438 for sl in return_slice_list:
439 if sl['oar_job_id'] is not -1:
440 rslt = self.GetJobs( sl['oar_job_id'],resources=False)
444 sl.update({'hrn':str(sl['slice_hrn'])})
445 #If GetJobs is empty, this means the job is now in the 'Terminated' state
446 #Update the slice record
448 sl['oar_job_id'] = '-1'
449 sl.update({'hrn':str(sl['slice_hrn'])})
450 self.db.update_senslab_slice(sl)
454 print >>sys.stderr, " \r\n \r\n \tSLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list)
455 return return_slice_list
459 def testbed_name (self): return "senslab2"
461 # 'geni_request_rspec_versions' and 'geni_ad_rspec_versions' are mandatory
462 def aggregate_version (self):
463 version_manager = VersionManager()
464 ad_rspec_versions = []
465 request_rspec_versions = []
466 for rspec_version in version_manager.versions:
467 if rspec_version.content_type in ['*', 'ad']:
468 ad_rspec_versions.append(rspec_version.to_dict())
469 if rspec_version.content_type in ['*', 'request']:
470 request_rspec_versions.append(rspec_version.to_dict())
472 'testbed':self.testbed_name(),
473 'geni_request_rspec_versions': request_rspec_versions,
474 'geni_ad_rspec_versions': ad_rspec_versions,
483 # Convert SFA fields to PLC fields for use when registering up updating
484 # registry record in the PLC database
486 # @param type type of record (user, slice, ...)
487 # @param hrn human readable name
488 # @param sfa_fields dictionary of SFA fields
489 # @param pl_fields dictionary of PLC fields (output)
491 def sfa_fields_to_pl_fields(self, type, hrn, record):
493 def convert_ints(tmpdict, int_fields):
494 for field in int_fields:
496 tmpdict[field] = int(tmpdict[field])
499 #for field in record:
500 # pl_record[field] = record[field]
503 #instantion used in get_slivers ?
504 if not "instantiation" in pl_record:
505 pl_record["instantiation"] = "senslab-instantiated"
506 pl_record["hrn"] = hrn_to_pl_slicename(hrn)
508 pl_record["url"] = record["url"]
509 if "description" in record:
510 pl_record["description"] = record["description"]
511 if "expires" in record:
512 pl_record["expires"] = int(record["expires"])
514 #nodes added by OAR only and then imported to SFA
515 #elif type == "node":
516 #if not "hostname" in pl_record:
517 #if not "hostname" in record:
518 #raise MissingSfaInfo("hostname")
519 #pl_record["hostname"] = record["hostname"]
520 #if not "model" in pl_record:
521 #pl_record["model"] = "geni"
524 #elif type == "authority":
525 #pl_record["login_base"] = hrn_to_pl_login_base(hrn)
527 #if not "name" in pl_record:
528 #pl_record["name"] = hrn
530 #if not "abbreviated_name" in pl_record:
531 #pl_record["abbreviated_name"] = hrn
533 #if not "enabled" in pl_record:
534 #pl_record["enabled"] = True
536 #if not "is_public" in pl_record:
537 #pl_record["is_public"] = True
544 def AddSliceToNodes(self, slice_name, added_nodes, slice_user=None):
545 print>>sys.stderr, "\r\n \r\n AddSliceToNodes slice_name %s added_nodes %s username %s" %(slice_name,added_nodes,slice_user )
550 reqdict['property'] ="network_address in ("
551 for node in added_nodes:
552 #Get the ID of the node : remove the root auth and put the site in a separate list
553 tmp = node.strip(self.root_auth+".")
556 nodeid= (l[len(l)-1])
557 reqdict['property'] += "'"+ nodeid +"', "
558 nodeid_list.append(nodeid)
559 site_list.append( l[0] )
561 reqdict['property'] = reqdict['property'][0: len( reqdict['property'])-2] +")"
562 reqdict['resource'] ="network_address="+ str(len(nodeid_list))
563 reqdict['resource']+= ",walltime=" + str(00) + ":" + str(05) + ":" + str(00)
564 reqdict['script_path'] = "/bin/sleep 320"
565 #reqdict['type'] = "deploy"
566 print>>sys.stderr, "\r\n \r\n AddSliceToNodes reqdict %s \r\n site_list %s" %(reqdict,site_list)
568 answer = OAR.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user)
569 print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s " %(answer)
570 self.db.update('slice',['oar_job_id'], [answer['id']], 'slice_hrn', slice_name)
576 def DeleteSliceFromNodes(self, slice_name, deleted_nodes):
581 def fill_record_sfa_info(self, records):
583 def startswith(prefix, values):
584 return [value for value in values if value.startswith(prefix)]
589 for record in records:
590 person_ids.extend(record.get("person_ids", []))
591 site_ids.extend(record.get("site_ids", []))
592 if 'site_id' in record:
593 site_ids.append(record['site_id'])
595 #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)
597 # get all pis from the sites we've encountered
598 # and store them in a dictionary keyed on site_id
601 pi_filter = {'|roles': ['pi'], '|site_ids': site_ids}
602 pi_list = self.GetPersons( pi_filter, ['person_id', 'site_ids'])
603 #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ GetPersons ['person_id', 'site_ids'] pi_ilist %s" %(pi_list)
606 # we will need the pi's hrns also
607 person_ids.append(pi['person_id'])
609 # we also need to keep track of the sites these pis
611 for site_id in pi['site_ids']:
612 if site_id in site_pis:
613 site_pis[site_id].append(pi)
615 site_pis[site_id] = [pi]
617 # get sfa records for all records associated with these records.
618 # we'll replace pl ids (person_ids) with hrns from the sfa records
621 # get the sfa records
623 person_list, persons = [], {}
624 person_list = table.find({'type': 'user', 'pointer': person_ids})
625 # create a hrns keyed on the sfa record's pointer.
626 # Its possible for multiple records to have the same pointer so
627 # the dict's value will be a list of hrns.
628 persons = defaultdict(list)
629 for person in person_list:
630 persons[person['pointer']].append(person)
633 pl_person_list, pl_persons = [], {}
634 pl_person_list = self.GetPersons(person_ids, ['person_id', 'roles'])
635 pl_persons = list_to_dict(pl_person_list, 'person_id')
636 #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ _list %s \r\n \t\t SenslabUsers.GetPersons ['person_id', 'roles'] pl_persons %s \r\n records %s" %(pl_person_list, pl_persons,records)
639 for record in records:
640 # skip records with no pl info (top level authorities)
641 #Sandrine 24 oct 11 2 lines
642 #if record['pointer'] == -1:
645 type = record['type']
646 if (type == "slice"):
647 # all slice users are researchers
648 #record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') ? besoin ou pas ?
650 record['researcher'] = []
651 for person_id in record.get('person_ids', []):
652 #Sandrine 24 oct 11 line
653 #for person_id in record['person_ids']:
654 hrns = [person['hrn'] for person in persons[person_id]]
655 record['researcher'].extend(hrns)
657 # pis at the slice's site
658 pl_pis = site_pis[record['site_id']]
659 pi_ids = [pi['person_id'] for pi in pl_pis]
660 for person_id in pi_ids:
661 hrns = [person['hrn'] for person in persons[person_id]]
662 record['PI'].extend(hrns)
663 record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice')
664 record['geni_creator'] = record['PI']
666 elif (type == "authority"):
668 record['operator'] = []
670 for pointer in record['person_ids']:
671 if pointer not in persons or pointer not in pl_persons:
672 # this means there is not sfa or pl record for this user
674 hrns = [person['hrn'] for person in persons[pointer]]
675 roles = pl_persons[pointer]['roles']
677 record['PI'].extend(hrns)
679 record['operator'].extend(hrns)
681 record['owner'].extend(hrns)
682 # xxx TODO: OrganizationName
683 elif (type == "node"):
684 sfa_info['dns'] = record.get("hostname", "")
685 # xxx TODO: URI, LatLong, IP, DNS
687 elif (type == "user"):
688 sfa_info['email'] = record.get("email", "")
689 sfa_info['geni_urn'] = hrn_to_urn(record['hrn'], 'user')
690 sfa_info['geni_certificate'] = record['gid']
691 # xxx TODO: PostalAddress, Phone
693 #print>>sys.stderr, "\r\n \r\rn \t\t \t <<<<<<<<<<<<<<<<<<<<<<<< fill_record_sfa_info sfa_info %s \r\n record %s : "%(sfa_info,record)
694 record.update(sfa_info)
696 def augment_records_with_testbed_info (self, sfa_records):
697 return self.fill_record_info (sfa_records)
699 def fill_record_info(self, records):
701 Given a SFA record, fill in the senslab specific and SFA specific
702 fields in the record.
704 print >>sys.stderr, "\r\n \t\t BEFORE fill_record_info %s" %(records)
705 if not isinstance(records, list):
707 #print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records)
710 for record in parkour:
712 if str(record['type']) == 'slice':
713 print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info record %s" %(record)
714 sfatable = SfaTable()
715 recslice = self.db.find('slice',str(record['hrn']))
716 if isinstance(recslice,list) and len(recslice) == 1:
717 recslice = recslice[0]
718 recuser = sfatable.find( recslice['record_id_user'], ['hrn'])
720 print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info %s" %(recuser)
722 if isinstance(recuser,list) and len(recuser) == 1:
724 record.update({'PI':[recuser['hrn']],
725 'researcher': [recuser['hrn']],
726 'name':record['hrn'],
727 'oar_job_id':recslice['oar_job_id'],
729 'person_ids':[recslice['record_id_user']]})
731 elif str(record['type']) == 'user':
732 recslice = self.db.find('slice', record_filter={'record_id_user':record['record_id']})
734 rec.update({'type':'slice'})
735 rec.update({'hrn':rec['slice_hrn'], 'record_id':rec['record_id_slice']})
737 print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info ADDING SLIC EINFO recslice %s" %(recslice)
741 print >>sys.stderr, "\r\n \t\t SLABDRIVER fill_record_info EXCEPTION RECORDS : %s" %(records)
744 #self.fill_record_pl_info(records)
745 ##print >>sys.stderr, "\r\n \t\t after fill_record_pl_info %s" %(records)
746 #self.fill_record_sfa_info(records)
747 #print >>sys.stderr, "\r\n \t\t after fill_record_sfa_info"
749 #def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):
750 ## get a list of the HRNs tht are members of the old and new records
752 #oldList = oldRecord.get(listName, [])
755 #newList = record.get(listName, [])
757 ## if the lists are the same, then we don't have to update anything
758 #if (oldList == newList):
761 ## build a list of the new person ids, by looking up each person to get
765 #records = table.find({'type': 'user', 'hrn': newList})
767 #newIdList.append(rec['pointer'])
769 ## build a list of the old person ids from the person_ids field
771 #oldIdList = oldRecord.get("person_ids", [])
772 #containerId = oldRecord.get_pointer()
774 ## if oldRecord==None, then we are doing a Register, instead of an
777 #containerId = record.get_pointer()
779 ## add people who are in the new list, but not the oldList
780 #for personId in newIdList:
781 #if not (personId in oldIdList):
782 #addFunc(self.plauth, personId, containerId)
784 ## remove people who are in the old list, but not the new list
785 #for personId in oldIdList:
786 #if not (personId in newIdList):
787 #delFunc(self.plauth, personId, containerId)
789 #def update_membership(self, oldRecord, record):
790 #print >>sys.stderr, " \r\n \r\n ***SLABDRIVER.PY update_membership record ", record
791 #if record.type == "slice":
792 #self.update_membership_list(oldRecord, record, 'researcher',
793 #self.users.AddPersonToSlice,
794 #self.users.DeletePersonFromSlice)
795 #elif record.type == "authority":
800 # I don't think you plan on running a component manager at this point
801 # let me clean up the mess of ComponentAPI that is deprecated anyways