Merge changeset 11123 from the trunk

[nodemanager.git] / sm.py

diff --git a/sm.py b/sm.py
index b291506..45644d8 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -7,12 +7,13 @@ also to make inter-sliver resource loans.  The sliver manager is also
 responsible for handling delegation accounts.
 """
 
-# $Id: sm.py,v 1.28 2007/07/27 18:02:36 dhozac Exp $
+# $Id$
 
 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,8 +24,8 @@ import string,re
 DEFAULT_ALLOCATION = {
     'enabled': 1,
     # CPU parameters
-    'cpu_min': 0, # ms/s
-    'cpu_share': 32, # proportional share
+    'cpu_pct': 0, # percent CPU reserved
+    'cpu_share': 1, # proportional share
     # bandwidth parameters
     'net_min_rate': bwmin / 1000, # kbps
     'net_max_rate': bwmax / 1000, # kbps
@@ -81,7 +82,7 @@ def GetSlivers(data, fullupdate=True):
     initscripts = {}
     for is_rec in data['initscripts']:
         logger.verbose("initscript: %s" % is_rec['name'])
-        initscripts[str(is_rec['initscript_id'])] = is_rec['script']
+        initscripts[str(is_rec['name'])] = is_rec['script']
 
     for sliver in data['slivers']:
         logger.verbose("sm:GetSlivers in slivers loop")
@@ -103,12 +104,17 @@ def GetSlivers(data, fullupdate=True):
         # instantiation here, but i suppose its the ssame thing when you think about it. -FA
             rec['type'] = 'delegate'
 
+        # set the vserver reference.  If none, set to default.
         rec.setdefault('vref', attr_dict.get('vref', 'default'))
-        is_id = attr_dict.get('initscript')
-        if is_id is not None and is_id in initscripts:
-            rec['initscript'] = initscripts[is_id]
+
+        # set initscripts.  first check if exists, if not, leave empty.
+        is_name = attr_dict.get('initscript')
+        if is_name is not None and is_name in initscripts:
+            rec['initscript'] = initscripts[is_name]
         else:
             rec['initscript'] = ''
+
+        # set delegations, if none, set empty
         rec.setdefault('delegations', attr_dict.get("delegations", []))
 
         # extract the implied rspec
@@ -121,6 +127,11 @@ def GetSlivers(data, fullupdate=True):
             except (KeyError, ValueError): amt = default_amt
             rspec[resname] = amt
 
+        # add in sysctl attributes into the rspec
+        for key in attr_dict.keys():
+            if key.find("sysctl.") == 0:
+                rspec[key] = attr_dict[key]
+
         database.db.deliver_record(rec)
     if fullupdate: database.db.set_min_timestamp(data['timestamp'])
     database.db.sync()
@@ -137,5 +148,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()