X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=e68a0b44c19a5883fc8709404dc90670c10891ed;hb=ae9ce869dc1f25965dfd8107c88bfc7bcddcf3e2;hp=aef00add081a10ca0865d527b739e9a65d27ad7b;hpb=adc04bc349fc16efea22c436f3b350f5ab937aad;p=nodemanager.git diff --git a/sliver_lxc.py b/sliver_lxc.py index aef00ad..e68a0b4 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -8,152 +8,72 @@ import subprocess import os import libvirt import sys +from string import Template +import sliver_libvirt as lv -def test_template(): - - xml_template = """ - - test_1 - 32768 - - exe - /bin/sh - - 1 - - destroy - restart - destroy - - /usr/libexec/libvirt_lxc - - - - - - - - - - """ - - return xml_template - -def createConnection(): - conn = libvirt.open('lxc:///') - if conn == None: - print 'Failed to open connection to LXC hypervisor' - sys.exit(1) - else: return conn - - -states = { - libvirt.VIR_DOMAIN_NOSTATE: 'no state', - libvirt.VIR_DOMAIN_RUNNING: 'running', - libvirt.VIR_DOMAIN_BLOCKED: 'blocked on resource', - libvirt.VIR_DOMAIN_PAUSED: 'paused by user', - libvirt.VIR_DOMAIN_SHUTDOWN: 'being shut down', - libvirt.VIR_DOMAIN_SHUTOFF: 'shut off', - libvirt.VIR_DOMAIN_CRASHED: 'crashed', -} - -def info(dom): - [state, maxmem, mem, ncpu, cputime] = dom.info() - return '%s is %s,\nmaxmem = %s, mem = %s, ncpu = %s, cputime = %s' % (dom.name(), states.get(state, state), maxmem, mem, ncpu, cputime) +URI = 'lxc://' class Sliver_LXC(accounts.Account): """This class wraps LXC commands""" - SHELL = '/bin/sh' - # Using /bin/bash triggers destroy root/site_admin (?!?) + SHELL = '/bin/sshsh' + TYPE = 'sliver.LXC' # Need to add a tag at myplc to actually use this account # type = 'sliver.LXC' + + @staticmethod + def create(name, rec=None): + conn = lv.getConnection(URI) + + # Template for libvirt sliver configuration + try: + with open('/vservers/.lvref/config_template.xml') as f: + template = Template(f.read()) + config = template.substitute(name=name) + except IOError: + logger.log('Cannot find XML template file') + return + + lv.create(name, config, rec, conn) + + @staticmethod + def destroy(name): + conn = lv.getConnection(URI) + lv.destroy(name, conn) + def __init__(self, rec): self.name = rec['name'] - print "LXC __init__ %s"%(self.name) - logger.verbose ('sliver_lxc: %s init'%self.name) + logger.verbose ('sliver_lxc: %s init'%(self.name)) self.dir = '/vservers/%s'%(self.name) # Assume the directory with the image and config files # are in place - self.config = '%s/config'%(self.dir) - self.fstab = '%s/fstab'%(self.dir) - self.lxc_log = '%s/lxc.log'%(self.dir) self.keys = '' self.rspec = {} self.slice_id = rec['slice_id'] self.disk_usage_initialized = False self.initscript = '' self.enabled = True - self.connection = createConnection() - - @staticmethod - def create(name, rec = None): - ''' Create dirs, copy fs image, lxc_create ''' - print "LXC create %s"%(name) - logger.verbose ('sliver_lxc: %s create'%name) - dir = '/vservers/%s'%(name) - config = '%s/config'%(dir) - lxc_log = '%s/lxc.log'%(dir) - - if not (os.path.isdir(dir) and - os.access(dir, os.R_OK | os.W_OK | os.X_OK)): - print 'lxc_create: directory %s does not exist or wrong perms'%(dir) - return - # Assume for now that the directory is there and with a FS - command=[] - # be verbose - command += ['/bin/bash','-x',] - command += ['/usr/bin/lxc-create', '-n', name, '-f', config, '&'] - print command - #subprocess.call(command, stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=False) - conn = createConnection() + self.conn = lv.getConnection(URI) try: - dom0 = conn.lookupByName(name) + self.container = self.conn.lookupByName(self.name) except: - dom0 = conn.defineXML(test_template()) - print info(dom0) - - @staticmethod - def destroy(name): - ''' lxc_destroy ''' - print "LXC destroy %s"%(name) - dir = '/vservers/%s'%(name) - lxc_log = '%s/lxc.log'%(dir) - command=[] - command += ['/usr/bin/lxc-destroy', '-n', name] - - subprocess.call(command, stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=False) - print "LXC destroy DONE" - - def configure(self, rec): - print "LXC configure %s"%(self.name) + logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(self.name, sys.exc_info()[0])) def start(self, delay=0): - ''' Check existence? lxc_start ''' - print "LXC start %s"%(self.name) - command=[] - command += ['/usr/bin/lxc-start', '-n', self.name, '-d'] - print command - subprocess.call(command, stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=False) + lv.start(self.container) def stop(self): - ''' lxc_stop ''' - print "LXC stop %s"%(self.name) - + lv.stop(self.container) + def is_running(self): - print "LXC is_running %s"%(self.name) - command = [] - command += ['/usr/bin/lxc-info -n %s'%(self.name)] - print command - p = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) - state = p.communicate()[0].split(' ')[2] - print state - if state == 'RUNNING': return True - else: return False + lv.is_running(self.container) - + def configure(self, rec): + ''' Allocate resources and fancy configuration stuff ''' + logger.verbose('sliver_libvirt: %s configure'%(self.name)) + accounts.Account.configure(self, rec)