X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FList.py;h=54b74082f59a1f0cf1b002d3f3c23877fbc4d561;hb=b9ded19b00915be69659adbaf6dc458e0f70c256;hp=a812c867cc52552c0d4bcfc478ec10d2b9c8b708;hpb=3109c266ca3a5df2364e52502479adcc2f995d68;p=sfa.git

diff --git a/sfa/methods/List.py b/sfa/methods/List.py
index a812c867..54b74082 100644
--- a/sfa/methods/List.py
+++ b/sfa/methods/List.py
@@ -1,13 +1,12 @@
-### $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 urn_to_hrn
+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. 
@@ -17,22 +16,26 @@ class List(Method):
     @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))
-       
-        manager = self.api.get_interface_manager()
-        return manager.list(self.api, xrn) 
+        # 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, options=options)