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
merge the vs and lxc nodemanagers
[nodemanager.git]
/
plugins
/
codemux.py
diff --git
a/plugins/codemux.py
b/plugins/codemux.py
index
7f2200d
..
49ada18
100644
(file)
--- a/
plugins/codemux.py
+++ b/
plugins/codemux.py
@@
-2,8
+2,9
@@
import logger
import os
import logger
import os
-import libvirt
+
from config import Config
from config import Config
+import slivermanager
CODEMUXCONF="/etc/codemux/codemux.conf"
CODEMUXCONF="/etc/codemux/codemux.conf"
@@
-51,7
+52,7
@@
def GetSlivers(data, config, plc = None):
try:
# Check to see if sliver is running. If not, continue
try:
# Check to see if sliver is running. If not, continue
- if
isLXCDomR
unning(sliver['name']):
+ if
slivermanager.is_r
unning(sliver['name']):
# Check if new or needs updating
if (sliver['name'] not in slicesinconf.keys()) \
or (params not in slicesinconf.get(sliver['name'], [])):
# Check if new or needs updating
if (sliver['name'] not in slicesinconf.keys()) \
or (params not in slicesinconf.get(sliver['name'], [])):
@@
-166,13
+167,3
@@
def stopService():
logger.log_call(["/etc/init.d/codemux", "stop", ])
logger.log_call(["/sbin/chkconfig", "codemux", "off"])
logger.log_call(["/etc/init.d/codemux", "stop", ])
logger.log_call(["/sbin/chkconfig", "codemux", "off"])
-def isLXCDomRunning(domName):
- try:
- running = False
- conn = libvirt.open('lxc://')
- dom = conn.lookupByName(domName)
- running = dom.info()[0] == libvirt.VIR_DOMAIN_RUNNING
- finally:
- conn.close()
- return running
-