X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fslices.py;h=9cbff41ebabfd656c2b7600512b42adaee1298b1;hb=ec3e398a24ba761666d5124f09c1a2fedd8af3b3;hp=6bc0470e1006e284c1fb815f2aa5b46240403ee8;hpb=10bbf9eb2e50da0aa96e6ecb3ff8e99439003011;p=sfa.git diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index 6bc0470e..9cbff41e 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -7,23 +7,25 @@ import traceback import sys from types import StringTypes -from sfa.util.misc import * +from sfa.util.namespace import * from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * from sfa.util.storage import * -from sfa.util.record import GeniRecord +from sfa.util.record import SfaRecord from sfa.util.policy import Policy from sfa.util.prefixTree import prefixTree from sfa.util.debug import log from sfa.server.aggregate import Aggregates from sfa.server.registry import Registries +MAXINT = 2L**31-1 + class Slices(SimpleStorage): rspec_to_slice_tag = {'max_rate':'net_max_rate'} - def __init__(self, api, ttl = .5, caller_cred=None): + def __init__(self, api, ttl = .5, origin_hrn=None): self.api = api self.ttl = ttl self.threshold = None @@ -34,9 +36,10 @@ class Slices(SimpleStorage): SimpleStorage.__init__(self, self.slices_file) self.policy = Policy(self.api) self.load() - self.caller_cred=caller_cred + self.origin_hrn = origin_hrn - def get_slivers(self, hrn): + def get_slivers(self, xrn, node=None): + hrn, type = urn_to_hrn(xrn) slice_name = hrn_to_pl_slicename(hrn) # XX Should we just call PLCAPI.GetSliceTicket(slice_name) instead @@ -44,28 +47,37 @@ class Slices(SimpleStorage): #return self.api.GetSliceTicket(self.auth, slice_name) # from PLCAPI.GetSlivers.get_slivers() - slice_fields = ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids']) - slices = self.api.GetSlices(self.auth, slice_name, slice_fields) + slice_fields = ['slice_id', 'name', 'instantiation', 'expires', 'person_ids', 'slice_tag_ids'] + slices = self.api.plshell.GetSlices(self.api.plauth, slice_name, slice_fields) # Build up list of users and slice attributes person_ids = set() all_slice_tag_ids = set() for slice in slices: person_ids.update(slice['person_ids']) - slice_tag_ids.update(slice['slice_tag_ids']) - + all_slice_tag_ids.update(slice['slice_tag_ids']) + person_ids = list(person_ids) + all_slice_tag_ids = list(all_slice_tag_ids) # Get user information - all_persons = Persons(api, {'person_id':person_ids,'enabled':True}, ['person_id', 'enabled', 'key_ids']).dict() + all_persons_list = self.api.plshell.GetPersons(self.api.plauth, {'person_id':person_ids,'enabled':True}, ['person_id', 'enabled', 'key_ids']) + all_persons = {} + for person in all_persons_list: + all_persons[person['person_id']] = person # Build up list of keys key_ids = set() for person in all_persons.values(): key_ids.update(person['key_ids']) - + key_ids = list(key_ids) # Get user account keys - all_keys = Keys(api, key_ids, ['key_id', 'key', 'key_type']).dict() - + all_keys_list = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key_id', 'key', 'key_type']) + all_keys = {} + for key in all_keys_list: + all_keys[key['key_id']] = key # Get slice attributes - all_slice_tags = SliceTags(api, slice_tag_ids).dict() + all_slice_tags_list = self.api.plshell.GetSliceTags(self.api.plauth, all_slice_tag_ids) + all_slice_tags = {} + for slice_tag in all_slice_tags_list: + all_slice_tags[slice_tag['slice_tag_id']] = slice_tag slivers = [] for slice in slices: @@ -104,7 +116,7 @@ class Slices(SimpleStorage): # which there is at least one sliver attribute # already set. if slice_tag not in slice_tags: - attributes.append({'tagname': slice_tag['tagname'], + attributes.append({'tagname': slice_tag['tagname'], 'value': slice_tag['value']}) for slice_tag in filter(lambda a: a['node_id'] is None, slice_tags): @@ -131,7 +143,8 @@ class Slices(SimpleStorage): return slivers - def get_peer(self, hrn): + def get_peer(self, xrn): + hrn, type = urn_to_hrn(xrn) # Becaues of myplc federation, we first need to determine if this # slice belongs to out local plc or a myplc peer. We will assume it # is a local site, unless we find out otherwise @@ -152,7 +165,9 @@ class Slices(SimpleStorage): return peer - def get_sfa_peer(self, hrn): + def get_sfa_peer(self, xrn): + hrn, type = urn_to_hrn(xrn) + # return the authority for this hrn or None if we are the authority sfa_peer = None slice_authority = get_authority(hrn) @@ -213,9 +228,8 @@ class Slices(SimpleStorage): # try sending the request hash if the previous call failed if not success: arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) try: - slices = aggregates[aggregate].get_slices(credential, request_hash) + slices = aggregates[aggregate].get_slices(credential) slice_hrns.extend(slices) success = True except: @@ -237,80 +251,10 @@ class Slices(SimpleStorage): self.write() - def delete_slice(self, hrn): - if self.api.interface in ['aggregate']: - self.delete_slice_aggregate(hrn) - elif self.api.interface in ['slicemgr']: - self.delete_slice_smgr(hrn) - - def delete_slice_aggregate(self, hrn): - - slicename = hrn_to_pl_slicename(hrn) - slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}) - if not slices: - return 1 - slice = slices[0] - - # determine if this is a peer slice - peer = self.get_peer(hrn) - if peer: - self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer) - self.api.plshell.DeleteSliceFromNodes(self.api.plauth, slicename, slice['node_ids']) - if peer: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', slice['slice_id'], peer, slice['peer_slice_id']) - return 1 - - def delete_slice_smgr(self, hrn): - credential = self.api.getCredential() - caller_cred = self.caller_cred - aggregates = Aggregates(self.api) - for aggregate in aggregates: - success = False - # request hash is optional so lets try the call without it - try: - request_hash=None - aggregates[aggregate].delete_slice(credential, hrn, request_hash, caller_cred) - success = True - except: - print >> log, "%s" % (traceback.format_exc()) - print >> log, "Error calling list nodes at aggregate %s" % aggregate - - # try sending the request hash if the previous call failed - if not success: - try: - arg_list = [credential, hrn] - request_hash = self.api.key.compute_hash(arg_list) - aggregates[aggregate].delete_slice(credential, hrn, request_hash, caller_cred) - success = True - except: - print >> log, "%s" % (traceback.format_exc()) - print >> log, "Error calling list nodes at aggregate %s" % aggregate - - def create_slice(self, hrn, rspec): - - # check our slice policy before we procede - whitelist = self.policy['slice_whitelist'] - blacklist = self.policy['slice_blacklist'] - - if whitelist and hrn not in whitelist or \ - blacklist and hrn in blacklist: - policy_file = self.policy.policy_file - print >> log, "Slice %(hrn)s not allowed by policy %(policy_file)s" % locals() - return 1 - - if self.api.interface in ['aggregate']: - self.create_slice_aggregate(hrn, rspec) - elif self.api.interface in ['slicemgr']: - self.create_slice_smgr(hrn, rspec) - def verify_site(self, registry, credential, slice_hrn, peer, sfa_peer): authority = get_authority(slice_hrn) - try: - site_records = registry.resolve(credential, authority) - except: - arg_list = [credential, authority] - request_hash = self.api.key.compute_hash(arg_list) - site_records = registry.resolve(credential, authority, request_hash) + authority_urn = hrn_to_urn(authority, 'authority') + site_records = registry.resolve(credential, authority_urn) site = {} for site_record in site_records: @@ -329,15 +273,13 @@ class Slices(SimpleStorage): # mark this site as an sfa peer record if sfa_peer: peer_dict = {'type': 'authority', 'hrn': authority, 'peer_authority': sfa_peer, 'pointer': site_id} - try: - registry.register_peer_object(credential, peer_dict) - except: - arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) - registry.register_peer_object(credential, peer_dict, request_hash) + registry.register_peer_object(credential, peer_dict) else: site_id = sites[0]['site_id'] remote_site_id = sites[0]['peer_site_id'] + old_site = sites[0] + #the site is alredy on the remote agg. Let us update(e.g. max_slices field) it with the latest info. + self.sync_site(old_site, site, peer) return (site_id, remote_site_id) @@ -346,12 +288,7 @@ class Slices(SimpleStorage): slice = {} slice_record = None authority = get_authority(slice_hrn) - try: - slice_records = registry.resolve(credential, slice_hrn) - except: - arg_list = [credential, slice_hrn] - request_hash = self.api.key.compute_hash(arg_list) - slice_records = registry.resolve(credential, slice_hrn, request_hash) + slice_records = registry.resolve(credential, slice_hrn) for record in slice_records: if record['type'] in ['slice']: @@ -361,7 +298,7 @@ class Slices(SimpleStorage): slicename = hrn_to_pl_slicename(slice_hrn) parts = slicename.split("_") login_base = parts[0] - slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids', 'site_id']) + slices = self.api.plshell.GetSlices(self.api.plauth, [slicename]) if not slices: slice_fields = {} slice_keys = ['name', 'url', 'description'] @@ -377,12 +314,7 @@ class Slices(SimpleStorage): # 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} - try: - registry.register_peer_object(credential, peer_dict) - except: - arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) - registry.register_peer_object(credential, peer_dict, request_hash) + registry.register_peer_object(credential, peer_dict) #this belongs to a peer if peer: @@ -392,6 +324,8 @@ class Slices(SimpleStorage): 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) @@ -405,12 +339,7 @@ class Slices(SimpleStorage): researchers = slice_record.get('researcher', []) for researcher in researchers: person_record = {} - try: - person_records = registry.resolve(credential, researcher) - except: - arg_list = [credential, researcher] - request_hash = self.api.key.compute_hash(arg_list) - person_records = registry.resolve(credential, researcher, request_hash) + person_records = registry.resolve(credential, researcher) for record in person_records: if record['type'] in ['user']: person_record = record @@ -436,12 +365,7 @@ class Slices(SimpleStorage): # mark this person as an sfa peer record if sfa_peer: peer_dict = {'type': 'user', 'hrn': researcher, 'peer_authority': sfa_peer, 'pointer': person_id} - try: - registry.register_peer_object(credential, peer_dict) - except: - arg_list = [credential] - request_hash = self.api.key.compute_hash(arg_list) - registry.register_peer_object(credential, peer_dict, request_hash) + registry.register_peer_object(credential, peer_dict) if peer: self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_dict['pointer']) @@ -485,8 +409,8 @@ class Slices(SimpleStorage): except: pass - def create_slice_aggregate(self, hrn, rspec): - + def create_slice_aggregate(self, xrn, rspec): + hrn, type = urn_to_hrn(xrn) # Determine if this is a peer slice peer = self.get_peer(hrn) sfa_peer = self.get_sfa_peer(hrn) @@ -563,129 +487,23 @@ class Slices(SimpleStorage): return 1 - def create_slice_smgr(self, hrn, rspec): - spec = RSpec() - tempspec = RSpec() - spec.parseString(rspec) - slicename = hrn_to_pl_slicename(hrn) - specDict = spec.toDict() - if specDict.has_key('RSpec'): specDict = specDict['RSpec'] - if specDict.has_key('start_time'): start_time = specDict['start_time'] - else: start_time = 0 - if specDict.has_key('end_time'): end_time = specDict['end_time'] - else: end_time = 0 - - rspecs = {} - aggregates = Aggregates(self.api) - credential = self.api.getCredential() - - # split the netspecs into individual rspecs - netspecs = spec.getDictsByTagName('NetSpec') - for netspec in netspecs: - net_hrn = netspec['name'] - resources = {'start_time': start_time, 'end_time': end_time, 'networks': netspec} - resourceDict = {'RSpec': resources} - tempspec.parseDict(resourceDict) - rspecs[net_hrn] = tempspec.toxml() - - # send each rspec to the appropriate aggregate/sm - caller_cred = self.caller_cred - for net_hrn in rspecs: - try: - # if we are directly connected to the aggregate then we can just send them the rspec - # if not, then we may be connected to an sm thats connected to the aggregate - if net_hrn in aggregates: - # send the whloe rspec to the local aggregate - if net_hrn in [self.api.hrn]: - try: - request_hash = None - aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, caller_cred) - except: - arg_list = [credential,hrn,rspec] - request_hash = self.api.key.compute_hash(arg_list) - aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, caller_cred) - else: - try: - request_hash = None - aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred) - except: - arg_list = [credential,hrn,rspecs[net_hrn]] - request_hash = self.api.key.compute_hash(arg_list) - aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred) - else: - # lets forward this rspec to a sm that knows about the network - arg_list = [credential, net_hrn] - request_hash = self.api.compute_hash(arg_list) - for aggregate in aggregates: - try: - network_found = aggregates[aggregate].get_aggregates(credential, net_hrn) - except: - network_found = aggregates[aggregate].get_aggregates(credential, net_hrn, request_hash) - if network_networks: - try: - request_hash = None - aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred) - except: - arg_list = [credential, hrn, rspecs[net_hrn]] - request_hash = self.api.key.compute_hash(arg_list) - aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred) - - except: - print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % locals() - traceback.print_exc() - return 1 - - - def start_slice(self, hrn): - if self.api.interface in ['aggregate']: - self.start_slice_aggregate(hrn) - elif self.api.interface in ['slicemgr']: - self.start_slice_smgr(hrn) - - def start_slice_aggregate(self, hrn): - slicename = hrn_to_pl_slicename(hrn) - slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}, ['slice_id']) - if not slices: - raise RecordNotFound(hrn) - slice_id = slices[0] - attributes = self.api.plshell.GetSliceAttributes(self.api.plauth, {'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id']) - attribute_id = attreibutes[0]['slice_attribute_id'] - self.api.plshell.UpdateSliceAttribute(self.api.plauth, attribute_id, "1" ) - return 1 - - def start_slice_smgr(self, hrn): - credential = self.api.getCredential() - aggregates = Aggregates(self.api) - for aggregate in aggregates: - aggregates[aggregate].start_slice(credential, hrn) - return 1 - - - def stop_slice(self, hrn): - if self.api.interface in ['aggregate']: - self.stop_slice_aggregate(hrn) - elif self.api.interface in ['slicemgr']: - self.stop_slice_smgr(hrn) - - def stop_slice_aggregate(self, hrn): - slicename = hrn_to_pl_slicename(hrn) - slices = self.api.plshell.GetSlices(self.api.plauth, {'name': slicename}, ['slice_id']) - if not slices: - raise RecordNotFound(hrn) - slice_id = slices[0]['slice_id'] - attributes = self.api.plshell.GetSliceAttributes(self.api.plauth, {'slice_id': slice_id, 'name': 'enabled'}, ['slice_attribute_id']) - attribute_id = attributes[0]['slice_attribute_id'] - self.api.plshell.UpdateSliceAttribute(self.api.plauth, attribute_id, "0") - return 1 - - def stop_slice_smgr(self, hrn): - credential = self.api.getCredential() - aggregates = Aggregates(self.api) - arg_list = [credential, hrn] - request_hash = self.api.key.compute_hash(arg_list) - for aggregate in aggregates: - try: - aggregates[aggregate].stop_slice(credential, hrn) - except: - aggregates[aggregate].stop_slice(credential, hrn, request_hash) - + 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']: + 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']}) + 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']: + 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']}) + if peer: + self.api.plshell.BindObjectToPeer(self.api.plauth, 'slice', old_record['slice_id'], peer, old_record['peer_slice_id']) + return 1