X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fresolve.py;h=b854d65602e899fc145bf4c75cdea39680862632;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=11ec8c6973b5f562196fbe996e27bb3ca3ca623a;hpb=f51d37ff7ce82c07102b83a6ffb35a59f6774a85;p=sfa.git

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 11ec8c69..b854d656 100644
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -4,13 +4,9 @@ import traceback
 from sfa.util.faults import *
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.util.record import GeniRecord
-from sfa.util.genitable import GeniTable
 from sfa.util.debug import log
-from sfa.server.registry import Registries
-from sfa.util.prefixTree import prefixTree
 from sfa.trust.credential import Credential
+from sfa.util.record import SfaRecord
 
 class resolve(Method):
     """
@@ -25,70 +21,28 @@ class resolve(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name (hrn)"),
-        Mixed(Parameter(str, "Request hash"),
-              Parameter(None, "Request hash not specified"))
+        Mixed(Parameter(str, "Human readable name (hrn)"),
+              Parameter(list, "List of Human readable names ([hrn])"))  
         ]
 
-    returns = [GeniRecord]
+    returns = [SfaRecord]
     
-    def call(self, cred, hrn, request_hash=None):
+    def call(self, cred, hrn, origin_hrn=None):
         user_cred = Credential(string=cred)
 
         #log the call
-        gid_origin_caller = user_cred.get_gid_origin_caller()
-        origin_hrn = gid_origin_caller.get_hrn()
+        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))
  
-        self.api.auth.authenticateCred(cred, [cred, hrn], request_hash) 
+        # 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)
 
-        # load all know registry names into a prefix tree and attempt to find
-        # the longest matching prefix
-        good_records = [] 
-        registries = Registries(self.api)
-        hrns = registries.keys()
-        tree = prefixTree()
-        tree.load(hrns)
-        registry_hrn = tree.best_match(hrn)
 
-        #if there was no match then this record belongs to an unknow registry
-        if not registry_hrn:
-            raise MissingAuthority(hrn)
-
-        # if the best match (longest matching hrn) is not the local registry,
-        # forward the request
-        if registry_hrn != self.api.hrn:
-            credential = self.api.getCredential()
-            credential.set_gid_origin_caller(gid_origin_caller)
-            try:
-                request_hash=None
-                records = registries[registry_hrn].resolve(credential, hrn, request_hash)
-                good_records = [GeniRecord(dict=record).as_dict() for record in records]
-            except:
-                arg_list = [credential, hrn]
-                request_hash=self.api.key.compute_hash(arg_list)                
-                records = registries[registry_hrn].resolve(credential, hrn, request_hash)
-                good_records = [GeniRecord(dict=record).as_dict() for record in records]
-                
-        if good_records:
-            return good_records
-
-        # if we still havnt found the record yet, try the local registry
-        table = GeniTable()
-        records = table.findObjects(hrn)
-        if not records:
-            raise RecordNotFound(hrn) 
-        for record in records:
-            try:
-                self.api.fill_record_info(record)
-                good_records.append(dict(record))
-            except PlanetLabRecordDoesNotExist:
-                # silently drop the ones that are missing in PL
-                print >> log, "ignoring geni record ", record['hrn'], \
-                              " because pl record does not exist"
-                table.remove(record)
-
-
-        return good_records