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 b5e9b34..489c083 100644 (file)
--- a/sfa/methods/list.py
+++ b/sfa/methods/list.py
@@ -4,10 +4,8 @@
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.auth import Auth
-from sfa.util.record import GeniRecord
-
-from sfa.server.registry import Registries
+from sfa.util.record import SfaRecord
+from sfa.trust.credential import Credential
 
 class list(Method):
     """
@@ -17,34 +15,30 @@ class list(Method):
     @param hrn human readable name of authority to list
     @return list of record dictionaries         
     """
-
     interfaces = ['registry']
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name (hrn)")
+        Parameter(str, "Human readable name (hrn)"),
+        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):
-        
+    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()
+        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')
-        records = []
-        try:
-            if not self.api.auth.hierarchy.auth_exists(hrn):
-                raise MissingAuthority(hrn)
-            table = self.api.auth.get_auth_table(hrn)   
-            records = table.list()
-        except MissingAuthority:
-            # is this a foreign authority
-            registries = Registries(self.api)
-            credential = self.api.getCredential()
-            for registry in registries:
-                if hrn.startswith(registry) and registry not in [self.api.hrn]:
-                    record_list = registries[registry].list(credential, hrn)
-                    for record in record_list:
-                        records.append(record.as_dict()) 
-                    return records
         
-        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)