X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=a050ded5b16765878be3e46e24ec7d948d09e172;hb=75eb060a541caa2fc9dabb82109e36e726128c1f;hp=efba0eb22e1dc4988611267fbaa8a7f99379240a;hpb=2820b66af336a29ffea357acab7891c958972e0a;p=nodemanager.git

diff --git a/sm.py b/sm.py
index efba0eb..a050ded 100644
--- a/sm.py
+++ b/sm.py
@@ -13,6 +13,7 @@ try: from bwlimit import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 import accounts
 import api
+import api_calls
 import database
 import delegate
 import logger
@@ -23,7 +24,7 @@ import string,re
 DEFAULT_ALLOCATION = {
     'enabled': 1,
     # CPU parameters
-    'cpu_min': 0, # percent CPU reserved
+    'cpu_pct': 0, # percent CPU reserved
     'cpu_share': 1, # proportional share
     # bandwidth parameters
     'net_min_rate': bwmin / 1000, # kbps
@@ -142,5 +143,5 @@ def start(options, config):
     accounts.register_class(delegate.Delegate)
     accounts.Startingup = options.startup
     database.start()
-    api.deliver_ticket = deliver_ticket
+    api_calls.deliver_ticket = deliver_ticket
     api.start()