adding support for geni_speaking_for option

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

diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py
index fe07b6a..caa3694 100644 (file)
--- 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
 
@@ -22,16 +22,16 @@ class DeleteSliver(Method):
         Parameter(dict, "options"),
         ]
 
-    returns = Parameter(int, "1 if successful")
+    returns = Parameter(bool, "True if successful")
     
-    def call(self, xrn, creds, options={}):
+    def call(self, xrn, creds, options):
         (hrn, type) = urn_to_hrn(xrn)
-        valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)
+        (speaking_for, _) = urn_to_hrn(options.get('geni_speaking_for'))
+        valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn, speaking_for)
 
         #log the call
         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))
 
-        self.api.manager.DeleteSliver(self.api, xrn, creds, options)
+        return self.api.manager.DeleteSliver(self.api, xrn, creds, options)
  
-        return 1