X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=6192ba1cc08cccd35613dce692d71b55c774d530;hb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;hp=62e49d1ff857f78bbbc5761189944be240f9ddea;hpb=737532f28237ed08d3895b5912866476f909e04f;p=nodemanager.git

diff --git a/sm.py b/sm.py
index 62e49d1..6192ba1 100644
--- a/sm.py
+++ b/sm.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """Sliver manager.
 
 The sliver manager has several functions.  It is responsible for
@@ -15,7 +18,7 @@ import accounts
 import api
 import api_calls
 import database
-import controller 
+import controller
 import logger
 import sliver_vs
 import string,re
@@ -34,12 +37,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,22 +57,22 @@ 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
     slivers."""
 
-    logger.verbose("Entering sm:GetSlivers with fullupdate=%r"%fullupdate)
+    logger.verbose("sm: Entering GetSlivers with fullupdate=%r"%fullupdate)
     for key in data.keys():
-        logger.verbose('GetSlivers key : ' + key)
+        logger.verbose('sm: GetSlivers key : ' + key)
 
     node_id = None
     try:
         f = open('/etc/planetlab/node_id')
         try: node_id = int(f.read())
         finally: f.close()
-    except: logger.log_exc()
+    except: logger.log_exc("sm: GetSlivers failed to read /etc/planetlab/node_id")
 
     if data.has_key('node_id') and data['node_id'] != node_id: return
 
@@ -79,28 +82,32 @@ def GetSlivers(data, fullupdate=True):
                 DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000
 
     # Take intscripts (global) returned by API, make dict
+    if 'initscripts' not in data:
+        logger.log_missing_data("sm.GetSlivers",'initscripts')
+        return
     initscripts = {}
     for is_rec in data['initscripts']:
-        logger.verbose("initscript: %s" % is_rec['name'])
+        logger.verbose("sm: initscript: %s" % is_rec['name'])
         initscripts[str(is_rec['name'])] = is_rec['script']
 
     for sliver in data['slivers']:
-        logger.verbose("sm:GetSlivers in slivers loop")
+        logger.verbose("sm: %s: sm:GetSlivers in slivers loop"%sliver['name'])
         rec = sliver.copy()
         rec.setdefault('timestamp', data['timestamp'])
 
         # convert attributes field to a proper dict
         attr_dict = {}
         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 ssame thing when you think about it. -FA
+        ## instantiation here, but i suppose its the same thing when you think about it. -FA
         # Handle nm controller here
-        if rec['instantiation'].lower() == 'nm-controller': 
+        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'))