import logger
import api, api_calls
import database
-import accounts
+import account
import controller
import sliver_lxc
-try: from bwlimit import bwmin, bwmax
+try: from bwlimitlxc import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
priority=10
if 'reservation_policy' not in data: return
policy=data['reservation_policy']
if policy not in ['lease_or_idle', 'lease_or_shared']:
- logger.log ("unexpected reservation_policy %(policy)s"%locals())
+ if policy is not None:
+ logger.log ("unexpected reservation_policy %(policy)s"%locals())
return
logger.log("slivermanager.adjustReservedSlivers")
#for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
# DEFAULT_ALLOCATION[resname]=default_amount
- accounts.register_class(sliver_lxc.Sliver_LXC)
- accounts.register_class(controller.Controller)
+ account.register_class(sliver_lxc.Sliver_LXC)
+ account.register_class(controller.Controller)
database.start()
api_calls.deliver_ticket = deliver_ticket
api.start()