X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bwmon.py;h=b6f56971d0e664b47f64b05ffaf50c3ca25cf4fe;hb=dff03b78bcf6bec800955db10c041c462f3f679a;hp=ca1a4f9024086288af31249938d35be1304fc972;hpb=e854f63233444546917b3e56776e559beda43c4d;p=mom.git

diff --git a/bwmon.py b/bwmon.py
index ca1a4f9..b6f5697 100755
--- a/bwmon.py
+++ b/bwmon.py
@@ -14,7 +14,7 @@
 # Andy Bavier <acb@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: BandwidthMonitor.py,v 1.1 2006/04/25 14:40:28 mlhuang Exp $
+# $Id: bwmon.py,v 1.2 2006/04/28 20:25:19 mlhuang Exp $
 #
 
 import syslog
@@ -140,7 +140,7 @@ class Slice:
         """
 
         # Query Node Manager for max average rate overrides
-        (self.avgrate, self.avgexemptrate) = nm.query(self.name, ['nm_net_max_rate', 'nm_net_max_exempt_rate'])
+        (self.avgrate, self.avgexemptrate) = nm.query(self.name, ['nm_net_avg_rate', 'nm_net_avg_exempt_rate'])
         if self.avgrate is None:
             self.avgrate = default_avgrate
         if self.avgexemptrate is None:
@@ -273,11 +273,11 @@ def main():
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
-        if version != "$Id: bwmon.py,v 1.1 2006/04/25 14:40:28 mlhuang Exp $":
+        if version != "$Id: bwmon.py,v 1.2 2006/04/28 20:25:19 mlhuang Exp $":
             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
     except Exception:
-        version = "$Id: bwmon.py,v 1.1 2006/04/25 14:40:28 mlhuang Exp $"
+        version = "$Id: bwmon.py,v 1.2 2006/04/28 20:25:19 mlhuang Exp $"
         slices = {}
 
     # Get special slice IDs
@@ -329,9 +329,6 @@ def main():
     for xid in dead:
         del slices[xid]
 
-    # Close connection to Node Manager
-    nm.close()
-
     if verbose:
         print "Saving %s" % datafile
     f = open(datafile, "w")