X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api_calls.py;h=4a5558e5ad368f14a9d1ead195522833f3e3b477;hb=973e601b8663412a3c31860b2a77fa7b87c8c360;hp=fa6ce2208c6b0cb5753f54a5d71cd23b648f648d;hpb=d3a3b2d3ea98e72183d1cb5497c38badaa0c5863;p=nodemanager.git

diff --git a/api_calls.py b/api_calls.py
index fa6ce22..4a5558e 100644
--- a/api_calls.py
+++ b/api_calls.py
@@ -1,6 +1,4 @@
-# $Id$
-# $URL$
-
+#
 """Sliver manager API.
 
 This module exposes an XMLRPC interface that allows PlanetLab users to
@@ -20,6 +18,7 @@ import socket
 import struct
 import threading
 import xmlrpclib
+import sliver_lxc
 
 try:
     from PLC.Parameter import Parameter, Mixed
@@ -37,8 +36,8 @@ import logger
 # A better approach will involve more extensive code splitting, I think.
 try: import database
 except: import logger as database
-try: import sliver_vs
-except: import logger as sliver_vs
+#try: import sliver_vs
+#except: import logger as sliver_vs
 import ticket as ticket_module
 import tools
 
@@ -149,7 +148,7 @@ def AdminTicket(ticket):
 @export_to_api(0)
 def GetXIDs():
     """Return an dictionary mapping Slice names to XIDs"""
-    return dict([(pwent[0], pwent[2]) for pwent in pwd.getpwall() if pwent[6] == sliver_vs.Sliver_VS.SHELL])
+    return dict([(pwent[0], pwent[2]) for pwent in pwd.getpwall() if pwent[6] == sliver_lxc.Sliver_LXC.SHELL])
 
 @export_to_docbook(roles=['self'],
                    accepts=[],