Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / methods / Delete.py

diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py
index 9dfebda..e8c5128 100644 (file)
--- a/sfa/methods/Delete.py
+++ b/sfa/methods/Delete.py
@@ -16,21 +16,19 @@ 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.checkCredentials(creds, 'deletesliver', xrns,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
 
         #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)