X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FList.py;h=83d7a6e0135854f8399287a667983daba8c4a7cb;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=ccd66b48ca7a4c379ee860b3577f1bed4148b323;hpb=2b3c0c7ebe7c55afb14e3ea3aed10f8b1abe01e7;p=sfa.git

diff --git a/sfa/methods/List.py b/sfa/methods/List.py
index ccd66b48..83d7a6e0 100644
--- a/sfa/methods/List.py
+++ b/sfa/methods/List.py
@@ -1,10 +1,11 @@
 
 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.trust.credential import Credential
 
+from sfa.storage.parameter import Parameter, Mixed
+
 class List(Method):
     """
     List the records in an authority. 
@@ -21,9 +22,11 @@ class List(Method):
               Parameter(type([str]), "List of credentials")),
         ]
 
-    returns = [SfaRecord]
+    # xxx used to be [SfaRecord]
+    returns = [Parameter(dict, "registry record")]
     
-    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')
 
@@ -31,4 +34,4 @@ class List(Method):
         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) 
+        return self.api.manager.List(self.api, xrn, options=options)