removed another bunch of references to geni

[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 9e17a51..f890a69 100644 (file)
--- 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,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
@@ -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: