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 3441998..5a6b015 100644 (file)
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -5,11 +5,12 @@ from sfa.util.faults 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
 
-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
@@ -29,33 +30,5 @@ class delete_slice(Method):
     returns = Parameter(int, "1 if successful")
     
     def call(self, cred, xrn, origin_hrn=None):
-        hrn, type = urn_to_hrn(xrn)
-        user_cred = Credential(string=cred)
-        
-        #log the call
-        if not origin_hrn:
-            origin_hrn = user_cred.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))
-
-        # validate the credential
-        self.api.auth.check(cred, 'deleteslice', hrn)
-
-        # send the call to the right manager
-        manager_base = 'sfa.managers'
-        if self.api.interface in ['component']:
-            mgr_type = self.api.config.SFA_CM_TYPE
-            manager_module = manager_base + ".component_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            manager.delete_slice(self.api, xrn)
-        elif self.api.interface in ['aggregate']:
-            mgr_type = self.api.config.SFA_AGGREGATE_TYPE
-            manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            manager.delete_slice(self.api, xrn)
-        elif self.api.interface in ['slicemgr']:        
-            mgr_type = self.api.config.SFA_SM_TYPE
-            manager_module = manager_base + ".slice_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            manager.delete_slice(self.api, xrn, origin_hrn)
 
-        return 1
+        return DeleteSliver.call(self, xrn, cred)