X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fmethods%2FResolve.py;h=7abc6cdacc077186d33e03579a1d1c380d58f073;hb=062f69a840aec2971420ba5ff8d3361923df7f74;hp=74972cc91ed9e7783e72822d5007d5e0463df3aa;hpb=ee8a376da1107884bee1ea29248a70e4da8410c9;p=sfa.git

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 74972cc9..7abc6cda 100644
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -2,9 +2,10 @@ import types
 
 from sfa.util.xrn import Xrn, urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+
 from sfa.trust.credential import Credential
-from sfa.util.record import SfaRecord
+
+from sfa.storage.parameter import Parameter, Mixed
 
 class Resolve(Method):
     """
@@ -24,7 +25,8 @@ class Resolve(Method):
               Parameter(list, "List of credentials)"))  
         ]
 
-    returns = [SfaRecord]
+    # xxx used to be [SfaRecord]
+    returns = [Parameter(dict, "registry record")]
     
     def call(self, xrns, creds):
         type = None
@@ -40,6 +42,5 @@ class Resolve(Method):
         self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrns, self.name))
  
         # send the call to the right manager
-        manager = self.api.get_interface_manager()
-        return manager.resolve(self.api, xrns, type)
+        return self.api.manager.Resolve(self.api, xrns, type)