except ImportError: bwmin, bwmax = 8, 1000*1000*1000
import accounts
import api
+import api_calls
import database
import delegate
import logger
DEFAULT_ALLOCATION = {
'enabled': 1,
# CPU parameters
- 'cpu_min': 0, # ms/s
- 'cpu_share': 32, # proportional share
+ 'cpu_pct': 0, # percent CPU reserved
+ 'cpu_share': 1, # proportional share
# bandwidth parameters
'net_min_rate': bwmin / 1000, # kbps
'net_max_rate': bwmax / 1000, # kbps
if network['is_primary'] and network['bwlimit'] is not None:
DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000
-### Emulab-specific hack begins here
-# emulabdelegate = {
-# 'instantiation': 'plc-instantiated',
-# 'keys': '''ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5Rimz6osRvlAUcaxe0YNfGsLL4XYBN6H30V3l/0alZOSXbGOgWNdEEdohwbh9E8oYgnpdEs41215UFHpj7EiRudu8Nm9mBI51ARHA6qF6RN+hQxMCB/Pxy08jDDBOGPefINq3VI2DRzxL1QyiTX0jESovrJzHGLxFTB3Zs+Y6CgmXcnI9i9t/zVq6XUAeUWeeXA9ADrKJdav0SxcWSg+B6F1uUcfUd5AHg7RoaccTldy146iF8xvnZw0CfGRCq2+95AU9rbMYS6Vid8Sm+NS+VLaAyJaslzfW+CAVBcywCOlQNbLuvNmL82exzgtl6fVzutRFYLlFDwEM2D2yvg4BQ== root@boss.emulab.net''',
- # 'name': 'utah_elab_delegate',
- # 'timestamp': data['timestamp'],
- # 'type': 'delegate',
- # 'vref': None
- # }
- # database.db.deliver_record(emulabdelegate)
-### Emulab-specific hack ends here
-
-
# Take intscripts (global) returned by API, make dict
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")
# instantiation here, but i suppose its the ssame thing when you think about it. -FA
rec['type'] = 'delegate'
+ # 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
accounts.register_class(delegate.Delegate)
accounts.Startingup = options.startup
database.start()
- api.deliver_ticket = deliver_ticket
+ api_calls.deliver_ticket = deliver_ticket
api.start()