fixed up the names of new site names/slices to be more PLC compatible

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

diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 02df39b..5a6b015 100644 (file)
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -2,34 +2,33 @@
 ### $URL$
 
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
+from sfa.methods.DeleteSliver import DeleteSliver
 
-from sfa.util.slices import Slices
-
-class delete_slice(Method):
+class delete_slice(DeleteSliver):
     """
+    Deprecated. Use delete instead.
+
     Remove the slice from all nodes.      
 
     @param cred credential string specifying the rights of the caller
-    @param hrn human readable name specifying the slice to delete
+    @param xrn human readable name specifying the slice to delete (hrn or urn)
     @return 1 if successful, faults otherwise  
     """
 
-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate', 'slicemgr', 'component']
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name of slice to delete"),
+        Parameter(str, "Human readable name of slice to delete (hrn or urn)"),
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
-    returns = [Parameter(int, "1 if successful")]
+    returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn):
-       
-        self.api.auth.check(cred, 'deleteslice')
-        slices = Slices(self.api)
-        slices.delete_slice(hrn)
-        return 1
+    def call(self, cred, xrn, origin_hrn=None):
+
+        return DeleteSliver.call(self, xrn, cred)