add steps to build and install Monitor docs into plc
[myplc.git] / db-config
index 146e7b4..4a1a22d 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -7,11 +7,12 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: db-config 7454 2007-12-11 18:55:00Z faiyaza $
+# $Id$
 # $HeadURL$
 
 from plc_config import PLCConfiguration
 import sys
+import resource
 
 def main():
     cfg = PLCConfiguration()
@@ -80,6 +81,215 @@ def main():
     AddRoleToPerson(10, admin['person_id'])
     AddRoleToPerson(20, admin['person_id'])
 
+    #################### node tags
+    default_node_types = [
+        { 'tagname' : 'arch',
+          'description' : 'architecture name',
+          'category' : 'node/config', 
+          'min_role_id' : 40} ,
+        { 'tagname' : 'pldistro',
+          'description' : 'PlanetLab distribution',
+          'category' : 'node/config', 
+          'min_role_id' : 10} ,
+        { 'tagname' : 'deployment',
+          'description' : 'typically "alpha", "beta", or "production"',
+          'category' : 'node/operation', 
+          'min_role_id' : 10} ,
+        ]
+
+    #################### interface settings
+    # xxx this should move to PLC/Accessors
+
+    # Setup default slice attribute types
+    default_setting_types = [
+        {'category' : "interface/general",
+         'tagname' : "ifname",
+         'description': "Set interface name, instead of eth0 or the like",
+         'min_role_id' : 40},
+        {'category' : "interface/multihome",
+         'tagname' : "alias",
+         'description': "Specifies that the network is used for multihoming",
+         'min_role_id' : 40},
+
+        {'category' : "interface/hidden",
+         'tagname' : "backdoor",
+         'description': "For testing new settings",
+         'min_role_id' : 10},
+        ] + [
+        { 'category' : "interface/wifi",
+          'tagname' : x,
+          'description' : "802.11 %s -- see %s"%(y,z),
+          'min_role_id' : 40 } for (x,y,z) in [
+            ("mode","Mode","iwconfig"),
+            ("essid","ESSID","iwconfig"),
+            ("nw","Network Id","iwconfig"),
+            ("freq","Frequency","iwconfig"),
+            ("channel","Channel","iwconfig"),
+            ("sens","sensitivity threshold","iwconfig"),
+            ("rate","Rate","iwconfig"),
+            ("key","key","iwconfig key"),
+            ("key1","key1","iwconfig key [1]"),
+            ("key2","key2","iwconfig key [2]"),
+            ("key3","key3","iwconfig key [3]"),
+            ("key4","key4","iwconfig key [4]"),
+            ("securitymode","Security mode","iwconfig enc"),
+            ("iwconfig","Additional parameters to iwconfig","ifup-wireless"),
+            ("iwpriv","Additional parameters to iwpriv","ifup-wireless"),
+            ]
+        ]
+
+    #################### slice attributes
+    # xxx this should move to PLC/Accessors
+
+    # Setup default slice attribute types
+    default_attribute_types = [
+        # Slice type (only vserver is supported)
+        {'tagname': "type",
+         'description': "Type of slice (e.g. vserver)",
+         'category' : 'slice/general',
+         'min_role_id': 20},
+
+        # System slice
+        {'tagname': "system",
+         'description': "Is a default system slice (1) or not (0 or unset)",
+         'category' : 'slice/general',
+         'min_role_id': 10},
+
+        # Slice enabled (1) or suspended (0)
+        {'tagname': "enabled",
+         'description': "Slice enabled (1 or unset) or suspended (0)",
+         'category' : 'slice/general',
+         'min_role_id': 10},
+
+        # Slice reference image
+        {'tagname': "vref",
+         'description': "Reference image",
+         'category' : 'slice/config',
+         'min_role_id': 30},
+
+        # Slice initialization script
+        {'tagname': "initscript",
+         'description': "Slice initialization script",
+         'category' : 'slice/config',
+         'min_role_id': 10},
+
+        # CPU share
+        {'tagname': "cpu_pct",
+         'description': "Reserved CPU percent",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "cpu_share",
+         'description': "Number of CPU shares",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+
+        # Bandwidth limits
+        {'tagname': "net_min_rate",
+         'description': "Minimum bandwidth (kbps)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_max_rate",
+         'description': "Maximum bandwidth (kbps)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_i2_min_rate",
+         'description': "Minimum bandwidth over I2 routes (kbps)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_i2_max_rate",
+         'description': "Maximum bandwidth over I2 routes (kbps)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_max_kbyte",
+         'description': "Maximum daily network Tx KByte limit.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_thresh_kbyte",
+         'description': "KByte limit before warning and throttling.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_i2_max_kbyte",
+         'description': "Maximum daily network Tx KByte limit to I2 hosts.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_i2_thresh_kbyte",
+         'description': "KByte limit to I2 hosts before warning and throttling.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_share",
+         'description': "Number of bandwidth shares",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        {'tagname': "net_i2_share",
+         'description': "Number of bandwidth shares over I2 routes",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+        # Disk quota
+        {'tagname': "disk_max",
+         'description': "Disk quota (1k disk blocks)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+
+        # Proper operations
+        {'tagname': "proper_op",
+         'description': "Proper operation (e.g. bind_socket)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+
+        # VServer capabilities 
+        {'tagname': "capabilities",
+         'description': "VServer bcapabilities (separate by commas)",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+
+        # Vsys
+        {'tagname': "vsys",
+         'description': "Bind vsys script fd's to a slice's vsys directory.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+
+        # CoDemux
+        {'tagname': "codemux",
+         'description': "Demux HTTP between slices using localhost ports. Value in the form 'host, localhost port'.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10},
+
+        # Delegation
+        {'tagname': "delegations",
+         'description': "Coma seperated list of slices to give delegation authority to.",
+         'category' : 'slice/rspec',
+         'min_role_id': 10}
+
+        ]
+
+    # add in the platform supported rlimits to the default_attribute_types
+    for entry in resource.__dict__.keys() + ["VLIMIT_OPENFD"]:
+        if entry.find("LIMIT_")==1:
+            rlim = entry[len("RLIMIT_"):]
+            rlim = rlim.lower()
+            for ty in ("min","soft","hard"):
+                attribute = {
+                    'tagname': "%s_%s"%(rlim,ty),
+                    'description': "Per sliver RLIMIT %s_%s."%(rlim,ty),
+                    'category': 'slice/limit',
+                    'min_role_id': 10 #admin
+                    }
+                default_attribute_types.append(attribute)
+
+    # Get list of existing tag types
+    known_tag_types = [tag_type['tagname'] for tag_type in GetTagTypes()]
+
+    all_default_types = default_node_types + default_setting_types + default_attribute_types
+    # Create/update default slice tag types
+    for default_tag_type in all_default_types:
+        if default_tag_type['tagname'] not in known_tag_types:
+            AddTagType(default_tag_type)
+        else:
+            UpdateTagType(default_tag_type['tagname'], default_tag_type)
+
+    #################### conf files
+
     # Setup default PlanetLabConf entries
     default_conf_files = [
         # NTP configuration
@@ -170,16 +380,27 @@ def main():
 
         # YUM configuration
         {'enabled': True,
-         'source': 'PlanetLabConf/yum.conf.php?gpgcheck=1',
+         'source': 'yum/myplc.repo.php?gpgcheck=1',
+         'dest': '/etc/yum.myplc.d/myplc.repo',
+         'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
+         'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
+         'ignore_cmd_errors': False,
+         'always_update': False},
+        {'enabled': True,
+         'source': 'yum/yum.conf',
          'dest': '/etc/yum.conf',
-         'file_permissions': '644',
-         'file_owner': 'root',
-         'file_group': 'root',
-         'preinstall_cmd': '',
-         'postinstall_cmd': '',
-         'error_cmd': '',
+         'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
+         'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
+         'ignore_cmd_errors': False,
+         'always_update': False},
+        {'enabled': True,
+         'source': 'yum/stock.repo',
+         'dest': '/etc/yum.myplc.d/stock.repo',
+         'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
+         'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
          'ignore_cmd_errors': False,
          'always_update': False},
+
         {'enabled': True,
          'source': 'PlanetLabConf/delete-rpm-list-production',
          'dest': '/etc/planetlab/delete-rpm-list',
@@ -238,34 +459,6 @@ def main():
          'ignore_cmd_errors': False,
          'always_update': False},
 
-        # XXX Required for old Node Manager
-        # Proper configuration
-        {'enabled': True,
-         'source': 'PlanetLabConf/propd.conf',
-         'dest': '/etc/proper/propd.conf',
-         'file_permissions': '644',
-         'file_owner': 'root',
-         'file_group': 'root',
-         'preinstall_cmd': '',
-         'postinstall_cmd': '/etc/init.d/proper restart',
-         'error_cmd': '',
-         'ignore_cmd_errors': True,
-         'always_update': False},
-
-        # XXX Required for old Node Manager
-        # Bandwidth cap
-        {'enabled': True,
-         'source': 'PlanetLabConf/bwlimit.php',
-         'dest': '/etc/planetlab/bwcap',
-         'file_permissions': '644',
-         'file_owner': 'root',
-         'file_group': 'root',
-         'preinstall_cmd': '',
-         'postinstall_cmd': '',
-         'error_cmd': '',
-         'ignore_cmd_errors': True,
-         'always_update': False},
-
         # Proxy ARP setup
         {'enabled': True,
          'source': 'PlanetLabConf/proxies.php',
@@ -280,17 +473,6 @@ def main():
          'always_update': False},
 
         # Firewall configuration
-        {'enabled': True,
-         'source': 'PlanetLabConf/iptables',
-         'dest': '/etc/sysconfig/iptables',
-         'file_permissions': '600',
-         'file_owner': 'root',
-         'file_group': 'root',
-         'preinstall_cmd': '',
-         'postinstall_cmd': '',
-         'error_cmd': '',
-         'ignore_cmd_errors': False,
-         'always_update': False},
         {'enabled': True,
          'source': 'PlanetLabConf/blacklist.php',
          'dest': '/etc/planetlab/blacklist',
@@ -393,7 +575,7 @@ def main():
 
         # sudo configuration
         {'enabled': True,
-         'source': 'PlanetLabConf/sudoers',
+         'source': 'PlanetLabConf/sudoers.php',
          'dest': '/etc/sudoers',
          'file_permissions': '440',
          'file_owner': 'root',
@@ -422,113 +604,22 @@ def main():
             conf_file = conf_files[default_conf_file['dest']]
             UpdateConfFile(conf_file['conf_file_id'], default_conf_file)
 
-    # Setup default slice attribute types
-    default_attribute_types = [
-        # Slice type (only vserver is supported)
-        {'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",
-         'min_role_id': 10},
-
-        # CPU share
-        {'name': "cpu_pct",
-         'description': "Reserved CPU percent",
-         'min_role_id': 10},
-        {'name': "cpu_share",
-         'description': "Number of CPU shares",
-         'min_role_id': 10},
-
-        # Bandwidth limits
-        {'name': "net_min_rate",
-         'description': "Minimum bandwidth (kbps)",
-         'min_role_id': 10},
-        {'name': "net_max_rate",
-         'description': "Maximum bandwidth (kbps)",
-         'min_role_id': 10},
-        {'name': "net_i2_min_rate",
-         'description': "Minimum bandwidth over I2 routes (kbps)",
-         'min_role_id': 10},
-        {'name': "net_i2_max_rate",
-         'description': "Maximum bandwidth over I2 routes (kbps)",
-         'min_role_id': 10},
-        {'name': "net_max_kbyte",
-         'description': "Maximum daily network Tx KByte limit.",
-         'min_role_id': 10},
-        {'name': "net_thresh_kbyte",
-         'description': "KByte limit before warning and throttling.",
-         'min_role_id': 10},
-        {'name': "net_i2_max_kbyte",
-         'description': "Maximum daily network Tx KByte limit to I2 hosts.",
-         'min_role_id': 10},
-        {'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)",
-         'min_role_id': 10},
-
-        # Proper operations
-        {'name': "proper_op",
-         'description': "Proper operation (e.g. bind_socket)",
-         'min_role_id': 10},
-
-        # VServer capabilities 
-        {'name': "capabilities",
-         'description': "VServer bcapabilities (separate by commas)",
-         'min_role_id': 10},
-
-               # Vsys
-        {'name': "vsys",
-         'description': "Bind vsys script fd's to a slice's vsys directory.",
-         'min_role_id': 10}
-        ]
-
-    # Get list of existing attribute types
-    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:
-            AddSliceAttributeType(default_attribute_type)
-        else:
-            UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type)
+    #################### initscripts
 
     # Default Initscripts
-    default_initscripts = [
-        # Sirius 
-        {'enabled': True, 
-         'name': plc['slice_prefix'] + "_sirius", 
-         'script': '#!/usr/bin/python\n\n"""The Sirius Calendar Service.\n\nThis Python program runs on each node.  It periodically downloads the schedule file and uses NodeManager\'s XML-RPC interface to adjust the priority increase.\n\nAuthor: David Eisenstat (deisenst@cs.princeton.edu)\n\nOriginal Sirius implementation by David Lowenthal.\n"""\n\nimport fcntl\nimport os\nimport random\nimport signal\nimport socket\nimport sys\nimport threading\nimport time\nimport traceback\nimport urllib\nfrom xmlrpclib import ServerProxy\n\n\n# 0 means normal operation\n# 1 means turn on the short time scales and read the schedule from a file\n# 2 means additionally don\'t contact NodeManager\n\nDEBUGLEVEL = 0\n\n########################################\n\nif DEBUGLEVEL < 2:\n    LOGFILE = \'/var/log/sirius\'\nelse:\n    LOGFILE = \'log.txt\'\n\nloglock = threading.Lock()\n\n\ndef log(msg):\n    """Append <msg> and a timestamp to <LOGFILE>."""\n    try:\n        if not msg.endswith(\'\\n\'):\n            msg += \'\\n\'\n        loglock.acquire()\n        try:\n            logfile = open(LOGFILE, \'a\')\n            t = time.time()\n            print >>logfile, t\n            print >>logfile, time.asctime(time.gmtime(t))\n            print >>logfile, msg\n        finally:\n            loglock.release()\n    except:\n        if DEBUGLEVEL > 0:\n            traceback.print_exc()\n\n\ndef logexception():\n    """Log an exception."""\n    log(traceback.format_exc())\n\n########################################\n\nif DEBUGLEVEL > 0:\n    # smaller time units so we can test faster\n    ONEMINUTE = 1\n    ONEHOUR = 10 * ONEMINUTE\nelse:\n    ONEMINUTE = 60\n    ONEHOUR = 60 * ONEMINUTE\n\n\nclass Periodic:\n    """Periodically make a function call."""\n\n    def __init__(self, target, interval, mindelta, maxdelta):\n        self._target = target\n        self._interval = interval\n        self._deltarange = mindelta, maxdelta+1\n        thr = threading.Thread(target=self.run, args=[target])\n        thr.setDaemon(True)\n        thr.start()\n\n    def run(self, target):\n        nextintervalstart = int(time.time() / self._interval) * self._interval\n        while True:\n            try:\n                self._target()\n            except:\n                logexception()\n            nextintervalstart += self._interval\n            nextfiring = nextintervalstart + random.randrange(*self._deltarange)\n            while True:\n                t = time.time()\n                if t < nextfiring:\n                    try:\n                        time.sleep(nextfiring - t)\n                    except:\n                        logexception()\n                else:\n                    break\n\n########################################\n\nSLOTDURATION = ONEHOUR\n\nSCHEDULEURL = \'' + site['url'] + '/planetlab/sirius/schedule.txt\'\n\nschedulelock = threading.Lock()\n\nschedule = {}\n\n\ndef currentslot():\n    return int(time.time() / SLOTDURATION) * SLOTDURATION\n\n\ndef updateschedule():\n    """Make one attempt at downloading and updating the schedule."""\n    log(\'Contacting PLC...\')\n    newschedule = {}\n    # Format is:\n    # timestamp\n    # slicename - starttime - -\n    # ...\n    if DEBUGLEVEL > 0:\n        f = open(\'/tmp/schedule.txt\')\n    else:\n        f = urllib.urlopen(SCHEDULEURL)\n    for line in f:\n        fields = line.split()\n        if len(fields) >= 3:\n            newschedule[fields[2]] = fields[0]\n    log(\'Current schedule is %s\' % newschedule)\n\n    schedulelock.acquire()\n    try:\n        schedule.clear()\n        schedule.update(newschedule)\n    finally:\n        schedulelock.release()\n    log(\'Updated schedule successfully\')\n\n########################################\n\nnodemanager = ServerProxy(\'http://127.0.0.1:812/\')\n\nrecipientcond = threading.Condition()\n\nrecipient = \'\'\nversionnumber = 0\n\ndef updateloans():\n    log(\'Contacting NodeManager...\')\n    schedulelock.acquire()\n    try:\n        newrecipient = schedule.get(str(currentslot()), \'\')\n    finally:\n        schedulelock.release()\n    if newrecipient:\n        loans = [(newrecipient, \'cpu_pct\', 25), (newrecipient, \'net_min_rate\', 2000)]\n    else:\n        loans = []\n    log(\'Current loans are %s\' % loans)\n\n    if DEBUGLEVEL < 2:\n        nodemanager.SetLoans(\'' + plc['slice_prefix'] + '_sirius\', loans)\n    log(\'Updated loans successfully\')\n\n    recipientcond.acquire()\n    try:\n        global recipient, versionnumber\n        if recipient != newrecipient:\n            recipient = newrecipient\n            versionnumber += 1\n            recipientcond.notifyAll()\n    finally:\n        recipientcond.release()\n\n########################################\n\nbackoff = 1\n\ndef success():\n    global backoff\n    backoff = 1\n\ndef failure():\n    global backoff\n    try:\n        time.sleep(backoff)\n    except:\n        logexception()\n    backoff = min(backoff*2, 5*ONEMINUTE)\n\n\ndef handleclient(clientsock, clientaddress):\n    try:\n        log(\'Connection from %s:%d\' % clientaddress)\n        clientsock.shutdown(socket.SHUT_RD)\n        recipientcond.acquire()\n        while True:\n            recip, vn = recipient, versionnumber\n            recipientcond.release()\n            clientsock.send(recip + \'\\n\')\n\n            recipientcond.acquire()\n            while versionnumber == vn:\n                recipientcond.wait()\n    except:\n        logexception()\n\n\ndef server():\n    while True:\n        try:\n            sock = socket.socket()\n            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)\n            sock.bind((\'\', 8124))\n            sock.listen(5)\n            success()\n            break\n        except:\n            logexception()\n            failure()\n    log(\'Bound server socket\')\n\n    while True:\n        try:\n            client = sock.accept()\n            threading.Thread(target=handleclient, args=client).start()\n            success()\n        except:\n            logexception()\n            failure()\n\n########################################\n\nif DEBUGLEVEL < 2:\n    PIDFILE = \'/tmp/sirius.pid\'\nelse:\n    PIDFILE = \'sirius.pid\'\n\ntry:\n    if os.fork():\n        sys.exit(0)\n    f = open(PIDFILE, \'w\')\n    fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)\nexcept:\n    logexception()\n    sys.exit(1)\n\nPeriodic(updateschedule, SLOTDURATION, -5*ONEMINUTE, -1*ONEMINUTE)\nPeriodic(updateloans, 5*ONEMINUTE, 0, 0)\nserver()\n'}]
-    
+    default_initscripts = []
+
+    # Find initscripts and add them to the db
+    for (root, dirs, files) in os.walk("/etc/plc_sliceinitscripts"):
+        for f in files:
+            # Read the file
+            file = open(root + "/" + f, "ro")
+            default_initscripts.append({"name": plc['slice_prefix'] + "_" + f,
+                                        "enabled": True,
+                                        "script": file.read().replace("@SITE@", url).replace("@PREFIX@", plc['slice_prefix'])})
+            file.close()
+
     # Get list of existing initscripts
     oldinitscripts = GetInitScripts()
     oldinitscripts = [script['name'] for script in oldinitscripts]
@@ -536,82 +627,25 @@ def main():
     for initscript in default_initscripts:
         if initscript['name'] not in oldinitscripts:  AddInitScript(initscript)
 
-    # Setup default slice attribute types
-    default_setting_types = [
-
-        {'category' : "general",
-         'name' : "ifname",
-         'description': "Set interface name, instead of eth0 or the like",
-         'min_role_id' : 40},
-        {'category' : "general",
-         'name' : "driver",
-         'description': "Use this to specify an alternate driver",
-         'min_role_id' : 40 },
-        {'category' : "general",
-         'name' : "alias",
-         'description': "Allows to reuse an interface as eth0:alias",
-         'min_role_id' : 40},
-
-        {'category' : "hidden",
-         'name' : "backdoor",
-         'description': "For testing new settings",
-         'min_role_id' : 10},
-        ] + [
-        { "category" : "WiFi",
-          "name" : x,
-          "description" : "802.11 %s -- see %s"%(y,z),
-          "min_role_id" : 40 } for (x,y,z) in [
-            ("mode","Mode","iwconfig"),
-            ("essid","ESSID","iwconfig"),
-            ("nw","Network Id","iwconfig"),
-            ("freq","Frequency","iwconfig"),
-            ("channel","Channel","iwconfig"),
-            ("sens","sensitivity threshold","iwconfig"),
-            ("rate","Rate","iwconfig"),
-            ("key","key","iwconfig key"),
-            ("key1","key1","iwconfig key [1]"),
-            ("key2","key2","iwconfig key [2]"),
-            ("key3","key3","iwconfig key [3]"),
-            ("key4","key4","iwconfig key [4]"),
-            ("securitymode","Security mode","iwconfig enc"),
-            ("iwconfig","Additional parameters to iwconfig","ifup-wireless"),
-            ("iwpriv","Additional parameters to iwpriv","ifup-wireless"),
-            ]
-        ]
-
-
-    # Get list of existing attribute types
-    setting_types = GetNodeNetworkSettingTypes()
-    setting_types = [setting_type['name'] for setting_type in setting_types]
-
-    # Create/update default slice setting types
-    for default_setting_type in default_setting_types:
-        if default_setting_type['name'] not in setting_types:
-            AddNodeNetworkSettingType(default_setting_type)
-        else:
-            UpdateNodeNetworkSettingType(default_setting_type['name'], default_setting_type)
-
     # Create/update system slices
     default_slices = [
          # PlanetFlow
         {'name': plc['slice_prefix'] + "_netflow",
-         'description': "PlanetFlow Traffic Auditing Service",
+         'description': "PlanetFlow Traffic Auditing Service.  Logs, captured in the root context using fprobe-ulogd, are stored in a directory in the root context which is bind mounted to the planetflow slice.  The Planetflow Central service then periodically rsyncs these logs from the planetflow slice for aggregation.",
          'url': url,
          'instantiation': "plc-instantiated",
          # Renew forever (minus one day, work around date conversion weirdness)
-         'expires': sys.maxint - (60 * 60 * 24),
+         'expires': 0x7fffffff - (60 * 60 * 24),
          'attributes': [('system', "1"),
                         ('vref', "planetflow"),
-                        ('proper_op', "open file=/etc/passwd, flags=r"),
-                        ('proper_op', "create_socket"),
-                        ('proper_op', "bind_socket")]},
+                        ('vsys', "pfmount")]},
           # Sirius
         {'name': plc['slice_prefix'] + "_sirius",
          'description': 'The Sirius Calendar Service.\n\nSirius provides system-wide reservations of 25% CPU and 2Mb/s outgoing\nbandwidth.  Sign up for hour-long slots using the Web GUI at the\nPlanetLab website.\n\nThis slice should not generate traffic external to PlanetLab.\n',
-         'url': url,
+         'url': url + "db/sirius/index.php",
          'instantiation': "plc-instantiated",
          # Renew forever (minus one day, work around date conversion weirdness)
-         'expires': sys.maxint - (60 * 60 * 24),
+         'expires': 0x7fffffff - (60 * 60 * 24),
          'attributes': [('system', "1"),
                         ('net_min_rate', "2000"),
                         ('cpu_pct', "25"),
@@ -619,6 +653,7 @@ def main():
         ]
     
     for default_slice in default_slices:
+        attributes=default_slice.pop('attributes')
         slices = GetSlices([default_slice['name']])
         if slices:
             slice = slices[0]
@@ -628,19 +663,22 @@ def main():
             slice = GetSlices([default_slice['name']])[0]
 
         # Create/update all attributes
-        slice_attributes = []
-        if slice['slice_attribute_ids']:
+        slice_tags = []
+        if slice['slice_tag_ids']:
             # Delete unknown attributes
-            for slice_attribute in GetSliceAttributes(slice['slice_attribute_ids']):
-                if (slice_attribute['name'], slice_attribute['value']) \
-                   not in default_slice['attributes']:
-                    DeleteSliceAttribute(slice_attribute['slice_attribute_id'])
+            for slice_tag in GetSliceTags(slice['slice_tag_ids']):
+                if (slice_tag['tagname'], slice_tag['value']) \
+                   not in attributes:
+                    DeleteSliceTag(slice_tag['slice_tag_id'])
                 else:
-                    slice_attributes.append((slice_attribute['name'], slice_attribute['value']))
+                    slice_tags.append((slice_tag['tagname'], slice_tag['value']))
 
-        for (name, value) in default_slice['attributes']:
-            if (name, value) not in slice_attributes:
-                AddSliceAttribute(slice['name'], name, value)
+        for (name, value) in attributes:
+            if (name, value) not in slice_tags:
+                AddSliceTag(slice['name'], name, value)
+
+    
+    #################### body for messages
 
     installfailed = """
 Once the node meets these requirements, please reinitiate the install
@@ -664,6 +702,8 @@ username %(email)s by visiting:
 
 https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/register.php?id=%(person_id)d&key=%(verification_key)s
 
+You must wait for this account to be approved before you can begin using it, please be patient.
+
 If you did not register for a %(PLC_NAME)s account, please ignore this
 message, or contact %(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>.
 """
@@ -885,126 +925,72 @@ message, please reply so that we may investigate the problem.
         if not messages:
             AddMessage(template)
 
+    #################### PCUs
     
     ### Setup Initial PCU information
-    pcu_types = [{'model': 'AP79xx',
-          'name': 'APC AP79xx',
-          'pcu_protocol_types': [{ 'port': 80,
-                                  'protocol': 'APC79xxHttp',
-                                  'supported': False},
-                                 { 'port': 23,
-                                  'protocol': 'APC79xx',
-                                  'supported': True},
-                                 { 'port': 22,
-                                  'protocol': 'APC79xx',
-                                  'supported': True}],
-          },
-         {'model': 'Masterswitch',
-          'name': 'APC Masterswitch',
-          'pcu_protocol_types': [{ 'port': 80,
-                                  'protocol': 'APCMasterHttp',
-                                  'supported': False},
-                                 { 'port': 23,
-                                  'protocol': 'APCMaster',
-                                  'supported': True},
-                                 { 'port': 22,
-                                  'protocol': 'APCMaster',
-                                  'supported': True}],
-          },
-         {'model': 'DS4-RPC',
-          'name': 'BayTech DS4-RPC',
-          'pcu_protocol_types': [{ 'port': 80,
-                                  'protocol': 'BayTechHttp',
-                                  'supported': False},
-                                 { 'port': 23,
-                                  'protocol': 'BayTech',
-                                  'supported': True},
-                                 { 'port': 22,
-                                  'protocol': 'BayTech',
-                                  'supported': True}],
-          },
-         {'model': 'IP-41x_IP-81x',
-          'name': 'Dataprobe IP-41x & IP-81x',
-          'pcu_protocol_types': [ { 'port': 23,
-                                  'protocol': 'IPALTelnet',
-                                  'supported': True},
-                                  { 'port': 80,
-                                  'protocol': 'IPALHttp',
-                                  'supported': False}],
-          },
-         {'model': 'DRAC3',
-          'name': 'Dell RAC Version 3',
-          'pcu_protocol_types': [],
-          },
-         {'model': 'DRAC4',
-          'name': 'Dell RAC Version 4',
-          'pcu_protocol_types': [{ 'port': 443,
-                                  'protocol': 'DRACRacAdm',
-                                  'supported': True},
-                                 { 'port': 80,
-                                  'protocol': 'DRACRacAdm',
-                                  'supported': False},
-                                 { 'port': 22,
-                                  'protocol': 'DRAC',
-                                  'supported': True}],
-          },
-         {'model': 'ePowerSwitch',
-          'name': 'ePowerSwitch 1/4/8x',
-          'pcu_protocol_types': [{ 'port': 80,
-                                  'protocol': 'ePowerSwitch',
-                                  'supported': True}],
-          },
-         {'model': 'ilo2',
-          'name': 'HP iLO2 (Integrated Lights-Out)',
-          'pcu_protocol_types': [{ 'port': 443,
-                                  'protocol': 'HPiLOHttps',
-                                  'supported': True},
-                                 { 'port': 22,
-                                  'protocol': 'HPiLO',
-                                  'supported': True}],
-          },
-         {'model': 'ilo1',
-          'name': 'HP iLO version 1',
-          'pcu_protocol_types': [],
-          },
-         {'model': 'PM211-MIP',
-          'name': 'Infratec PM221-MIP',
-          'pcu_protocol_types': [],
-          },
-         {'model': 'AMT2.5',
-          'name': 'Intel AMT v2.5 (Active Management Technology)',
-          'pcu_protocol_types': [],
-          },
-         {'model': 'AMT3.0',
-          'name': 'Intel AMT v3.0 (Active Management Technology)',
-          'pcu_protocol_types': [],
-          },
-         {'model': 'WTI_IPS-4',
-          'name': 'Western Telematic (WTI IPS-4)',
-          'pcu_protocol_types': [],
-          },
-         {'model': 'unknown',
-          'name': 'Unknown Vendor or Model',
-          'pcu_protocol_types': [{ 'port': 443,
-                                  'protocol': 'UnknownPCU',
-                                  'supported': False},
-                                 { 'port': 80,
-                                  'protocol': 'UnknownPCU',
-                                  'supported': False},
-                                 { 'port': 23,
-                                  'protocol': 'UnknownPCU',
-                                  'supported': False},
-                                 { 'port': 22,
-                                  'protocol': 'UnknownPCU',
-                                  'supported': False}],
-          }]
+       pcu_types = [
+                        {'model': 'APCControl12p3',
+                         'name': 'APC AP79xx or Masterswitch (sequence 1-2-port-3)', },
+                        {'model': 'APCControl1p4',
+                         'name': 'APC AP79xx or Masterswitch (sequence 1-port-4)', },
+                        {'model': 'APCControl121p3',
+                         'name': 'APC AP79xx or Masterswitch (sequence 1-2-1-port-3)', },
+                        {'model': 'APCControl121p1',
+                         'name': 'APC AP79xx or Masterswitch (sequence 1-2-1-port-1)', },
+                        {'model': 'APCControl13p13',
+                         'name': 'APC AP79xx or Masterswitch (sequence 1-3-port-1-3)', },
+
+                        {'model': 'BayTechRPC3NC', 
+                         'name': 'BayTech with prompt RPC3-NC>', },
+                        {'model': 'BayTechRPC16', 
+                         'name': 'BayTech with prompt RPC-16>', },
+                        {'model': 'BayTech',
+                         'name': 'BayTech with prompt DS-RPC>', },
+                        {'model': 'BayTechCtrlC', 
+                         'name': 'BayTech Ctrl-C, 5, then with prompt DS-RPC>', },
+                        {'model': 'BayTechCtrlCUnibe', 
+                         'name': 'BayTech Ctrl-C, 3, then with prompt DS-RPC>', },
+
+                        {'model': 'BlackBoxPSMaverick',
+                         'name': 'BlackBoxPSMaverick Web based controller'},
+
+                        {'model': 'IPAL', 
+                         'name': 'IPAL - Dataprobe IP-41x & IP-81x', },
+                        {'model': 'DRAC',
+                         'name': 'DRAC - Dell RAC Version 3 or 4', },
+                        {'model': 'ePowerSwitchNew',
+                         'name': 'ePowerSwitch Newer Models 1/4/8x', },
+                        {'model': 'ePowerSwitchOld',
+                         'name': 'ePowerSwitch Older Models 1/4/8x', },
+
+                        {'model': 'HPiLO',
+                         'name': 'HP iLO v1 or v2 (Integrated Lights-Out)', },
+
+                        {'model': 'IntelAMT',
+                         'name': 'Intel AMT v2.5 or v3.0 (Active Management Technology)', },
+
+                        {'model': 'IPMI',
+                         'name': 'OpenIPMI - Intelligent Platform Management Interface', },
+
+                        {'model': 'PM211MIP',
+                         'name': 'Infratec PM221-MIP', },
+
+                        {'model': 'WTIIPS4',
+                         'name': 'Western Telematic (WTI IPS-4)', },
+
+                        {'model': 'ManualPCU',
+                         'name': 'Manual Administrator Operation (choose if model unknown)', },
+                         ]
 
     # Get all model names
     pcu_models = [type['model'] for type in GetPCUTypes()]
     for type in pcu_types:
-        protocol_types = type['pcu_protocol_types']
-        # Take this value out of the struct.
-        del type['pcu_protocol_types']
+               if 'pcu_protocol_types' in type:
+               protocol_types = type['pcu_protocol_types']
+               # Take this value out of the struct.
+               del type['pcu_protocol_types']
+               else:
+                       protocol_types = []
         if type['model'] not in pcu_models:
             # Add the name/model info into DB
             id = AddPCUType(type)
@@ -1012,6 +998,40 @@ message, please reply so that we may investigate the problem.
             for ptype in protocol_types:
                 AddPCUProtocolType(id, ptype)
 
+    default_boot_states = [
+        'boot',
+        'failboot',
+        'safeboot',
+        'install',
+        'reinstall',
+        'disabled',
+    ]
+    current_boot_states = GetBootStates()
+    for state in default_boot_states:
+        if state not in current_boot_states:
+            AddBootState(state)
+
+    # TODO: Delete old boot states. 
+    # NOTE: Only do this if all federating peers have the new default boot states above.
+    #for state in current_boot_states:
+    #    if state not in default_boot_states:
+    #        DeleteBootState(state)
+
+    # Run local db-config snippets
+    files = []
+    dir = "/etc/planetlab/db-config.d"
+    try:
+        files = os.listdir(dir)
+    except:
+        pass
+
+    for file in files:
+        if (file.endswith(".bak") or file.endswith("~") or
+            file.endswith(".rpmsave") or file.endswith(".rpmnew") or
+            file.endswith(".orig")):
+            continue
+        execfile(os.path.join(dir, file))
+
 
 if __name__ == '__main__':
     main()