git://git.onelab.eu
/
mom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26b391f
)
- query nm for the right average rate parameters
author
Mark Huang
<mlhuang@cs.princeton.edu>
Fri, 28 Apr 2006 20:25:19 +0000
(20:25 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Fri, 28 Apr 2006 20:25:19 +0000
(20:25 +0000)
bwmon.py
patch
|
blob
|
history
diff --git
a/bwmon.py
b/bwmon.py
index
ca1a4f9
..
baee9be
100755
(executable)
--- 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
#
# 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.1 2006/04/28 19:11:20
mlhuang Exp $
#
import syslog
#
import syslog
@@
-140,7
+140,7
@@
class Slice:
"""
# Query Node Manager for max average rate overrides
"""
# 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:
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
(version, slices) = pickle.load(f)
f.close()
# Check version of data file
- if version != "$Id: bwmon.py,v 1.1 2006/04/2
5 14:40:28
mlhuang Exp $":
+ if version != "$Id: bwmon.py,v 1.1 2006/04/2
8 19:11:20
mlhuang Exp $":
print "Not using old version '%s' data file %s" % (version, datafile)
raise Exception
except Exception:
print "Not using old version '%s' data file %s" % (version, datafile)
raise Exception
except Exception:
- version = "$Id: bwmon.py,v 1.1 2006/04/2
5 14:40:28
mlhuang Exp $"
+ version = "$Id: bwmon.py,v 1.1 2006/04/2
8 19:11:20
mlhuang Exp $"
slices = {}
# Get special slice IDs
slices = {}
# Get special slice IDs