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 b9dbdb7..5a6b015 100644 (file)
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -2,20 +2,19 @@
 ### $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.trust.credential import Credential
+from sfa.methods.DeleteSliver import DeleteSliver
 
-from sfa.plc.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  
     """
 
@@ -23,27 +22,13 @@ class delete_slice(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name of slice to delete"),
-        Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified"))
+        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")
     
-    def call(self, cred, hrn, request_hash=None, caller_cred=None):
-       
-        if caller_cred==None:
-            caller_cred=cred
-        #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+    def call(self, cred, xrn, origin_hrn=None):
 
-        # This cred will be an slice cred, not a user, so we cant use it to
-        # authenticate the caller's request_hash. Let just get the caller's gid
-        # from the cred and authenticate using that
-        client_gid = Credential(string=cred).get_gid_caller()
-        client_gid_str = client_gid.save_to_string(save_parents=True)
-        self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash)
-        self.api.auth.check(cred, 'deleteslice')
-        slices = Slices(self.api, caller_cred=caller_cred)
-        slices.delete_slice(hrn)
-        return 1
+        return DeleteSliver.call(self, xrn, cred)