X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=f890a6971023fbf2c3e9ee29f7e3e1622f60bac3;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hp=212699beb75eb81ba6a293e32a62b6a565f93356;hpb=9797fe9b994b5bddd2d1ee6ade36c6716fb9c118;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 212699be..f890a697 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -7,16 +7,17 @@ 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 from sfa.server.registry import Registries from sfa.util.debug import log +from sfa.plc.slices import Slices import sfa.plc.peers as peers def delete_slice(api, hrn): @@ -40,7 +41,7 @@ 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, origin_hrn=None): # the the slice record @@ -52,8 +53,8 @@ def get_ticket(api, slice_hrn, rspec, origin_hrn=None): # make sure we get a local slice record record = None for tmp_record in records: - if record['type'] == 'slice' and \ - not record['peer_authority']: + if tmp_record['type'] == 'slice' and \ + not tmp_record['peer_authority']: record = SliceRecord(dict=tmp_record) if not record: raise RecordNotFound(slice_hrn)