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

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

diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index 03b9d0f..87aad94 100644 (file)
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -2,15 +2,13 @@
 ### $URL$
 
 from sfa.util.faults import *
-from sfa.util.misc import *
 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.trust.credential import Credential
+from sfa.methods.ListSlices import ListSlices
 
-class get_slices(Method):
+class get_slices(ListSlices):
     """
+    Deprecated. Use ListSlices instead.
     Get a list of instantiated slices at this authority.      
 
     @param cred credential string specifying the rights of the caller
@@ -21,40 +19,12 @@ class get_slices(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified")),
-       Parameter(str, "Callers credential string")
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
     returns = [Parameter(str, "Human readable slice name (hrn)")]
     
-    def call(self, cred, request_hash=None):
-        self.api.auth.authenticateCred(cred, [cred], request_hash) 
-        self.api.auth.check(cred, 'listslices')
-        if caller_cred==None:
-            caller_cred=cred
-       
-        #log the call
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), None, self.name))
+    def call(self, cred, origin_hrn=None):
 
-        slices = []
-        return [1]   
-        # 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)
-            slices = manager.get_slices(self.api)
-        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)
-            slices = manager.get_slices(self.api)
-        elif self.api.interface in ['slicemngr']:
-            mgr_type = self.api.config.SFA_SM_TYPE
-            manager_module = manger_base + ".slice_manager_%s" % mgr_type
-            manager = __import__(manager_module, manager_base)
-            slices = manager.get_slices(self.api)
-
-        return slices
+        return ListSlices.call(self, cred)