X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FCreateSliver.py;h=96b535dbccd209861952650612121b4322eb30d6;hb=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f;hp=0c729b945bbf475002ec2d7bb2c2acf67e8bf2ac;hpb=ba2aaa438f939a4b5c697052e37b1c3218901319;p=sfa.git diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py index 0c729b94..96b535db 100644 --- a/sfa/methods/CreateSliver.py +++ b/sfa/methods/CreateSliver.py @@ -23,11 +23,12 @@ class CreateSliver(Method): Mixed(Parameter(str, "Credential string"), Parameter(type([str]), "List of credentials")), Parameter(str, "RSpec"), - Parameter(type([]), "List of user information") + Parameter(type([]), "List of user information"), + Parameter(str, "call_id"), ] returns = Parameter(str, "Allocated RSpec") - def call(self, slice_xrn, creds, rspec, users): + def call(self, slice_xrn, creds, rspec, users, call_id=""): hrn, type = urn_to_hrn(slice_xrn) self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name)) @@ -43,7 +44,10 @@ class CreateSliver(Method): chain_name = 'INCOMING' elif self.api.interface in ['slicemgr']: chain_name = 'FORWARD-INCOMING' + self.api.logger.debug("CreateSliver: sfatables on chain %s"%chain_name) rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) - allocated = manager.create_slice(self.api, slice_xrn, creds, rspec, users) - - return rspec + # the aggregate's CreateSliver returns false if call_id was already handled + if manager.CreateSliver(self.api, slice_xrn, creds, rspec, users, call_id): + return rspec + else: + return ""