X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fmethods%2FDelete.py;h=593de28fa74f7892c2e7587185a393beab69d15c;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=9dfebda632e5bc6cb619831b9eb3df40fe9e233a;hpb=9e81d35f8421dd1e3ae87fdb263de02df09091af;p=sfa.git diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py index 9dfebda6..593de28f 100644 --- a/sfa/methods/Delete.py +++ b/sfa/methods/Delete.py @@ -16,21 +16,20 @@ class Delete(Method): interfaces = ['aggregate', 'slicemgr', 'component'] accepts = [ - Parameter([str], "Human readable name of slice to delete (hrn or urn)"), - Mixed(Parameter(str, "Credential string"), - Parameter(type([str]), "List of credentials")), + Parameter(type([str]), "Human readable name of slice to delete (hrn or urn)"), + Parameter(type([dict]), "Credentials"), Parameter(dict, "options"), ] returns = Parameter(int, "1 if successful") def call(self, xrns, creds, options): - valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', xrns) + valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'deletesliver', xrns, + check_sliver_callback = self.api.driver.check_sliver_credentials, + options=options) #log the call - origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() + origin_hrn = Credential(cred=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, xrns, self.name)) - self.api.manager.Delete(self.api, xrns, options) - - return 1 + return self.api.manager.Delete(self.api, xrns, creds, options)