From 6cf60e8322bf92161e416eaa8f35feddf9719e2e Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 28 Apr 2006 20:25:19 +0000 Subject: [PATCH] - query nm for the right average rate parameters --- bwmon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bwmon.py b/bwmon.py index ca1a4f9..baee9be 100755 --- a/bwmon.py +++ b/bwmon.py @@ -14,7 +14,7 @@ # Andy Bavier # 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.1 2006/04/28 19:11:20 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.1 2006/04/28 19:11:20 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.1 2006/04/28 19:11:20 mlhuang Exp $" slices = {} # Get special slice IDs -- 2.43.0