# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: db-config,v 1.2 2006/10/27 20:25:13 mlhuang Exp $
+# $Id$
#
from plc_config import PLCConfiguration
site = { 'site_id': 1,
'name': plc['name'] + " Central",
'abbreviated_name': plc['name'],
- # XXX Default site slice_prefix/login_base must be "pl_"
- # 'login_base': plc['slice_prefix'],
- 'login_base': "pl",
+ 'login_base': plc['slice_prefix'],
'is_public': False,
'url': url,
'max_slices': 100 }
site['name']
sites = [site]
- # Must call AdmUpdateSite() even after AdmAddSite() to update max_slices
+ # Must call UpdateSite() even after AddSite() to update max_slices
site_id = sites[0]['site_id']
- # XXX login_base cannot be updated
- del site['login_base']
UpdateSite(site_id, site)
# The default administrator account must be associated with a site
'file_owner': 'root',
'file_group': 'root',
'preinstall_cmd': '',
- 'postinstall_cmd': '',
+ 'postinstall_cmd': '/bin/chmod 700 /root/.ssh',
'error_cmd': '',
'ignore_cmd_errors': False,
'always_update': False},
'file_owner': 'site_admin',
'file_group': 'site_admin',
'preinstall_cmd': 'grep -q site_admin /etc/passwd',
- 'postinstall_cmd': '',
+ 'postinstall_cmd': '/bin/chmod 700 /home/site_admin/.ssh',
'error_cmd': '',
'ignore_cmd_errors': False,
'always_update': False},
'file_owner': 'pl_admin',
'file_group': 'pl_admin',
'preinstall_cmd': 'grep -q pl_admin /etc/passwd',
- 'postinstall_cmd': '',
+ 'postinstall_cmd': '/bin/chmod 700 /home/pl_admin/.ssh',
'error_cmd': '',
'ignore_cmd_errors': False,
'always_update': False},
'ignore_cmd_errors': False,
'always_update': False},
+ # XXX Required for old Node Manager
# Node Manager configuration
{'enabled': True,
'source': 'PlanetLabConf/pl_nm.conf',
'ignore_cmd_errors': False,
'always_update': False},
+ # XXX Required for old Node Manager
# Proper configuration
{'enabled': True,
'source': 'PlanetLabConf/propd.conf',
'ignore_cmd_errors': True,
'always_update': False},
+ # XXX Required for old Node Manager
# Bandwidth cap
{'enabled': True,
'source': 'PlanetLabConf/bwlimit.php',
'postinstall_cmd': '/sbin/iptables-restore --noflush < /etc/planetlab/blacklist',
'error_cmd': '',
'ignore_cmd_errors': True,
- 'always_update': True},
+ 'always_update': False},
# /etc/issue
{'enabled': True,
'postinstall_cmd': '/sbin/sysctl -e -p /etc/sysctl.conf',
'error_cmd': '',
'ignore_cmd_errors': False,
- 'always_update': True},
+ 'always_update': False},
# Sendmail configuration
{'enabled': True,
# Setup default slice attribute types
default_attribute_types = [
# Slice type (only vserver is supported)
- {'name': "plc_slice_type",
- 'description': "Type of slice rspec to be created",
+ {'name': "type",
+ 'description': "Type of slice (e.g. vserver)",
'min_role_id': 20},
+ # System slice
+ {'name': "system",
+ 'description': "Is a default system slice (1) or not (0 or unset)",
+ 'min_role_id': 10},
+
+ # Slice enabled (1) or suspended (0)
+ {'name': "enabled",
+ 'description': "Slice enabled (1 or unset) or suspended (0)",
+ 'min_role_id': 10},
+
+ # Slice reference image
+ {'name': "vref",
+ 'description': "Reference image",
+ 'min_role_id': 30},
+
# Slice initialization script
{'name': "initscript",
- 'description': "slice initialization script",
+ 'description': "Slice initialization script",
'min_role_id': 10},
- # CPU share (general_prop_share is deprecated)
- {'name': "general_prop_share",
- 'description': "general share",
+ # CPU share
+ {'name': "cpu_min",
+ 'description': "Minimum CPU share (ms/s)",
'min_role_id': 10},
- {'name': "nm_cpu_share",
- 'description': "Number of CPU shares to be allocated to slice",
+ {'name': "cpu_share",
+ 'description': "Number of CPU shares",
'min_role_id': 10},
# Bandwidth limits
- {'name': "nm_net_min_rate",
- 'description': "Minimum network Tx bandwidth (bps)",
+ {'name': "net_min",
+ 'description': "Minimum bandwidth (bps)",
+ 'min_role_id': 10},
+ {'name': "net_max",
+ 'description': "Maximum bandwidth (bps)",
+ 'min_role_id': 10},
+ {'name': "net_avg",
+ 'description': "Average bandwidth (bps)",
'min_role_id': 10},
- {'name': "nm_net_max_rate",
- 'description': "Maximum network Tx bandwidth (bps)",
+ {'name': "net_share",
+ 'description': "Number of bandwidth shares",
'min_role_id': 10},
- {'name': "nm_net_avg_rate",
- 'description': "Average daily network Tx bandwidth (bps)",
+ {'name': "net2_min",
+ 'description': "Minimum bandwidth over routes exempt from node bandwidth limits (bps)",
'min_role_id': 10},
- {'name': "nm_net_exempt_min_rate",
- 'description': "Minimum network Tx bandwidth to Internet2 destinations (bps)",
+ {'name': "net2_max",
+ 'description': "Maximum bandwidth over routes exempt from node bandwidth limits (bps)",
'min_role_id': 10},
- {'name': "nm_net_exempt_max_rate",
- 'description': "Maximum network Tx bandwidth to Internet2 destinations (bps)",
+ {'name': "net2_avg",
+ 'description': "Average bandwidth over routes exempt from node bandwidth limits (bps)",
'min_role_id': 10},
- {'name': "nm_net_exempt avg_rate",
- 'description': "Average daily network Tx bandwidth to Internet2 destinations (bps)",
+ {'name': "net2_share",
+ 'description': "Number of bandwidth shares over routes exempt from node bandwidth limits",
'min_role_id': 10},
# Disk quota
- {'name': "nm_disk_quota",
+ {'name': "disk_max",
'description': "Disk quota (1k disk blocks)",
'min_role_id': 10},
+ # Proper operations
+ {'name': "proper_op",
+ 'description': "Proper operation (e.g. bind_socket)",
+ 'min_role_id': 10},
+
+ # XXX Required for old Node Manager
# Special attributes applicable to Slice Creation Service (pl_conf) slice
+ {'name': "plc_slice_type",
+ 'description': "Type of slice rspec to be created",
+ 'min_role_id': 20},
{'name': "plc_agent_version",
'description': "Version of PLC agent (slice creation service) software to be deployed",
'min_role_id': 10},
# Create/update system slices
default_slices = [
+ # XXX Required for old Node Manager
{'name': "pl_conf",
'description': "PlanetLab Slice Creation Service (SCS)",
'url': url,
'instantiation': "plc-instantiated",
# Renew forever
'expires': sys.maxint,
- 'attributes': {'plc_slice_type': "VServerSlice",
- 'plc_agent_version': "1.0",
- 'plc_ticket_pubkey': plc_ticket_pubkey}},
+ 'attributes': [('plc_slice_type', "VServerSlice"),
+ ('plc_agent_version', "1.0"),
+ ('plc_ticket_pubkey', plc_ticket_pubkey)]},
+
+ # XXX Required for old Node Manager
{'name': "pl_conf_vserverslice",
'description': "Default attributes for vserver slices",
'url': url,
'instantiation': "plc-instantiated",
# Renew forever
'expires': sys.maxint,
- 'attributes': {'nm_cpu_share': "32",
- 'plc_slice_type': "VServerSlice",
- 'nm_disk_quota': "5000000"}}]
+ 'attributes': [('cpu_share', "32"),
+ ('plc_slice_type', "VServerSlice"),
+ ('disk_max', "5000000")]},
+
+ # PlanetFlow
+ {'name': plc['slice_prefix'] + "_netflow",
+ 'description': "PlanetFlow Traffic Auditing Service",
+ 'url': url,
+ 'instantiation': "plc-instantiated",
+ # Renew forever
+ 'expires': sys.maxint,
+ 'attributes': [('system', "1"),
+ ('vref', "planetflow"),
+ ('proper_op', "open file=/etc/passwd, flags=r"),
+ ('proper_op', "create_socket"),
+ ('proper_op', "bind_socket")]},
+ ]
+
for default_slice in default_slices:
- slice = GetSlices([default_slice['name']])[0]
- if slice:
- UpdateSlice(default_slice['name'], default_slice)
+ slices = GetSlices([default_slice['name']])
+ if slices:
+ slice = slices[0]
+ UpdateSlice(slice['slice_id'], default_slice)
else:
- AddSlice(slice)
+ AddSlice(default_slice)
slice = GetSlices([default_slice['name']])[0]
# Create/update all attributes
- slice_attributes = {}
+ slice_attributes = []
if slice['slice_attribute_ids']:
+ # Delete unknown attributes
for slice_attribute in GetSliceAttributes(slice['slice_attribute_ids']):
- slice_attributes[slice_attribute['name']] = slice_attribute
-
- for name, value in default_slice['attributes'].iteritems():
- if name not in slice_attributes:
+ if (slice_attribute['name'], slice_attribute['value']) \
+ not in default_slice['attributes']:
+ DeleteSliceAttribute(slice_attribute['slice_attribute_id'])
+ else:
+ slice_attributes.append((slice_attribute['name'], slice_attribute['value']))
+
+ for (name, value) in default_slice['attributes']:
+ if (name, value) not in slice_attributes:
AddSliceAttribute(slice['name'], name, value)
- else:
- UpdateSliceAttribute(slice_attributes[name]['slice_attribute_id'], value)
if __name__ == '__main__':
main()
+
+# Local variables:
+# tab-width: 4
+# mode: python
+# End:
git://git.onelab.eu / myplc.git / blobdiff