X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FList.py;h=b48728567a7639a1b425b333e64c9875426c62d1;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=55dd7dd9a8d6bd14c10f9d0fdb0e3b5e8e74c9b9;hpb=29df906cd2d154a3b90fcb1b7025f3fc1bb577fe;p=sfa.git

diff --git a/sfa/methods/List.py b/sfa/methods/List.py
index 55dd7dd9..b4872856 100644
--- a/sfa/methods/List.py
+++ b/sfa/methods/List.py
@@ -1,34 +1,42 @@
 
 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
 
+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, "Human readable name (hrn or urn)"),
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
-        ]
+    ]
+
+    # xxx used to be [SfaRecord]
+    returns = [Parameter(dict, "registry record")]
 
-    returns = [SfaRecord]
-    
-    def call(self, xrn, creds):
+    def call(self, xrn, creds, options=None):
+        if options is None:
+            options = {}
         hrn, type = urn_to_hrn(xrn)
         valid_creds = self.api.auth.checkCredentials(creds, 'list')
 
-        #log the call
-        origin_hrn = Credential(string=valid_creds[0]).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))
-       
-        return self.api.manager.List(self.api, xrn) 
+        # 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)