From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 6 Feb 2007 22:27:12 +0000 (+0000)
Subject: net_*_rate are in kbps because of XML-RPC maxint
X-Git-Tag: NodeManager-1.6-1~160
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=afa2473cf1c7bbb3c425bd3242ffe200bd94b36e;p=nodemanager.git

net_*_rate are in kbps because of XML-RPC maxint
limitations, convert to bps which is what bwlimit.py expects.
---

diff --git a/sliver_vs.py b/sliver_vs.py
index b757400..29ab5ba 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -111,7 +111,13 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             logger.log('%s: failed to set max disk usage' % self.name)
             logger.log_exc()
 
-        net_limits = (self.rspec['net_min_rate'], self.rspec['net_max_rate'], self.rspec['net_i2_min_rate'], self.rspec['net_i2_max_rate'], self.rspec['net_share'])
+        # N.B. net_*_rate are in kbps because of XML-RPC maxint
+        # limitations, convert to bps which is what bwlimit.py expects.
+        net_limits = (self.rspec['net_min_rate'] * 1000,
+                      self.rspec['net_max_rate'] * 1000,
+                      self.rspec['net_i2_min_rate'] * 1000,
+                      self.rspec['net_i2_max_rate'] * 1000,
+                      self.rspec['net_share'])
         logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
         logger.log('%s: setting net share to %d' % (self.name, net_limits[-1]))
         self.set_bwlimit(*net_limits)