Merge branch 'master' into lxc_devel

diff --combined setup.py
index 082e565,a3e93f6..98ec085
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -14,22 -14,19 +14,23 @@@ setup
          'api',
          'api_calls',
          'bwmon',
 +        'bwlimit',
 +        'cgroups',
          'conf_files',
          'config',
          'controller',
          'coresched',
          'curlwrapper',
          'database',
+         'initscript',
          'iptables',
          'logger',
          'net',
          'nodemanager',
          'plcapi',
          'safexmlrpc',
 +        'sliver_libvirt',
 +        'sliver_lxc',
          'sliver_vs',
          'slivermanager',
          'ticket',

diff --combined slivermanager.py
index 606f4f3,bacf338..4caa1ad
--- 1/slivermanager.py
--- 2/slivermanager.py
+++ b/slivermanager.py
@@@ -16,7 -16,7 +16,7 @@@ import api, api_call
  import database
  import account
  import controller
 -import sliver_vs
 +import sliver_lxc
  
  try: from bwlimit import bwmin, bwmax
  except ImportError: bwmin, bwmax = 8, 1000*1000*1000
@@@ -68,7 -68,8 +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")
@@@ -92,7 -93,7 +93,7 @@@
          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
@@@ -158,7 -159,7 +159,7 @@@ def GetSlivers(data, config = None, plc
          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'))
@@@ -205,12 -206,10 +206,12 @@@ 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
  
 -    account.register_class(sliver_vs.Sliver_VS)
 +    account.register_class(sliver_lxc.Sliver_LXC)
      account.register_class(controller.Controller)
      database.start()
      api_calls.deliver_ticket = deliver_ticket