X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fpldriver.py;h=c3d14ea076267ae0b1d0d545eb8f0e9d90534e33;hb=23666284b256845f8c04b287b9560f87f8629bc9;hp=76f54da92993f3b958cc8669122db0b263ab13b4;hpb=2ac2da4b770f57bede8e9a9ee65142242fdf05a3;p=sfa.git diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index 76f54da9..c3d14ea0 100644 --- a/sfa/planetlab/pldriver.py +++ b/sfa/planetlab/pldriver.py @@ -7,7 +7,7 @@ from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch -from sfa.util.xrn import hrn_to_urn, get_leaf, urn_to_sliver_id +from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf from sfa.util.cache import Cache # one would think the driver should not need to mess with the SFA db, but.. @@ -27,7 +27,7 @@ from sfa.planetlab.plshell import PlShell import sfa.planetlab.peers as peers from sfa.planetlab.plaggregate import PlAggregate from sfa.planetlab.plslices import PlSlices -from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename +from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, xrn_to_hostname def list_to_dict(recs, key): @@ -94,7 +94,10 @@ class PlDriver (Driver): if not persons: for key in ['first_name','last_name']: if key not in sfa_record: sfa_record[key]='*from*sfa*' - pointer = self.shell.AddPerson(dict(sfa_record)) + # AddPerson does not allow everything to be set + can_add = ['first_name', 'last_name', 'title','email', 'password', 'phone', 'url', 'bio'] + add_person_dict=dict ( [ (k,sfa_record[k]) for k in sfa_record if k in can_add ] ) + pointer = self.shell.AddPerson(add_person_dict) else: pointer = persons[0]['person_id'] @@ -135,6 +138,7 @@ class PlDriver (Driver): def update (self, old_sfa_record, new_sfa_record, hrn, new_key): pointer = old_sfa_record['pointer'] type = old_sfa_record['type'] + new_key_pointer = None # new_key implemented for users only if new_key and type not in [ 'user' ]: @@ -160,6 +164,10 @@ class PlDriver (Driver): 'password', 'phone', 'url', 'bio', 'accepted_aup', 'enabled']: update_fields[key] = all_fields[key] + # when updating a user, we always get a 'email' field at this point + # this is because 'email' is a native field in the RegUser object... + if 'email' in update_fields and not update_fields['email']: + del update_fields['email'] self.shell.UpdatePerson(pointer, update_fields) if new_key: @@ -169,20 +177,19 @@ class PlDriver (Driver): keys = person['key_ids'] keys = self.shell.GetKeys(person['key_ids']) - # Delete all stale keys key_exists = False for key in keys: - if new_key != key['key']: - self.shell.DeleteKey(key['key_id']) - else: + if new_key == key['key']: key_exists = True + new_key_pointer = key['key_id'] + break if not key_exists: - self.shell.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key}) + new_key_pointer = self.shell.AddPersonKey(pointer, {'key_type': 'ssh', 'key': new_key}) elif type == "node": self.shell.UpdateNode(pointer, new_sfa_record) - return True + return (pointer, new_key_pointer) ########## @@ -607,6 +614,14 @@ class PlDriver (Driver): #panos adding the info option to the caching key (can be improved) if options.get('info'): version_string = version_string + "_"+options.get('info', 'default') + + # Adding the list_leases option to the caching key + if options.get('list_leases'): + version_string = version_string + "_"+options.get('list_leases', 'default') + + # Adding geni_available to caching key + if options.get('geni_available'): + version_string = version_string + "_" + str(options.get('geni_available')) # look in cache first if cached_requested and self.cache and not slice_hrn: @@ -650,7 +665,7 @@ class PlDriver (Driver): persons = self.shell.GetPersons(slice['person_ids'], ['key_ids']) key_ids = [key_id for person in persons for key_id in person['key_ids']] person_keys = self.shell.GetKeys(key_ids) - keys = [key['key'] for key in keys] + keys = [key['key'] for key in person_keys] user.update({'urn': slice_urn, 'login': slice['name'], @@ -679,8 +694,10 @@ class PlDriver (Driver): if node['last_contact'] is not None: res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact'])) - sliver_id = urn_to_sliver_id(slice_urn, slice['slice_id'], node['node_id'], authority=self.hrn) - res['geni_urn'] = sliver_id + sliver_xrn = Xrn(slice_urn, type='sliver', id=node['node_id']) + sliver_xrn.set_authority(self.hrn) + + res['geni_urn'] = sliver_xrn.urn if node['boot_state'] == 'boot': res['geni_status'] = 'ready' else: @@ -720,31 +737,43 @@ class PlDriver (Driver): slices.verify_slice_attributes(slice, requested_attributes, options=options) # add/remove slice from nodes - requested_slivers = [] - for node in rspec.version.get_nodes_with_slivers(): - hostname = None - if node.get('component_name'): - hostname = node.get('component_name') - elif node.get('component_id'): - hostname = xrn_to_hostname(node.get('component_id')) - if hostname: - requested_slivers.append(hostname) - nodes = slices.verify_slice_nodes(slice, requested_slivers, peer) + requested_slivers = {} + slivers = rspec.version.get_nodes_with_slivers() + nodes = slices.verify_slice_nodes(slice, slivers, peer) # add/remove links links slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes) + + # add/remove leases + rspec_requested_leases = rspec.version.get_leases() + leases = slices.verify_slice_leases(slice, rspec_requested_leases, peer) + #requested_leases = [] + #kept_leases = [] + #for lease in rspec.version.get_leases(): + # requested_lease = {} + # if not lease.get('lease_id'): + # requested_lease['hostname'] = xrn_to_hostname(lease.get('component_id').strip()) + # requested_lease['start_time'] = lease.get('start_time') + # requested_lease['duration'] = lease.get('duration') + # else: + # kept_leases.append(int(lease['lease_id'])) + # if requested_lease.get('hostname'): + # requested_leases.append(requested_lease) + + #leases = slices.verify_slice_leases(slice, requested_leases, kept_leases, peer) # handle MyPLC peer association. # only used by plc and ple. slices.handle_peer(site, slice, persons, peer) - return aggregate.get_rspec(slice_xrn=slice_urn, version=rspec.version) + return aggregate.get_rspec(slice_xrn=slice_urn, + version=rspec.version) def delete_sliver (self, slice_urn, slice_hrn, creds, options): slicename = hrn_to_pl_slicename(slice_hrn) slices = self.shell.GetSlices({'name': slicename}) if not slices: - return 1 + return True slice = slices[0] # determine if this is a peer slice @@ -759,7 +788,7 @@ class PlDriver (Driver): finally: if peer: self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id']) - return 1 + return True def renew_sliver (self, slice_urn, slice_hrn, creds, expiration_time, options): slicename = hrn_to_pl_slicename(slice_hrn)