pass request_hash argument to sfa interface calls
authorTony Mack <tmack@cs.princeton.edu>
Fri, 23 Oct 2009 14:45:56 +0000 (14:45 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Fri, 23 Oct 2009 14:45:56 +0000 (14:45 +0000)
sfa/plc/nodes.py

index e4458d3..29668b7 100644 (file)
@@ -114,12 +114,11 @@ class Nodes(SimpleStorage):
         for aggregate in aggregates:
             try:
                 caller_cred = self.caller_cred
-                cred_str = credential.save_to_string(save_parents=True)
-                arg_list = [cred_str, hrn]
+                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(cred_str, hrn, request_hash, caller_cred)
+                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')}])