X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=ea446fc556624411a0621d6bdd6e201f93b480aa;hb=e35cdeb5ae4e37a7205150195735ab8c69e6d522;hp=3e4fb1f3b8db8ca720e8fd27a55ed88d7da24f19;hpb=da256268978e70f27e39f26012abd615e26a99c4;p=nodemanager.git

diff --git a/slivermanager.py b/slivermanager.py
index 3e4fb1f..ea446fc 100644
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -14,12 +14,11 @@ import time
 import logger
 import api, api_calls
 import database
-import accounts
+import account
 import controller
-import sliver_vs
 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
@@ -69,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")
@@ -93,7 +93,7 @@ def adjustReservedSlivers (data):
         if is_system_sliver(sliver):
             sliver['reservation_alive']=True
             continue
-        
+
         # regular slivers
         if not active_lease:
             # with 'idle_or_shared', just let the field out, behave like a shared node
@@ -159,7 +159,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
         if rec['instantiation'].lower() == 'nm-controller':
             rec.setdefault('type', attributes.get('type', 'controller.Controller'))
         else:
-            rec.setdefault('type', attributes.get('type', 'sliver.VServer'))
+            rec.setdefault('type', attributes.get('type', 'sliver.LXC'))
 
         # set the vserver reference.  If none, set to default.
         rec.setdefault('vref', attributes.get('vref', 'default'))
@@ -206,13 +206,13 @@ def deliver_ticket(data):
     return GetSlivers(data, fullupdate=False)
 
 def start():
-    for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
-        DEFAULT_ALLOCATION[resname]=default_amount
+    # No default allocation values for LXC yet, think if its necessary given
+    # that they are also default allocation values in this module
+    #for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
+    #    DEFAULT_ALLOCATION[resname]=default_amount
 
-    #accounts.register_class(sliver_vs.Sliver_VS)
-    #accounts.register_class(sliver_libvirt.Sliver_LV)
-    accounts.register_class(sliver_lxc.Sliver_LXC)
-    accounts.register_class(controller.Controller)
+    account.register_class(sliver_lxc.Sliver_LXC)
+    account.register_class(controller.Controller)
     database.start()
     api_calls.deliver_ticket = deliver_ticket
     api.start()