minor bug

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

diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index 7fea274..402bf0a 100644 (file)
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -2,11 +2,11 @@
 ### $URL$
 
 from sfa.util.faults import *
 ### $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.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

 
 class get_slices(Method):
     """
 
 class get_slices(Method):
     """


@@ -16,18 +16,43 @@ class get_slices(Method):
     @return list of human readable slice names (hrn).  
     """
 
     @return list of human readable slice names (hrn).  
     """
 

-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate', 'slicemgr', 'component']

     
     accepts = [
         Parameter(str, "Credential string"),
     
     accepts = [
         Parameter(str, "Credential string"),

-        Parameter(str, "Request hash")
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))

         ]
 
     returns = [Parameter(str, "Human readable slice name (hrn)")]
     
         ]
 
     returns = [Parameter(str, "Human readable slice name (hrn)")]
     

-    def call(self, cred, request_hash):
-        self.api.auth.authenticateCred(cred, [cred], request_hash) 
+    def call(self, cred, origin_hrn=None):
+        user_cred = Credential(string=cred)
+        #log the call
+        if not origin_hrn:
+            origin_hrn = user_cred.get_gid_caller().get_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, None, self.name))
+
+        # validate the cred

         self.api.auth.check(cred, 'listslices')
         self.api.auth.check(cred, 'listslices')

-        slices = Slices(self.api)
-        slices.refresh()    
-        return slices['hrn']
+
+        slices = []
+        # 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])
+            slices = manager.get_slices(self.api)
+        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])
+            slices = manager.get_slices(self.api)
+        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])
+            slices = manager.get_slices(self.api)
+
+        return slices