- pass rspec['vref'] instead of internal rspec['type'] to vuseradd -t

[nodemanager.git] / sm.py

diff --git a/sm.py b/sm.py
index a289ea8..cdb42ee 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -17,14 +17,31 @@ 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_rate': bwmin, # bps
+    'net_max_rate': bwmax, # bps
+    'net_share': 1, # proportional share
+    # bandwidth parameters over routes exempt from node bandwidth limits
+    'net_i2_min_rate': bwmin, # bps
+    'net_i2_max_rate': bwmax, # bps
+    'net_i2_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, 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."""
+def GetSlivers(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:
@@ -33,33 +50,33 @@ def GetSlivers_callback(data, fullupdate=True):
         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 = {}
-            for attr in rec.pop('attributes'): attr_dict[attr['name']] = attr['value']
-
-            # squash keys
-            keys = rec.pop('keys')
-            rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
-
-            rec.setdefault('initscript', attr_dict.get('initscript', ''))
-            rec.setdefault('delegations', [])  # XXX - delegation not yet supported
-
-            # extract the implied rspec
-            rspec = {}
-            rec['rspec'] = rspec
-            for resname, default_amt in DEFAULT_ALLOCATION.iteritems():
-                try: amt = int(attr_dict[resname])
-                except (KeyError, ValueError): amt = default_amt
-                rspec[resname] = amt
-            database.db.deliver_record(rec)
-        if fullupdate: database.db.set_min_timestamp(d['timestamp'])
+    if data.has_key('node_id') and data['node_id'] != node_id: return
+    for sliver in data['slivers']:
+        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['name']] = attr['value']
+
+        # squash keys
+        keys = rec.pop('keys')
+        rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
+
+        rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
+        rec.setdefault('vref', attr_dict.get('vref', 'default'))
+        rec.setdefault('initscript', attr_dict.get('initscript', ''))
+        rec.setdefault('delegations', [])  # XXX - delegation not yet supported
+
+        # extract the implied rspec
+        rspec = {}
+        rec['rspec'] = rspec
+        for resname, default_amt in DEFAULT_ALLOCATION.iteritems():
+            try: amt = int(attr_dict[resname])
+            except (KeyError, ValueError): amt = default_amt
+            rspec[resname] = amt
+        database.db.deliver_record(rec)
+    if fullupdate: database.db.set_min_timestamp(data['timestamp'])
     database.db.sync()
 
     # handle requested startup
@@ -71,10 +88,10 @@ def GetSlivers_callback(data, fullupdate=True):
             accounts.get(name).start(delay=cumulative_delay)
             cumulative_delay += 3
 
-def deliver_ticket(data): return GetSlivers_callback(data, fullupdate=False)
+def deliver_ticket(data): return GetSlivers(data, fullupdate=False)
 
 
-def start(options):
+def start(options, config):
     accounts.register_class(sliver_vs.Sliver_VS)
     accounts.register_class(delegate.Delegate)
     global start_requested