X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Flist.py;h=489c08312cd2cc9f4705567c0301dbf3674d651a;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=a33cad5b5513507a159dd073363e52eab5669bcc;hpb=cc424a19c4c158f5ccb861ac825850ce26df43c6;p=sfa.git

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index a33cad5b..489c0831 100644
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -4,11 +4,7 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.util.record import GeniRecord
-from sfa.util.genitable import GeniTable
-from sfa.server.registry import Registries
-from sfa.util.prefixTree import prefixTree
+from sfa.util.record import SfaRecord
 from sfa.trust.credential import Credential
 
 class list(Method):
@@ -24,55 +20,25 @@ class list(Method):
     accepts = [
         Parameter(str, "Credential string"),
         Parameter(str, "Human readable name (hrn)"),
-        Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified"))
+        Mixed(Parameter(str, "Human readable name of the original caller"),
+              Parameter(None, "Origin hrn not specified"))
         ]
 
-    returns = [GeniRecord]
+    returns = [SfaRecord]
     
-    def call(self, cred, hrn, request_hash=None, caller_cred=None):
-        self.api.auth.authenticateCred(cred, [cred, hrn], request_hash)
-        self.api.auth.check(cred, 'list')
-        if caller_cred==None:
-            caller_cred=cred
-
+    def call(self, cred, hrn, origin_hrn=None):
+        user_cred = Credential(string=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(), hrn, self.name))
-        records = []
-
-        # load all know registry names into a prefix tree and attempt to find
-        # the longest matching prefix  
-        registries = Registries(self.api)
-        hrns = registries.keys()
-        tree = prefixTree()
-        tree.load(hrns)
-        registry_hrn = tree.best_match(hrn)
-
-        #if there was no match then this record belongs to an unknow registry
-        if not registry_hrn:
-            raise MissingAuthority(hrn)
-        
-        # if the best match (longest matching hrn) is not the local registry,
-        # forward the request
-        if registry_hrn != self.api.hrn:
-            credential = self.api.getCredential()
-            try:
-                record_list = registries[registry_hrn].list(credential, hrn, caller_cred)
-                records = [GeniRecord(dict=record).as_dict() for record in record_list]
-            except:
-                arg_list = [credential, hrn]
-                request_hash = self.api.compute_hash(arg_list)
-                record_list = registries[registry_hrn].list(credential, hrn, request_hash, caller_cred)
-                records = [GeniRecord(dict=record).as_dict() for record in record_list] 
-                
-        if records:
-            return records
-
-        # if we still havnt found the record yet, try the local registry
-        if not self.api.auth.hierarchy.auth_exists(hrn):
-            raise MissingAuthority(hrn)
-        
-        table = GeniTable()
-        records = table.find({'authority': hrn})
+        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, hrn, self.name))
+       
+        # validate the cred 
+        self.api.auth.check(cred, 'list')
         
-        return records
+        # send the call to the right manager    
+        manager_base = 'sfa.managers'
+        mgr_type = self.api.config.SFA_REGISTRY_TYPE
+        manager_module = manager_base + ".registry_manager_%s" % mgr_type
+        manager = __import__(manager_module, fromlist=[manager_base])
+        return manager.list(self.api, hrn)