X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager_pl.py;h=5ed2261e96eff5159e6102e23b2d4f038d67c058;hb=3eea82897aba845da0d12c1ba56012e599f58853;hp=bc777a635b6c2c5eeb3ab0c1ed3ebd00e7f0dcaf;hpb=45ec5d374d680b30464a5c47082eb578c2acac28;p=sfa.git diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index bc777a63..5ed2261e 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -7,7 +7,7 @@ from copy import deepcopy from copy import copy from lxml import etree -from sfa.util.sfalogging import sfa_logger +from sfa.util.sfalogging import logger from sfa.util.rspecHelper import merge_rspecs from sfa.util.xrn import Xrn, urn_to_hrn, hrn_to_urn from sfa.util.plxrn import hrn_to_pl_slicename @@ -15,6 +15,13 @@ from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * from sfa.util.record import SfaRecord +from sfa.rspecs.pg_rspec import PGRSpec +from sfa.rspecs.sfa_rspec import SfaRSpec +from sfa.rspecs.rspec_converter import RSpecConverter +from sfa.rspecs.rspec_parser import parse_rspec +from sfa.rspecs.rspec_version import RSpecVersion +from sfa.rspecs.sfa_rspec import sfa_rspec_version +from sfa.rspecs.pg_rspec import pg_rspec_ad_version, pg_rspec_request_version from sfa.util.policy import Policy from sfa.util.prefixTree import prefixTree from sfa.util.sfaticket import * @@ -25,9 +32,29 @@ import sfa.plc.peers as peers from sfa.util.version import version_core from sfa.util.callids import Callids -# XX FIX ME: should merge result from multiple aggregates instead of -# calling aggregate implementation -from sfa.managers.aggregate_manager_pl import slice_status + +def _call_id_supported(api, server): + """ + Returns true if server support the optional call_id arg, false otherwise. + """ + cache_key = server.url + "-version" + server_version = api.cache.get(cache_key) + if not server_version: + server_version = server.GetVersion() + # cache version for 24 hours + cache.add(cache_key, server_version, ttl= 60*60*24) + + if 'sfa' in server_version: + code_tag = server_version['code_tag'] + code_tag_parts = code_tag.split("-") + + version_parts = code_tag_parts[0].split(".") + major, minor = version_parts[0], version_parts[1] + rev = code_tag_parts[1] + if int(major) > 1: + if int(minor) > 0 or int(rev) > 20: + return True + return False # we have specialized xmlrpclib.ServerProxy to remember the input url # OTOH it's not clear if we're only dealing with XMLRPCServerProxy instances @@ -35,7 +62,7 @@ def get_serverproxy_url (server): try: return server.url except: - sfa_logger().warning("GetVersion, falling back to xmlrpclib.ServerProxy internals") + logger.warning("GetVersion, falling back to xmlrpclib.ServerProxy internals") return server._ServerProxy__host + server._ServerProxy__handler def GetVersion(api): @@ -43,65 +70,147 @@ def GetVersion(api): peers =dict ([ (peername,get_serverproxy_url(v)) for (peername,v) in api.aggregates.iteritems() if peername != api.hrn]) xrn=Xrn (api.hrn) - sm_version=version_core({'interface':'slicemgr', - 'hrn' : xrn.get_hrn(), - 'urn' : xrn.get_urn(), - 'peers': peers, - }) + request_rspec_versions = [dict(pg_rspec_request_version), dict(sfa_rspec_version)] + ad_rspec_versions = [dict(pg_rspec_ad_version), dict(sfa_rspec_version)] + version_more = {'interface':'slicemgr', + 'hrn' : xrn.get_hrn(), + 'urn' : xrn.get_urn(), + 'peers': peers, + 'request_rspec_versions': request_rspec_versions, + 'ad_rspec_versions': ad_rspec_versions, + 'default_ad_rspec': dict(sfa_rspec_version) + } + sm_version=version_core(version_more) # local aggregate if present needs to have localhost resolved if api.hrn in api.aggregates: local_am_url=get_serverproxy_url(api.aggregates[api.hrn]) sm_version['peers'][api.hrn]=local_am_url.replace('localhost',sm_version['hostname']) return sm_version -def create_slice(api, xrn, creds, rspec, users): - hrn, type = urn_to_hrn(xrn) +def ListResources(api, creds, options, call_id): + def _ListResources(server, credential, my_opts, call_id): + args = [credential, my_opts] + if _call_id_supported(api, server): + args.append(call_id) + return server.ListResources(*args) + + if Callids().already_handled(call_id): return "" + + # get slice's hrn from options + xrn = options.get('geni_slice_urn', '') + (hrn, type) = urn_to_hrn(xrn) + my_opts = copy(options) + my_opts['geni_compressed'] = False + + # get the rspec's return format from options + rspec_version = RSpecVersion(options.get('rspec_version')) + version_string = "rspec_%s" % (rspec_version.get_version_name()) + + # look in cache first + if caching and api.cache and not xrn: + rspec = api.cache.get(version_string) + if rspec: + return rspec + + # 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: + # 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] + #threads.run(server.ListResources, credential, my_opts, call_id) + threads.run(_ListResources, server, credential, my_opts, call_id) + + results = threads.get_results() + rspec_version = RSpecVersion(my_opts.get('rspec_version')) + if rspec_version['type'] == pg_rspec_ad_version['type']: + rspec = PGRSpec() + else: + rspec = SfaRSpec() + for result in results: + try: + rspec.merge(result) + except: + api.logger.info("SM.ListResources: Failed to merge aggregate rspec") + + # cache the result + if caching and api.cache and not xrn: + api.cache.add(version_string, rspec.toxml()) + + return rspec.toxml() + + +def CreateSliver(api, xrn, creds, rspec_str, users, call_id): + + def _CreateSliver(server, xrn, credential, rspec, users, call_id): + # Need to call GetVersion at an aggregate to determine the supported + # rspec type/format beofre calling CreateSliver at an Aggregate. + server_version = _get_server_version(api, server) + if 'sfa' not in aggregate_version and 'geni_api' in aggregate_version: + # sfa aggregtes support both sfa and pg rspecs, no need to convert + # if aggregate supports sfa rspecs. othewise convert to pg rspec + rspec = RSpecConverter.to_pg_rspec(rspec) + args = [xrn, credential, rspec, users] + if _call_id_supported(api, server): + args.append(call_id) + return server.CreateSliver(*args) + + if Callids().already_handled(call_id): return "" # Validate the RSpec against PlanetLab's schema --disabled for now # The schema used here needs to aggregate the PL and VINI schemas # schema = "/var/www/html/schemas/pl.rng" + rspec = parse_rspec(rspec_str) schema = None if schema: - try: - tree = etree.parse(StringIO(rspec)) - except etree.XMLSyntaxError: - message = str(sys.exc_info()[1]) - raise InvalidRSpec(message) - - relaxng_doc = etree.parse(schema) - relaxng = etree.RelaxNG(relaxng_doc) - - if not relaxng(tree): - error = relaxng.error_log.last_error - message = "%s (line %s)" % (error.message, error.line) - raise InvalidRSpec(message) - - # get the callers hrn - valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0] - caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + rspec.validate(schema) # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) - if not credential: + if not credential: credential = api.getCredential() + + # get the callers hrn + hrn, type = urn_to_hrn(xrn) + valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0] + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() 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 - - # Just send entire RSpec to each aggregate server = api.aggregates[aggregate] - threads.run(server.CreateSliver, xrn, credential, rspec, users) + # Just send entire RSpec to each aggregate + threads.run(_CreateSliver, server, xrn, credential, rspec.toxml(), users, call_id) - results = threads.get_results() - merged_rspec = merge_rspecs(results) - return merged_rspec + results = threads.get_results() + rspec = SfaRSpec() + for result in results: + rspec.merge(result) + return rspec.toxml() -def renew_slice(api, xrn, creds, expiration_time): - hrn, type = urn_to_hrn(xrn) +def RenewSliver(api, xrn, creds, expiration_time, call_id): + def _RenewSliver(server, xrn, creds, expiration_time, call_id): + server_version = _get_server_version(api, server) + args = [xrn, creds, expiration_time, call_id] + if _call_id_supported(api, server): + args.append(call_id) + return server.RenewSliver(*args) + if Callids().already_handled(call_id): return True + + (hrn, type) = urn_to_hrn(xrn) # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'renewsliver', hrn)[0] caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() @@ -116,12 +225,148 @@ def renew_slice(api, xrn, creds, expiration_time): # unless the caller is the aggregate's SM if caller_hrn == aggregate and aggregate != api.hrn: continue + server = api.aggregates[aggregate] + threads.run(_RenewSliver, server, xrn, [credential], expiration_time, call_id) + # 'and' the results + return reduce (lambda x,y: x and y, threads.get_results() , True) + +def DeleteSliver(api, xrn, creds, call_id): + def _DeleteSliver(server, xrn, creds, call_id): + server_version = _get_server_version(api, server) + args = [xrn, creds] + if _call_id_supported(api, server): + args.append(call_id) + return server.DeleteSliver(*args) + + if Callids().already_handled(call_id): return "" + (hrn, type) = urn_to_hrn(xrn) + # 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.RenewSliver, xrn, [credential], expiration_time) + threads.run(_DeleteSliver, server, xrn, credential, call_id) threads.get_results() return 1 + +# first draft at a merging SliverStatus +def SliverStatus(api, slice_xrn, creds, call_id): + def _SliverStatus(server, xrn, creds, call_id): + server_version = _get_server_version(api, server) + args = [xrn, creds] + if _call_id_supported(api, server): + args.append(call_id) + return server.SliverStatus(*args) + + if Callids().already_handled(call_id): return {} + # attempt to use delegated credential first + credential = api.getDelegatedCredential(creds) + if not credential: + credential = api.getCredential() + threads = ThreadManager() + for aggregate in api.aggregates: + server = api.aggregates[aggregate] + threads.run (_SliverStatus, server, slice_xrn, credential, call_id) + results = threads.get_results() + + # get rid of any void result - e.g. when call_id was hit where by convention we return {} + results = [ result for result in results if result and result['geni_resources']] + + # do not try to combine if there's no result + if not results : return {} + + # otherwise let's merge stuff + overall = {} + + # mmh, it is expected that all results carry the same urn + overall['geni_urn'] = results[0]['geni_urn'] + overall['pl_login'] = results[0]['pl_login'] + # append all geni_resources + overall['geni_resources'] = \ + reduce (lambda x,y: x+y, [ result['geni_resources'] for result in results] , []) + overall['status'] = 'unknown' + if overall['geni_resources']: + overall['status'] = 'ready' + + return overall + +caching=True +#caching=False +def ListSlices(api, creds, call_id): + def _ListSlices(server, creds, call_id): + server_version = _get_server_version(api, server) + args = [creds] + if _call_id_supported(api, server): + args.append(call_id) + return server.ListSlices(*args) + + if Callids().already_handled(call_id): return [] + + # look in cache first + if caching and api.cache: + slices = api.cache.get('slices') + if slices: + return slices + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'listslices', None)[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(_ListSlices, server, credential, call_id) + + # combime results + results = threads.get_results() + slices = [] + for result in results: + slices.extend(result) + + # cache the result + if caching and api.cache: + api.cache.add('slices', slices) + + return slices + + + if rspec_version['type'] == pg_rspec_ad_version['type']: + rspec = PGRSpec() + else: + rspec = SfaRSpec() + for result in results: + try: + rspec.merge(result) + except: + api.logger.info("SM.ListResources: Failed to merge aggregate rspec") + + # cache the result + if caching and api.cache and not xrn: + api.cache.add(version_string, rspec.toxml()) + + return rspec.toxml() + + def get_ticket(api, xrn, creds, rspec, users): slice_hrn, type = urn_to_hrn(xrn) # get the netspecs contained within the clients rspec @@ -199,29 +444,6 @@ def get_ticket(api, xrn, creds, rspec, users): ticket.sign() return ticket.save_to_string(save_parents=True) - -def delete_slice(api, xrn, creds): - hrn, type = urn_to_hrn(xrn) - - # 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.DeleteSliver, xrn, credential) - threads.get_results() - return 1 - def start_slice(api, xrn, creds): hrn, type = urn_to_hrn(xrn) @@ -284,106 +506,11 @@ def status(api, xrn, creds): """ return 1 -def get_slices(api, creds): - - # look in cache first - if api.cache: - slices = api.cache.get('slices') - if slices: - return slices - - # get the callers hrn - valid_cred = api.auth.checkCredentials(creds, 'listslices', None)[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.ListSlices, credential) - - # combime results - results = threads.get_results() - slices = [] - for result in results: - slices.extend(result) - - # cache the result - if api.cache: - api.cache.add('slices', slices) - - return slices - - -# Thierry : caching at the slicemgr level makes sense to some extent -caching=True -def get_rspec(api, creds, options, call_id): - - if not Callids().should_handle_call_id(call_id): - api.logger.info("%d received get_rspec with known call_id %s"%(api.interface,call_id)) - return "" - - # get slice's hrn from options - xrn = options.get('geni_slice_urn', '') - (hrn, type) = urn_to_hrn(xrn) - - # get hrn of the original caller - origin_hrn = options.get('origin_hrn', None) - if not origin_hrn: - if isinstance(creds, list): - origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn() - else: - origin_hrn = Credential(string=creds).get_gid_caller().get_hrn() - - # look in cache first - if caching and api.cache and not xrn: - rspec = api.cache.get('nodes') - if rspec: - return rspec - - # 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: - # 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, call_id) - #threads.run(server.get_resources, cred, xrn, origin_hrn) - - results = threads.get_results() - merged_rspec = merge_rspecs(results) - - # cache the result - if caching and api.cache and not xrn: - api.cache.add('nodes', merged_rspec) - - return merged_rspec - def main(): r = RSpec() r.parseFile(sys.argv[1]) rspec = r.toDict() - create_slice(None,'plc.princeton.tmacktestslice',rspec) + CreateSliver(None,'plc.princeton.tmacktestslice',rspec,'create-slice-tmacktestslice') if __name__ == "__main__": main()