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 OARapi, 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
62 self.users = SenslabImportUsers()
63 self.time_format = "%Y-%m-%d %H:%M:%S"
65 #self.logger=sfa_logger()
70 def create_sliver (self, slice_urn, slice_hrn, creds, rspec_string, users, options):
71 aggregate = SlabAggregate(self)
72 #aggregate = SlabAggregate(self)
73 slices = SlabSlices(self)
74 peer = slices.get_peer(slice_hrn)
75 sfa_peer = slices.get_sfa_peer(slice_hrn)
77 #print>>sys.stderr, " \r\n \r\n create_sliver creds %s \r\n \r\n users %s " %(creds,users)
79 if not isinstance(creds, list):
83 #cred_obj=Credential(string=cred)
84 #print >>sys.stderr," \r\n \r\n create_sliver cred %s " %(cred)
85 #GIDcall = cred_obj.get_gid_caller()
86 #GIDobj = cred_obj.get_gid_object()
87 #print >>sys.stderr," \r\n \r\n create_sliver GIDobj pubkey %s hrn %s " %(GIDobj.get_pubkey().get_pubkey_string(), GIDobj.get_hrn())
88 #print >>sys.stderr," \r\n \r\n create_sliver GIDcall pubkey %s hrn %s" %(GIDcall.get_pubkey().get_pubkey_string(),GIDobj.get_hrn())
91 #tmpcert = GID(string = users[0]['gid'])
92 #print >>sys.stderr," \r\n \r\n create_sliver tmpcer pubkey %s hrn %s " %(tmpcert.get_pubkey().get_pubkey_string(), tmpcert.get_hrn())
95 slice_record = users[0].get('slice_record', {})
98 rspec = RSpec(rspec_string)
99 requested_attributes = rspec.version.get_slice_attributes()
101 # ensure site record exists
102 #site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer, options=options)
103 # ensure slice record exists
104 slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer, options=options)
105 # ensure person records exists
106 persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer, options=options)
107 # ensure slice attributes exists
108 #slices.verify_slice_attributes(slice, requested_attributes, options=options)
110 # add/remove slice from nodes
111 requested_slivers = [node.get('component_name') for node in rspec.version.get_nodes_with_slivers()]
112 nodes = slices.verify_slice_nodes(slice, requested_slivers, peer)
116 # handle MyPLC peer association.
117 # only used by plc and ple.
118 #slices.handle_peer(site, slice, persons, peer)
120 return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version)
123 def delete_sliver (self, slice_urn, slice_hrn, creds, options):
125 slices = self.GetSlices({'slice_hrn': slice_hrn})
130 # determine if this is a peer slice
131 # xxx I wonder if this would not need to use PlSlices.get_peer instead
132 # in which case plc.peers could be deprecated as this here
133 # is the only/last call to this last method in plc.peers
134 peer = peers.get_peer(self, slice_hrn)
137 self.UnBindObjectFromPeer('slice', slice['slice_id'], peer)
138 self.DeleteSliceFromNodes(slice_hrn, slice['node_ids'])
141 self.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
147 # first 2 args are None in case of resource discovery
148 def list_resources (self, slice_urn, slice_hrn, creds, options):
149 #cached_requested = options.get('cached', True)
151 version_manager = VersionManager()
152 # get the rspec's return format from options
153 rspec_version = version_manager.get_version(options.get('geni_rspec_version'))
154 version_string = "rspec_%s" % (rspec_version)
156 #panos adding the info option to the caching key (can be improved)
157 if options.get('info'):
158 version_string = version_string + "_"+options.get('info', 'default')
160 # look in cache first
161 #if cached_requested and self.cache and not slice_hrn:
162 #rspec = self.cache.get(version_string)
164 #logger.debug("SlabDriver.ListResources: returning cached advertisement")
167 #panos: passing user-defined options
168 #print "manager options = ",options
169 aggregate = SlabAggregate(self)
170 rspec = aggregate.get_rspec(slice_xrn=slice_urn, version=rspec_version,
174 #if self.cache and not slice_hrn:
175 #logger.debug("Slab.ListResources: stores advertisement in cache")
176 #self.cache.add(version_string, rspec)
181 def list_slices (self, creds, options):
182 # look in cache first
184 #slices = self.cache.get('slices')
186 #logger.debug("PlDriver.list_slices returns from cache")
190 slices = self.GetSlices({'peer_id': None}, ['name'])
191 slice_hrns = [slicename_to_hrn(self.hrn, slice['name']) for slice in slices]
192 slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns]
196 #logger.debug ("SlabDriver.list_slices stores value in cache")
197 #self.cache.add('slices', slice_urns)
201 #No site or node register supported
202 def register (self, sfa_record, hrn, pub_key):
203 type = sfa_record['type']
204 pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record)
206 #if type == 'authority':
207 #sites = self.shell.GetSites([pl_record['login_base']])
209 #pointer = self.shell.AddSite(pl_record)
211 #pointer = sites[0]['site_id']
214 acceptable_fields=['url', 'instantiation', 'name', 'description']
215 for key in pl_record.keys():
216 if key not in acceptable_fields:
218 slices = self.GetSlices([pl_record['hrn']])
220 pointer = self.AddSlice(pl_record)
222 pointer = slices[0]['slice_id']
225 persons = self.GetPersons([sfa_record['hrn']])
227 pointer = self.AddPerson(dict(sfa_record))
230 pointer = persons[0]['person_id']
232 #Does this make sense to senslab ?
233 #if 'enabled' in sfa_record and sfa_record['enabled']:
234 #self.UpdatePerson(pointer, {'enabled': sfa_record['enabled']})
236 # add this person to the site only if she is being added for the first
237 # time by sfa and doesont already exist in plc
238 if not persons or not persons[0]['site_ids']:
239 login_base = get_leaf(sfa_record['authority'])
240 self.AddPersonToSite(pointer, login_base)
242 # What roles should this user have?
243 self.AddRoleToPerson('user', pointer)
246 self.AddPersonKey(pointer, {'key_type' : 'ssh', 'key' : pub_key})
248 #No node adding outside OAR
249 #elif type == 'node':
250 #login_base = hrn_to_pl_login_base(sfa_record['authority'])
251 #nodes = self.GetNodes([pl_record['hostname']])
253 #pointer = self.AddNode(login_base, pl_record)
255 #pointer = nodes[0]['node_id']
259 #No site or node record update allowed
260 def update (self, old_sfa_record, new_sfa_record, hrn, new_key):
261 pointer = old_sfa_record['pointer']
262 type = old_sfa_record['type']
264 # new_key implemented for users only
265 if new_key and type not in [ 'user' ]:
266 raise UnknownSfaType(type)
268 #if (type == "authority"):
269 #self.shell.UpdateSite(pointer, new_sfa_record)
272 pl_record=self.sfa_fields_to_pl_fields(type, hrn, new_sfa_record)
273 if 'name' in pl_record:
274 pl_record.pop('name')
275 self.UpdateSlice(pointer, pl_record)
279 all_fields = new_sfa_record
280 for key in all_fields.keys():
281 if key in ['first_name', 'last_name', 'title', 'email',
282 'password', 'phone', 'url', 'bio', 'accepted_aup',
284 update_fields[key] = all_fields[key]
285 self.UpdatePerson(pointer, update_fields)
288 # must check this key against the previous one if it exists
289 persons = self.GetPersons([pointer], ['key_ids'])
291 keys = person['key_ids']
292 keys = self.GetKeys(person['key_ids'])
294 # Delete all stale keys
297 if new_key != key['key']:
298 self.DeleteKey(key['key_id'])
302 self.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key})
304 #elif type == "node":
305 #self.UpdateNode(pointer, new_sfa_record)
310 def remove (self, sfa_record):
311 type=sfa_record['type']
312 hrn=sfa_record['hrn']
313 record_id= sfa_record['record_id']
315 username = hrn.split(".")[len(hrn.split(".")) -1]
317 persons = self.GetPersons(username)
318 # only delete this person if he has site ids. if he doesnt, it probably means
319 # he was just removed from a site, not actually deleted
320 if persons and persons[0]['site_ids']:
321 self.DeletePerson(username)
322 elif type == 'slice':
323 if self.GetSlices(hrn):
324 self.DeleteSlice(hrn)
326 #elif type == 'authority':
327 #if self.GetSites(pointer):
328 #self.DeleteSite(pointer)
334 def GetPersons(self, person_filter=None, return_fields=None):
336 person_list = self.ldap.ldapFind({'authority': self.root_auth })
339 #if person_filter and isinstance(person_filter, dict):
340 #for k in person_filter.keys():
341 #if k in person_list[0].keys():
344 return_person_list = parse_filter(person_list,person_filter ,'persons', return_fields)
345 if return_person_list:
346 print>>sys.stderr, " \r\n GetPersons person_filter %s return_fields %s return_person_list %s " %(person_filter,return_fields,return_person_list)
347 return return_person_list
350 def GetJobs(self,job_id= None, resources=True,return_fields=None, details = None):
351 if job_id and resources is False:
352 self.oar.parser.SendRequest("GET_jobs_id", job_id)
353 if job_id and resources:
354 self.oar.parser.SendRequest("GET_jobs_id_resources", job_id)
356 #node_dict = self.oar.parser.GetNodesFromOARParse()
357 #return_node_list = []
359 #if not (node_filter or return_fields):
360 #return_node_list = node_dict.values()
361 #return return_node_list
363 #return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
364 #return return_node_list
366 def GetNodes(self,node_filter= None, return_fields=None):
368 self.oar.parser.SendRequest("GET_resources_full")
369 node_dict = self.oar.parser.GetNodesFromOARParse()
370 return_node_list = []
372 if not (node_filter or return_fields):
373 return_node_list = node_dict.values()
374 return return_node_list
376 return_node_list= parse_filter(node_dict.values(),node_filter ,'node', return_fields)
377 return return_node_list
379 #def GetSites(self, auth, site_filter = None, return_fields=None):
380 #self.oar.parser.SendRequest("GET_resources_full")
381 #site_dict = self.oar.parser.GetSitesFromOARParse()
382 #return_site_list = []
383 #site = site_dict.values()[0]
384 #if not (site_filter or return_fields):
385 #return_site_list = site_dict.values()
386 #return return_site_list
388 #return_site_list = parse_filter(site_dict.values(),site_filter ,'site', return_fields)
389 #return return_site_list
391 def GetSlices(self,slice_filter = None, return_fields=None):
393 return_slice_list =[]
394 sliceslist = self.db.find('slice',columns = ['oar_job_id', 'slice_hrn', 'record_id_slice','record_id_user'])
395 print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices slices %s slice_filter %s " %(sliceslist,slice_filter)
396 #slicesdict = sliceslist[0]
399 if not (slice_filter or return_fields) and sliceslist:
400 for sl in sliceslist:
401 if sl['oar_job_id'] is not '-1':
402 self.GetJobs( sl['oar_job_id'],resources=False)
403 return_slice_list = sliceslist
404 return return_slice_list
406 return_slice_list = parse_filter(sliceslist, slice_filter,'slice', return_fields)
407 for sl in return_slice_list:
408 if sl['oar_job_id'] is not '-1':
409 self.GetJobs( sl['oar_job_id'],resources=False)
410 #print >>sys.stderr, " \r\n \r\n SLABDRIVER.PY GetSlices return_slice_list %s" %(return_slice_list)
411 return return_slice_list
413 def testbed_name (self): return "senslab2"
415 # 'geni_request_rspec_versions' and 'geni_ad_rspec_versions' are mandatory
416 def aggregate_version (self):
417 version_manager = VersionManager()
418 ad_rspec_versions = []
419 request_rspec_versions = []
420 for rspec_version in version_manager.versions:
421 if rspec_version.content_type in ['*', 'ad']:
422 ad_rspec_versions.append(rspec_version.to_dict())
423 if rspec_version.content_type in ['*', 'request']:
424 request_rspec_versions.append(rspec_version.to_dict())
426 'testbed':self.testbed_name(),
427 'geni_request_rspec_versions': request_rspec_versions,
428 'geni_ad_rspec_versions': ad_rspec_versions,
437 # Convert SFA fields to PLC fields for use when registering up updating
438 # registry record in the PLC database
440 # @param type type of record (user, slice, ...)
441 # @param hrn human readable name
442 # @param sfa_fields dictionary of SFA fields
443 # @param pl_fields dictionary of PLC fields (output)
445 def sfa_fields_to_pl_fields(self, type, hrn, record):
447 def convert_ints(tmpdict, int_fields):
448 for field in int_fields:
450 tmpdict[field] = int(tmpdict[field])
453 #for field in record:
454 # pl_record[field] = record[field]
457 #instantion used in get_slivers ?
458 if not "instantiation" in pl_record:
459 pl_record["instantiation"] = "senslab-instantiated"
460 pl_record["hrn"] = hrn_to_pl_slicename(hrn)
462 pl_record["url"] = record["url"]
463 if "description" in record:
464 pl_record["description"] = record["description"]
465 if "expires" in record:
466 pl_record["expires"] = int(record["expires"])
468 #nodes added by OAR only and then imported to SFA
469 #elif type == "node":
470 #if not "hostname" in pl_record:
471 #if not "hostname" in record:
472 #raise MissingSfaInfo("hostname")
473 #pl_record["hostname"] = record["hostname"]
474 #if not "model" in pl_record:
475 #pl_record["model"] = "geni"
478 #elif type == "authority":
479 #pl_record["login_base"] = hrn_to_pl_login_base(hrn)
481 #if not "name" in pl_record:
482 #pl_record["name"] = hrn
484 #if not "abbreviated_name" in pl_record:
485 #pl_record["abbreviated_name"] = hrn
487 #if not "enabled" in pl_record:
488 #pl_record["enabled"] = True
490 #if not "is_public" in pl_record:
491 #pl_record["is_public"] = True
498 def AddSliceToNodes(self, slice_name, added_nodes, slice_user=None):
499 print>>sys.stderr, "\r\n \r\n AddSliceToNodes slice_name %s added_nodes %s username %s" %(slice_name,added_nodes,slice_user )
504 reqdict['property'] ="network_address in ("
505 for node in added_nodes:
506 #Get the ID of the node : remove the root auth and put the site in a separate list
507 tmp = node.strip(self.root_auth+".")
510 nodeid= (l[len(l)-1])
511 reqdict['property'] += "'"+ nodeid +"', "
512 nodeid_list.append(nodeid)
513 site_list.append( l[0] )
515 reqdict['property'] = reqdict['property'][0: len( reqdict['property'])-2] +")"
516 reqdict['resource'] ="network_address="+ str(len(nodeid_list))
517 reqdict['resource']+= ",walltime=" + str(00) + ":" + str(05) + ":" + str(00)
518 reqdict['script_path'] = "/bin/sleep 320"
519 #reqdict['type'] = "deploy"
520 print>>sys.stderr, "\r\n \r\n AddSliceToNodes reqdict %s \r\n site_list %s" %(reqdict,site_list)
522 answer = OAR.POSTRequestToOARRestAPI('POST_job',reqdict,slice_user)
523 print>>sys.stderr, "\r\n \r\n AddSliceToNodes jobid %s " %(answer)
524 self.db.update('slice',['oar_job_id'], [answer['id']], 'slice_hrn', slice_name)
530 def DeleteSliceFromNodes(self, slice_name, deleted_nodes):
535 def fill_record_sfa_info(self, records):
537 def startswith(prefix, values):
538 return [value for value in values if value.startswith(prefix)]
543 for record in records:
544 person_ids.extend(record.get("person_ids", []))
545 site_ids.extend(record.get("site_ids", []))
546 if 'site_id' in record:
547 site_ids.append(record['site_id'])
549 #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)
551 # get all pis from the sites we've encountered
552 # and store them in a dictionary keyed on site_id
555 pi_filter = {'|roles': ['pi'], '|site_ids': site_ids}
556 pi_list = self.GetPersons( pi_filter, ['person_id', 'site_ids'])
557 #print>>sys.stderr, "\r\n \r\n _fill_record_sfa_info ___ GetPersons ['person_id', 'site_ids'] pi_ilist %s" %(pi_list)
560 # we will need the pi's hrns also
561 person_ids.append(pi['person_id'])
563 # we also need to keep track of the sites these pis
565 for site_id in pi['site_ids']:
566 if site_id in site_pis:
567 site_pis[site_id].append(pi)
569 site_pis[site_id] = [pi]
571 # get sfa records for all records associated with these records.
572 # we'll replace pl ids (person_ids) with hrns from the sfa records
575 # get the sfa records
577 person_list, persons = [], {}
578 person_list = table.find({'type': 'user', 'pointer': person_ids})
579 # create a hrns keyed on the sfa record's pointer.
580 # Its possible for multiple records to have the same pointer so
581 # the dict's value will be a list of hrns.
582 persons = defaultdict(list)
583 for person in person_list:
584 persons[person['pointer']].append(person)
587 pl_person_list, pl_persons = [], {}
588 pl_person_list = self.GetPersons(person_ids, ['person_id', 'roles'])
589 pl_persons = list_to_dict(pl_person_list, 'person_id')
590 #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)
593 for record in records:
594 # skip records with no pl info (top level authorities)
595 #Sandrine 24 oct 11 2 lines
596 #if record['pointer'] == -1:
599 type = record['type']
600 if (type == "slice"):
601 # all slice users are researchers
602 #record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') ? besoin ou pas ?
604 record['researcher'] = []
605 for person_id in record.get('person_ids', []):
606 #Sandrine 24 oct 11 line
607 #for person_id in record['person_ids']:
608 hrns = [person['hrn'] for person in persons[person_id]]
609 record['researcher'].extend(hrns)
611 # pis at the slice's site
612 pl_pis = site_pis[record['site_id']]
613 pi_ids = [pi['person_id'] for pi in pl_pis]
614 for person_id in pi_ids:
615 hrns = [person['hrn'] for person in persons[person_id]]
616 record['PI'].extend(hrns)
617 record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice')
618 record['geni_creator'] = record['PI']
620 elif (type == "authority"):
622 record['operator'] = []
624 for pointer in record['person_ids']:
625 if pointer not in persons or pointer not in pl_persons:
626 # this means there is not sfa or pl record for this user
628 hrns = [person['hrn'] for person in persons[pointer]]
629 roles = pl_persons[pointer]['roles']
631 record['PI'].extend(hrns)
633 record['operator'].extend(hrns)
635 record['owner'].extend(hrns)
636 # xxx TODO: OrganizationName
637 elif (type == "node"):
638 sfa_info['dns'] = record.get("hostname", "")
639 # xxx TODO: URI, LatLong, IP, DNS
641 elif (type == "user"):
642 sfa_info['email'] = record.get("email", "")
643 sfa_info['geni_urn'] = hrn_to_urn(record['hrn'], 'user')
644 sfa_info['geni_certificate'] = record['gid']
645 # xxx TODO: PostalAddress, Phone
647 #print>>sys.stderr, "\r\n \r\rn \t\t \t <<<<<<<<<<<<<<<<<<<<<<<< fill_record_sfa_info sfa_info %s \r\n record %s : "%(sfa_info,record)
648 record.update(sfa_info)
650 def augment_records_with_testbed_info (self, sfa_records):
651 return self.fill_record_info (sfa_records)
653 def fill_record_info(self, records):
655 Given a SFA record, fill in the senslab specific and SFA specific
656 fields in the record.
658 print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records)
659 if isinstance(records, list):
661 #print >>sys.stderr, "\r\n \t\t BEFORE fill_record_pl_info %s" %(records)
664 if records['type'] == 'slice':
666 sfatable = SfaTable()
667 recslice = self.db.find('slice',str(records['hrn']))
668 if isinstance(recslice,list) and len(recslice) == 1:
669 recslice = recslice[0]
670 recuser = sfatable.find( recslice['record_id_user'], ['hrn'])
672 print >>sys.stderr, "\r\n \t\t SLABDRIVER.PY fill_record_info %s" %(recuser)
674 if isinstance(recuser,list) and len(recuser) == 1:
676 records.update({'PI':[recuser['hrn']],
677 'researcher': [recuser['hrn']],
678 'name':records['hrn'], 'oar_job_id':recslice['oar_job_id'],
681 'person_ids':[recslice['record_id_user']]})
683 #self.fill_record_pl_info(records)
684 ##print >>sys.stderr, "\r\n \t\t after fill_record_pl_info %s" %(records)
685 #self.fill_record_sfa_info(records)
686 #print >>sys.stderr, "\r\n \t\t after fill_record_sfa_info"
688 #def update_membership_list(self, oldRecord, record, listName, addFunc, delFunc):
689 ## get a list of the HRNs tht are members of the old and new records
691 #oldList = oldRecord.get(listName, [])
694 #newList = record.get(listName, [])
696 ## if the lists are the same, then we don't have to update anything
697 #if (oldList == newList):
700 ## build a list of the new person ids, by looking up each person to get
704 #records = table.find({'type': 'user', 'hrn': newList})
706 #newIdList.append(rec['pointer'])
708 ## build a list of the old person ids from the person_ids field
710 #oldIdList = oldRecord.get("person_ids", [])
711 #containerId = oldRecord.get_pointer()
713 ## if oldRecord==None, then we are doing a Register, instead of an
716 #containerId = record.get_pointer()
718 ## add people who are in the new list, but not the oldList
719 #for personId in newIdList:
720 #if not (personId in oldIdList):
721 #addFunc(self.plauth, personId, containerId)
723 ## remove people who are in the old list, but not the new list
724 #for personId in oldIdList:
725 #if not (personId in newIdList):
726 #delFunc(self.plauth, personId, containerId)
728 #def update_membership(self, oldRecord, record):
729 #print >>sys.stderr, " \r\n \r\n ***SLABDRIVER.PY update_membership record ", record
730 #if record.type == "slice":
731 #self.update_membership_list(oldRecord, record, 'researcher',
732 #self.users.AddPersonToSlice,
733 #self.users.DeletePersonFromSlice)
734 #elif record.type == "authority":
739 # I don't think you plan on running a component manager at this point
740 # let me clean up the mess of ComponentAPI that is deprecated anyways