updated renew(), delete(), allocate(), provision()

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

diff --git a/sfa/methods/DeleteSliver.py b/sfa/methods/DeleteSliver.py
index 8715407..9dfebda 100644 (file)
--- a/sfa/methods/DeleteSliver.py
+++ b/sfa/methods/DeleteSliver.py
@@ -1,41 +1,36 @@
-### $Id: stop_slice.py 17732 2010-04-19 21:10:45Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/stop_slice.py $
-
-from sfa.util.faults import *
-from sfa.util.namespace import urn_to_hrn
+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
 
-class DeleteSliver(Method):
+class Delete(Method):
     """
-    Remove the slice from all nodes and free the allocated resources        
+    Remove the slice or slivers and free the allocated resources        
 
-    @param xrn human readable name of slice to instantiate (hrn or urn)
-    @param cred credential string specifying the rights of the caller
+    @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  
     """
 
     interfaces = ['aggregate', 'slicemgr', 'component']
     
     accepts = [
-        Parameter(str, "Human readable name of slice to delete (hrn or urn)"),
+        Parameter([str], "Human readable name of slice to delete (hrn or urn)"),
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
+        Parameter(dict, "options"),
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, xrn, creds):
-        hrn, type = urn_to_hrn(xrn)
-        valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)
+    def call(self, xrns, creds, options):
+        valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', xrns)
 
         #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.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, xrns, self.name))
 
-        manager = self.api.get_interface_manager() 
-        manager.delete_slice(self.api, xrn, creds)
+        self.api.manager.Delete(self.api, xrns, options)
  
         return 1