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

[nodemanager.git] / sm.py

diff --git a/sm.py b/sm.py
index 9f38902..cdb42ee 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -7,14 +7,14 @@ also to make inter-sliver resource loans.  The sliver manager is also
 responsible for handling delegation accounts.
 """
 
-import bwlimit
+try: from bwlimit import bwmin, bwmax
+except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 import accounts
 import api
 import database
 import delegate
 import logger
 import sliver_vs
-import sioc
 
 
 DEFAULT_ALLOCATION = {
@@ -23,13 +23,13 @@ DEFAULT_ALLOCATION = {
     'cpu_min': 0, # ms/s
     'cpu_share': 32, # proportional share
     # bandwidth parameters
-    'net_min': bwlimit.bwmin, # bps
-    'net_max': bwlimit.bwmax, # bps
+    'net_min_rate': bwmin, # bps
+    'net_max_rate': 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
+    'net_i2_min_rate': bwmin, # bps
+    'net_i2_max_rate': bwmax, # bps
+    'net_i2_share': 1, # proportional share
     'disk_max': 5000000 # bytes
     }
 
@@ -37,8 +37,11 @@ start_requested = False  # set to True in order to request that all slivers be s
 
 
 @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:
@@ -47,72 +50,33 @@ 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'])
-
-            # 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(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
@@ -124,7 +88,7 @@ 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, config):