self.set_rlimit_config(limit, hard, soft, minimum)
self.set_WHITELISTED_config(self.rspec['whitelist'])
+ self.set_capabilities_config(self.rspec['capabilities'])
+ if self.rspec['capabilities']:
+ logger.log('%s: setting capabilities to %s' % (self.name, self.rspec['capabilities']))
if False: # this code was commented out before
# N.B. net_*_rate are in kbps because of XML-RPC maxint
'net_i2_thresh_kbyte': 13757316,
# disk space limit
'disk_max': 5000000, # bytes
+ # capabilities
+ 'capabilities': '',
# NOTE: this table is further populated with resource names and
# default amounts via the start() function below. This probably
rec['rspec'] = rspec
for resname, default_amt in DEFAULT_ALLOCATION.iteritems():
try: amt = int(attr_dict[resname])
- except (KeyError, ValueError): amt = default_amt
+ except KeyError: amt = default_amt
+ except ValueError:
+ if type(default_amt) is type('str'):
+ amt = attr_dict[resname]
+ else:
+ amt = default_amt
rspec[resname] = amt
# disable sliver