X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api_calls.py;h=592335dfa06010f9a4079e0046e245c5965c1838;hb=9e6b9c1ea9e020c55c85b433bac47231d63e9ffd;hp=084bf669fb10bc9fea3d6f94f6f60d26426b2d77;hpb=f699ab76a8c8a5ba09d2286a833a8a05ecf8564c;p=nodemanager.git diff --git a/api_calls.py b/api_calls.py index 084bf66..592335d 100644 --- a/api_calls.py +++ b/api_calls.py @@ -18,7 +18,7 @@ import socket import struct import threading import xmlrpclib -import sliver_lxc +import slivermanager try: from PLC.Parameter import Parameter, Mixed @@ -36,8 +36,6 @@ 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 import ticket as ticket_module import tools @@ -148,7 +146,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_lxc.Sliver_LXC.SHELL]) + return dict([(pwent[0], pwent[2]) for pwent in pwd.getpwall() if pwent[6] == slivermanager.sliver_password_shell]) @export_to_docbook(roles=['self'], accepts=[],