From 7eb5d10231243cd88299181f1af982c02b79dc91 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 31 Dec 2009 00:00:34 +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/aggregate_manager_pl.py | 4 ++-- sfa/managers/slice_manager_pl.py | 4 ++-- sfa/plc/nodes.py | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index f42453d3..9e17a51c 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -123,9 +123,9 @@ def get_slices(api): return slices['hrn'] -def get_rspec(api, hrn=None, origin_hrn=None): +def get_rspec(api, hrn=None, origin_gid_caller=None): from sfa.plc.nodes import Nodes - nodes = Nodes(api, origin_hrn=origin_hrn) + nodes = Nodes(api, origin_gid_caller=origin_gid_caller) if hrn: rspec = nodes.get_rspec(hrn) else: diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 698acf67..dda726af 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -256,9 +256,9 @@ def get_slices(api): slices.refresh() return slices['hrn'] -def get_rspec(api, hrn=None, origin_hrn=None): +def get_rspec(api, hrn=None, origin_gid_caller=None): from sfa.plc.nodes import Nodes - nodes = Nodes(api, origin_hrn=origin_hrn) + nodes = Nodes(api, origin_gid_caller=origin_gid_caller) if hrn: rspec = nodes.get_rspec(hrn) else: diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py index 97100406..cfa17b3e 100644 --- a/sfa/plc/nodes.py +++ b/sfa/plc/nodes.py @@ -20,7 +20,7 @@ from sfa.server.aggregate import Aggregates class Nodes(SimpleStorage): - def __init__(self, api, ttl = 1, origin_hrn=None): + def __init__(self, api, ttl = 1, origin_gid_caller=None): self.api = api self.ttl = ttl self.threshold = None @@ -31,7 +31,9 @@ class Nodes(SimpleStorage): SimpleStorage.__init__(self, self.nodes_file) self.policy = Policy(api) self.load() - self.origin_hrn=origin_hrn + self.origin_hrn = None + if origin_gid_caller: + self.origin_hrn=origin_gid_caller.get_hrn() def refresh(self): -- 2.43.0