From bca45cf0a1505e6030648ddd11e8fefd9d34500c Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Sun, 17 Jun 2012 09:53:48 +0200
Subject: [PATCH] fix previous merge

---
 sliver_libvirt.py | 6 +++---
 sliver_lxc.py     | 1 -
 slivermanager.py  | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 209cb71..ce54933 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -1,6 +1,6 @@
 """LibVirt slivers"""
 
-import accounts
+import account
 import logger
 import subprocess
 import os
@@ -42,7 +42,7 @@ def debuginfo(dom):
 
 # Common Libvirt code
 
-class Sliver_Libvirt(accounts.Account):
+class Sliver_Libvirt(account.Account):
 
     def __init__(self, rec):
         self.name = rec['name']
@@ -157,5 +157,5 @@ class Sliver_Libvirt(accounts.Account):
             cgroups.write(self.name, 'cpu.shares', cpu_share)
 
         # Call the upper configure method (ssh keys...)
-        accounts.Account.configure(self, rec)
+        account.Account.configure(self, rec)
 
diff --git a/sliver_lxc.py b/sliver_lxc.py
index 1b038d5..a2b3432 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -2,7 +2,6 @@
 
 """LXC slivers"""
 
-import accounts
 import logger
 import subprocess
 import os, os.path
diff --git a/slivermanager.py b/slivermanager.py
index d118fff..606f4f3 100644
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -210,7 +210,7 @@ def start():
     #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
-- 
2.43.0