X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=ca21d481ae3cbb6262fc4b421a5fc4eb38d791ab;hb=refs%2Fheads%2F1.8;hp=bcf2dbf5eeeffa3de05a50ec381d98a5ef4e65cc;hpb=ea6f598f124c67b94207792353aef1401295f5e6;p=nodemanager.git

diff --git a/sm.py b/sm.py
index bcf2dbf..ca21d48 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, 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,13 +92,14 @@ def GetSlivers(data, 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')
         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':
             rec.setdefault('type', attr_dict.get('type', 'controller.Controller'))