X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=ea446fc556624411a0621d6bdd6e201f93b480aa;hb=e35cdeb5ae4e37a7205150195735ab8c69e6d522;hp=606f4f309ab1b7c8c876c2f6b64e819a92a14062;hpb=0f51f7fc64906f87640def6f27a1dc732ed8f453;p=nodemanager.git

diff --git a/slivermanager.py b/slivermanager.py
index 606f4f3..ea446fc 100644
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -18,7 +18,7 @@ import account
 import controller
 import sliver_lxc
 
-try: from bwlimit import bwmin, bwmax
+try: from bwlimitlxc import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 
 priority=10
@@ -68,7 +68,8 @@ def adjustReservedSlivers (data):
     if 'reservation_policy' not in data: return
     policy=data['reservation_policy'] 
     if policy not in ['lease_or_idle', 'lease_or_shared']:
-        logger.log ("unexpected reservation_policy %(policy)s"%locals())
+        if policy is not None:
+            logger.log ("unexpected reservation_policy %(policy)s"%locals())
         return
 
     logger.log("slivermanager.adjustReservedSlivers")