X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=f890a6971023fbf2c3e9ee29f7e3e1622f60bac3;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=3dd860bd5789df29e9bdab5b16354dc8f80e76d0;hpb=ed16d55a2f364c83b2cd94fa70f9da3ba3fa4e2e;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 3dd860bd..f890a697 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -7,11 +7,11 @@ import traceback import sys from types import StringTypes -from sfa.util.misc import * +from sfa.util.namespace import * from sfa.util.rspec import * from sfa.util.specdict import * from sfa.util.faults import * -from sfa.util.record import GeniRecord +from sfa.util.record import SfaRecord from sfa.util.policy import Policy from sfa.util.record import * from sfa.util.sfaticket import SfaTicket @@ -41,9 +41,9 @@ def create_slice(api, hrn, rspec): # we transition the code to this module from sfa.plc.slices import Slices slices = Slices(api) - slices.create_slice(hrn, rspec) + slices.create_slice_aggregate(hrn, rspec) -def get_ticket(api, slice_hrn, rspec, gid_origin_caller=None): +def get_ticket(api, slice_hrn, rspec, origin_hrn=None): # the the slice record registries = Registries(api) registry = registries[api.hrn] @@ -123,9 +123,9 @@ def get_slices(api): return slices['hrn'] -def get_rspec(api, hrn=None, origin_gid_caller=None): +def get_rspec(api, hrn=None, origin_hrn=None): from sfa.plc.nodes import Nodes - nodes = Nodes(api, origin_gid_caller=origin_gid_caller) + nodes = Nodes(api, origin_hrn=origin_hrn) if hrn: rspec = nodes.get_rspec(hrn) else: