From 9ef1ce2f595c60d94e71efd7142eec5baa8e558a Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 30 Dec 2009 23:50:12 +0000 Subject: [PATCH] in create_slice() and delete_slice() set the right gid_object_caller on the credential, no longer pass origin_hrn to calls --- sfa/managers/slice_manager_pl.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 09eabf53..698acf67 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -21,8 +21,9 @@ from sfa.server.registry import Registries from sfa.server.aggregate import Aggregates import sfa.plc.peers as peers -def delete_slice(api, hrn, origin_hrn=None): +def delete_slice(api, hrn, gid_origin_caller=None): credential = api.getCredential() + credential.set_gid_origin_caller(gid_origin_caller) aggregates = Aggregates(api) for aggregate in aggregates: success = False @@ -40,7 +41,7 @@ def delete_slice(api, hrn, origin_hrn=None): try: arg_list = [credential, hrn] request_hash = api.key.compute_hash(arg_list) - aggregates[aggregate].delete_slice(credential, hrn, request_hash, origin_hrn) + aggregates[aggregate].delete_slice(credential, hrn, request_hash) success = True except: print >> log, "%s" % (traceback.format_exc()) @@ -86,22 +87,22 @@ def create_slice(api, hrn, rspec, gid_origin_caller=None): try: request_hash = None aggregates[net_hrn].create_slice(credential, hrn, \ - rspec, request_hash, origin_hrn) + rspec, request_hash) except: arg_list = [credential,hrn,rspec] request_hash = api.key.compute_hash(arg_list) aggregates[net_hrn].create_slice(credential, hrn, \ - rspec, request_hash, origin_hrn) + rspec, request_hash) else: try: request_hash = None aggregates[net_hrn].create_slice(credential, hrn, \ - rspecs[net_hrn], request_hash, origin_hrn) + rspecs[net_hrn], request_hash) except: arg_list = [credential,hrn,rspecs[net_hrn]] request_hash = api.key.compute_hash(arg_list) aggregates[net_hrn].create_slice(credential, hrn, \ - rspecs[net_hrn], request_hash, origin_hrn) + rspecs[net_hrn], request_hash) else: # lets forward this rspec to a sm that knows about the network arg_list = [credential, net_hrn] -- 2.43.0