From: Tony Mack Date: Thu, 19 Aug 2010 22:12:20 +0000 (+0000) Subject: fix bug where slicemgr will skip local interface when the calling cred is delegated... X-Git-Tag: sfa-1.0-0~31 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6c0957b9d3cc52c6eacdb82c8254d59c58773f5d fix bug where slicemgr will skip local interface when the calling cred is delegated to the slice manager --- diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 1103bdc1..527814ea 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -66,10 +66,9 @@ def create_slice(api, xrn, creds, rspec, users): cred = 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.CreateSliver, xrn, cred, rspec, users) + # Just send entire RSpec to each aggregate + server = api.aggregates[aggregate] + threads.run(server.CreateSliver, xrn, cred, rspec, users) results = threads.get_results() merged_rspec = merge_rspecs(results) @@ -261,15 +260,13 @@ def get_rspec(api, creds, options): 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] - my_opts = copy(options) - my_opts['geni_compressed'] = False - threads.run(server.ListResources, cred, my_opts) - #threads.run(server.get_resources, cred, xrn, origin_hrn) + # get the rspec from the aggregate + server = api.aggregates[aggregate] + my_opts = copy(options) + my_opts['geni_compressed'] = False + threads.run(server.ListResources, cred, 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: