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
review imports in sliver_{libvirt,lxc}
[nodemanager.git]
/
sliver_lxc.py
diff --git
a/sliver_lxc.py
b/sliver_lxc.py
index
1b1a20c
..
246c5f0
100644
(file)
--- a/
sliver_lxc.py
+++ b/
sliver_lxc.py
@@
-11,9
+11,9
@@
from string import Template
import logger
import bwlimit
import logger
import bwlimit
-
import sliver_l
ibvirt
+
from sliver_libvirt import Sliver_L
ibvirt
-class Sliver_LXC(
sliver_libvirt.
Sliver_Libvirt):
+class Sliver_LXC(Sliver_Libvirt):
"""This class wraps LXC commands"""
SHELL = '/bin/sshsh'
"""This class wraps LXC commands"""
SHELL = '/bin/sshsh'
@@
-28,7
+28,7
@@
class Sliver_LXC(sliver_libvirt.Sliver_Libvirt):
def create(name, rec=None):
''' Create dirs, copy fs image, lxc_create '''
logger.verbose ('sliver_lxc: %s create'%(name))
def create(name, rec=None):
''' Create dirs, copy fs image, lxc_create '''
logger.verbose ('sliver_lxc: %s create'%(name))
- conn =
sliver_l
ibvirt.getConnection(Sliver_LXC.TYPE)
+ conn =
Sliver_L
ibvirt.getConnection(Sliver_LXC.TYPE)
# Get the type of image from vref myplc tags specified as:
# pldistro = lxc
# Get the type of image from vref myplc tags specified as:
# pldistro = lxc
@@
-122,13
+122,13
@@
class Sliver_LXC(sliver_libvirt.Sliver_Libvirt):
dom = conn.lookupByName(name)
except:
dom = conn.defineXML(xml)
dom = conn.lookupByName(name)
except:
dom = conn.defineXML(xml)
- logger.verbose('lxc_create: %s -> %s'%(name,
sliver_l
ibvirt.debuginfo(dom)))
+ logger.verbose('lxc_create: %s -> %s'%(name,
Sliver_L
ibvirt.debuginfo(dom)))
@staticmethod
def destroy(name):
logger.verbose ('sliver_lxc: %s destroy'%(name))
@staticmethod
def destroy(name):
logger.verbose ('sliver_lxc: %s destroy'%(name))
- conn =
sliver_l
ibvirt.getConnection(Sliver_LXC.TYPE)
+ conn =
Sliver_L
ibvirt.getConnection(Sliver_LXC.TYPE)
containerDir = Sliver_LXC.CON_BASE_DIR + '/%s'%(name)
containerDir = Sliver_LXC.CON_BASE_DIR + '/%s'%(name)