get_ticket has been replaced by GetTicket

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

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index e305e4d..1d2f695 100644 (file)
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -69,8 +69,9 @@ def create_slice(api, xrn, creds, rspec, users):
             # Just send entire RSpec to each aggregate
             threads.run(server.CreateSliver, xrn, cred, rspec, users)
             
-    threads.get_results() 
-    return 1
+    results = threads.get_results() 
+    merged_rspec = merge_rspecs(results)
+    return merged_rspec
 
 def renew_slice(api, xrn, creds, expiration_time):
     # XX
@@ -84,7 +85,7 @@ def renew_slice(api, xrn, creds, expiration_time):
     threads.get_results()
     return 1
 
-def get_ticket(api, xrn, rspec, origin_hrn=None):
+def get_ticket(api, xrn, creds, rspec, users):
     slice_hrn, type = urn_to_hrn(xrn)
     # get the netspecs contained within the clients rspec
     aggregate_rspecs = {}
@@ -113,7 +114,8 @@ def get_ticket(api, xrn, rspec, origin_hrn=None):
                     break   
         if server is None:
             continue 
-        threads.run(server.get_ticket, credential, xrn, aggregate_rspec, origin_hrn)
+        threads.run(server.GetTicket, xrn, credential, aggregate_rspec, users)
+
     results = threads.get_results()
     
     # gather information from each ticket