git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
syntax errors
[nodemanager.git]
/
api_calls.py
diff --git
a/api_calls.py
b/api_calls.py
index
4a5558e
..
592335d
100644
(file)
--- a/
api_calls.py
+++ b/
api_calls.py
@@
-18,7
+18,7
@@
import socket
import struct
import threading
import xmlrpclib
import struct
import threading
import xmlrpclib
-import sliver
_lxc
+import sliver
manager
try:
from PLC.Parameter import Parameter, Mixed
try:
from PLC.Parameter import Parameter, Mixed
@@
-27,7
+27,7
@@
except:
def Mixed(a = None, b = None, c = None): pass
def Mixed(a = None, b = None, c = None): pass
-import account
s
+import account
import logger
# TODO: These try/excepts are a hack to allow doc/DocBookLocal.py to
import logger
# TODO: These try/excepts are a hack to allow doc/DocBookLocal.py to
@@
-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
# 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
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"""
@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] == sliver
manager.sliver_password_shell
])
@export_to_docbook(roles=['self'],
accepts=[],
@export_to_docbook(roles=['self'],
accepts=[],
@@
-171,7
+169,7
@@
def Create(sliver_name):
"""Create a non-PLC-instantiated sliver"""
rec = sliver_name
if rec['instantiation'] == 'delegated':
"""Create a non-PLC-instantiated sliver"""
rec = sliver_name
if rec['instantiation'] == 'delegated':
- account
s
.get(rec['name']).ensure_created(rec)
+ account.get(rec['name']).ensure_created(rec)
logger.log("api_calls: Create %s"%rec['name'])
else:
raise Exception, "Only PLC can create non delegated slivers."
logger.log("api_calls: Create %s"%rec['name'])
else:
raise Exception, "Only PLC can create non delegated slivers."
@@
-185,7
+183,7
@@
def Destroy(sliver_name):
"""Destroy a non-PLC-instantiated sliver"""
rec = sliver_name
if rec['instantiation'] == 'delegated':
"""Destroy a non-PLC-instantiated sliver"""
rec = sliver_name
if rec['instantiation'] == 'delegated':
- account
s
.get(rec['name']).ensure_destroyed()
+ account.get(rec['name']).ensure_destroyed()
logger.log("api_calls: Destroy %s"%rec['name'])
else:
raise Exception, "Only PLC can destroy non delegated slivers."
logger.log("api_calls: Destroy %s"%rec['name'])
else:
raise Exception, "Only PLC can destroy non delegated slivers."
@@
-198,7
+196,7
@@
def Destroy(sliver_name):
def Start(sliver_name):
"""Configure and start sliver."""
rec = sliver_name
def Start(sliver_name):
"""Configure and start sliver."""
rec = sliver_name
- account
s
.get(rec['name']).start(rec)
+ account.get(rec['name']).start(rec)
logger.log("api_calls: Start %s"%rec['name'])
logger.log("api_calls: Start %s"%rec['name'])
@@
-209,7
+207,7
@@
def Start(sliver_name):
def Stop(sliver_name):
"""Kill all processes belonging to the specified sliver"""
rec = sliver_name
def Stop(sliver_name):
"""Kill all processes belonging to the specified sliver"""
rec = sliver_name
- account
s
.get(rec['name']).stop()
+ account.get(rec['name']).stop()
logger.log("api_calls: Stop %s"%rec['name'])
logger.log("api_calls: Stop %s"%rec['name'])
@@
-220,9
+218,9
@@
def Stop(sliver_name):
def ReCreate(sliver_name):
"""Stop, Destroy, Create, Start sliver in order to reinstall it."""
rec = sliver_name
def ReCreate(sliver_name):
"""Stop, Destroy, Create, Start sliver in order to reinstall it."""
rec = sliver_name
- account
s
.get(rec['name']).stop()
- account
s
.get(rec['name']).ensure_created(rec)
- account
s
.get(rec['name']).start(rec)
+ account.get(rec['name']).stop()
+ account.get(rec['name']).ensure_created(rec)
+ account.get(rec['name']).start(rec)
logger.log("api_calls: ReCreate %s"%rec['name'])
@export_to_docbook(roles=['nm-controller', 'self'],
logger.log("api_calls: ReCreate %s"%rec['name'])
@export_to_docbook(roles=['nm-controller', 'self'],