X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=841fb8f6e38569de8ab294725e28e47c6c7746d6;hb=3e610bb9e7c357e06a5a757809e7323e0402f841;hp=395a3fbcdb971cf62440d793edf4959b8b8d2c67;hpb=658683174ea538f4cacdab54302882005e148b8f;p=nodemanager.git

diff --git a/sm.py b/sm.py
index 395a3fb..841fb8f 100644
--- a/sm.py
+++ b/sm.py
@@ -39,7 +39,7 @@ DEFAULT_ALLOCATION = {
     '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, plc = None, config = None, 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
@@ -92,6 +92,7 @@ def GetSlivers(data, plc = None, config = None, fullupdate=True):
         # 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')