X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager.py;h=b8aafcc2bfc6a4d7163811f0f690d8041c0b10f4;hb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;hp=952bfaddf75b97bddbe92de391dffca70f51b542;hpb=d01c9dbfe4e91eab05137f058b3bc1f717b463ce;p=sfa.git diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py index 952bfadd..b8aafcc2 100644 --- a/sfa/managers/slice_manager.py +++ b/sfa/managers/slice_manager.py @@ -14,7 +14,7 @@ from sfa.util.version import version_core from sfa.util.callids import Callids from sfa.util.cache import Cache -from sfa.server.threadmanager import ThreadManager +from sfa.client.multiclient import MultiClient from sfa.rspecs.rspec_converter import RSpecConverter from sfa.rspecs.version_manager import VersionManager @@ -48,7 +48,7 @@ class SliceManager: ad_rspec_versions.append(rspec_version.to_dict()) if rspec_version.content_type in ['*', 'request']: request_rspec_versions.append(rspec_version.to_dict()) - xrn=Xrn(api.hrn, 'authority+sa') + xrn=Xrn(api.hrn, 'authority+sm') version_more = { 'interface':'slicemgr', 'sfa': 2, @@ -73,7 +73,7 @@ class SliceManager: stats_elements = rspec.xml.xpath('//statistics') for node in stats_elements: node.getparent().remove(node) - except Exception, e: + except Exception as e: logger.warn("drop_slicemgr_stats failed: %s " % (str(e))) def add_slicemgr_stat(self, rspec, callname, aggname, elapsed, status, exc_info=None): @@ -99,7 +99,7 @@ class SliceManager: exc_frame = exc_tag.add_element("tb_frame", filename=str(item[0]), line=str(item[1]), func=str(item[2]), code=str(item[3])) - except Exception, e: + except Exception as e: logger.warn("add_slicemgr_stat failed on %s: %s" %(aggname, str(e))) def ListResources(self, api, creds, options): @@ -117,7 +117,7 @@ class SliceManager: forward_options['geni_rspec_version'] = options.get('geni_rspec_version') result = server.ListResources(credential, forward_options) return {"aggregate": aggregate, "result": result, "elapsed": time.time()-tStart, "status": "success"} - except Exception, e: + except Exception as e: api.logger.log_exc("ListResources failed at %s" %(server.url)) return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()} @@ -147,7 +147,7 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -157,10 +157,10 @@ class SliceManager: # get the rspec from the aggregate interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_ListResources, aggregate, server, [cred], options) + multiclient.run(_ListResources, aggregate, server, [cred], options) - results = threads.get_results() + results = multiclient.get_results() rspec_version = version_manager.get_version(options.get('geni_rspec_version')) if xrn: result_version = version_manager._get_version(rspec_version.type, rspec_version.version, 'manifest') @@ -230,7 +230,7 @@ class SliceManager: hrn, type = urn_to_hrn(xrn) valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0] caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -239,9 +239,9 @@ class SliceManager: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) # Just send entire RSpec to each aggregate - threads.run(_Allocate, aggregate, server, xrn, [cred], rspec.toxml(), options) + multiclient.run(_Allocate, aggregate, server, xrn, [cred], rspec.toxml(), options) - results = threads.get_results() + results = multiclient.get_results() manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest') result_rspec = RSpec(version=manifest_version) geni_urn = None @@ -290,7 +290,7 @@ class SliceManager: # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'createsliver', xrn)[0] caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -299,9 +299,9 @@ class SliceManager: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) # Just send entire RSpec to each aggregate - threads.run(_Provision, aggregate, server, xrn, [cred], options) + multiclient.run(_Provision, aggregate, server, xrn, [cred], options) - results = threads.get_results() + results = multiclient.get_results() manifest_version = version_manager._get_version('GENI', '3', 'manifest') result_rspec = RSpec(version=manifest_version) geni_slivers = [] @@ -350,7 +350,7 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential(minimumExpiration=31*86400) - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -358,9 +358,9 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_Renew, aggregate, server, xrn, [cred], expiration_time, options) + multiclient.run(_Renew, aggregate, server, xrn, [cred], expiration_time, options) - results = threads.get_results() + results = multiclient.get_results() geni_code = 0 geni_output = ",".join([x.get('output',"") for x in results]) @@ -390,7 +390,7 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -398,9 +398,12 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_Delete, server, xrn, [cred], options) - threads.get_results() - return 1 + multiclient.run(_Delete, server, xrn, [cred], options) + + results = [] + for result in multiclient.get_results(): + results += ReturnValue.get_value(result) + return results # first draft at a merging SliverStatus @@ -414,12 +417,12 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run (_Status, server, slice_xrn, [cred], options) - results = [ReturnValue.get_value(result) for result in threads.get_results()] + multiclient.run (_Status, server, slice_xrn, [cred], options) + results = [ReturnValue.get_value(result) for result in multiclient.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_slivers']] @@ -452,12 +455,12 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run (_Describe, server, xrns, [cred], options) - results = [ReturnValue.get_value(result) for result in threads.get_results()] + multiclient.run (_Describe, server, xrns, [cred], options) + results = [ReturnValue.get_value(result) for result in multiclient.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.get('geni_urn')] @@ -483,73 +486,6 @@ class SliceManager: 'geni_rspec': result_rspec.toxml(), 'geni_slivers': geni_slivers } - - - def GetTicket(self, api, xrn, creds, rspec, users, options): - slice_hrn, type = urn_to_hrn(xrn) - # get the netspecs contained within the clients rspec - aggregate_rspecs = {} - tree= etree.parse(StringIO(rspec)) - elements = tree.findall('./network') - for element in elements: - aggregate_hrn = element.values()[0] - aggregate_rspecs[aggregate_hrn] = rspec - - # get the callers hrn - valid_cred = api.auth.checkCredentials(creds, 'getticket', slice_hrn)[0] - caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn() - - # attempt to use delegated credential first - cred = api.getDelegatedCredential(creds) - if not cred: - cred = api.getCredential() - threads = ThreadManager() - for (aggregate, aggregate_rspec) in aggregate_rspecs.iteritems(): - # xxx sounds like using call_id here would be safer - # 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 - - interface = api.aggregates[aggregate] - server = api.server_proxy(interface, cred) - threads.run(server.GetTicket, xrn, [cred], aggregate_rspec, users, options) - - results = threads.get_results() - - # gather information from each ticket - rspec = None - initscripts = [] - slivers = [] - object_gid = None - for result in results: - agg_ticket = SfaTicket(string=result) - attrs = agg_ticket.get_attributes() - if not object_gid: - object_gid = agg_ticket.get_gid_object() - if not rspec: - rspec = RSpec(agg_ticket.get_rspec()) - else: - rspec.version.merge(agg_ticket.get_rspec()) - initscripts.extend(attrs.get('initscripts', [])) - slivers.extend(attrs.get('slivers', [])) - - # merge info - attributes = {'initscripts': initscripts, - 'slivers': slivers} - - # create a new ticket - ticket = SfaTicket(subject = slice_hrn) - ticket.set_gid_caller(api.auth.client_gid) - ticket.set_issuer(key=api.key, subject=api.hrn) - ticket.set_gid_object(object_gid) - ticket.set_pubkey(object_gid.get_pubkey()) - #new_ticket.set_parent(api.auth.hierarchy.get_auth_ticket(auth_hrn)) - ticket.set_attributes(attributes) - ticket.set_rspec(rspec.toxml()) - ticket.encode() - ticket.sign() - return ticket.save_to_string(save_parents=True) def PerformOperationalAction(self, api, xrn, creds, action, options): # get the callers hrn @@ -560,7 +496,7 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -568,11 +504,12 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(server.PerformOperationalAction, xrn, cred, action, options) - threads.get_results() + multiclient.run(server.PerformOperationalAction, xrn, [cred], action, options) + multiclient.get_results() return 1 - def Shutdown(self, api, xrn, creds, options={}): + def Shutdown(self, api, xrn, creds, options=None): + if options is None: options={} xrn = Xrn(xrn) # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'stopslice', xrn.hrn)[0] @@ -582,7 +519,7 @@ class SliceManager: cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -590,7 +527,7 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(server.Shutdown, xrn.urn, cred) - threads.get_results() + multiclient.run(server.Shutdown, xrn.urn, cred) + multiclient.get_results() return 1