- initialize bwlimit appropriately

[nodemanager.git] / sm.py

diff --git a/sm.py b/sm.py
index a289ea8..9f38902 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -7,17 +7,31 @@ also to make inter-sliver resource loans.  The sliver manager is also
 responsible for handling delegation accounts.
 """
 
-try: from bwlimit import bwmin, bwmax
-except ImportError: bwmin, bwmax = 8, 1000*1000*1000
+import bwlimit
 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}
+import sioc
+
+
+DEFAULT_ALLOCATION = {
+    'enabled': 1,
+    # CPU parameters
+    'cpu_min': 0, # ms/s
+    'cpu_share': 32, # proportional share
+    # bandwidth parameters
+    'net_min': bwlimit.bwmin, # bps
+    'net_max': bwlimit.bwmax, # bps
+    'net_share': 1, # proportional share
+    # bandwidth parameters over routes exempt from node bandwidth limits
+    'net2_min': bwlimit.bwmin, # bps
+    'net2_max': bwlimit.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
 
@@ -33,12 +47,49 @@ def GetSlivers_callback(data, fullupdate=True):
         finally: f.close()
     except: logger.log_exc()
 
+    # query running network interfaces
+    devs = sioc.gifconf()
+    ips = dict(zip(devs.values(), devs.keys()))
+    macs = {}
+    for dev in devs:
+        macs[sioc.gifhwaddr(dev).lower()] = dev
+
     for d in data:
         if d['node_id'] != node_id: continue
+
+        # XXX Exempt Internet2 destinations from node bwlimits
+        # bwlimit.exempt_init('Internet2', internet2_ips)
+
+        for network in d['networks']:
+            if macs.has_key(network['mac'].lower()):
+                dev = macs[network['mac'].lower()]
+            elif ips.has_key(network['ip']):
+                dev = ips[network['ip']]
+            else:
+                logger.log('%s: no such interface with address %s/%s' % (self.name, network['ip'], network['mac']))
+                continue
+
+            try:
+                old_bwlimit = bwlimit.get_bwcap(dev)
+            except:
+                old_bwlimit = None
+
+            if network['bwlimit'] is None:
+                new_bwlimit = bwlimit.bwmax
+            else:
+                new_bwlimit = network['bwlimit']
+
+            if old_bwlimit != new_bwlimit:
+                # reinitialize bandwidth limits
+                bwlimit.init(dev, new_bwlimit)
+
+                # XXX this should trigger an rspec refresh in case
+                # some previously invalid sliver bwlimit is now valid
+                # again, or vice-versa.
+
         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 = {}
@@ -48,6 +99,8 @@ def GetSlivers_callback(data, fullupdate=True):
             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
 
@@ -74,7 +127,7 @@ def GetSlivers_callback(data, fullupdate=True):
 def deliver_ticket(data): return GetSlivers_callback(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