Merge branch 'upstreammaster'

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

diff --git a/sfa/methods/ResolveGENI.py b/sfa/methods/ResolveGENI.py
index cfca1b9..7c9cc14 100644 (file)
--- a/sfa/methods/ResolveGENI.py
+++ b/sfa/methods/ResolveGENI.py
@@ -1,9 +1,7 @@
-from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter
-from sfa.trust.credential import Credential
 
-class Resolve(Method):
+class ResolveGENI(Method):
     """
     Lookup a URN and return information about the corresponding object.
     @param urn
@@ -17,13 +15,4 @@ class Resolve(Method):
     returns = Parameter(bool, "Success or Failure")
 
     def call(self, xrn):
-
-        manager_base = 'sfa.managers'
-
-        if self.api.interface in ['registry']:
-            mgr_type = self.api.config.SFA_REGISTRY_TYPE
-            manager_module = manager_base + ".registry_manager_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            return manager.Resolve(self.api, xrn, '')
-               
-        return {}
+        return self.api.manager.Resolve(self.api, xrn, '')