X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager_pl.py;h=dd80ddd74f7b7bd2a5c485d57fc6b688eb6acfba;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=b921b8aa119c14400cbc0cf7917aeb3f543dee82;hpb=3fdaacab241d4ea1113c767dd3ca8538688fdab5;p=sfa.git diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index b921b8aa..dd80ddd7 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -7,46 +7,35 @@ 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.record import GeniRecord +from sfa.util.record import SfaRecord from sfa.util.policy import Policy from sfa.util.prefixTree import prefixTree from sfa.util.rspec import * +from sfa.util.sfaticket import * from sfa.util.debug import log from sfa.server.registry import Registries from sfa.server.aggregate import Aggregates import sfa.plc.peers as peers -def delete_slice(api, hrn, caller_cred=None): +def delete_slice(api, hrn, origin_hrn=None): credential = api.getCredential() aggregates = Aggregates(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) + aggregates[aggregate].delete_slice(credential, hrn, origin_hrn) success = True except: print >> log, "%s" % (traceback.format_exc()) print >> log, "Error calling delete slice at aggregate %s" % aggregate - - # try sending the request hash if the previous call failed - if not success: - try: - arg_list = [credential, hrn] - request_hash = 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 return 1 -def create_slice(api, hrn, rspec, caller_cred=None): +def create_slice(api, hrn, rspec, origin_hrn=None): spec = RSpec() tempspec = RSpec() spec.parseString(rspec) @@ -61,7 +50,6 @@ def create_slice(api, hrn, rspec, caller_cred=None): rspecs = {} aggregates = Aggregates(api) credential = api.getCredential() - # split the netspecs into individual rspecs netspecs = spec.getDictsByTagName('NetSpec') for netspec in netspecs: @@ -71,8 +59,8 @@ def create_slice(api, hrn, rspec, caller_cred=None): tempspec.parseDict(resourceDict) rspecs[net_hrn] = tempspec.toxml() - print "rspecs:", rspecs.keys() - print "aggregates:", aggregates.keys() + #print "rspecs:", rspecs.keys() + #print "aggregates:", aggregates.keys() # send each rspec to the appropriate aggregate/sm for net_hrn in rspecs: try: @@ -82,44 +70,18 @@ def create_slice(api, hrn, rspec, caller_cred=None): if net_hrn in aggregates: # send the whloe rspec to the local aggregate if net_hrn in [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 = api.key.compute_hash(arg_list) - aggregates[net_hrn].create_slice(credential, hrn, \ - rspec, request_hash, caller_cred) + aggregates[net_hrn].create_slice(credential, hrn, rspec, \ + origin_hrn) 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 = api.key.compute_hash(arg_list) - aggregates[net_hrn].create_slice(credential, hrn, \ - rspecs[net_hrn], request_hash, caller_cred) + aggregates[net_hrn].create_slice(credential, hrn, \ + rspecs[net_hrn], origin_hrn) else: # lets forward this rspec to a sm that knows about the network - arg_list = [credential, net_hrn] - request_hash = api.key.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 = api.key.compute_hash(arg_list) - aggregates[aggregate].create_slice(credential, hrn, \ - rspecs[net_hrn], request_hash, caller_cred) + network_found = aggregates[aggregate].get_aggregates(credential, net_hrn) + if network_found: + aggregates[aggregate].create_slice(credential, hrn, \ + rspecs[net_hrn], origin_hrn) except: print >> log, "Error creating slice %(hrn)s at aggregate %(net_hrn)s" % \ @@ -127,7 +89,78 @@ def create_slice(api, hrn, rspec, caller_cred=None): traceback.print_exc() return 1 -def start_slice(api, hrn, caller_cred=None): +def get_ticket(api, slice_hrn, rspec, origin_hrn=None): + + # get the netspecs contained within the clients rspec + client_rspec = RSpec(xml=rspec) + netspecs = client_rspec.getDictsByTagName('NetSpec') + + # create an rspec for each individual rspec + rspecs = {} + temp_rspec = RSpec() + for netspec in netspecs: + net_hrn = netspec['name'] + resources = {'start_time': 0, 'end_time': 0 , + 'network': netspec} + resourceDict = {'RSpec': resources} + temp_rspec.parseDict(resourceDict) + rspecs[net_hrn] = temp_rspec.toxml() + + # send the rspec to the appropiate aggregate/sm + aggregates = Aggregates(api) + credential = api.getCredential() + tickets = {} + for net_hrn in rspecs: + try: + # if we are directly connected to the aggregate then we can just + # send them the request. if not, then we may be connected to an sm + # thats connected to the aggregate + if net_hrn in aggregates: + ticket = aggregates[net_hrn].get_ticket(credential, slice_hrn, \ + rspecs[net_hrn], origin_hrn) + tickets[net_hrn] = ticket + else: + # lets forward this rspec to a sm that knows about the network + for agg in aggregates: + network_found = aggregates[agg].get_aggregates(credential, net_hrn) + if network_found: + ticket = aggregates[aggregate].get_ticket(credential, \ + slice_hrn, rspecs[net_hrn], origin_hrn) + tickets[aggregate] = ticket + except: + print >> log, "Error getting ticket for %(slice_hrn)s at aggregate %(net_hrn)s" % \ + locals() + + # create a new ticket + new_ticket = SfaTicket(subject = slice_hrn) + new_ticket.set_gid_caller(api.auth.client_gid) + + tmp_rspec = RSpec() + networks = [] + valid_data = {} + # merge data from aggregate ticket into new ticket + for agg_ticket in tickets.values(): + agg_ticket = SfaTicket(string=agg_ticket) + object_gid = agg_ticket.get_gid_object() + new_ticket.set_gid_object(object_gid) + new_ticket.set_issuer(key=api.key, subject=api.hrn) + new_ticket.set_pubkey(object_gid.get_pubkey()) + + #new_ticket.set_attributes(data) + tmp_rspec.parseString(agg_ticket.get_rspec()) + networks.extend([{'NetSpec': tmp_rspec.getDictsByTagName('NetSpec')}]) + + #new_ticket.set_parent(api.auth.hierarchy.get_auth_ticket(auth_hrn)) + resources = {'networks': networks, 'start_time': 0, 'duration': 0} + resourceDict = {'RSpec': resources} + tmp_rspec.parseDict(resourceDict) + new_ticket.set_rspec(tmp_rspec.toxml()) + + new_ticket.encode() + new_ticket.sign() + return new_ticket.save_to_string(save_parents=True) + +def start_slice(api, hrn): slicename = hrn_to_pl_slicename(hrn) slices = api.plshell.GetSlices(api.plauth, {'name': slicename}, ['slice_id']) if not slices: @@ -139,7 +172,7 @@ def start_slice(api, hrn, caller_cred=None): return 1 -def stop_slice(api, hrn, caller_cred): +def stop_slice(api, hrn): slicename = hrn_to_pl_slicename(hrn) slices = api.plshell.GetSlices(api.plauth, {'name': slicename}, ['slice_id']) if not slices: @@ -150,7 +183,7 @@ def stop_slice(api, hrn, caller_cred): api.plshell.UpdateSliceTag(api.plauth, attribute_id, "0") return 1 -def reset_slice(api, hrn, caller_cred): +def reset_slice(api, hrn): # XX not implemented at this interface return 1 @@ -162,9 +195,9 @@ def get_slices(api): slices.refresh() return slices['hrn'] -def get_rspec(api, hrn=None, caller_cred=None): +def get_rspec(api, hrn=None, origin_hrn=None): from sfa.plc.nodes import Nodes - nodes = Nodes(api, caller_cred=caller_cred) + nodes = Nodes(api, origin_hrn=origin_hrn) if hrn: rspec = nodes.get_rspec(hrn) else: