X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FDeleteSliver.py;h=f766cb12e7a74a2cf1013a4ec4ba023c8e6a1e60;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=2df5f75079decea32999f89238a8f2037c9fa5a9;hpb=ba2aaa438f939a4b5c697052e37b1c3218901319;p=sfa.git diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py index 2df5f750..f766cb12 100644 --- a/sfa/methods/DeleteSliver.py +++ b/sfa/methods/DeleteSliver.py @@ -1,7 +1,3 @@ -### $Id: stop_slice.py 17732 2010-04-19 21:10:45Z tmack $ -### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/stop_slice.py $ - -from sfa.util.faults import * from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method from sfa.util.parameter import Parameter, Mixed @@ -23,12 +19,13 @@ class DeleteSliver(Method): Parameter(str, "Human readable name of slice to delete (hrn or urn)"), Mixed(Parameter(str, "Credential string"), Parameter(type([str]), "List of credentials")), + Parameter(str, "call_id"), ] returns = Parameter(int, "1 if successful") - def call(self, xrn, creds): - hrn, type = urn_to_hrn(xrn) + def call(self, xrn, creds, call_id=""): + (hrn, type) = urn_to_hrn(xrn) valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn) #log the call @@ -36,6 +33,6 @@ class DeleteSliver(Method): self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) manager = self.api.get_interface_manager() - manager.delete_slice(self.api, xrn, creds) + manager.DeleteSliver(self.api, xrn, creds, call_id) return 1