X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager.py;h=b8aafcc2bfc6a4d7163811f0f690d8041c0b10f4;hp=02729b004f2213ea6dcf3f39f765e87068c97dee;hb=a0ef6e7c91c3c8fa376943d28fec8c5c204a78cd;hpb=048e0c1b8cd5995b11e4f59ebf972cf2d98af46e diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py index 02729b00..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 @@ -42,22 +42,24 @@ class SliceManager: version_manager = VersionManager() ad_rspec_versions = [] request_rspec_versions = [] + cred_types = [{'geni_type': 'geni_sfa', 'geni_version': str(i)} for i in range(4)[-2:]] for rspec_version in version_manager.versions: if rspec_version.content_type in ['*', 'ad']: 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, - 'geni_api': 2, - 'geni_api_versions': {'2': 'http://%s:%s' % (api.config.SFA_SM_HOST, api.config.SFA_SM_PORT)}, + 'geni_api': 3, + 'geni_api_versions': {'3': 'http://%s:%s' % (api.config.SFA_SM_HOST, api.config.SFA_SM_PORT)}, 'hrn' : xrn.get_hrn(), 'urn' : xrn.get_urn(), 'peers': peers, - 'geni_request_rspec_versions': request_rspec_versions, - 'geni_ad_rspec_versions': ad_rspec_versions, + 'geni_single_allocation': 0, # Accept operations that act on as subset of slivers in a given state. + 'geni_allocate': 'geni_many',# Multiple slivers can exist and be incrementally added, including those which connect or overlap in some way. + 'geni_credential_types': cred_types, } sm_version=version_core(version_more) # local aggregate if present needs to have localhost resolved @@ -71,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): @@ -97,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): @@ -112,14 +114,10 @@ class SliceManager: try: version = api.get_cached_server_version(server) # force ProtoGENI aggregates to give us a v2 RSpec - if 'sfa' in version.keys(): - forward_options['rspec_version'] = version_manager.get_version('SFA 1').to_dict() - else: - forward_options['rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict() - forward_options['geni_rspec_version'] = {'type': 'geni', 'version': '3.0'} - rspec = server.ListResources(credential, forward_options) - return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"} - except Exception, e: + 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 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()} @@ -143,13 +141,13 @@ class SliceManager: # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'listnodes', hrn)[0] - caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + 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() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -159,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') @@ -173,8 +171,9 @@ class SliceManager: self.add_slicemgr_stat(rspec, "ListResources", result["aggregate"], result["elapsed"], result["status"], result.get("exc_info",None)) if result["status"]=="success": + res = result['result']['value'] try: - rspec.version.merge(ReturnValue.get_value(result["rspec"])) + rspec.version.merge(ReturnValue.get_value(res)) except: api.logger.log_exc("SM.ListResources: Failed to merge aggregate rspec") @@ -186,30 +185,28 @@ class SliceManager: return rspec.toxml() - def CreateSliver(self, api, xrn, creds, rspec_str, users, options): + def Allocate(self, api, xrn, creds, rspec_str, expiration, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return "" version_manager = VersionManager() - def _CreateSliver(aggregate, server, xrn, credential, rspec, users, options): + def _Allocate(aggregate, server, xrn, credential, rspec, options): tStart = time.time() try: # Need to call GetVersion at an aggregate to determine the supported # rspec type/format beofre calling CreateSliver at an Aggregate. - server_version = api.get_cached_server_version(server) - requested_users = users - if 'sfa' not in server_version and 'geni_api' in server_version: + #server_version = api.get_cached_server_version(server) + #if 'sfa' not in server_version and 'geni_api' in server_version: # sfa aggregtes support both sfa and pg rspecs, no need to convert # if aggregate supports sfa rspecs. otherwise convert to pg rspec - rspec = RSpec(RSpecConverter.to_pg_rspec(rspec, 'request')) - filter = {'component_manager_id': server_version['urn']} - rspec.filter(filter) - rspec = rspec.toxml() - requested_users = sfa_to_pg_users_arg(users) - rspec = server.CreateSliver(xrn, credential, rspec, requested_users, options) - return {"aggregate": aggregate, "rspec": rspec, "elapsed": time.time()-tStart, "status": "success"} + #rspec = RSpec(RSpecConverter.to_pg_rspec(rspec, 'request')) + #filter = {'component_manager_id': server_version['urn']} + #rspec.filter(filter) + #rspec = rspec.toxml() + result = server.Allocate(xrn, credential, rspec, options) + return {"aggregate": aggregate, "result": result, "elapsed": time.time()-tStart, "status": "success"} except: - logger.log_exc('Something wrong in _CreateSliver with URL %s'%server.url) + logger.log_exc('Something wrong in _Allocate with URL %s'%server.url) return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()} # Validate the RSpec against PlanetLab's schema --disabled for now @@ -232,8 +229,8 @@ class SliceManager: # 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() + caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -242,48 +239,118 @@ class SliceManager: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) # Just send entire RSpec to each aggregate - threads.run(_CreateSliver, aggregate, server, xrn, [cred], rspec.toxml(), users, 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 + geni_slivers = [] + + for result in results: + self.add_slicemgr_stat(result_rspec, "Allocate", result["aggregate"], result["elapsed"], + result["status"], result.get("exc_info",None)) + if result["status"]=="success": + try: + res = result['result']['value'] + geni_urn = res['geni_urn'] + result_rspec.version.merge(ReturnValue.get_value(res['geni_rspec'])) + geni_slivers.extend(res['geni_slivers']) + except: + api.logger.log_exc("SM.Allocate: Failed to merge aggregate rspec") + return { + 'geni_urn': geni_urn, + 'geni_rspec': result_rspec.toxml(), + 'geni_slivers': geni_slivers + } + + + def Provision(self, api, xrn, creds, options): + call_id = options.get('call_id') + if Callids().already_handled(call_id): return "" + + version_manager = VersionManager() + def _Provision(aggregate, server, xrn, credential, options): + tStart = time.time() + try: + # Need to call GetVersion at an aggregate to determine the supported + # rspec type/format beofre calling CreateSliver at an Aggregate. + server_version = api.get_cached_server_version(server) + result = server.Provision(xrn, credential, options) + return {"aggregate": aggregate, "result": result, "elapsed": time.time()-tStart, "status": "success"} + except: + logger.log_exc('Something wrong in _Allocate with URL %s'%server.url) + return {"aggregate": aggregate, "elapsed": time.time()-tStart, "status": "exception", "exc_info": sys.exc_info()} + + # attempt to use delegated credential first + cred = api.getDelegatedCredential(creds) + if not cred: + cred = api.getCredential() + + # get the callers hrn + valid_cred = api.auth.checkCredentials(creds, 'createsliver', xrn)[0] + caller_hrn = Credential(cred=valid_cred).get_gid_caller().get_hrn() + multiclient = MultiClient() + 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 + interface = api.aggregates[aggregate] + server = api.server_proxy(interface, cred) + # Just send entire RSpec to each aggregate + multiclient.run(_Provision, aggregate, server, xrn, [cred], options) + + results = multiclient.get_results() + manifest_version = version_manager._get_version('GENI', '3', 'manifest') + result_rspec = RSpec(version=manifest_version) + geni_slivers = [] + geni_urn = None for result in results: - self.add_slicemgr_stat(result_rspec, "CreateSliver", result["aggregate"], result["elapsed"], + self.add_slicemgr_stat(result_rspec, "Provision", result["aggregate"], result["elapsed"], result["status"], result.get("exc_info",None)) if result["status"]=="success": try: - result_rspec.version.merge(ReturnValue.get_value(result["rspec"])) + res = result['result']['value'] + geni_urn = res['geni_urn'] + result_rspec.version.merge(ReturnValue.get_value(res['geni_rspec'])) + geni_slivers.extend(res['geni_slivers']) except: - api.logger.log_exc("SM.CreateSliver: Failed to merge aggregate rspec") - return result_rspec.toxml() + api.logger.log_exc("SM.Provision: Failed to merge aggregate rspec") + return { + 'geni_urn': geni_urn, + 'geni_rspec': result_rspec.toxml(), + 'geni_slivers': geni_slivers + } + + - def RenewSliver(self, api, xrn, creds, expiration_time, options): + def Renew(self, api, xrn, creds, expiration_time, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return True - def _RenewSliver(aggregate, server, xrn, creds, expiration_time, options): + def _Renew(aggregate, server, xrn, creds, expiration_time, options): try: - result=server.RenewSliver(xrn, creds, expiration_time, options) + result=server.Renew(xrn, creds, expiration_time, options) if type(result)!=dict: result = {'code': {'geni_code': 0}, 'value': result} result['aggregate'] = aggregate return result except: - logger.log_exc('Something wrong in _RenewSliver with URL %s'%server.url) + logger.log_exc('Something wrong in _Renew with URL %s'%server.url) return {'aggregate': aggregate, 'exc_info': traceback.format_exc(), 'code': {'geni_code': -1}, 'value': False, 'output': ""} - (hrn, urn_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() + valid_cred = api.auth.checkCredentials(creds, 'renewsliver', xrn)[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(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 @@ -291,9 +358,9 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_RenewSliver, 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]) @@ -307,23 +374,23 @@ class SliceManager: return results - def DeleteSliver(self, api, xrn, creds, options): + def Delete(self, api, xrn, creds, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return "" - def _DeleteSliver(server, xrn, creds, options): - return server.DeleteSliver(xrn, creds, options) + def _Delete(server, xrn, creds, options): + return server.Delete(xrn, creds, options) - (hrn, type) = urn_to_hrn(xrn) + (hrn, type) = urn_to_hrn(xrn[0]) # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0] - caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + 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() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -331,15 +398,18 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_DeleteSliver, 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 - def SliverStatus(self, api, slice_xrn, creds, options): - def _SliverStatus(server, xrn, creds, options): - return server.SliverStatus(xrn, creds, options) + def Status(self, api, slice_xrn, creds, options): + def _Status(server, xrn, creds, options): + return server.Status(xrn, creds, options) call_id = options.get('call_id') if Callids().already_handled(call_id): return {} @@ -347,167 +417,86 @@ 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 (_SliverStatus, 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_resources']] + results = [ result for result in results if result and result['geni_slivers']] # 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'] = None + geni_slivers = [] + geni_urn = None for result in results: - if result.get('pl_login'): - overall['pl_login'] = result['pl_login'] - break - elif isinstance(result.get('value'), dict) and result['value'].get('pl_login'): - overall['pl_login'] = result['value']['pl_login'] - break - # 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 - - def ListSlices(self, api, creds, options): - call_id = options.get('call_id') - if Callids().already_handled(call_id): return [] - - def _ListSlices(server, creds, options): - return server.ListSlices(creds, options) + try: + geni_urn = result['geni_urn'] + geni_slivers.extend(result['geni_slivers']) + except: + api.logger.log_exc("SM.Provision: Failed to merge aggregate rspec") + return { + 'geni_urn': geni_urn, + 'geni_slivers': geni_slivers + } - # look in cache first - # xxx is this really frequent enough that it is worth being cached ? - if self.cache: - slices = self.cache.get('slices') - if slices: - api.logger.debug("SliceManager.ListSlices returns from cache") - 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() - + + def Describe(self, api, creds, xrns, options): + def _Describe(server, xrn, creds, options): + return server.Describe(xrn, creds, options) + + call_id = options.get('call_id') + if Callids().already_handled(call_id): return {} # attempt to use delegated credential first - cred= api.getDelegatedCredential(creds) + cred = api.getDelegatedCredential(creds) if not cred: cred = api.getCredential() - threads = ThreadManager() - # fetch from aggregates + multiclient = MultiClient() 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 - interface = api.aggregates[aggregate] - server = api.server_proxy(interface, cred) - threads.run(_ListSlices, server, [cred], options) - - # combime results - results = [ReturnValue.get_value(result) for result in threads.get_results()] - slices = [] - for result in results: - slices.extend(result) - - # cache the result - if self.cache: - api.logger.debug("SliceManager.ListSlices caches value") - self.cache.add('slices', slices) - - return slices - - - 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(string=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 + 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')] + + # do not try to combine if there's no result + if not results : return {} + + # otherwise let's merge stuff + version_manager = VersionManager() + manifest_version = version_manager._get_version('GENI', '3', 'manifest') + result_rspec = RSpec(version=manifest_version) + geni_slivers = [] + geni_urn = 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 start_slice(self, api, xrn, creds): - hrn, type = urn_to_hrn(xrn) - + try: + geni_urn = result['geni_urn'] + result_rspec.version.merge(ReturnValue.get_value(result['geni_rspec'])) + geni_slivers.extend(result['geni_slivers']) + except: + api.logger.log_exc("SM.Provision: Failed to merge aggregate rspec") + return { + 'geni_urn': geni_urn, + 'geni_rspec': result_rspec.toxml(), + 'geni_slivers': geni_slivers + } + + def PerformOperationalAction(self, api, xrn, creds, action, options): # get the callers hrn - valid_cred = api.auth.checkCredentials(creds, 'startslice', hrn)[0] - caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + valid_cred = api.auth.checkCredentials(creds, 'createsliver', xrn)[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() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -515,22 +504,22 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(server.Start, xrn, cred) - threads.get_results() + multiclient.run(server.PerformOperationalAction, xrn, [cred], action, options) + multiclient.get_results() return 1 - def stop_slice(self, api, xrn, creds): - hrn, type = urn_to_hrn(xrn) - + 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', hrn)[0] - caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() + valid_cred = api.auth.checkCredentials(creds, 'stopslice', xrn.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() + multiclient = MultiClient() for aggregate in api.aggregates: # prevent infinite loop. Dont send request back to caller # unless the caller is the aggregate's SM @@ -538,25 +527,7 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(server.Stop, xrn, cred) - threads.get_results() + multiclient.run(server.Shutdown, xrn.urn, cred) + multiclient.get_results() return 1 - def reset_slice(self, api, xrn): - """ - Not implemented - """ - return 1 - - def shutdown(self, api, xrn, creds): - """ - Not implemented - """ - return 1 - - def status(self, api, xrn, creds): - """ - Not implemented - """ - return 1 -