moved rspec managers here from and named them aggregate managers

[sfa.git] / sfa / managers / aggregate_manager_pl.py

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index d38a950..34230e0 100644 (file)
--- 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