From 1a00a5a6a29c51b41c6d6bdc77a73493167c76a1 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 9 Dec 2011 12:26:41 +0100 Subject: [PATCH] fix bug that had gone silent until we resurrect the use of call_id many methods were passing call_id instead of options --- sfa/managers/slice_manager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sfa/managers/slice_manager.py b/sfa/managers/slice_manager.py index 349aa011..24fc7a4e 100644 --- a/sfa/managers/slice_manager.py +++ b/sfa/managers/slice_manager.py @@ -233,7 +233,7 @@ 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, call_id) + threads.run(_CreateSliver, aggregate, server, xrn, [cred], rspec.toxml(), users, options) results = threads.get_results() manifest_version = version_manager._get_version(rspec.version.type, rspec.version.version, 'manifest') @@ -275,7 +275,7 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_RenewSliver, server, xrn, [cred], expiration_time, call_id) + threads.run(_RenewSliver, server, xrn, [cred], expiration_time, options) # 'and' the results results = [ReturnValue.get_value(result) for result in threads.get_results()] return reduce (lambda x,y: x and y, results , True) @@ -307,7 +307,7 @@ class SliceManager: continue interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run(_DeleteSliver, server, xrn, [cred], call_id) + threads.run(_DeleteSliver, server, xrn, [cred], options) threads.get_results() return 1 @@ -331,7 +331,7 @@ class SliceManager: for aggregate in api.aggregates: interface = api.aggregates[aggregate] server = api.server_proxy(interface, cred) - threads.run (_SliverStatus, server, slice_xrn, [cred], call_id) + threads.run (_SliverStatus, server, slice_xrn, [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 {} -- 2.47.0