import logger
import api, api_calls
import database
-import accounts
+import account
import controller
import sliver_vs
# CPU parameters
'cpu_pct': 0, # percent CPU reserved
'cpu_share': 1, # proportional share
- 'cpu_cores': 0, # reserved cpu cores
+ 'cpu_cores': "0b", # reserved cpu cores <num_cores>[b]
# bandwidth parameters
'net_min_rate': bwmin / 1000, # kbps
'net_max_rate': bwmax / 1000, # kbps
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_vs.Sliver_VS)
- accounts.register_class(controller.Controller)
+ account.register_class(sliver_vs.Sliver_VS)
+ account.register_class(controller.Controller)
database.start()
api_calls.deliver_ticket = deliver_ticket
api.start()