Merge changeset 11123 from the trunk

[nodemanager.git] / api_calls.py

diff --git a/api_calls.py b/api_calls.py
index 4abf67c..cd97e13 100644 (file)
--- a/api_calls.py
+++ b/api_calls.py
@@ -39,6 +39,7 @@ except: import logger as sliver_vs
 import ticket as ticket_module
 import tools
 
+deliver_ticket = None  # set in sm.py:start()
 
 api_method_dict = {}
 nargs_dict = {}
@@ -163,9 +164,9 @@ def Destroy(sliver_name):
                    returns=Parameter(int, '1 if successful'))
 @export_to_api(1)
 def Start(sliver_name):
-    """Run start scripts belonging to the specified sliver"""
+    """Configure and start sliver."""
     rec = sliver_name
-    accounts.get(rec['name']).start()
+    accounts.get(rec['name']).start(rec)
 
 @export_to_docbook(roles=['nm-controller', 'self'], 
                     accepts=[Parameter(str, 'A sliver/slice name.')], 
@@ -186,7 +187,6 @@ def ReCreate(sliver_name):
     Stop(sliver_name)
     Destroy(sliver_name)
     Create(sliver_name)
-    Start(sliver_name)
 
 @export_to_docbook(roles=['nm-controller', 'self'], 
                     accepts=[Parameter(str, 'A sliver/slice name.')],