From: Mark Huang Date: Fri, 27 Oct 2006 20:25:37 +0000 (+0000) Subject: - convert to new_plc_api as best as possible X-Git-Tag: planetlab-4_0-rc1~92 X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=bdc3b2afbe0007b7e8de74039143e582ebe82485 - convert to new_plc_api as best as possible --- diff --git a/db-config b/db-config index 1df4ba6..833657a 100755 --- a/db-config +++ b/db-config @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env /usr/bin/plcsh # # Bootstraps the PLC database with a default administrator account and # a default site, defines default slice attribute types, and @@ -7,15 +7,12 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: api-config,v 1.12 2006/05/30 15:06:20 mlhuang Exp $ +# $Id: db-config,v 1.1 2006/06/23 20:33:44 mlhuang Exp $ # -import plcapilib -(plcapi, moreopts, argv) = plcapilib.plcapi(globals()) from plc_config import PLCConfiguration import sys - def main(): cfg = PLCConfiguration() cfg.load() @@ -33,18 +30,18 @@ def main(): 'last_name': "Administrator", 'email': plc['root_user'], 'password': plc['root_password'] } - persons = AdmGetPersons([admin['person_id']]) + persons = GetPersons([admin['person_id']]) if not persons: - person_id = AdmAddPerson(admin['first_name'], admin['last_name'], admin) + person_id = AddPerson(admin) if person_id != admin['person_id']: # Huh? Someone deleted the account manually from the database. - AdmDeletePerson(person_id) + DeletePerson(person_id) raise Exception, "Someone deleted the \"%s %s\" account from the database!" % \ (admin['first_name'], admin['last_name']) - AdmSetPersonEnabled(person_id, True) + UpdatePerson(person_id, { 'enabled': True }) else: person_id = persons[0]['person_id'] - AdmUpdatePerson(person_id, admin) + UpdatePerson(person_id, admin) # Create/update the default site (should be site_id 1) if plc_www['port'] == '80': @@ -63,11 +60,11 @@ def main(): 'url': url, 'max_slices': 100 } - sites = AdmGetSites([site['site_id']]) + sites = GetSites([site['site_id']]) if not sites: - site_id = AdmAddSite(site['name'], site['abbreviated_name'], site['login_base'], site) + site_id = AddSite(site['name'], site['abbreviated_name'], site['login_base'], site) if site_id != site['site_id']: - AdmDeleteSite(site_id) + DeleteSite(site_id) raise Exception, "Someone deleted the \"%s\" site from the database!" % \ site['name'] sites = [site] @@ -76,21 +73,21 @@ def main(): site_id = sites[0]['site_id'] # XXX login_base cannot be updated del site['login_base'] - AdmUpdateSite(site_id, site) + UpdateSite(site_id, site) # The default administrator account must be associated with a site # in order to login. - AdmAddPersonToSite(admin['person_id'], site['site_id']) - AdmSetPersonPrimarySite(admin['person_id'], site['site_id']) + AddPersonToSite(admin['person_id'], site['site_id']) + SetPersonPrimarySite(admin['person_id'], site['site_id']) # Grant admin and PI roles to the default administrator account - AdmGrantRoleToPerson(admin['person_id'], 10) - AdmGrantRoleToPerson(admin['person_id'], 20) + AddRoleToPerson(10, admin['person_id']) + AddRoleToPerson(20, admin['person_id']) # Setup default PlanetLabConf entries default_conf_files = [ # NTP configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/ntpconf.php', 'dest': '/etc/ntp.conf', 'file_permissions': '644', @@ -99,9 +96,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/rc.d/init.d/ntpd restart', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/ntptickers.php', 'dest': '/etc/ntp/step-tickers', 'file_permissions': '644', @@ -110,11 +107,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/rc.d/init.d/ntpd restart', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # SSH server configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/sshd_config', 'dest': '/etc/ssh/sshd_config', 'file_permissions': '600', @@ -123,11 +120,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/init.d/sshd restart', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Administrative SSH keys - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/keys.php?root', 'dest': '/root/.ssh/authorized_keys', 'file_permissions': '644', @@ -136,9 +133,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/keys.php?site_admin', 'dest': '/home/site_admin/.ssh/authorized_keys', 'file_permissions': '644', @@ -147,9 +144,9 @@ def main(): 'preinstall_cmd': 'grep -q site_admin /etc/passwd', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/keys.php?role=admin', 'dest': '/home/pl_admin/.ssh/authorized_keys', 'file_permissions': '644', @@ -158,11 +155,11 @@ def main(): 'preinstall_cmd': 'grep -q pl_admin /etc/passwd', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Log rotation configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/logrotate.conf', 'dest': '/etc/logrotate.conf', 'file_permissions': '644', @@ -171,11 +168,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # updatedb/locate nightly cron job - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/slocate.cron', 'dest': '/etc/cron.daily/slocate.cron', 'file_permissions': '755', @@ -184,11 +181,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # YUM configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/yum.conf.php?gpgcheck=1', 'dest': '/etc/yum.conf', 'file_permissions': '644', @@ -197,9 +194,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/delete-rpm-list-production', 'dest': '/etc/planetlab/delete-rpm-list', 'file_permissions': '644', @@ -208,11 +205,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # PLC configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/get_plc_config.php', 'dest': '/etc/planetlab/plc_config', 'file_permissions': '644', @@ -221,9 +218,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/get_plc_config.php?python', 'dest': '/etc/planetlab/plc_config.py', 'file_permissions': '644', @@ -232,9 +229,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/get_plc_config.php?perl', 'dest': '/etc/planetlab/plc_config.pl', 'file_permissions': '644', @@ -243,9 +240,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/get_plc_config.php?php', 'dest': '/etc/planetlab/php/plc_config.php', 'file_permissions': '644', @@ -254,11 +251,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Node Manager configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/pl_nm-v3.conf', 'dest': '/etc/planetlab/pl_nm.conf', 'file_permissions': '644', @@ -267,9 +264,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/init.d/pl_nm restart', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/RootResources/plc_slice_pool.php', 'dest': '/home/pl_nm/RootResources/plc_slice_pool', 'file_permissions': '644', @@ -278,9 +275,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/RootResources/pl_conf.py', 'dest': '/home/pl_nm/RootResources/pl_conf', 'file_permissions': '644', @@ -289,9 +286,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/init.d/pl_nm restart', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/RootResources/pl_netflow.py', 'dest': '/home/pl_nm/RootResources/pl_netflow', 'file_permissions': '644', @@ -300,11 +297,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Proper configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/propd-NM-1.0.conf', 'dest': '/etc/proper/propd.conf', 'file_permissions': '644', @@ -313,11 +310,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/init.d/proper restart', 'error_cmd': '', - 'ignore_cmd_errors': 1, - 'always_update': 0}, + 'ignore_cmd_errors': True, + 'always_update': False}, # Bandwidth cap - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/bwlimit.php', 'dest': '/etc/planetlab/bwcap', 'file_permissions': '644', @@ -326,11 +323,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/etc/init.d/pl_nm restart', 'error_cmd': '', - 'ignore_cmd_errors': 1, - 'always_update': 0}, + 'ignore_cmd_errors': True, + 'always_update': False}, # Proxy ARP setup - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/proxies.php', 'dest': '/etc/planetlab/proxies', 'file_permissions': '644', @@ -339,11 +336,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Firewall configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/iptables', 'dest': '/etc/sysconfig/iptables', 'file_permissions': '600', @@ -352,9 +349,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/blacklist.php', 'dest': '/etc/planetlab/blacklist', 'file_permissions': '600', @@ -363,11 +360,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/sbin/iptables-restore --noflush < /etc/planetlab/blacklist', 'error_cmd': '', - 'ignore_cmd_errors': 1, - 'always_update': 1}, + 'ignore_cmd_errors': True, + 'always_update': True}, # /etc/issue - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/issue.php', 'dest': '/etc/issue', 'file_permissions': '644', @@ -376,11 +373,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Kernel parameters - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/sysctl.php', 'dest': '/etc/sysctl.conf', 'file_permissions': '644', @@ -389,11 +386,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/sbin/sysctl -e -p /etc/sysctl.conf', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 1}, + 'ignore_cmd_errors': False, + 'always_update': True}, # Sendmail configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/alpha-sendmail.mc', 'dest': '/etc/mail/sendmail.mc', 'file_permissions': '644', @@ -402,9 +399,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/alpha-sendmail.cf', 'dest': '/etc/mail/sendmail.cf', 'file_permissions': '644', @@ -413,11 +410,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': 'service sendmail restart', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # GPG signing keys - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/RPM-GPG-KEY-fedora', 'dest': '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora', 'file_permissions': '644', @@ -426,9 +423,9 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': 'rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, - {'enabled': 1, + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/get_gpg_key.php', 'dest': '/etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab', 'file_permissions': '644', @@ -437,11 +434,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': 'rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-planetlab', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # Ping of death configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/ipod.conf.php', 'dest': '/etc/ipod.conf', 'file_permissions': '644', @@ -450,11 +447,11 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}, + 'ignore_cmd_errors': False, + 'always_update': False}, # sudo configuration - {'enabled': 1, + {'enabled': True, 'source': 'PlanetLabConf/v3-sudoers.php', 'dest': '/etc/sudoers', 'file_permissions': '440', @@ -463,143 +460,92 @@ def main(): 'preinstall_cmd': '', 'postinstall_cmd': '/usr/sbin/visudo -c', 'error_cmd': '', - 'ignore_cmd_errors': 0, - 'always_update': 0}] + 'ignore_cmd_errors': False, + 'always_update': False} + ] # Get list of existing (enabled, global) files - conf_files = AdmGetConfFile() + conf_files = GetConfFiles() conf_files = filter(lambda conf_file: conf_file['enabled'] and \ - not conf_file['node_id'] and \ - not conf_file['nodegroup_id'], + not conf_file['node_ids'] and \ + not conf_file['nodegroup_ids'], conf_files) dests = [conf_file['dest'] for conf_file in conf_files] conf_files = dict(zip(dests, conf_files)) # Create/update default PlanetLabConf entries for default_conf_file in default_conf_files: + print "Considering", default_conf_file['dest'] if default_conf_file['dest'] not in dests: - AdmCreateConfFile(default_conf_file['enabled'], - default_conf_file['source'], - default_conf_file['dest'], - default_conf_file['file_permissions'], - default_conf_file['file_owner'], - default_conf_file['file_group'], - default_conf_file['preinstall_cmd'], - default_conf_file['postinstall_cmd'], - default_conf_file['error_cmd'], - default_conf_file['ignore_cmd_errors'], - default_conf_file['always_update']) + AddConfFile(default_conf_file) else: conf_file = conf_files[default_conf_file['dest']] - AdmUpdateConfFile(conf_file['conf_file_id'], default_conf_file) + UpdateConfFile(conf_file['conf_file_id'], default_conf_file) # 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", - 'is_exclusive': True, 'min_role_id': 20, 'max_per_slice': 1, - 'value_fields': [{'description': "rspec class", - 'name': "type", - 'type': "string"}]}, + 'min_role_id': 20}, # Slice initialization script {'name': "initscript", 'description': "slice initialization script", - 'is_exclusive': False, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "", - 'name': "initscript_id", - 'type': "integer"}]}, + 'min_role_id': 10}, # CPU share (general_prop_share is deprecated) {'name': "general_prop_share", 'description': "general share", - 'is_exclusive': False, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "", - 'name': "general_prop_share", - 'type': "integer"}]}, + 'min_role_id': 10}, {'name': "nm_cpu_share", 'description': "Number of CPU shares to be allocated to slice", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "number of shares", - 'name': "cpu_share", - 'type': "integer"}]}, + 'min_role_id': 10}, # Bandwidth limits {'name': "nm_net_min_rate", - 'description': "Minimum network Tx bandwidth", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "rate (bps)", - 'name': "rate", - 'type': "integer"}]}, + 'description': "Minimum network Tx bandwidth (bps)", + 'min_role_id': 10}, {'name': "nm_net_max_rate", - 'description': "Maximum network Tx bandwidth", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "rate (bps)", - 'name': "rate", - 'type': "integer"}]}, + 'description': "Maximum network Tx bandwidth (bps)", + 'min_role_id': 10}, {'name': "nm_net_avg_rate", - 'description': "Average daily network Tx bandwidth", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "rate (bps)", - 'name': "rate", - 'type': "integer"}]}, + 'description': "Average daily network Tx bandwidth (bps)", + 'min_role_id': 10}, {'name': "nm_net_exempt_min_rate", - 'description': "Minimum network Tx bandwidth to Internet2 destinations", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "rate (bps)", - 'name': "rate", - 'type': "integer"}]}, + 'description': "Minimum network Tx bandwidth to Internet2 destinations (bps)", + 'min_role_id': 10}, {'name': "nm_net_exempt_max_rate", - 'description': "Maximum network Tx bandwidth to Internet2 destinations", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "rate (bps)", - 'name': "rate", - 'type': "integer"}]}, + 'description': "Maximum network Tx bandwidth to Internet2 destinations (bps)", + 'min_role_id': 10}, {'name': "nm_net_exempt avg_rate", - 'description': "Average daily network Tx bandwidth to Internet2 destinations", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "rate (bps)", - 'name': "rate", - 'type': "integer"}]}, + 'description': "Average daily network Tx bandwidth to Internet2 destinations (bps)", + 'min_role_id': 10}, # Disk quota {'name': "nm_disk_quota", - 'description': "Disk quota", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "Number of 1k disk blocks", - 'name': "quota", - 'type': "integer"}]}, + 'description': "Disk quota (1k disk blocks)", + 'min_role_id': 10}, # Special attributes applicable to Slice Creation Service (pl_conf) slice {'name': "plc_agent_version", 'description': "Version of PLC agent (slice creation service) software to be deployed", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "current version of PLC agent (SCS)", - 'name': "version", - 'type': "string"}]}, + 'min_role_id': 10}, {'name': "plc_ticket_pubkey", 'description': "Public key used to verify PLC-signed tickets", - 'is_exclusive': True, 'min_role_id': 10, 'max_per_slice': 1, - 'value_fields': [{'description': "PEM-encoded public key", - 'name': "key", - 'type': "string"}]}] + 'min_role_id': 10} + ] # Get list of existing attribute types - attribute_types = SliceAttributeTypeList() + attribute_types = GetSliceAttributeTypes() + attribute_types = [attribute_type['name'] for attribute_type in attribute_types] # Create/update default slice attribute types for default_attribute_type in default_attribute_types: if default_attribute_type['name'] not in attribute_types: - SliceAttributeTypeCreate(default_attribute_type['name'], - default_attribute_type['description'], - default_attribute_type['min_role_id'], - default_attribute_type['max_per_slice'], - default_attribute_type['is_exclusive'], - default_attribute_type['value_fields']) + AddSliceAttributeType(default_attribute_type) else: - # XXX No way to update slice attribute types - pass + UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type) # Get contents of SSL public certificate used for signing slice tickets try: @@ -616,27 +562,29 @@ def main(): slices = [{'name': "pl_conf", 'description': "PlanetLab Slice Creation Service (SCS)", 'url': url, - 'attributes': {'plc_slice_type': {'type': "VServerSlice"}, - 'plc_agent_version': {'version': "1.0"}, - 'plc_ticket_pubkey': {'key': plc_ticket_pubkey}}}, + 'instantiation': "plc-instantiated", + # Renew forever + 'expires': sys.maxint, + 'attributes': {'plc_slice_type': "VServerSlice", + 'plc_agent_version': "1.0", + 'plc_ticket_pubkey': plc_ticket_pubkey}}, {'name': "pl_conf_vserverslice", 'description': "Default attributes for vserver slices", 'url': url, - 'attributes': {'nm_cpu_share': {'cpu_share': 32}, - 'plc_slice_type': {'type': "VServerSlice"}, - 'nm_disk_quota': {'quota': 5000000}}}] + 'instantiation': "plc-instantiated", + # Renew forever + 'expires': sys.maxint, + 'attributes': {'nm_cpu_share': "32", + 'plc_slice_type': "VServerSlice", + 'nm_disk_quota': "5000000"}}] for slice in slices: try: - SliceInfo([slice['name']]) + UpdateSlice(slice['name'], slice) except: - SliceCreate(slice['name']) - SliceSetInstantiationMethod(slice['name'], 'plc-instantiated') - SliceUpdate(slice['name'], slice['url'], slice['description']) - # Renew forever - SliceRenew(slice['name'], sys.maxint) + AddSlice(slice) # Create/update all attributes - for attribute, values in slice['attributes'].iteritems(): - SliceAttributeSet(slice['name'], attribute, values) + for attribute, value in slice['attributes'].iteritems(): + AddSliceAttribute(slice['name'], attribute, value) if __name__ == '__main__': diff --git a/dns-config b/dns-config index bc2bf46..b018558 100755 --- a/dns-config +++ b/dns-config @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env /usr/bin/plcsh # # Writes IP addresses and hostnames of PlanetLab nodes to # /etc/plc_hosts. Useful for dnsmasq, specify "addn-hosts @@ -7,11 +7,9 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: api-config,v 1.10 2006/05/24 03:08:55 mlhuang Exp $ +# $Id: dns-config,v 1.1 2006/05/26 19:57:30 mlhuang Exp $ # -import plcapilib -(plcapi, moreopts, argv) = plcapilib.plcapi(globals()) from plc_config import PLCConfiguration import os, sys @@ -53,24 +51,29 @@ def main(): # Get the primary IP address for each node hosts = {} - nodes = AdmGetNodes([], ['node_id', 'hostname']) - plcapi.begin() - for node in nodes: - AdmGetAllNodeNetworks(node['node_id']) - nodenetworks_list = plcapi.commit() - if nodenetworks_list is not None: - for i, nodenetworks in enumerate(nodenetworks_list): - for nodenetwork in nodenetworks: - if nodenetwork['hostname']: - hostname = nodenetwork['hostname'] - else: - hostname = nodes[i]['hostname'] - - if hosts.has_key(nodenetwork['ip']): - if hostname not in hosts[nodenetwork['ip']]: - hosts[nodenetwork['ip']].append(hostname) - else: - hosts[nodenetwork['ip']] = [hostname] + + nodes = {} + for node in GetNodes(): + nodes[node['node_id']] = node + + nodenetwork_ids = set() + for node in nodes.values(): + nodenetwork_ids.update(node['nodenetwork_ids']) + + for nodenetwork in GetNodeNetworks(list(nodenetwork_ids)): + if not nodenetwork['ip']: + continue + + if nodenetwork['hostname']: + hostname = nodenetwork['hostname'] + else: + hostname = nodes[nodenetwork['node_id']]['hostname'] + + if hosts.has_key(nodenetwork['ip']): + if hostname not in hosts[nodenetwork['ip']]: + hosts[nodenetwork['ip']].append(hostname) + else: + hosts[nodenetwork['ip']] = [hostname] # Write /etc/plc_hosts plc_hosts = open("/etc/plc_hosts", "w")