import api
import api_calls
import database
-import delegate
+import controller
import logger
import sliver_vs
import string,re
'net_i2_min_rate': bwmin / 1000, # kbps
'net_i2_max_rate': bwmax / 1000, # kbps
'net_i2_share': 1, # proportional share
- 'net_max_kbyte' : 5662310, #Kbyte
- 'net_thresh_kbyte': 4529848, #Kbyte
- 'net_i2_max_kbyte': 17196646,
- 'net_i2_thresh_kbyte': 13757316,
+ 'net_max_kbyte' : 10546875, #Kbyte
+ 'net_thresh_kbyte': 9492187, #Kbyte
+ 'net_i2_max_kbyte': 31640625,
+ 'net_i2_thresh_kbyte': 28476562,
# disk space limit
'disk_max': 5000000, # bytes
# capabilities
start_requested = False # set to True in order to request that all slivers be started
@database.synchronized
-def GetSlivers(data, fullupdate=True):
+def GetSlivers(data, config = None, plc=None, 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
# convert attributes field to a proper dict
attr_dict = {}
- for attr in rec.pop('attributes'): attr_dict[attr['name']] = attr['value']
+ for attr in rec.pop('attributes'): attr_dict[attr['tagname']] = attr['value']
+ rec.setdefault("attributes", attr_dict)
# squash keys
keys = rec.pop('keys')
rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
+ ## 'Type' isn't returned by GetSlivers() for whatever reason. We're overloading
+ ## instantiation here, but i suppose its the ssame thing when you think about it. -FA
# Handle nm controller here
- rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
- if rec['instantiation'] == 'nm-controller':
- # type isn't returned by GetSlivers() for whatever reason. We're overloading
- # instantiation here, but i suppose its the ssame thing when you think about it. -FA
- rec['type'] = 'delegate'
+ if rec['instantiation'].lower() == 'nm-controller':
+ rec.setdefault('type', attr_dict.get('type', 'controller.Controller'))
+ else:
+ rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
# set the vserver reference. If none, set to default.
rec.setdefault('vref', attr_dict.get('vref', 'default'))
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.
database.db.sync()
accounts.Startingup = False
DEFAULT_ALLOCATION[resname]=default_amt
accounts.register_class(sliver_vs.Sliver_VS)
- accounts.register_class(delegate.Delegate)
+ accounts.register_class(controller.Controller)
accounts.Startingup = options.startup
database.start()
api_calls.deliver_ticket = deliver_ticket