X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fslice_manager.py;h=746bac6b43968fcbbd3afd7539dd9ea97db1ca05;hb=e11a52dab8bd82ec9d8a3194b10ffc17cc0f27e2;hp=1c1c06224a717414f3b7afd801ec4a2ac5eb814b;hpb=510763490e86632a50496f611aa3dbc1a2eae924;p=sfa.git diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py index 1c1c0622..746bac6b 100644 --- a/sfa/managers/slice_manager.py +++ b/sfa/managers/slice_manager.py @@ -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, @@ -337,7 +337,7 @@ class SliceManager: 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': ""} @@ -381,7 +381,7 @@ class SliceManager: 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(cred=valid_cred).get_gid_caller().get_hrn() @@ -398,9 +398,12 @@ 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 + threads.run(_Delete, server, xrn, [cred], options) + + results = [] + for result in threads.get_results(): + results += ReturnValue.get_value(result) + return results # first draft at a merging SliverStatus @@ -433,7 +436,7 @@ class SliceManager: for result in results: try: geni_urn = result['geni_urn'] - geni_slivers.extend(result['result']['geni_slivers']) + geni_slivers.extend(result['geni_slivers']) except: api.logger.log_exc("SM.Provision: Failed to merge aggregate rspec") return { @@ -442,7 +445,7 @@ class SliceManager: } - def Describe(self, api, xrns, creds, options): + def Describe(self, api, creds, xrns, options): def _Describe(server, xrn, creds, options): return server.Describe(xrn, creds, options) @@ -456,7 +459,7 @@ class SliceManager: for aggregate in api.aggregates: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run (_Describe, server, slice_xrn, [cred], options) + threads.run (_Describe, server, xrns, [cred], options) results = [ReturnValue.get_value(result) for result in threads.get_results()] # get rid of any void result - e.g. when call_id was hit, where by convention we return {} @@ -466,6 +469,7 @@ class SliceManager: 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 = [] @@ -473,8 +477,8 @@ class SliceManager: for result in results: try: geni_urn = result['geni_urn'] - result_rspec.version.merge(ReturnValue.get_value(result['result']['geni_rspec'])) - geni_slivers.extend(result['result']['geni_slivers']) + 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 { @@ -482,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 @@ -567,7 +504,7 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(server.PerformOperationalAction, xrn, cred, action, options) + threads.run(server.PerformOperationalAction, xrn, [cred], action, options) threads.get_results() return 1