X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=ca21d481ae3cbb6262fc4b421a5fc4eb38d791ab;hb=da3058ad1667905cbcdd803a92a1326aceb48065;hp=a050ded5b16765878be3e46e24ec7d948d09e172;hpb=14db173670c1fe536c0bf9a8faa88e18ad2dcf96;p=nodemanager.git

diff --git a/sm.py b/sm.py
index a050ded..ca21d48 100644
--- a/sm.py
+++ b/sm.py
@@ -7,7 +7,7 @@ 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
@@ -15,7 +15,7 @@ import accounts
 import api
 import api_calls
 import database
-import delegate
+import controller
 import logger
 import sliver_vs
 import string,re
@@ -34,12 +34,12 @@ DEFAULT_ALLOCATION = {
     'net_i2_min_rate': bwmin / 1000, # kbps
     'net_i2_max_rate': bwmax / 1000, # kbps
     'net_i2_share': 1, # proportional share
-    'net_max_kbyte' : 5662310, #Kbyte
-    'net_thresh_kbyte': 4529848, #Kbyte
-    'net_i2_max_kbyte': 17196646,
-    'net_i2_thresh_kbyte': 13757316,
+    'net_max_kbyte' : 10546875, #Kbyte
+    'net_thresh_kbyte': 9492187, #Kbyte
+    'net_i2_max_kbyte': 31640625,
+    'net_i2_thresh_kbyte': 28476562,
     # disk space limit
-    'disk_max': 5000000, # bytes
+    'disk_max': 10000000, # bytes
     # capabilities
     'capabilities': '',
     # IP addresses
@@ -54,7 +54,7 @@ DEFAULT_ALLOCATION = {
 start_requested = False  # set to True in order to request that all slivers be started
 
 @database.synchronized
-def GetSlivers(data, fullupdate=True):
+def GetSlivers(data, config = None, plc=None, fullupdate=True):
     """This function has two purposes.  One, convert GetSlivers() data
     into a more convenient format.  Two, even if no updates are coming
     in, use the GetSlivers() heartbeat as a cue to scan for expired
@@ -91,18 +91,20 @@ def GetSlivers(data, fullupdate=True):
 
         # convert attributes field to a proper dict
         attr_dict = {}
-        for attr in rec.pop('attributes'): attr_dict[attr['name']] = attr['value']
+        for attr in rec.pop('attributes'): attr_dict[attr['tagname']] = attr['value']
+        rec.setdefault("attributes", attr_dict)
 
         # squash keys
         keys = rec.pop('keys')
         rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
 
+        ## 'Type' isn't returned by GetSlivers() for whatever reason.  We're overloading
+        ## instantiation here, but i suppose its the same thing when you think about it. -FA
         # Handle nm controller here
-        rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
-        if rec['instantiation'] == 'nm-controller':
-        # type isn't returned by GetSlivers() for whatever reason.  We're overloading
-        # instantiation here, but i suppose its the ssame thing when you think about it. -FA
-            rec['type'] = 'delegate'
+        if rec['instantiation'].lower() == 'nm-controller':
+            rec.setdefault('type', attr_dict.get('type', 'controller.Controller'))
+        else:
+            rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
 
         # set the vserver reference.  If none, set to default.
         rec.setdefault('vref', attr_dict.get('vref', 'default'))
@@ -127,8 +129,14 @@ 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'])
+    # slivers are created here.
     database.db.sync()
     accounts.Startingup = False
 
@@ -140,7 +148,7 @@ def start(options, config):
         DEFAULT_ALLOCATION[resname]=default_amt
         
     accounts.register_class(sliver_vs.Sliver_VS)
-    accounts.register_class(delegate.Delegate)
+    accounts.register_class(controller.Controller)
     accounts.Startingup = options.startup
     database.start()
     api_calls.deliver_ticket = deliver_ticket