X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FResolve.py;h=fc12df1b4b7867ccd89117afe4e9e9fb1e6a8e72;hb=30d9951e075d93127c3909dcb41be09b420b3525;hp=92aeec29189058a239ce16c7ca88237b09c13118;hpb=ba2aaa438f939a4b5c697052e37b1c3218901319;p=sfa.git

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 92aeec29..fc12df1b 100644
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -1,13 +1,9 @@
-### $Id: resolve.py 17157 2010-02-21 04:19:34Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/resolve.py $
-import traceback
-import types
-from sfa.util.faults import *
-from sfa.util.xrn import urn_to_hrn
+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):
     """
@@ -20,20 +16,29 @@ class Resolve(Method):
 
     interfaces = ['registry']
     
+    # should we not accept an optional 'details' argument ?
     accepts = [
         Mixed(Parameter(str, "Human readable name (hrn or urn)"),
               Parameter(list, "List of Human readable names ([hrn])")),
         Mixed(Parameter(str, "Credential string"),
-              Parameter(list, "List of credentials)"))  
+              Parameter(list, "List of credentials)")),
+        Parameter(dict, "options"),
         ]
 
-    returns = [SfaRecord]
+    # xxx used to be [SfaRecord]
+    returns = [Parameter(dict, "registry record")]
     
-    def call(self, xrns, creds):
-        if not isinstance(xrns, types.ListType):
+    def call(self, xrns, creds, options=None):
+        if options is None: options={}
+        # use details=False by default, only when explicitly specified do we want 
+        # to mess with the testbed details
+        if 'details' in options: details=options['details']
+        else:                    details=False
+        type = None
+        if not isinstance(xrns, list):
+            type = Xrn(xrns).get_type()
             xrns=[xrns]
         hrns = [urn_to_hrn(xrn)[0] for xrn in xrns]
-        
         #find valid credentials
         valid_creds = self.api.auth.checkCredentials(creds, 'resolve')
 
@@ -42,8 +47,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)
-
-
+        return self.api.manager.Resolve(self.api, xrns, type, details=details)