typo

[myplc.git] / db-config

diff --git a/db-config b/db-config
index c1ef89e..a773320 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: db-config,v 1.18 2007/01/30 23:11:14 mlhuang Exp $
+# $Id: db-config,v 1.22 2007/02/02 23:40:22 mlhuang Exp $
 #
 
 from plc_config import PLCConfiguration
@@ -54,7 +54,7 @@ def main():
              'name': plc['name'] + " Central",
              'abbreviated_name': plc['name'],
              'login_base': plc['slice_prefix'],
-             'is_public': False,
+             'is_public': True,
              'url': url,
              'max_slices': 100 }
 
@@ -516,43 +516,37 @@ def main():
          'min_role_id': 10},
 
         # Bandwidth limits
-        #{'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': "net_share",
-         'description': "Number of bandwidth shares",
+        {'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': "net2_min",
-        # 'description': "Minimum bandwidth over routes exempt from node bandwidth limits (bps)",
-        # 'min_role_id': 10},
-        #{'name': "net2_max",
-        # 'description': "Maximum bandwidth over routes exempt from node bandwidth limits (bps)",
-        # 'min_role_id': 10},
-        #{'name': "net2_avg",
-        # 'description': "Average bandwidth over routes exempt from node bandwidth limits (bps)",
-        # 'min_role_id': 10},
-        {'name': "net2_share",
-         'description': "Number of bandwidth shares over routes exempt from node bandwidth limits",
+        {'name': "net_i2_min_rate",
+         'description': "Minimum bandwidth over I2 routes (kbps)",
          'min_role_id': 10},
-        {'name': "KByteMax",
+        {'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': "KByteThresh",
-         'description': "Threshold KByte limit before warning and throttling.",
+        {'name': "net_thresh_kbyte",
+         'description': "KByte limit before warning and throttling.",
          'min_role_id': 10},
-        {'name': "KByteMaxI2",
+        {'name': "net_i2_max_kbyte",
          'description': "Maximum daily network Tx KByte limit to I2 hosts.",
          'min_role_id': 10},
-        {'name': "KByteThreshI2",
-         'description': "Threshold KByte limit to I2 hosts before warning and throttling.",
+        {'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)",
@@ -587,17 +581,6 @@ def main():
         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
@@ -609,7 +592,7 @@ def main():
          '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",