More sane network slice attribute names. Also added rate limits back.

diff --git a/db-config b/db-config
index c1ef89e..b98fcd4 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.19 2007/02/01 21:09:22 faiyaza Exp $
 #
 
 from plc_config import PLCConfiguration
@@ -516,42 +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': "net_i2min_rate",
+         'description': "Minimum bandwidth over I2 routes (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_i2max_rate",
+         'description': "Maximum bandwidth over I2 routes (kbps)",
          'min_role_id': 10},
-        {'name': "KByteMax",
+        {'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_i2max_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_i2thresh_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_i2share",
+         'description': "Number of bandwidth shares over I2 routes",
          'min_role_id': 10},
+ 
 
         # Disk quota
         {'name': "disk_max",