X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FDelete.py;h=dd594c6ad0a9a4939622dae6c0b68bd6d23bbb50;hb=3147e8e089dd44e40b852cc121483189807ffa9b;hp=94684b97abd19950c19494571788d03d5a40c01a;hpb=1489b2d5fbc1e4ce3622fcff10efcee166394337;p=sfa.git

diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py
index 94684b97..dd594c6a 100644
--- a/sfa/methods/Delete.py
+++ b/sfa/methods/Delete.py
@@ -1,34 +1,41 @@
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
+from sfa.util.sfalogging import logger
+
 from sfa.storage.parameter import Parameter, Mixed
 from sfa.trust.auth import Auth
 from sfa.trust.credential import Credential
 
+
 class Delete(Method):
     """
-    Remove the slice or slivers and free the allocated resources        
+    Remove the slice or slivers and free the allocated resources
 
     @param xrns human readable name of slice to instantiate (hrn or urn)
     @param creds credential string specifying the rights of the caller
-    @return 1 is successful, faults otherwise  
+    @return 1 is successful, faults otherwise
     """
 
-    interfaces = ['aggregate', 'slicemgr', 'component']
-    
+    interfaces = ['aggregate']
+
     accepts = [
-        Parameter(type([str]), "Human readable name of slice to delete (hrn or urn)"),
+        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,
-                      check_sliver_callback = self.api.driver.check_sliver_credentials)
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(
+            creds, 'deletesliver', xrns,
+            check_sliver_callback=self.api.driver.check_sliver_credentials,
+            options=options)
 
-        #log the call
+        # log the call
         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))
+        logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" %
+                    (self.api.interface, origin_hrn, xrns, self.name))
 
         return self.api.manager.Delete(self.api, xrns, creds, options)