X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fmethods%2FDeleteSliver.py;h=697b6d3ed5a7d85a4005d2683cb70b99fce3b188;hb=5377ee9f47665b845f230aa678c51bd8d0bd64bb;hp=f766cb12e7a74a2cf1013a4ec4ba023c8e6a1e60;hpb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;p=sfa.git diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py index f766cb12..697b6d3e 100644 --- a/sfa/methods/DeleteSliver.py +++ b/sfa/methods/DeleteSliver.py @@ -1,6 +1,6 @@ from sfa.util.xrn import urn_to_hrn from sfa.util.method import Method -from sfa.util.parameter import Parameter, Mixed +from sfa.storage.parameter import Parameter, Mixed from sfa.trust.auth import Auth from sfa.trust.credential import Credential @@ -19,12 +19,12 @@ 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"), + Parameter(dict, "options"), ] returns = Parameter(int, "1 if successful") - def call(self, xrn, creds, call_id=""): + def call(self, xrn, creds, options): (hrn, type) = urn_to_hrn(xrn) valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn) @@ -32,7 +32,6 @@ class DeleteSliver(Method): origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() 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.DeleteSliver(self.api, xrn, creds, call_id) + self.api.manager.DeleteSliver(self.api, xrn, creds, options) return 1