removed another bunch of references to geni

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

diff --git a/sfa/methods/list.py b/sfa/methods/list.py
index 8935429..489c083 100644 (file)
--- 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.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):
 from sfa.trust.credential import Credential
 
 class list(Method):


@@ -25,12 +21,13 @@ class list(Method):
         Parameter(str, "Credential string"),
         Parameter(str, "Human readable name (hrn)"),
         Mixed(Parameter(str, "Human readable name of the original caller"),
         Parameter(str, "Credential string"),
         Parameter(str, "Human readable name (hrn)"),
         Mixed(Parameter(str, "Human readable name of the original caller"),

-              Paramater(None, "Origin hrn not specified"))
+              Parameter(None, "Origin hrn not specified"))

         ]
 
         ]
 

-    returns = [GeniRecord]
+    returns = [SfaRecord]

     
     def call(self, cred, hrn, origin_hrn=None):
     
     def call(self, cred, hrn, origin_hrn=None):

+        user_cred = Credential(string=cred)

         #log the call
         if not origin_hrn:
             origin_hrn = user_cred.get_gid_caller().get_hrn()
         #log the call
         if not origin_hrn:
             origin_hrn = user_cred.get_gid_caller().get_hrn()


@@ -38,35 +35,10 @@ class list(Method):
        
         # validate the cred 
         self.api.auth.check(cred, 'list')
        
         # validate the cred 
         self.api.auth.check(cred, 'list')

-            
-        # load all know registry names into a prefix tree and attempt to find
-        # the longest matching prefix  
-        records = []
-        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()
-            record_list = registries[registry_hrn].list(credential, hrn, origin_hrn)
-            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})

         
         

-        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)