addressing some of the remaining occurrences of SfaRecord

[sfa.git] / sfa / methods / Resolve.py

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 6277e1b..7abc6cd 100644 (file)
--- 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,5 +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
-        return self.api.manager.resolve(self.api, xrns, type)
+        return self.api.manager.Resolve(self.api, xrns, type)