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
rename accounts into account for consistency
[nodemanager.git]
/
api_calls.py
diff --git
a/api_calls.py
b/api_calls.py
index
66d8833
..
bc1962c
100644
(file)
--- a/
api_calls.py
+++ b/
api_calls.py
@@
-26,7
+26,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
@@
-170,7
+170,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."
@@
-184,7
+184,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."
@@
-197,7
+197,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'])
@@
-208,7
+208,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'])
@@
-219,9
+219,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'],