X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Freset_slice.py;h=15fb4a5ba2e6457905f8c2a769b41d41d5ee0021;hb=57b6a99255d4a88be9c0f910f8524677e34ff4bc;hp=1bb8b054b171c945db3a9d467756d821e460dcb0;hpb=157b5e90d109aaeb84cbb16d0c7003fa10a7f42b;p=sfa.git

diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py
index 1bb8b054..15fb4a5b 100644
--- a/sfa/methods/reset_slice.py
+++ b/sfa/methods/reset_slice.py
@@ -1,19 +1,13 @@
-### $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.misc 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
 
 class reset_slice(Method):
     """
     Reset the specified slice      
 
     @param cred credential string specifying the rights of the caller
-    @param hrn human readable name of slice to instantiate
+    @param xrn human readable name of slice to instantiate (hrn or urn)
     @return 1 is successful, faults otherwise  
     """
 
@@ -21,37 +15,32 @@ class reset_slice(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name of slice to instantiate"),
-        Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified"))
+        Parameter(str, "Human readable name of slice to instantiate (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):
-        # This cred will be an authority 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, 'resetslice')
+    def call(self, cred, xrn, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn)
+        self.api.auth.check(cred, 'resetslice', 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 = manger_base+= ".component_manager_%s" % mgr_type
-            manager = __import__(manager_module, manager_base)
-            manager.reset_slice(self.api, hrn)
+            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 = manger_base+= ".agregate_manager_%s" % mgr_type
-            manager = __import__(manager_module, manager_base)
-            manager.reset_slice(self.api, hrn)
-        elif self.api.interface in ['slicemngr']:
+            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 = manger_base+= ".slice_manager_%s" % mgr_type
-            manager = __import__(manager_module, manager_base)
-            manager.reset_slice(self.api, hrn) 
+            manager_module = manager_base + ".slice_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            manager.reset_slice(self.api, xrn) 
 
         return 1