- 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'])
+ t = type(default_amt)
+ amt = t.__new__(t, attr_dict[resname])
+ except (KeyError, ValueError): amt = default_amt
+ rspec[resname] = amt
+
+ # add in sysctl attributes into the rspec
+ for key in attr_dict.keys():
+ if key.find("sysctl.") == 0:
+ rspec[key] = attr_dict[key]
+
+ database.db.deliver_record(rec)
+ if fullupdate: database.db.set_min_timestamp(data['timestamp'])
+ # slivers are created here.