X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=62de7f9a8f84593534999b787a9a14331e3a9503;hb=3b869bb6f51790344bb1927d827ecd2b9a3dace1;hp=bcf2dbf5eeeffa3de05a50ec381d98a5ef4e65cc;hpb=c61169a5fbf60d34c41d9243ce2a500dee47fb29;p=nodemanager.git

diff --git a/sm.py b/sm.py
index bcf2dbf..62de7f9 100644
--- a/sm.py
+++ b/sm.py
@@ -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(plc, data, config = 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, 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')