X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FResolve.py;h=094500f040038464279374db4736bdc2c4ec9892;hb=29df906cd2d154a3b90fcb1b7025f3fc1bb577fe;hp=3f7a61ab1f0866ac8a8f1fdb3537fdb8a330c952;hpb=b1775bb47ea5e242d337dbd34f5d58d10a57a028;p=sfa.git

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 3f7a61ab..094500f0 100644
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -1,9 +1,6 @@
-### $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.trust.credential import Credential
@@ -30,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')
 
@@ -42,8 +40,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)