From: Tony Mack Date: Wed, 24 Aug 2011 00:37:44 +0000 (-0400) Subject: Aggregates no longer try to lookup slice and person records when processing CreateSli... X-Git-Tag: sfa-1.0-33~2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5c2cc92224fa8fb97322a7374e7c05dcb3f4f309;p=sfa.git Aggregates no longer try to lookup slice and person records when processing CreateSliver requests. Clients are expected to pass info to the aggregate --- diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 7dd06079..6797b8fa 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -114,7 +114,6 @@ def SliverStatus(api, slice_xrn, creds, call_id): (hrn, type) = urn_to_hrn(slice_xrn) # find out where this slice is currently running - api.logger.info(hrn) slicename = hrn_to_pl_slicename(hrn) slices = api.plshell.GetSlices(api.plauth, [slicename], ['slice_id', 'node_ids','person_ids','name','expires']) @@ -160,9 +159,6 @@ def SliverStatus(api, slice_xrn, creds, call_id): result['geni_status'] = top_level_status result['geni_resources'] = resources - # XX remove me - #api.logger.info(result) - # XX remove me return result def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): @@ -172,22 +168,19 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): """ if Callids().already_handled(call_id): return "" - reg_objects = __get_registry_objects(slice_xrn, creds, users) - - (hrn, type) = urn_to_hrn(slice_xrn) - peer = None + #reg_objects = __get_registry_objects(slice_xrn, creds, users) aggregate = Aggregate(api) slices = Slices(api) + (hrn, type) = urn_to_hrn(slice_xrn) peer = slices.get_peer(hrn) - sfa_peer = slices.get_sfa_peer(hrn) - registry = api.registries[api.hrn] - credential = api.getCredential() - (site_id, remote_site_id) = slices.verify_site(registry, credential, hrn, - peer, sfa_peer, reg_objects) + slice_record=None + if users: + slice_record = users[0].get('slice_record', {}) - slice = slices.verify_slice(registry, credential, hrn, site_id, - remote_site_id, peer, sfa_peer, reg_objects) - + # create required records + slice = slices.verify_slice_records(hrn, slice_record, users, peer) + + # assoicate slice with nodes nodes = api.plshell.GetNodes(api.plauth, slice['node_ids'], ['hostname']) current_slivers = [node['hostname'] for node in nodes] rspec = parse_rspec(rspec_string) @@ -216,10 +209,10 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): try: if peer: - api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) - + api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer['shortname']) api.plshell.AddSliceToNodes(api.plauth, slice['name'], added_nodes) api.plshell.DeleteSliceFromNodes(api.plauth, slice['name'], deleted_nodes) + # remove stale attributes for attribute in removed_slice_attributes: try: @@ -236,11 +229,12 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id): except Exception, e: api.logger.warn('Failed to add sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\ % (name, value, node_id, str(e))) + except: raise finally: if peer: - api.plshell.BindObjectToPeer(api.plauth, 'slice', slice['slice_id'], peer, - slice['peer_id']) + api.plshell.BindObjectToPeer(api.plauth, 'slice', slice['slice_id'], peer['shortname'], + slice['peer_slice_id']) return aggregate.get_rspec(slice_xrn=slice_xrn, version=rspec.version) diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py index e62e6f45..7895de3c 100644 --- a/sfa/methods/CreateSliver.py +++ b/sfa/methods/CreateSliver.py @@ -37,6 +37,11 @@ class CreateSliver(Method): valid_creds = self.api.auth.checkCredentials(creds, 'createsliver', hrn) origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() + # make sure users info is specified + if not users: + msg = "'users' musst be specified and cannot be null. You may need to update your client." + raise SfaInvalidArgument(name='users', extra=msg) + manager = self.api.get_interface_manager() # flter rspec through sfatables diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index f99ddc13..5921fea3 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -5,7 +5,7 @@ import sys from types import StringTypes from sfa.util.xrn import get_leaf, get_authority, hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import hrn_to_pl_slicename +from sfa.util.plxrn import hrn_to_pl_slicename, hrn_to_pl_login_base from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * @@ -24,6 +24,8 @@ class Slices: #filepath = path + os.sep + filename self.policy = Policy(self.api) self.origin_hrn = origin_hrn + self.registry = api.registries[api.hrn] + self.credential = api.getCredential() def get_slivers(self, xrn, node=None): hrn, type = urn_to_hrn(xrn) @@ -148,7 +150,7 @@ class Slices: for peer_record in peers: names = [name.lower() for name in peer_record.values() if isinstance(name, StringTypes)] if site_authority in names: - peer = peer_record['shortname'] + peer = peer_record return peer @@ -163,206 +165,264 @@ class Slices: if site_authority != self.api.hrn: sfa_peer = site_authority - return sfa_peer + return sfa_peer - def verify_site(self, registry, credential, slice_hrn, peer, sfa_peer, reg_objects=None): - authority = get_authority(slice_hrn) - authority_urn = hrn_to_urn(authority, 'authority') - login_base = None - if reg_objects: - site = reg_objects['site'] - login_base = site['login_base'] - else: - site_records = registry.Resolve(authority_urn, [credential]) - site = {} - for site_record in site_records: - if site_record['type'] == 'authority': - site = site_record - if not site: - raise RecordNotFound(authority) + def verify_slice_records(self, hrn, slice_record, users, peer): + """ + Creates required slice, site, person and key records in the Myplc db. + """ + site = None + slice = None + persons = [] + + sfa_peer = self.get_sfa_peer(hrn) + site = self.verify_site(hrn, slice_record, peer, sfa_peer) + slice = self.verify_slice(hrn, slice_record, peer, sfa_peer) + persons = self.verify_persons(hrn, slice, users, peer, sfa_peer) + + if peer: + # bind site + try: + if site: + self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', \ + site['site_id'], peer['shortname'], slice_record['site_id']) + except Exception,e: + self.api.plshell.DeleteSite(self.api.plauth, site['site_id']) + raise e - remote_site_id = site.pop('site_id') - - if login_base is None: - login_base = get_leaf(authority) - sites = self.api.plshell.GetSites(self.api.plauth, login_base) - - if not sites: - site_id = self.api.plshell.AddSite(self.api.plauth, site) - if peer: + # bind slice + try: + if slice: + self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', \ + slice['slice_id'], peer['shortname'], slice_record['slice_id']) + except Exception,e: + self.api.plshell.DeleteSlice(self.api.plauth,slice['slice_id']) + raise e + + # bind persons + for person in persons: try: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id) + self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', \ + person['person_id'], peer['shortname'], person['peer_person_id']) + + for (key, remote_key_id) in zip(person['keys'], person['key_ids']): + try: + self.api.plshell.BindObjectToPeer(self.api.plauth, 'key',\ + key['key_id'], peer['shortname'], remote_key_id) + except: + self.api.plshell.DeleteKey(self.api.plauth, key['key_id']) + self.api.logger("failed to bind key: %s to peer: %s " % (key['key_id'], peer['shortname'])) except Exception,e: - self.api.plshell.DeleteSite(self.api.plauth, site_id) - raise e - # mark this site as an sfa peer record - if sfa_peer and not reg_objects: - peer_dict = {'type': 'authority', 'hrn': authority, 'peer_authority': sfa_peer, 'pointer': site_id} - registry.register_peer_object(credential, peer_dict) - - # exempt federated sites from monitor policies - self.api.plshell.AddSiteTag(site_id, 'exempt_site_until', "20200101") - - else: - site_id = sites[0]['site_id'] - remote_site_id = sites[0]['peer_site_id'] - old_site = sites[0] - #the site is already on the remote agg. Let us update(e.g. max_slices field) it with the latest info. - self.sync_site(old_site, site, peer) + self.api.plshell.DeletePerson(self.api.plauth, person['person_id']) + raise e + return slice - return (site_id, remote_site_id) - - def verify_slice(self, registry, credential, slice_hrn, site_id, remote_site_id, peer, sfa_peer, reg_objects=None): - slice = {} - slice_record = None - authority = get_authority(slice_hrn) - - if reg_objects: - slice_record = reg_objects['slice_record'] - else: - slice_records = registry.Resolve(slice_hrn, [credential]) - - for record in slice_records: - if record['type'] in ['slice']: - slice_record = record - if not slice_record: - raise RecordNotFound(hrn) + def verify_site(self, slice_xrn, slice_record={}, peer=None, sfa_peer=None): + (slice_hrn, type) = urn_to_hrn(slice_xrn) + site_hrn = get_authority(slice_hrn) + login_base = get_leaf(site_hrn) + sites = self.api.plshell.GetSites(self.api.plauth, login_base) + if not sites: + # create new site record + site = {'name': 'geni.%s' % login_base, + 'abbreviated_name': login_base, + 'login_base': login_base, + 'max_slices': 100, + 'max_slivers': 1000, + 'enabled': True, + 'peer_site_id': None} + if peer: + site['peer_site_id'] = slice_record.get('site_id', None) + site['site_id'] = self.api.plshell.AddSite(self.api.plauth, site) + # exempt federated sites from monitor policies + self.api.plshell.AddSiteTag(self.api.plauth, site['site_id'], 'exempt_site_until', "20200101") + # is this still necessary? + # add record to the local registry + if sfa_peer and slice_record: + peer_dict = {'type': 'authority', 'hrn': site_hrn, \ + 'peer_authority': sfa_peer, 'pointer': site['site_id']} + self.registry.register_peer_object(self.credential, peer_dict) + else: + site = sites[0] + if peer: + # unbind from peer so we can modify if necessary. Will bind back later + self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'site', site['site_id'], peer['shortname']) + return site + + def verify_slice(self, slice_hrn, slice_record, peer, sfa_peer): slicename = hrn_to_pl_slicename(slice_hrn) parts = slicename.split("_") login_base = parts[0] slices = self.api.plshell.GetSlices(self.api.plauth, [slicename]) if not slices: - slice_fields = {} - slice_keys = ['name', 'url', 'description'] - for key in slice_keys: - if key in slice_record and slice_record[key]: - slice_fields[key] = slice_record[key] + slice = {'name': slicename, + 'url': slice_record.get('url', slice_hrn), + 'description': slice_record.get('description', slice_hrn)} # add the slice - slice_id = self.api.plshell.AddSlice(self.api.plauth, slice_fields) - slice = slice_fields - slice['slice_id'] = slice_id - + slice['slice_id'] = self.api.plshell.AddSlice(self.api.plauth, slice) + slice['node_ids'] = [] + slice['person_ids'] = [] + if peer: + slice['peer_slice_id'] = slice_record.get('slice_id', None) # mark this slice as an sfa peer record if sfa_peer: - peer_dict = {'type': 'slice', 'hrn': slice_hrn, 'peer_authority': sfa_peer, 'pointer': slice_id} - registry.register_peer_object(credential, peer_dict) - - #this belongs to a peer - if peer: - try: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', slice_id, peer, slice_record['pointer']) - except Exception,e: - self.api.plshell.DeleteSlice(self.api.plauth,slice_id) - raise e - slice['node_ids'] = [] + peer_dict = {'type': 'slice', 'hrn': slice_hrn, + 'peer_authority': sfa_peer, 'pointer': slice['slice_id']} + self.registry.register_peer_object(self.credential, peer_dict) else: slice = slices[0] - slice_id = slice['slice_id'] - site_id = slice['site_id'] - #the slice is alredy on the remote agg. Let us update(e.g. expires field) it with the latest info. - self.sync_slice(slice, slice_record, peer) - - slice['peer_slice_id'] = slice_record['pointer'] - self.verify_persons(registry, credential, slice_record, site_id, remote_site_id, peer, sfa_peer, reg_objects) - + if peer: + slice['peer_slice_id'] = slice_record.get('slice_id', None) + # unbind from peer so we can modify if necessary. Will bind back later + self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice',\ + slice['slice_id'], peer['shortname']) + #Update existing record (e.g. expires field) it with the latest info. + if slice_record and slice['expires'] != slice_record['expires']: + self.api.plshell.UpdateSlice(self.api.plauth, slice['slice_id'],\ + {'expires' : slice_record['expires']}) + return slice - def verify_persons(self, registry, credential, slice_record, site_id, remote_site_id, peer, sfa_peer, reg_objects=None): - # get the list of valid slice users from the registry and make - # sure they are added to the slice - slicename = hrn_to_pl_slicename(slice_record['hrn']) - if reg_objects: - researchers = reg_objects['users'].keys() - else: - researchers = slice_record.get('researcher', []) - for researcher in researchers: - if reg_objects: - person_dict = reg_objects['users'][researcher] - else: - person_records = registry.Resolve(researcher, [credential]) - for record in person_records: - if record['type'] in ['user'] and record['enabled']: - person_record = record - if not person_record: - return 1 - person_dict = person_record - - local_person=False - if peer: - peer_id = self.api.plshell.GetPeers(self.api.plauth, {'shortname': peer}, ['peer_id'])[0]['peer_id'] - persons = self.api.plshell.GetPersons(self.api.plauth, {'email': [person_dict['email']], 'peer_id': peer_id}, ['person_id', 'key_ids']) - if not persons: - persons = self.api.plshell.GetPersons(self.api.plauth, [person_dict['email']], ['person_id', 'key_ids']) - if persons: - local_person=True - + def verify_persons(self, slice_hrn, slice_record, users, peer, sfa_peer): + slicename = hrn_to_pl_slicename(slice_hrn) + login_base = hrn_to_pl_login_base(slice_hrn) + + # create a dict users keyed on the user's email + users_dict = {} + for user in users: + if 'email' in user: + users_dict[user['email']] = user else: - persons = self.api.plshell.GetPersons(self.api.plauth, [person_dict['email']], ['person_id', 'key_ids']) + fake_email = hrn_to_pl_slicename(slice_hrn) + "@geni.net" + user['email'] = fake_email + users_dict[fake_email] = user - if not persons: - person_id=self.api.plshell.AddPerson(self.api.plauth, person_dict) - self.api.plshell.UpdatePerson(self.api.plauth, person_id, {'enabled' : True}) - - # mark this person as an sfa peer record - if sfa_peer: - peer_dict = {'type': 'user', 'hrn': researcher, 'peer_authority': sfa_peer, 'pointer': person_id} - registry.register_peer_object(credential, peer_dict) - - if peer: - try: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer']) - except Exception,e: - self.api.plshell.DeletePerson(self.api.plauth,person_id) - raise e - key_ids = [] - else: - person_id = persons[0]['person_id'] - key_ids = persons[0]['key_ids'] + # requested slice users + requested_user_ids = users_dict.keys() + + # existing users + existing_users_filter = {'email': requested_user_ids} + existing_users = self.api.plshell.GetPersons(self.api.plauth, \ + existing_users_filter, ['person_id', 'key_ids', 'email']) + existing_user_ids = [user['email'] for user in existing_users] + + # existing slice users + existing_slice_users_filter = {'person_id': slice_record.get('person_ids', [])} + existing_slice_users = self.api.plshell.GetPersons(self.api.plauth, \ + existing_slice_users_filter, ['person_id', 'key_ids', 'email']) + existing_slice_user_ids = [user['email'] for user in existing_slice_users] + + # users to be added, removed or updated + added_user_ids = set(requested_user_ids).difference(existing_user_ids) + added_slice_user_ids = set(requested_user_ids).difference(existing_slice_user_ids) + removed_user_ids = set(existing_slice_user_ids).difference(requested_user_ids) + updated_user_ids = set(existing_slice_user_ids).intersection(requested_user_ids) + + # remove stale users + for removed_user_id in removed_user_ids: + self.api.plshell.DeletePersonFromSlice(self.api.plauth, removed_user_id, slicename) + + # update_existing users + updated_users_list = [user for user in users if user['email'] in updated_user_ids] + self.verify_keys(existing_slice_users, updated_users_list, peer) + + added_persons = [] + # add new users + for added_user_id in added_user_ids: + added_user = users_dict[added_user_id] + hrn, type = urn_to_hrn(added_user['urn']) + person = { + 'first_name': added_user.get('first_name', hrn), + 'last_name': added_user.get('last_name', hrn), + 'email': added_user_id, + 'peer_person_id': None, + 'keys': [], + 'key_ids': added_user.get('key_ids', []), + } + person['person_id'] = self.api.plshell.AddPerson(self.api.plauth, person) + if peer: + person['peer_person_id'] = added_user['person_id'] + added_persons.append(person) + + # enable the account + self.api.plshell.UpdatePerson(self.api.plauth, person['person_id'], {'enabled': True}) + + # add person to site + self.api.plshell.AddPersonToSite(self.api.plauth, added_slice_user_id, login_base) + for key_string in added_user.get('keys', []): + key = {'key':key_string, 'key_type':'ssh'} + key['key_id'] = self.api.plshell.AddPersonKey(self.api.plauth, person['person_id'], key) + person['keys'].append(key) + + # add the registry record + if sfa_peer: + peer_dict = {'type': 'user', 'hrn': hrn, 'peer_authority': sfa_peer, \ + 'pointer': person['person_id']} + self.registry.register_peer_object(self.credential, peer_dict) + + for added_slice_user_id in added_slice_user_ids.union(added_user_ids): + # add person to the slice + self.api.plshell.AddPersonToSlice(self.api.plauth, added_slice_user_id, slicename) - # if this is a peer person, we must unbind them from the peer or PLCAPI will throw - # an error - try: - if peer and not local_person: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer) - if peer: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'site', site_id, peer) - - self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename) - self.api.plshell.AddPersonToSite(self.api.plauth, person_dict['email'], site_id) - finally: - if peer: - try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id) - except: pass - if peer and not local_person: - try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer']) - except: pass - self.verify_keys(registry, credential, person_dict, key_ids, person_id, peer, local_person) + # if this is a peer record then it should already be bound to a peer. + # no need to return worry about it getting bound later - def verify_keys(self, registry, credential, person_dict, key_ids, person_id, peer, local_person): - keylist = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key']) - keys = [key['key'] for key in keylist] + return added_persons + + + def verify_keys(self, persons, users, peer): + # existing keys + key_ids = [] + for person in persons: + key_ids.extend(person['key_ids']) + keylist = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key_id', 'key']) + keydict = {} + for key in keylist: + keydict[key['key']] = key['key_id'] + existing_keys = keydict.keys() + persondict = {} + for person in persons: + persondict[person['email']] = person + + # add new keys + requested_keys = [] + updated_persons = [] + for user in users: + user_keys = user.get('keys', []) + updated_persons.append(user) + for key_string in user_keys: + requested_keys.append(key_string) + if key_string not in existing_keys: + key = {'key': key_string, 'key_type': 'ssh'} + try: + if peer: + person = persondict[user['email']] + self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person['person_id'], peer['shortname']) + key['key_id'] = self.api.plshell.AddPersonKey(self.api.plauth, user['email'], key) + if peer: + key_index = user_keys.index(key['key']) + remote_key_id = user['key_ids'][key_index] + self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key['key_id'], peer['shortname'], remote_key_id) + + finally: + if peer: + self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person['person_id'], peer['shortname'], user['person_id']) - #add keys that arent already there - key_ids = person_dict['key_ids'] - for personkey in person_dict['keys']: - if personkey not in keys: - key = {'key_type': 'ssh', 'key': personkey} + # remove old keys + removed_keys = set(existing_keys).difference(requested_keys) + for existing_key_id in keydict: + if keydict[existing_key_id] in removed_keys: try: if peer: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer) - key_id = self.api.plshell.AddPersonKey(self.api.plauth, person_dict['email'], key) - finally: - if peer and not local_person: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer']) - if peer: - # xxx - thierry how are we getting the peer_key_id in here ? - try: self.api.plshell.BindObjectToPeer(self.api.plauth, 'key', key_id, peer, key_ids.pop(0)) - except: pass + self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'key', existing_key_id, peer['shortname']) + self.api.plshell.DeleteKey(self.api.plauth, existing_key_id) + except: + pass def create_slice_aggregate(self, xrn, rspec): hrn, type = urn_to_hrn(xrn) @@ -443,27 +503,3 @@ class Slices: return 1 - def sync_site(self, old_record, new_record, peer): - if old_record['max_slices'] != new_record['max_slices'] or old_record['max_slivers'] != new_record['max_slivers']: - try: - if peer: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'site', old_record['site_id'], peer) - if old_record['max_slices'] != new_record['max_slices']: - self.api.plshell.UpdateSite(self.api.plauth, old_record['site_id'], {'max_slices' : new_record['max_slices']}) - if old_record['max_slivers'] != new_record['max_slivers']: - self.api.plshell.UpdateSite(self.api.plauth, old_record['site_id'], {'max_slivers' : new_record['max_slivers']}) - finally: - if peer: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', old_record['site_id'], peer, old_record['peer_site_id']) - return 1 - - def sync_slice(self, old_record, new_record, peer): - if old_record['expires'] != new_record['expires']: - try: - if peer: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', old_record['slice_id'], peer) - self.api.plshell.UpdateSlice(self.api.plauth, old_record['slice_id'], {'expires' : new_record['expires']}) - finally: - if peer: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', old_record['slice_id'], peer, old_record['peer_slice_id']) - return 1