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 5761d34..d26625e 100644 (file)
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -1,19 +1,21 @@
 ### $Id$
 ### $URL$
 import traceback
+import types
 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 GeniRecord
+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
-    @param hrn human readable name to resolve
+    @param hrn human readable name to resolve (hrn or urn) 
     @return a list of record dictionaries or empty list     
     """
 
@@ -21,28 +23,14 @@ class resolve(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Mixed(Parameter(str, "Human readable name (hrn)"),
+        Mixed(Parameter(str, "Human readable name (hrn or urn)"),
               Parameter(list, "List of Human readable names ([hrn])"))  
         ]
 
-    returns = [GeniRecord]
+    returns = [SfaRecord]
     
-    def call(self, cred, hrn, origin_hrn=None):
-        user_cred = Credential(string=cred)
-
-        #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, hrn, 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, hrn, origin_hrn=origin_hrn)
+    def call(self, cred, xrns, origin_hrn=None):
+        return Resolve.call(self, xrns, cred)