request hash is optional

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

diff --git a/sfa/methods/resolve.py b/sfa/methods/resolve.py
index 5f047cb..29e79b4 100644 (file)
--- a/sfa/methods/resolve.py
+++ b/sfa/methods/resolve.py
@@ -25,13 +25,16 @@ class resolve(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name (hrn)")
+        Parameter(str, "Human readable name (hrn)"),
+        Mixed(Parameter(str, "Request hash"),
+              Parameter(None, "Request hash not specified"))
         ]
 
     returns = [GeniRecord]
     
-    def call(self, cred, hrn, caller_cred=None):
+    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
@@ -57,16 +60,20 @@ class resolve(Method):
         if registry_hrn != self.api.hrn:
             credential = self.api.getCredential()
             try:
-                records = registries[registry_hrn].resolve(credential, hrn, caller_cred=caller_cred)
-                good_records = [record.as_dict() for record in records]
-                if good_records:
-                    return good_records
+                records = registries[registry_hrn].resolve(credential, hrn, caller_cred)
+                good_records = [GeniRecord(dict=record).as_dict() for record in records]
             except:
-                traceback.print_exc()
+                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.find(hrn)
+        records = table.findObjects(hrn)
         if not records:
             raise RecordNotFound(hrn) 
         for record in records:
@@ -75,7 +82,7 @@ class resolve(Method):
                 good_records.append(dict(record))
             except PlanetLabRecordDoesNotExist:
                 # silently drop the ones that are missing in PL
-                print >> log, "ignoring geni record ", record.get_name(), \
+                print >> log, "ignoring geni record ", record['hrn'], \
                               " because pl record does not exist"
                 table.remove(record)