X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fresolve.py;h=8920cdca3b2474be74eaaf6d349df3ef14dddb4b;hb=82f6b46e70dff8f7defd92177562c7d387b2f1fd;hp=29e79b4b8b58f84951456c20491877fcd454fc66;hpb=cc424a19c4c158f5ccb861ac825850ce26df43c6;p=sfa.git

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 29e79b4b..8920cdca 100644
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -1,23 +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.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):
     """
     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     
     """
 
@@ -25,67 +23,31 @@ 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 or urn)"),
+              Parameter(list, "List of Human readable names ([hrn])"))  
         ]
 
-    returns = [GeniRecord]
+    returns = [SfaRecord]
     
-    def call(self, cred, hrn, request_hash=None, caller_cred=None):
-        
-        self.api.auth.authenticateCred(cred, [cred, hrn], request_hash) 
-        self.api.auth.check(cred, 'resolve')
-        if caller_cred==None:
-            caller_cred=cred
+    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
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
-        good_records = [] 
-
-        # load all know registry names into a prefix tree and attempt to find
-        # the longest matching prefix
-        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()
-            try:
-                records = registries[registry_hrn].resolve(credential, hrn, caller_cred)
-                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, caller_cred)
-                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)
+        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 good_records