# 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
"""
# 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:
(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
for xid in dead:
del slices[xid]
- # Close connection to Node Manager
- nm.close()
-
if verbose:
print "Saving %s" % datafile
f = open(datafile, "w")