X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FResolve.py;h=9a6dd47c0fe7c52750fc2abaf65f35be34a38e81;hb=cf630d87d633f3861e3ac8a50433fa29ca46a74e;hp=7e1a5892aa3c017044420ad4c19f1b4b22edb975;hpb=d944c825ddbc9b02a5c011daa5a4399afa58ab19;p=sfa.git

diff --git a/sfa/methods/Resolve.py b/sfa/methods/Resolve.py
index 7e1a5892..9a6dd47c 100644
--- a/sfa/methods/Resolve.py
+++ b/sfa/methods/Resolve.py
@@ -1,13 +1,12 @@
-### $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
+from sfa.storage.record import SfaRecord
 
 class Resolve(Method):
     """
@@ -30,10 +29,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]
-        #test 
         #find valid credentials
         valid_creds = self.api.auth.checkCredentials(creds, 'resolve')
 
@@ -42,8 +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)
-
-
+        return self.api.manager.Resolve(self.api, xrns, type)