responsible for handling delegation accounts.
"""
-# $Id: sm.py,v 1.28 2007/07/27 18:02:36 dhozac Exp $
+# $Id$
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
import accounts
import api
+import api_calls
import database
-import delegate
+import controller
import logger
import sliver_vs
import string,re
DEFAULT_ALLOCATION = {
'enabled': 1,
# CPU parameters
- 'cpu_min': 0, # percent CPU reserved
+ 'cpu_pct': 0, # percent CPU reserved
'cpu_share': 1, # proportional share
# bandwidth parameters
'net_min_rate': bwmin / 1000, # kbps
initscripts = {}
for is_rec in data['initscripts']:
logger.verbose("initscript: %s" % is_rec['name'])
- initscripts[str(is_rec['initscript_id'])] = is_rec['script']
+ initscripts[str(is_rec['name'])] = is_rec['script']
for sliver in data['slivers']:
logger.verbose("sm:GetSlivers in slivers loop")
# 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']
# squash keys
keys = rec.pop('keys')
rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
- # 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'))
- is_id = attr_dict.get('initscript')
- if is_id is not None and is_id in initscripts:
- rec['initscript'] = initscripts[is_id]
+
+ # set initscripts. first check if exists, if not, leave empty.
+ is_name = attr_dict.get('initscript')
+ if is_name is not None and is_name in initscripts:
+ rec['initscript'] = initscripts[is_name]
else:
rec['initscript'] = ''
+
+ # set delegations, if none, set empty
rec.setdefault('delegations', attr_dict.get("delegations", []))
# extract the implied rspec
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.deliver_ticket = deliver_ticket
+ api_calls.deliver_ticket = deliver_ticket
api.start()