X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager_pl.py;h=05cd043a947bd99446a427d54d699bd1d7b1f03b;hb=2f2558923fd80e0c13018188df38112d8f36ed39;hp=d1415394efd78eab0b7ded5cf343c518911251e8;hpb=86e8ecb4eb183d68181ecd9a4625180949f9af8e;p=sfa.git diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index d1415394..05cd043a 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -9,7 +9,7 @@ from copy import deepcopy from lxml import etree from StringIO import StringIO from types import StringTypes -from sfa.util.rspec import merge_rspecs +from sfa.util.rspecHelper import merge_rspecs from sfa.util.namespace import * from sfa.util.rspec import * from sfa.util.specdict import * @@ -23,22 +23,22 @@ from sfa.util.threadmanager import ThreadManager import sfa.util.xmlrpcprotocol as xmlrpcprotocol from sfa.util.debug import log import sfa.plc.peers as peers +from copy import copy def get_version(): version = {} version['geni_api'] = 1 + version['sfa'] = 1 return version -def delete_slice(api, xrn, origin_hrn=None): - credential = api.getCredential() - threads = ThreadManager() - for aggregate in api.aggregates: - server = api.aggregates[aggregate] - threads.run(server.delete_slice, credential, xrn, origin_hrn) - threads.get_results() - return 1 +def slice_status(api, slice_xrn, creds ): + result = {} + result['geni_urn'] = slice_xrn + result['geni_status'] = 'unknown' + result['geni_resources'] = {} + return result -def create_slice(api, xrn, rspec, origin_hrn=None): +def create_slice(api, xrn, creds, rspec, users): hrn, type = urn_to_hrn(xrn) # Validate the RSpec against PlanetLab's schema --disabled for now @@ -60,17 +60,51 @@ def create_slice(api, xrn, rspec, origin_hrn=None): message = "%s (line %s)" % (error.message, error.line) raise InvalidRSpec(message) - cred = api.getCredential() + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: - if aggregate not in [api.auth.client_cred.get_gid_caller().get_hrn()]: - server = api.aggregates[aggregate] - # Just send entire RSpec to each aggregate - threads.run(server.create_slice, cred, xrn, rspec, origin_hrn) - threads.get_results() + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + + # Just send entire RSpec to each aggregate + server = api.aggregates[aggregate] + threads.run(server.CreateSliver, xrn, credential, rspec, users) + + results = threads.get_results() + merged_rspec = merge_rspecs(results) + return merged_rspec + +def renew_slice(api, xrn, creds, expiration_time): + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'renewesliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() + threads = ThreadManager() + for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + + server = api.aggregates[aggregate] + threads.run(server.RenewSliver, xrn, credential, expiration_time) + threads.get_results() return 1 -def get_ticket(api, xrn, rspec, origin_hrn=None): +def get_ticket(api, xrn, creds, rspec, users): slice_hrn, type = urn_to_hrn(xrn) # get the netspecs contained within the clients rspec aggregate_rspecs = {} @@ -80,10 +114,20 @@ def get_ticket(api, xrn, rspec, origin_hrn=None): aggregate_hrn = element.values()[0] aggregate_rspecs[aggregate_hrn] = rspec - # get a ticket from each aggregate - credential = api.getCredential() + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'getticket', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate, aggregate_rspec in aggregate_rspecs.items(): + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = None if aggregate in api.aggregates: server = api.aggregates[aggregate] @@ -91,15 +135,18 @@ def get_ticket(api, xrn, rspec, origin_hrn=None): net_urn = hrn_to_urn(aggregate, 'authority') # we may have a peer that knows about this aggregate for agg in api.aggregates: - agg_info = api.aggregates[agg].get_aggregates(credential, net_urn) - if agg_info: - # send the request to this address - url = 'http://%s:%s' % (agg_info['addr'], agg_info['port']) - server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file) - break + target_aggs = api.aggregates[agg].get_aggregates(credential, net_urn) + if not target_aggs or not 'hrn' in target_aggs[0]: + continue + # send the request to this address + url = target_aggs[0]['url'] + server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file) + # aggregate found, no need to keep looping + break if server is None: continue - threads.run(server.get_ticket, credential, xrn, aggregate_rspec, origin_hrn) + threads.run(server.GetTicket, xrn, credential, aggregate_rspec, users) + results = threads.get_results() # gather information from each ticket @@ -134,42 +181,110 @@ def get_ticket(api, xrn, rspec, origin_hrn=None): ticket.sign() return ticket.save_to_string(save_parents=True) -def start_slice(api, xrn): - credential = api.getCredential() + +def delete_slice(api, xrn, creds): + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] - threads.run(server.stop_slice, credential, xrn) + threads.run(server.DeleteSliver, xrn, credential) + threads.get_results() + return 1 + +def start_slice(api, xrn, creds): + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'startslice', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() + threads = ThreadManager() + for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + server = api.aggregates[aggregate] + threads.run(server.Start, xrn, credential) threads.get_results() return 1 -def stop_slice(api, xrn): - credential = api.getCredential() +def stop_slice(api, xrn, creds): + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'stopslice', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] - threads.run(server.stop_slice, credential, xrn) + threads.run(server.Stop, xrn, credential) threads.get_results() return 1 def reset_slice(api, xrn): - # XX not implemented at this interface + """ + Not implemented + """ + return 1 + +def shutdown(api, xrn, creds): + """ + Not implemented + """ return 1 -def get_slices(api): +def status(api, xrn, creds): + """ + Not implemented + """ + return 1 + +def get_slices(api, creds): + # look in cache first if api.cache: slices = api.cache.get('slices') if slices: return slices - # fetch from aggregates - slices = [] - credential = api.getCredential() + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'listslices', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() + # fetch from aggregates for aggregate in api.aggregates: + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue server = api.aggregates[aggregate] - threads.run(server.get_slices, credential) + threads.run(server.ListSlices, credential) # combime results results = threads.get_results() @@ -184,6 +299,7 @@ def get_slices(api): return slices def get_rspec(api, creds, options): + # get slice's hrn from options xrn = options.get('geni_slice_urn', None) hrn, type = urn_to_hrn(xrn) @@ -201,24 +317,28 @@ def get_rspec(api, creds, options): hrn, type = urn_to_hrn(xrn) rspec = None - # XX - # XX TODO: Should try to use delegated credential first - # XX - cred = api.getCredential() + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'listnodes', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() threads = ThreadManager() - for aggregate in api.aggregates: - if aggregate not in [api.auth.client_cred.get_gid_caller().get_hrn()]: - # get the rspec from the aggregate - server = api.aggregates[aggregate] - # XX - # XX TODO: switch to ProtoGeni spec in next release. Give other - # XX aggregtes a chacne to upgrade to this release before switching - # XX - # threads.run(server.ListResources, cred, options) - threads.run(server.get_resources, cred, xrn, origin_hrn) + # prevent infinite loop. Dont send request back to caller + # unless the caller is the aggregate's SM + if caller_hrn == aggregate and aggregate != api.hrn: + continue + # get the rspec from the aggregate + server = api.aggregates[aggregate] + my_opts = copy(options) + my_opts['geni_compressed'] = False + threads.run(server.ListResources, credential, my_opts) + #threads.run(server.get_resources, cred, xrn, origin_hrn) - results = threads.get_results() # combine the rspecs into a single rspec for agg_rspec in results: @@ -238,7 +358,6 @@ def get_rspec(api, creds, options): for request in root.iterfind("./request"): rspec.append(deepcopy(request)) - print results rspec = etree.tostring(rspec, xml_declaration=True, pretty_print=True) # cache the result if api.cache and not xrn: @@ -246,18 +365,6 @@ def get_rspec(api, creds, options): return rspec -""" -Returns the request context required by sfatables. At some point, this -mechanism should be changed to refer to "contexts", which is the -information that sfatables is requesting. But for now, we just return -the basic information needed in a dict. -""" -def fetch_context(slice_hrn, user_hrn, contexts): - #slice_hrn = urn_to_hrn(slice_xrn)[0] - #user_hrn = urn_to_hrn(user_xrn)[0] - base_context = {'sfa':{'user':{'hrn':user_hrn}, 'slice':{'hrn':slice_hrn}}} - return base_context - def main(): r = RSpec() r.parseFile(sys.argv[1])