X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fmethods%2Freset_slice.py;h=c3975ffd672687b04fc6e11321928162c08a4729;hb=9b30c6b0437afeb679cdf00bc8b7abae3e41dbd3;hp=9d0e0f090ef4968c0d5d9d7217bc0079f38eb768;hpb=11d02cbfd5e91784119bb9377fceb4fa6adae621;p=sfa.git

diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py
index 9d0e0f09..c3975ffd 100644
--- a/sfa/methods/reset_slice.py
+++ b/sfa/methods/reset_slice.py
@@ -1,12 +1,7 @@
-### $Id: reset_slices.py 15428 2009-10-23 15:28:03Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/reset_slices.py $
-
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.plc.slices import Slices
+
+from sfa.storage.parameter import Parameter, Mixed
 
 class reset_slice(Method):
     """
@@ -30,23 +25,6 @@ class reset_slice(Method):
     
     def call(self, cred, xrn, origin_hrn=None):
         hrn, type = urn_to_hrn(xrn)
-        self.api.auth.check(cred, 'resetslice')
-        # 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.reset_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.reset_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.reset_slice(self.api, xrn) 
-
+        self.api.auth.check(cred, 'resetslice', hrn)
+        self.api.manager.reset_slice (self.api, xrn)
         return 1