use "vserver" as the default value for the slice attribute "type"

[nodemanager.git] / sm.py

diff --git a/sm.py b/sm.py
index 79403ca..fecfbf6 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -13,22 +13,45 @@ import accounts
 import api
 import database
 import delegate
+import logger
 import sliver_vs
 
 
-DEFAULT_ALLOCATION = {'enabled': 1, 'cpu_min': 0, 'cpu_share': 32, 'net_min': bwmin, 'net_max': bwmax, 'net2_min': bwmin, 'net2_max': bwmax, 'net_share': 1, 'disk_max': 5000000}
+DEFAULT_ALLOCATION = {
+    'enabled': 1,
+    # CPU parameters
+    'cpu_min': 0, # ms/s
+    'cpu_share': 32, # proportional share
+    # bandwidth parameters
+    'net_min': bwmin, # bps
+    'net_max': bwmax, # bps
+    'net_share': 1, # proportional share
+    # bandwidth parameters over routes exempt from node bandwidth limits
+    'net2_min': bwmin, # bps
+    'net2_max': bwmax, # bps
+    'net2_share': 1, # proportional share
+    'disk_max': 5000000 # bytes
+    }
 
 start_requested = False  # set to True in order to request that all slivers be started
 
 
 @database.synchronized
-def GetSlivers_callback(data):
+def GetSlivers_callback(data, 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."""
+
+    node_id = None
+    try:
+        f = open('/etc/planetlab/node_id')
+        try: node_id = int(f.read())
+        finally: f.close()
+    except: logger.log_exc()
+
     for d in data:
+        if d['node_id'] != node_id: continue
         for sliver in d['slivers']:
             rec = sliver.copy()
             rec.setdefault('timestamp', d['timestamp'])
-            rec.setdefault('type', 'sliver.VServer')
 
             # convert attributes field to a proper dict
             attr_dict = {}
@@ -38,6 +61,8 @@ def GetSlivers_callback(data):
             keys = rec.pop('keys')
             rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
 
+            rec.setdefault('type', attr_dict.get('type', 'vserver'))
+            rec.setdefault('vref', attr_dict.get('vref', 'default'))
             rec.setdefault('initscript', attr_dict.get('initscript', ''))
             rec.setdefault('delegations', [])  # XXX - delegation not yet supported
 
@@ -49,7 +74,7 @@ def GetSlivers_callback(data):
                 except (KeyError, ValueError): amt = default_amt
                 rspec[resname] = amt
             database.db.deliver_record(rec)
-        database.db.set_min_timestamp(d['timestamp'])
+        if fullupdate: database.db.set_min_timestamp(d['timestamp'])
     database.db.sync()
 
     # handle requested startup
@@ -61,6 +86,8 @@ def GetSlivers_callback(data):
             accounts.get(name).start(delay=cumulative_delay)
             cumulative_delay += 3
 
+def deliver_ticket(data): return GetSlivers_callback(data, fullupdate=False)
+
 
 def start(options):
     accounts.register_class(sliver_vs.Sliver_VS)
@@ -68,4 +95,5 @@ def start(options):
     global start_requested
     start_requested = options.startup
     database.start()
+    api.deliver_ticket = deliver_ticket
     api.start()