From 6c8152ed40590db2fe7f13f7a29c4d222b2ea764 Mon Sep 17 00:00:00 2001 From: Anil-Kumar Vengalil Date: Sun, 15 Nov 2009 19:39:54 +0000 Subject: [PATCH] continuation of making request_hash optional --- sfa/plc/nodes.py | 3 ++- sfa/plc/slices.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py index c3f6a26e..5c0777ae 100644 --- a/sfa/plc/nodes.py +++ b/sfa/plc/nodes.py @@ -116,7 +116,8 @@ class Nodes(SimpleStorage): caller_cred = self.caller_cred # get the rspec from the aggregate try: - agg_rspec = aggregates[aggregate].get_resources(credential, hrn, caller_cred) + request_hash=None + agg_rspec = aggregates[aggregate].get_resources(credential, hrn, request_hash, caller_cred) except: arg_list = [credential, hrn] request_hash = self.api.key.compute_hash(arg_list) diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index 7a9e5cc0..8f1da894 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -174,7 +174,8 @@ class Slices(SimpleStorage): success = False # request hash is optional so lets try the call without it try: - aggregates[aggregate].delete_slice(credential, hrn, caller_cred) + request_hash=None + aggregates[aggregate].delete_slice(credential, hrn, request_hash, caller_cred) success = True except: print >> log, "%s" % (traceback.format_exc()) @@ -503,14 +504,16 @@ class Slices(SimpleStorage): # send the whloe rspec to the local aggregate if net_hrn in [self.api.hrn]: try: - aggregates[net_hrn].create_slice(credential, hrn, rspec, caller_cred) + request_hash = None + aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, caller_cred) except: arg_list = [credential,hrn,rspec] request_hash = self.api.key.compute_hash(arg_list) aggregates[net_hrn].create_slice(credential, hrn, rspec, request_hash, caller_cred) else: try: - aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], caller_cred) + request_hash = None + aggregates[net_hrn].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred) except: arg_list = [credential,hrn,rspecs[net_hrn]] request_hash = self.api.key.compute_hash(arg_list) @@ -526,7 +529,8 @@ class Slices(SimpleStorage): network_found = aggregates[aggregate].get_aggregates(credential, net_hrn, request_hash) if network_networks: try: - aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], caller_cred) + request_hash = None + aggregates[aggregate].create_slice(credential, hrn, rspecs[net_hrn], request_hash, caller_cred) except: arg_list = [credential, hrn, rspecs[net_hrn]] request_hash = self.api.key.compute_hash(arg_list) -- 2.43.0