fixed up the names of new site names/slices to be more PLC compatible

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

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 8920cdc..d26625e 100644 (file)
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -6,12 +6,12 @@ from sfa.util.faults import *
 from sfa.util.namespace import *
 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
+from sfa.methods.Resolve import Resolve
 
-class resolve(Method):
+class resolve(Resolve):
     """
+    Deprecated. Use Resolve instead
     Resolve a record.
 
     @param cred credential string authorizing the caller
@@ -30,24 +30,7 @@ class resolve(Method):
     returns = [SfaRecord]
     
     def call(self, cred, xrns, origin_hrn=None):
-        user_cred = Credential(string=cred)
-        if not isinstance(xrns, types.ListType):
-            xrns=[xrns]
-        hrns = [urn_to_hrn(xrn)[0] for xrn in xrns]
-
-        #log the call
-        if not origin_hrn:
-            origin_hrn = user_cred.get_gid_caller().get_hrn()
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrns, self.name))
- 
-        # validate the cred
-        self.api.auth.check(cred, 'resolve')
-        # send the call to the right manager
-        manager_base = 'sfa.managers'
-        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, xrns, origin_hrn=origin_hrn)
+        return Resolve.call(self, xrns, cred)