Merge branch 'master' of ssh://git.onelab.eu/git/sfa

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

diff --git a/sfa/methods/reset_slice.py b/sfa/methods/reset_slice.py
index e5fa112..c3975ff 100644 (file)
--- a/sfa/methods/reset_slice.py
+++ b/sfa/methods/reset_slice.py
@@ -1,34 +1,30 @@
-### $Id$
-### $URL$
-
-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.util.slices import Slices
 
-class reset_slices(Method):
+from sfa.storage.parameter import Parameter, Mixed
+
+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  
     """
 
-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate', 'slicemgr', 'component']
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name of slice to instantiate"),
+        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")]
+    returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn):
-       
-        self.api.auth.check(cred, 'resetslice')
-        ## XX Not yet implemented
- 
+    def call(self, cred, xrn, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn)
+        self.api.auth.check(cred, 'resetslice', hrn)
+        self.api.manager.reset_slice (self.api, xrn)
         return 1