X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FResolve.py;h=74972cc91ed9e7783e72822d5007d5e0463df3aa;hb=ee8a376da1107884bee1ea29248a70e4da8410c9;hp=ec47e41b1000c2cb16542a97c259bdd0e4a7b983;hpb=8a47ee165cb347ffe148b26b85213cfabe389387;p=sfa.git

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index ec47e41b..74972cc9 100644
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -1,12 +1,8 @@
-### $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.namespace import *
+
+from sfa.util.xrn import Xrn, urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.util.debug import log
 from sfa.trust.credential import Credential
 from sfa.util.record import SfaRecord
 
@@ -31,10 +27,11 @@ class Resolve(Method):
     returns = [SfaRecord]
     
     def call(self, xrns, creds):
+        type = None
         if not isinstance(xrns, types.ListType):
+            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')
 
@@ -44,7 +41,5 @@ class Resolve(Method):
  
         # send the call to the right manager
         manager = self.api.get_interface_manager()
-        return manager.resolve(self.api, xrns)
-
-
+        return manager.resolve(self.api, xrns, type)