updated accepted arguemts for create_slice and get_rspec calls
authorTony Mack <tmack@cs.princeton.edu>
Fri, 6 Aug 2010 16:01:32 +0000 (16:01 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Fri, 6 Aug 2010 16:01:32 +0000 (16:01 +0000)
sfa/managers/aggregate_manager_max.py

index d341034..d7aed8e 100644 (file)
@@ -248,8 +248,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 +264,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()