fixed up the names of new site names/slices to be more PLC compatible

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

diff --git a/sfa/methods/stop_slice.py b/sfa/methods/stop_slice.py
index b58f235..14d17f2 100644 (file)
--- a/sfa/methods/stop_slice.py
+++ b/sfa/methods/stop_slice.py
@@ -2,34 +2,32 @@
 ### $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.util.slices import Slices
+from sfa.methods.Stop import Stop
 
-class stop_slice(Method):
+class stop_slice(Stop):
     """
+    Deprecated. Use Stop instead
     Stop 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")
     
-    def call(self, cred, hrn):
-       
-        self.api.auth.check(cred, 'stopslice')
-        slices = Slices(self.api)
-        slices.stop_slice(hrn)
-        
-        return 1 
+    def call(self, cred, xrn, origin_hrn=None):
+ 
+        return Stop.call(self, xrn, cred)