X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=34230e0802cabe353fe3460d0672e1738d687e1e;hb=c6808303b7564ed7ba3bc888c4f6e56167a83e2a;hp=d38a950c69eb22ef441fb2c517c0f8ece54c0f47;hpb=3cac15f26a27127be9c5c4529f019a2231533c5f;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index d38a950c..34230e08 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -16,17 +16,17 @@ from sfa.util.policy import Policy from sfa.util.prefixTree import prefixTree from sfa.util.debug import log from sfa.server.registry import Registries -from sfa.util import peers +import sfa.plc.peers as peers def delete_slice(api, hrn): slicename = hrn_to_pl_slicename(hrn) - slices = api.plshell.GetSlices(self.api.plauth, {'name': slicename}) + slices = api.plshell.GetSlices(api.plauth, {'name': slicename}) if not slices: return 1 slice = slices[0] # determine if this is a peer slice - peer = peers.get_peer(hrn) + peer = peers.get_peer(api, hrn) if peer: api.plshell.UnBindObjectFromPeer(api.plauth, 'slice', slice['slice_id'], peer) api.plshell.DeleteSliceFromNodes(api.plauth, slicename, slice['node_ids']) @@ -76,4 +76,13 @@ def get_slices(api): slices.refresh() return slices['hrn'] - + +def get_rspec(api, hrn=None): + nodes = Nodes(api) + if hrn: + rspec = nodes.get_rspec(hrn) + else: + nodes.refresh() + rspec = nodes['rspec'] + + return rspec