From: Tony Mack Date: Wed, 2 Nov 2011 16:22:59 +0000 (-0400) Subject: only send the request to the aggregate manager module if the rspec has slivers after... X-Git-Tag: sfa-1.1-2~9 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ec5c590f9bd45a7bf3a23ce06533b8542eeeb786;p=sfa.git only send the request to the aggregate manager module if the rspec has slivers after being filtered through sfatables --- diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py index dcb25eb4..bb0051a9 100644 --- a/sfa/methods/CreateSliver.py +++ b/sfa/methods/CreateSliver.py @@ -4,6 +4,7 @@ from sfa.util.method import Method from sfa.util.parameter import Parameter, Mixed from sfa.util.sfatablesRuntime import run_sfatables from sfa.trust.credential import Credential +from sfa.rspecs.rspec import RSpec class CreateSliver(Method): """ @@ -51,5 +52,9 @@ class CreateSliver(Method): chain_name = 'FORWARD-INCOMING' self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name) rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) - - return manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id) + slivers = RSpec(rspec).version.get_nodes_with_slivers() + if slivers: + result = manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id) + else: + result = rspec + return result