# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: db-config,v 1.17 2007/01/17 22:35:31 mlhuang Exp $
+# $Id: db-config,v 1.21 2007/02/02 19:56:21 mlhuang Exp $
#
from plc_config import PLCConfiguration
'min_role_id': 10},
# Bandwidth limits
- {'name': "net_min",
- 'description': "Minimum bandwidth (bps)",
+ {'name': "net_min_rate",
+ 'description': "Minimum bandwidth (kbps)",
'min_role_id': 10},
- {'name': "net_max",
- 'description': "Maximum bandwidth (bps)",
+ {'name': "net_max_rate",
+ 'description': "Maximum bandwidth (kbps)",
'min_role_id': 10},
- {'name': "net_avg",
- 'description': "Average bandwidth (bps)",
+ {'name': "net_i2_min_rate",
+ 'description': "Minimum bandwidth over I2 routes (kbps)",
'min_role_id': 10},
- {'name': "net_share",
- 'description': "Number of bandwidth shares",
+ {'name': "net_i2_max_rate",
+ 'description': "Maximum bandwidth over I2 routes (kbps)",
'min_role_id': 10},
- {'name': "net2_min",
- 'description': "Minimum bandwidth over routes exempt from node bandwidth limits (bps)",
+ {'name': "net_max_kbyte",
+ 'description': "Maximum daily network Tx KByte limit.",
'min_role_id': 10},
- {'name': "net2_max",
- 'description': "Maximum bandwidth over routes exempt from node bandwidth limits (bps)",
+ {'name': "net_thresh_kbyte",
+ 'description': "KByte limit before warning and throttling.",
'min_role_id': 10},
- {'name': "net2_avg",
- 'description': "Average bandwidth over routes exempt from node bandwidth limits (bps)",
+ {'name': "net_i2_max_kbyte",
+ 'description': "Maximum daily network Tx KByte limit to I2 hosts.",
'min_role_id': 10},
- {'name': "net2_share",
- 'description': "Number of bandwidth shares over routes exempt from node bandwidth limits",
+ {'name': "net_i2_thresh_kbyte",
+ 'description': "KByte limit to I2 hosts before warning and throttling.",
'min_role_id': 10},
-
+ {'name': "net_share",
+ 'description': "Number of bandwidth shares",
+ 'min_role_id': 10},
+ {'name': "net_i2_share",
+ 'description': "Number of bandwidth shares over I2 routes",
+ 'min_role_id': 10},
+
# Disk quota
{'name': "disk_max",
'description': "Disk quota (1k disk blocks)",
else:
UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type)
- # Get contents of SSL public certificate used for signing slice tickets
- try:
- plc_ticket_pubkey = ""
- for line in file(plc_ma_sa['ca_ssl_key_pub']):
- # Skip comments
- if line[0:5] != "-----":
- # XXX The embedded newlines matter, do not strip()!
- plc_ticket_pubkey += line
- except:
- plc_ticket_pubkey = '%KEY%'
-
# Create/update system slices
legacy_slices = [
# XXX Required for old Node Manager
'expires': sys.maxint,
'attributes': [('plc_slice_type', "VServerSlice"),
('plc_agent_version', "1.0"),
- ('plc_ticket_pubkey', plc_ticket_pubkey)]},
+ ('plc_ticket_pubkey', "")]},
# XXX Required for old Node Manager
{'name': "pl_conf_vserverslice",