# CPU parameters
'cpu_pct': 0, # percent CPU reserved
'cpu_share': 1, # proportional share
+ 'cpu_cores': "0b", # reserved cpu cores <num_cores>[b]
# 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
- # Take initscripts (global) returned by API, make dict
+ # Take initscripts (global) returned by API, build a hash scriptname->code
+ iscripts_hash = {}
if 'initscripts' not in data:
logger.log_missing_data("slivermanager.GetSlivers",'initscripts')
return
- initscripts = {}
- for is_rec in data['initscripts']:
- logger.verbose("slivermanager: initscript: %s" % is_rec['name'])
- initscripts[str(is_rec['name'])] = is_rec['script']
+ for initscript_rec in data['initscripts']:
+ logger.verbose("slivermanager: initscript: %s" % initscript_rec['name'])
+ iscripts_hash[str(initscript_rec['name'])] = initscript_rec['script']
adjustReservedSlivers (data)
for sliver in data['slivers']:
# set the vserver reference. If none, set to default.
rec.setdefault('vref', attributes.get('vref', 'default'))
- # set initscripts. first check if exists, if not, leave empty.
- is_name = attributes.get('initscript')
- if is_name is not None and is_name in initscripts:
- rec['initscript'] = initscripts[is_name]
+ ### set initscripts; set empty rec['initscript'] if not
+ # if tag 'initscript_code' is set, that's what we use
+ iscode = attributes.get('initscript_code','')
+ if iscode:
+ rec['initscript']=iscode
else:
- rec['initscript'] = ''
+ isname = attributes.get('initscript')
+ if isname is not None and isname in iscripts_hash:
+ rec['initscript'] = iscripts_hash[isname]
+ else:
+ rec['initscript'] = ''
# set delegations, if none, set empty
rec.setdefault('delegations', attributes.get("delegations", []))