X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fpldriver.py;h=9dba0095ef70384047be1cda970c4399de95da9f;hb=06d76dbb3c38b9702b62d5ffac03d39a0fcf1fa9;hp=27c6b4bde321dd7e76d61aaa168f1d044e506829;hpb=2889c58ce3ac9e7f87f2a55ceb4a02041cbe8780;p=sfa.git diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index 27c6b4bd..9dba0095 100644 --- a/sfa/planetlab/pldriver.py +++ b/sfa/planetlab/pldriver.py @@ -10,7 +10,6 @@ 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.. -from sfa.storage.alchemy import dbsession from sfa.storage.model import RegRecord, SliverAllocation from sfa.trust.credential import Credential @@ -22,10 +21,9 @@ from sfa.rspecs.rspec import RSpec # the driver interface, mostly provides default behaviours from sfa.managers.driver import Driver 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, xrn_to_hostname, top_auth, hash_loginbase +from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, top_auth, hash_loginbase def list_to_dict(recs, key): @@ -33,7 +31,7 @@ def list_to_dict(recs, key): convert a list of dictionaries into a dictionary keyed on the specified dictionary key """ - return dict ( [ (rec[key],rec) for rec in recs ] ) + return { rec[key] : rec for rec in recs } # # PlShell is just an xmlrpc serverproxy where methods @@ -45,10 +43,11 @@ class PlDriver (Driver): # the cache instance is a class member so it survives across incoming requests cache = None - def __init__ (self, config): - Driver.__init__ (self, config) + def __init__ (self, api): + Driver.__init__ (self, api) + config = api.config self.shell = PlShell (config) - self.cache=None + self.cache = None if config.SFA_AGGREGATE_CACHING: if PlDriver.cache is None: PlDriver.cache = Cache() @@ -56,16 +55,16 @@ class PlDriver (Driver): def sliver_to_slice_xrn(self, xrn): sliver_id_parts = Xrn(xrn).get_sliver_id_parts() - filter = {} + filter = {'peer_id': None} try: filter['slice_id'] = int(sliver_id_parts[0]) except ValueError: - fliter['name'] = sliver_id_parts[0] - slices = self.shell.GetSlices(filter) + filter['name'] = sliver_id_parts[0] + slices = self.shell.GetSlices(filter, ['hrn']) if not slices: - raise Forbidden("Unable to locate slice record for sliver: %s" % xrn) + raise Forbidden("Unable to locate slice record for sliver: {}".format(xrn)) slice = slices[0] - slice_xrn = PlXrn(auth=self.hrn, slicename=slice['name']) + slice_xrn = slice['hrn'] return slice_xrn def check_sliver_credentials(self, creds, urns): @@ -73,7 +72,16 @@ class PlDriver (Driver): slice_cred_names = [] for cred in creds: slice_cred_hrn = Credential(cred=cred).get_gid_object().get_hrn() - slice_cred_names.append(PlXrn(xrn=slice_cred_hrn).pl_slicename()) + top_auth_hrn = top_auth(slice_cred_hrn) + site_hrn = '.'.join(slice_cred_hrn.split('.')[:-1]) + slice_part = slice_cred_hrn.split('.')[-1] + if top_auth_hrn == self.hrn: + login_base = slice_cred_hrn.split('.')[-2][:12] + else: + login_base = hash_loginbase(site_hrn) + + slicename = '_'.join([login_base, slice_part]) + slice_cred_names.append(slicename) # look up slice name of slivers listed in urns arg slice_ids = [] @@ -93,7 +101,7 @@ class PlDriver (Driver): # make sure we have a credential for every specified sliver ierd for sliver_name in sliver_names: if sliver_name not in slice_cred_names: - msg = "Valid credential not found for target: %s" % sliver_name + msg = "Valid credential not found for target: {}".format(sliver_name) raise Forbidden(msg) ######################################## @@ -109,7 +117,7 @@ class PlDriver (Driver): pl_record = self.sfa_fields_to_pl_fields(type, hrn, sfa_record) if type == 'authority': - sites = self.shell.GetSites([pl_record['login_base']]) + sites = self.shell.GetSites({'peer_id': None, 'login_base': pl_record['login_base']}) if not sites: # xxx when a site gets registered through SFA we need to set its max_slices if 'max_slices' not in pl_record: @@ -124,33 +132,35 @@ class PlDriver (Driver): for key in pl_record.keys(): if key not in acceptable_fields: pl_record.pop(key) - slices = self.shell.GetSlices([pl_record['name']]) + slices = self.shell.GetSlices({'peer_id': None, 'name': pl_record['name']}) if not slices: + if not pl_record.get('url', None) or not pl_record.get('description', None): + pl_record['url'] = hrn + pl_record['description'] = hrn + pointer = self.shell.AddSlice(pl_record) self.shell.SetSliceHrn(int(pointer), hrn) else: pointer = slices[0]['slice_id'] elif type == 'user': - persons = self.shell.GetPersons({'email':sfa_record['email']}) + persons = self.shell.GetPersons({'peer_id': None, 'email': sfa_record['email']}) if not persons: for key in ['first_name','last_name']: if key not in sfa_record: sfa_record[key]='*from*sfa*' # 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 ] ) + add_person_dict = { k : sfa_record[k] for k in sfa_record if k in can_add } pointer = self.shell.AddPerson(add_person_dict) self.shell.SetPersonHrn(int(pointer), hrn) else: pointer = persons[0]['person_id'] - if 'enabled' in sfa_record and sfa_record['enabled']: - self.shell.UpdatePerson(pointer, {'enabled': sfa_record['enabled']}) - # add this person to the site only if she is being added for the first - # time by sfa and doesont already exist in plc - if not persons or not persons[0]['site_ids']: - login_base = get_leaf(sfa_record['authority']) - self.shell.AddPersonToSite(pointer, login_base) + # enable the person's account + self.shell.UpdatePerson(pointer, {'enabled': True}) + # add this person to the site + login_base = get_leaf(sfa_record['authority']) + self.shell.AddPersonToSite(pointer, login_base) # What roles should this user have? roles=[] @@ -167,8 +177,8 @@ class PlDriver (Driver): self.shell.AddPersonKey(pointer, {'key_type' : 'ssh', 'key' : pub_key}) elif type == 'node': - login_base = PlXrn(xrn=sfa_record['authority'],type='authority').pl_login_base() - nodes = self.shell.GetNodes([pl_record['hostname']]) + login_base = PlXrn(xrn=sfa_record['authority'], type='authority').pl_login_base() + nodes = self.shell.GetNodes({'peer_id': None, 'hostname': pl_record['hostname']}) if not nodes: pointer = self.shell.AddNode(login_base, pl_record) self.shell.SetNodeHrn(int(pointer), hrn) @@ -219,7 +229,7 @@ class PlDriver (Driver): if new_key: # must check this key against the previous one if it exists - persons = self.shell.GetPersons([pointer], ['key_ids']) + persons = self.shell.GetPersons({'peer_id': None, 'person_id': pointer}, ['key_ids']) person = persons[0] keys = person['key_ids'] keys = self.shell.GetKeys(person['key_ids']) @@ -244,27 +254,24 @@ class PlDriver (Driver): type=sfa_record['type'] pointer=sfa_record['pointer'] if type == 'user': - persons = self.shell.GetPersons(pointer) + persons = self.shell.GetPersons({'peer_id': None, 'person_id': pointer}) # only delete this person if he has site ids. if he doesnt, it probably means # he was just removed from a site, not actually deleted if persons and persons[0]['site_ids']: self.shell.DeletePerson(pointer) elif type == 'slice': - if self.shell.GetSlices(pointer): + if self.shell.GetSlices({'peer_id': None, 'slice_id': pointer}): self.shell.DeleteSlice(pointer) elif type == 'node': - if self.shell.GetNodes(pointer): + if self.shell.GetNodes({'peer_id': None, 'node_id': pointer}): self.shell.DeleteNode(pointer) elif type == 'authority': - if self.shell.GetSites(pointer): + if self.shell.GetSites({'peer_id': None, 'site_id': pointer}): self.shell.DeleteSite(pointer) return True - - - ## # Convert SFA fields to PLC fields for use when registering or updating # registry record in the PLC database @@ -302,7 +309,7 @@ class PlDriver (Driver): elif type == "authority": pl_record["login_base"] = PlXrn(xrn=hrn,type='authority').pl_login_base() - if "name" not in sfa_record: + if "name" not in sfa_record or not sfa_record['name']: pl_record["name"] = hrn if "abbreviated_name" not in sfa_record: pl_record["abbreviated_name"] = hrn @@ -349,16 +356,16 @@ class PlDriver (Driver): # get pl records nodes, sites, slices, persons, keys = {}, {}, {}, {}, {} if node_ids: - node_list = self.shell.GetNodes(node_ids) + node_list = self.shell.GetNodes({'peer_id': None, 'node_id': node_ids}) nodes = list_to_dict(node_list, 'node_id') if site_ids: - site_list = self.shell.GetSites(site_ids) + site_list = self.shell.GetSites({'peer_id': None, 'site_id': site_ids}) sites = list_to_dict(site_list, 'site_id') if slice_ids: - slice_list = self.shell.GetSlices(slice_ids) + slice_list = self.shell.GetSlices({'peer_id': None, 'slice_id': slice_ids}) slices = list_to_dict(slice_list, 'slice_id') if person_ids: - person_list = self.shell.GetPersons(person_ids) + person_list = self.shell.GetPersons({'peer_id': None, 'person_id': person_ids}) persons = list_to_dict(person_list, 'person_id') for person in persons: key_ids.extend(persons[person]['key_ids']) @@ -415,16 +422,16 @@ class PlDriver (Driver): # get pl records slices, persons, sites, nodes = {}, {}, {}, {} if site_ids: - site_list = self.shell.GetSites(site_ids, ['site_id', 'login_base']) + site_list = self.shell.GetSites({'peer_id': None, 'site_id': site_ids}, ['site_id', 'login_base']) sites = list_to_dict(site_list, 'site_id') if person_ids: - person_list = self.shell.GetPersons(person_ids, ['person_id', 'email']) + person_list = self.shell.GetPersons({'peer_id': None, 'person_id': person_ids}, ['person_id', 'email']) persons = list_to_dict(person_list, 'person_id') if slice_ids: - slice_list = self.shell.GetSlices(slice_ids, ['slice_id', 'name']) + slice_list = self.shell.GetSlices({'peer_id': None, 'slice_id': slice_ids}, ['slice_id', 'name']) slices = list_to_dict(slice_list, 'slice_id') if node_ids: - node_list = self.shell.GetNodes(node_ids, ['node_id', 'hostname']) + node_list = self.shell.GetNodes({'peer_id': None, 'node_id': node_ids}, ['node_id', 'hostname']) nodes = list_to_dict(node_list, 'node_id') # convert ids to hrns @@ -488,7 +495,7 @@ class PlDriver (Driver): # and store them in a dictionary keyed on site_id site_pis = {} if site_ids: - pi_filter = {'|roles': ['pi'], '|site_ids': site_ids} + pi_filter = {'peer_id': None, '|roles': ['pi'], '|site_ids': site_ids} pi_list = self.shell.GetPersons(pi_filter, ['person_id', 'site_ids']) for pi in pi_list: # we will need the pi's hrns also @@ -508,7 +515,7 @@ class PlDriver (Driver): # get the registry records person_list, persons = [], {} - person_list = dbsession.query (RegRecord).filter(RegRecord.pointer.in_(person_ids)) + person_list = self.api.dbsession().query (RegRecord).filter(RegRecord.pointer.in_(person_ids)) # 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. @@ -528,7 +535,7 @@ class PlDriver (Driver): # continue sfa_info = {} type = record['type'] - logger.info("fill_record_sfa_info - incoming record typed %s"%type) + logger.info("fill_record_sfa_info - incoming record typed {}".format(type)) if (type == "slice"): # all slice users are researchers record['geni_urn'] = hrn_to_urn(record['hrn'], 'slice') @@ -589,22 +596,23 @@ class PlDriver (Driver): current_target_ids = subject['person_ids'] add_target_ids = list ( set (target_ids).difference(current_target_ids)) del_target_ids = list ( set (current_target_ids).difference(target_ids)) - logger.debug ("subject_id = %s (type=%s)"%(subject_id,type(subject_id))) + logger.debug ("subject_id = {} (type={})".format(subject_id, type(subject_id))) for target_id in add_target_ids: self.shell.AddPersonToSlice (target_id,subject_id) - logger.debug ("add_target_id = %s (type=%s)"%(target_id,type(target_id))) + logger.debug ("add_target_id = {} (type={})".format(target_id, type(target_id))) for target_id in del_target_ids: - logger.debug ("del_target_id = %s (type=%s)"%(target_id,type(target_id))) + logger.debug ("del_target_id = {} (type={})".format(target_id, type(target_id))) self.shell.DeletePersonFromSlice (target_id, subject_id) elif subject_type == 'authority' and target_type == 'user' and relation_name == 'pi': # due to the plcapi limitations this means essentially adding pi role to all people in the list # it's tricky to remove any pi role here, although it might be desirable - persons = self.shell.GetPersons (target_ids) + persons = self.shell.GetPersons ({'peer_id': None, 'person_id': target_ids}) for person in persons: if 'pi' not in person['roles']: self.shell.AddRoleToPerson('pi',person['person_id']) else: - logger.info('unexpected relation %s to maintain, %s -> %s'%(relation_name,subject_type,target_type)) + logger.info('unexpected relation {} to maintain, {} -> {}'\ + .format(relation_name, subject_type, target_type)) ######################################## @@ -617,30 +625,45 @@ class PlDriver (Driver): return {} # first 2 args are None in case of resource discovery - def list_resources (self, version=None, options={}): + def list_resources (self, version=None, options=None): + if options is None: options={} aggregate = PlAggregate(self) rspec = aggregate.list_resources(version=version, options=options) return rspec - def describe(self, urns, version, options={}): + def describe(self, urns, version, options=None): + if options is None: options={} aggregate = PlAggregate(self) return aggregate.describe(urns, version=version, options=options) - def status (self, urns, options={}): + def status (self, urns, options=None): + if options is None: options={} aggregate = PlAggregate(self) desc = aggregate.describe(urns, version='GENI 3') status = {'geni_urn': desc['geni_urn'], 'geni_slivers': desc['geni_slivers']} return status - def allocate (self, urn, rspec_string, expiration, options={}): + def allocate (self, urn, rspec_string, expiration, options=None): + """ + Allocate a PL slice + + Supported options: + (*) geni_users + (*) append : if set to True, provided attributes are appended + to the current list of tags for the slice + otherwise, the set of provided attributes are meant to be the + the exact set of tags at the end of the call, meaning pre-existing tags + are deleted if not repeated in the incoming request + """ + if options is None: options={} xrn = Xrn(urn) aggregate = PlAggregate(self) slices = PlSlices(self) - peer = slices.get_peer(xrn.get_hrn()) sfa_peer = slices.get_sfa_peer(xrn.get_hrn()) - slice_record=None + slice_record = None users = options.get('geni_users', []) + if users: slice_record = users[0].get('slice_record', {}) @@ -649,50 +672,67 @@ class PlDriver (Driver): requested_attributes = rspec.version.get_slice_attributes() # ensure site record exists - site = slices.verify_site(xrn.hrn, slice_record, peer, sfa_peer, options=options) + site = slices.verify_site(xrn.hrn, slice_record, sfa_peer, options=options) # ensure slice record exists - slice = slices.verify_slice(xrn.hrn, slice_record, peer, sfa_peer, expiration=expiration, options=options) + slice = slices.verify_slice(xrn.hrn, slice_record, sfa_peer, expiration=expiration, options=options) # ensure person records exists - persons = slices.verify_persons(xrn.hrn, slice, users, peer, sfa_peer, options=options) + persons = slices.verify_persons(xrn.hrn, slice, users, sfa_peer, options=options) # ensure slice attributes exists slices.verify_slice_attributes(slice, requested_attributes, options=options) # add/remove slice from nodes request_nodes = rspec.version.get_nodes_with_slivers() - nodes = slices.verify_slice_nodes(urn, slice, request_nodes, peer) + nodes = slices.verify_slice_nodes(urn, slice, request_nodes) # 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) + leases = slices.verify_slice_leases(slice, rspec_requested_leases) - # handle MyPLC peer association. - # only used by plc and ple. - slices.handle_peer(site, slice, None, peer) - return aggregate.describe([xrn.get_urn()], version=rspec.version) - def provision(self, urns, options={}): + def provision(self, urns, options=None): + if options is None: options={} # update users slices = PlSlices(self) aggregate = PlAggregate(self) slivers = aggregate.get_slivers(urns) - slice = slivers[0] - peer = slices.get_peer(slice['hrn']) - sfa_peer = slices.get_sfa_peer(slice['hrn']) - users = options.get('geni_users', []) - persons = slices.verify_persons(slice['hrn'], slice, users, peer, sfa_peer, options=options) - slices.handle_peer(None, None, persons, peer) - # update sliver allocation states and set them to geni_provisioned - sliver_ids = [sliver['sliver_id'] for sliver in slivers] - SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned') + if not slivers: + sliver_id_parts = Xrn(urns[0]).get_sliver_id_parts() + # allow to be called with an empty rspec, meaning flush reservations + if sliver_id_parts: + filter = {} + try: + filter['slice_id'] = int(sliver_id_parts[0]) + except ValueError: + filter['name'] = sliver_id_parts[0] + slices = self.shell.GetSlices(filter,['hrn']) + if not slices: + raise Forbidden("Unable to locate slice record for sliver: {}".format(xrn)) + slice = slices[0] + slice_urn = hrn_to_urn(slice['hrn'], type='slice') + urns = [slice_urn] + else: + slice_id = slivers[0]['slice_id'] + slice_hrn = self.shell.GetSliceHrn(slice_id) + slice = self.shell.GetSlices({'slice_id': slice_id})[0] + slice['hrn'] = slice_hrn + sfa_peer = slices.get_sfa_peer(slice['hrn']) + users = options.get('geni_users', []) + persons = slices.verify_persons(slice['hrn'], slice, users, sfa_peer, options=options) + # update sliver allocation states and set them to geni_provisioned + sliver_ids = [sliver['sliver_id'] for sliver in slivers] + dbsession=self.api.dbsession() + SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned',dbsession) + version_manager = VersionManager() rspec_version = version_manager.get_version(options['geni_rspec_version']) return self.describe(urns, rspec_version, options=options) - def delete(self, urns, options={}): + def delete(self, urns, options=None): + if options is None: options={} # collect sliver ids so we can update sliver allocation states after # we remove the slivers. aggregate = PlAggregate(self) @@ -707,29 +747,20 @@ class PlDriver (Driver): sliver_ids.append(sliver['sliver_id']) # leases - leases = self.shell.GetLeases({'name': slice_name}) + leases = self.shell.GetLeases({'name': slice_name, 'node_id': node_ids}) leases_ids = [lease['lease_id'] for lease in leases ] - # determine if this is a peer slice - # xxx I wonder if this would not need to use PlSlices.get_peer instead - # in which case plc.peers could be deprecated as this here - # is the only/last call to this last method in plc.peers - #slice_hrn = PlXrn(auth=self.hrn, slice_name).get_hrn() slice_hrn = self.shell.GetSliceHrn(int(slice_id)) - peer = peers.get_peer(self, slice_hrn) try: - if peer: - self.shell.UnBindObjectFromPeer('slice', slice_id, peer) - self.shell.DeleteSliceFromNodes(slice_id, node_ids) if len(leases_ids) > 0: self.shell.DeleteLeases(leases_ids) # delete sliver allocation states - SliverAllocation.delete_allocations(sliver_ids) + dbsession = self.api.dbsession() + SliverAllocation.delete_allocations(sliver_ids, dbsession) finally: - if peer: - self.shell.BindObjectToPeer('slice', slice_id, peer, slice['peer_slice_id']) + pass # prepare return struct geni_slivers = [] @@ -740,7 +771,8 @@ class PlDriver (Driver): 'geni_expires': datetime_to_string(utcparse(sliver['expires']))}) return geni_slivers - def renew (self, urns, expiration_time, options={}): + def renew (self, urns, expiration_time, options=None): + if options is None: options={} aggregate = PlAggregate(self) slivers = aggregate.get_slivers(urns) if not slivers: @@ -753,7 +785,8 @@ class PlDriver (Driver): return description['geni_slivers'] - def perform_operational_action (self, urns, action, options={}): + def perform_operational_action (self, urns, action, options=None): + if options is None: options={} # MyPLC doesn't support operational actions. Lets pretend like it # supports start, but reject everything else. action = action.lower() @@ -764,7 +797,8 @@ class PlDriver (Driver): description = self.describe(urns, 'GENI 3', options) for sliver in description['geni_slivers']: if sliver['geni_operational_status'] == 'geni_pending_allocation': - raise UnsupportedOperation(action, "Sliver must be fully allocated (operational status is not geni_pending_allocation)") + raise UnsupportedOperation\ + (action, "Sliver must be fully allocated (operational status is not geni_pending_allocation)") # # Perform Operational Action Here # @@ -773,19 +807,20 @@ class PlDriver (Driver): return geni_slivers # set the 'enabled' tag to 0 - def shutdown (self, xrn, options={}): + def shutdown (self, xrn, options=None): + if options is None: options={} hrn, _ = urn_to_hrn(xrn) top_auth_hrn = top_auth(hrn) site_hrn = '.'.join(hrn.split('.')[:-1]) slice_part = hrn.split('.')[-1] - if top_auth_hrn == self.driver.hrn: + if top_auth_hrn == self.hrn: login_base = slice_hrn.split('.')[-2][:12] else: login_base = hash_loginbase(site_hrn) slicename = '_'.join([login_base, slice_part]) - slices = self.shell.GetSlices({'name': slicename}, ['slice_id']) + slices = self.shell.GetSlices({'peer_id': None, 'name': slicename}, ['slice_id']) if not slices: raise RecordNotFound(slice_hrn) slice_id = slices[0]['slice_id']