merged namespace

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

diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py
index d341034..14168a0 100644 (file)
--- a/sfa/managers/aggregate_manager_max.py
+++ b/sfa/managers/aggregate_manager_max.py
@@ -9,7 +9,6 @@ from sfa.util.specdict import *
 from sfa.util.faults import *
 from sfa.util.storage import *
 from sfa.util.policy import Policy
-from sfa.util.debug import log
 from sfa.server.aggregate import Aggregates
 from sfa.server.registry import Registries
 from sfa.util.faults import *
@@ -248,8 +247,10 @@ def create_slice_max_aggregate(api, hrn, nodes):
     return 1
 
 
-def get_rspec(api, xrn):
-    hrn = urn_to_hrn(xrn)[0]
+def get_rspec(api, creds, options):
+    # get slice's hrn from options
+    xrn = options.get('geni_slice_urn', None)
+    hrn, type = urn_to_hrn(xrn)
     # Eg. config line:
     # plc.princeton.sapan vlan23,vlan45
 
@@ -262,7 +263,7 @@ def get_rspec(api, xrn):
     return (ret_rspec)
 
 
-def create_slice(api, xrn, rspec_xml):
+def create_slice(api, xrn, creds, rspec_xml, users):
     global topology
     hrn = urn_to_hrn(xrn)[0]
     topology = get_interface_map()