From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 4 Nov 2009 00:47:44 +0000 (+0000)
Subject: request hash is optional
X-Git-Tag: sfa-0.9-6~65
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=29d9f3fea7b205e52c235daea87ed5bfbf36e94d;p=sfa.git

request hash is optional
---

diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py
index 3fb3e984..c057a625 100644
--- a/sfa/plc/nodes.py
+++ b/sfa/plc/nodes.py
@@ -114,11 +114,13 @@ class Nodes(SimpleStorage):
         for aggregate in aggregates:
             try:
                 caller_cred = self.caller_cred
-                arg_list = [credential, hrn]
-                request_hash = self.api.key.compute_hash(arg_list)
-                
                 # get the rspec from the aggregate
-                agg_rspec = aggregates[aggregate].get_resources(credential, hrn, request_hash, caller_cred)
+                try:
+                    agg_rspec = aggregates[aggregate].get_resources(credential, hrn, caller_cred)
+                except:
+                    arg_list = [credential, hrn]
+                    request_hash = self.api.key.compute_hash(arg_list)
+                    agg_rspec = aggregates[aggregate].get_resources(credential, hrn, request_hash, caller_cred)
                 # extract the netspec from each aggregates rspec
                 rspec.parseString(agg_rspec)
                 networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}])