X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FList.py;h=b48728567a7639a1b425b333e64c9875426c62d1;hb=3147e8e089dd44e40b852cc121483189807ffa9b;hp=36607dd64144ca943802ec9fbad16b0b27257fbc;hpb=680d4fc1af88ed631f820545216bee6e7a698f39;p=sfa.git

diff --git a/sfa/methods/List.py b/sfa/methods/List.py
index 36607dd6..b4872856 100644
--- a/sfa/methods/List.py
+++ b/sfa/methods/List.py
@@ -1,46 +1,42 @@
-### $Id: list.py 16588 2010-01-13 17:53:44Z anil $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/list.py $
 
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
-from sfa.util.record import SfaRecord
+from sfa.util.sfalogging import logger
+
 from sfa.trust.credential import Credential
 
-class list(Method):
+from sfa.storage.parameter import Parameter, Mixed
+
+
+class List(Method):
     """
-    List the records in an authority. 
+    List the records in an authority.
 
     @param cred credential string specifying the rights of the caller
     @param hrn human readable name of authority to list (hrn or urn)
-    @return list of record dictionaries         
+    @return list of record dictionaries
     """
     interfaces = ['registry']
-    
+
     accepts = [
-        Parameter(str, "Credential string"),
         Parameter(str, "Human readable name (hrn or urn)"),
-        Mixed(Parameter(str, "Human readable name of the original caller"),
-              Parameter(None, "Origin hrn not specified"))
-        ]
+        Mixed(Parameter(str, "Credential string"),
+              Parameter(type([str]), "List of credentials")),
+    ]
 
-    returns = [SfaRecord]
-    
-    def call(self, cred, xrn, origin_hrn=None):
+    # xxx used to be [SfaRecord]
+    returns = [Parameter(dict, "registry record")]
+
+    def call(self, xrn, creds, options=None):
+        if options is None:
+            options = {}
         hrn, type = urn_to_hrn(xrn)
-        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')
-        
-        # 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, xrn, origin_hrn) 
+        valid_creds = self.api.auth.checkCredentials(creds, 'list')
+
+        # log the call
+        origin_hrn = Credential(
+            string=valid_creds[0]).get_gid_caller().get_hrn()
+        logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" %
+                    (self.api.interface, origin_hrn, hrn, self.name))
+
+        return self.api.manager.List(self.api, xrn, options=options)