From: Xavi Leon Date: Thu, 10 Nov 2011 21:29:05 +0000 (-0500) Subject: Refactor of code to allow several virt techs. Minor bugs. Closes #8. X-Git-Tag: lxcbuild~2 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=ae9ce869dc1f25965dfd8107c88bfc7bcddcf3e2 Refactor of code to allow several virt techs. Minor bugs. Closes #8. --- diff --git a/sliver_libvirt.py b/sliver_libvirt.py index b991556..506ae0c 100644 --- a/sliver_libvirt.py +++ b/sliver_libvirt.py @@ -13,7 +13,7 @@ import shutil from string import Template -states = { +STATES = { libvirt.VIR_DOMAIN_NOSTATE: 'no state', libvirt.VIR_DOMAIN_RUNNING: 'running', libvirt.VIR_DOMAIN_BLOCKED: 'blocked on resource', @@ -26,170 +26,134 @@ states = { REF_IMG_BASE_DIR = '/vservers/.lvref' CON_BASE_DIR = '/vservers' -class Sliver_LV(accounts.Account): - """This class wraps LibVirt commands""" - - SHELL = '/bin/sh' +connections = dict() - # Need to add a tag at myplc to actually use this account - # type = 'sliver.LIBVIRT' - TYPE = 'sliver.LIBVIRT' +def getConnection(uri): + # TODO: error checking + return connections.setdefault(uri, libvirt.open(uri)) + +def create(name, xml, rec, conn): + ''' Create dirs, copy fs image, lxc_create ''' + logger.verbose ('sliver_libvirt: %s create'%(name)) + + # Get the type of image from vref myplc tags specified as: + # pldistro = lxc + # fcdistro = squeeze + # arch x86_64 + vref = rec['vref'] + if vref is None: + logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-debian' % (name)) + vref = "lxc-squeeze-x86_64" + + refImgDir = os.path.join(REF_IMG_BASE_DIR, vref) + containerDir = os.path.join(CON_BASE_DIR, name) + + # check the template exists -- there's probably a better way.. + if not os.path.isdir(refImgDir): + logger.log('sliver_libvirt: %s: ERROR Could not create sliver - reference image %s not found' % (name,vref)) + return + + # Copy the reference image fs + # shutil.copytree("/vservers/.lvref/%s"%vref, "/vservers/%s"%name, symlinks=True) + command = ['cp', '-r', refImgDir, containerDir] + logger.log_call(command, timeout=15*60) + + # Set hostname. A valid hostname cannot have '_' + with open(os.path.join(containerDir, 'etc/hostname'), 'w') as f: + print >>f, name.replace('_', '-') + + # Add slices group if not already present + command = ['/usr/sbin/groupadd', 'slices'] + logger.log_call(command, timeout=15*60) + # Add unix account (TYPE is specified in the subclass) + command = ['/usr/sbin/useradd', '-g', 'slices', '-s', '/bin/sshsh', name, '-p', '*'] + logger.log_call(command, timeout=15*60) + command = ['mkdir', '/home/%s/.ssh'%name] + logger.log_call(command, timeout=15*60) + + # Create PK pair keys to connect from the host to the guest without + # password... maybe remove the need for authentication inside the + # guest? + command = ['su', '-s', '/bin/bash', '-c', 'ssh-keygen -t rsa -N "" -f /home/%s/.ssh/id_rsa'%(name)] + logger.log_call(command, timeout=15*60) + + command = ['chown', '-R', '%s.slices'%name, '/home/%s/.ssh'%name] + logger.log_call(command, timeout=15*60) - @staticmethod - def create(name, rec = None): - ''' Create dirs, copy fs image, lxc_create ''' - logger.verbose ('sliver_libvirt: %s create'%(name)) - - # 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 - - # Get the type of image from vref myplc tags specified as: - # pldistro = lxc - # fcdistro = squeeze - # arch x86_64 - vref = rec['vref'] - if vref is None: - logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-debian' % (name)) - vref = "lxc-squeeze-x86_64" - - refImgDir = os.path.join(REF_IMG_BASE_DIR, vref) - containerDir = os.path.join(CON_BASE_DIR, name) - - # check the template exists -- there's probably a better way.. - if not os.path.isdir(refImgDir): - logger.log('sliver_libvirt: %s: ERROR Could not create sliver - reference image %s not found' % (name,vref)) - return - - # Copy the reference image fs - # shutil.copytree("/vservers/.lvref/%s"%vref, "/vservers/%s"%name, symlinks=True) - command = ['cp', '-r', refImgDir, containerDir] - logger.log_call(command, timeout=15*60) + command = ['cp', '/home/%s/.ssh/id_rsa.pub'%name, '%s/root/.ssh/authorized_keys'%containerDir] + logger.log_call(command, timeout=15*60) - # Set hostname. A valid hostname cannot have '_' - with open(os.path.join(containerDir, 'etc/hostname'), 'w') as f: - print >>f, name.replace('_', '-') + # Get a connection and lookup for the sliver before actually + # defining it, just in case it was already defined. + try: + dom = conn.lookupByName(name) + except: + dom = conn.defineXML(xml) + logger.verbose('lxc_create: %s -> %s'%(name, debuginfo(dom))) - # Add slices group if not already present - command = ['/usr/sbin/groupadd slices'] - logger.log_call(command, timeout=15*60) - - # Add unix account - command = ['/usr/sbin/useradd', '-g', 'slices', '-s', '/bin/sh', name, '-p', '*'] - logger.log_call(command, timeout=15*60) - # Get a connection and lookup for the sliver before actually - # defining it, just in case it was already defined. - conn = Sliver_LV.getConnection() - try: - dom = conn.lookupByName(name) - except: - dom = conn.defineXML(config) - logger.verbose('lxc_create: %s -> %s'%(name, Sliver_LV.info(dom))) - - @staticmethod - def destroy(name): - logger.verbose ('sliver_libvirt: %s destroy'%(name)) - - dir = '/vservers/%s'%(name) - lxc_log = '%s/lxc.log'%(dir) - - conn = Sliver_LV.getConnection() - - try: - command = ['/usr/sbin/userdel', '-r', name] - logger.log_call(command, timeout=15*60) - - # Destroy libvirt domain - dom = conn.lookupByName(name) - dom.destroy() - dom.undefine() - - # Remove rootfs of destroyed domain - shutil.rmtree("/vservers/%s"%name) - except: - logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(name, sys.exc_info()[0])) +def destroy(name, conn): + logger.verbose ('sliver_libvirt: %s destroy'%(name)) - def __init__(self, rec): - self.name = rec['name'] - logger.verbose ('sliver_libvirt: %s init'%(self.name)) - - self.dir = '/vservers/%s'%(self.name) + dir = '/vservers/%s'%(name) + lxc_log = '%s/lxc.log'%(dir) + + try: - # Assume the directory with the image and config files - # are in place + # Destroy libvirt domain + dom = conn.lookupByName(name) + dom.destroy() + dom.undefine() + + # Remove user after destroy domain to force logout + command = ['/usr/sbin/userdel', '-f', '-r', name] + logger.log_call(command, timeout=15*60) - self.keys = '' - self.rspec = {} - self.slice_id = rec['slice_id'] - self.disk_usage_initialized = False - self.initscript = '' - self.enabled = True - conn = Sliver_LV.getConnection() - try: - self.container = conn.lookupByName(self.name) - except: - logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(self.name, sys.exc_info()[0])) - - def configure(self, rec): - ''' Allocate resources and fancy configuration stuff ''' - logger.verbose('sliver_libvirt: %s configure'%(self.name)) - accounts.Account.configure(self, rec) + # Remove rootfs of destroyed domain + shutil.rmtree("/vservers/%s"%name) + except: + logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(name, sys.exc_info()[0])) + + +def start(dom): + ''' Just start the sliver ''' + print "LIBVIRT %s start"%(dom.name()) + + # Check if it's running to avoid throwing an exception if the + # domain was already running, create actually means start + if not is_running(dom): + dom.create() + else: + logger.verbose('sliver_libvirt: sliver %s already started'%(dom.name())) + + +def stop(dom): + logger.verbose('sliver_libvirt: %s stop'%(dom.name())) - def start(self, delay=0): - ''' Just start the sliver ''' - print "LIBVIRT %s start"%(self.name) - - # Check if it's running to avoid throwing an exception if the - # domain was already running, create actually means start - if not self.is_running(): - self.container.create() - else: - logger.verbose('sliver_libvirt: sliver %s already started'%(self.name)) - - def stop(self): - logger.verbose('sliver_libvirt: %s stop'%(self.name)) - - try: - self.container.destroy() - except: - print "Unexpected error:", sys.exc_info()[0] + try: + dom.destroy() + except: + print "Unexpected error:", sys.exc_info()[0] - def is_running(self): - ''' Return True if the domain is running ''' - logger.verbose('sliver_libvirt: %s is_running'%(self.name)) - try: - [state, _, _, _, _] = self.container.info() - if state == libvirt.VIR_DOMAIN_RUNNING: - logger.verbose('sliver_libvirt: %s is RUNNING'%(self.name)) - return True - else: - info = Sliver_LV.info(self.container) - logger.verbose('sliver_libvirt: %s is NOT RUNNING...\n%s'%(self.name, info)) - return False - except: - print "Unexpected error:", sys.exc_info() - - ''' PRIVATE/HELPER/STATIC METHODS ''' - @staticmethod - def getConnection(): - ''' Helper method to get a connection to the LXC driver of Libvirt ''' - conn = libvirt.open('lxc:///') - if conn == None: - print 'Failed to open connection to LXC hypervisor' - sys.exit(1) - else: return conn - - @staticmethod - def info(dom): - ''' Helper method to get a "nice" output of the info struct for debug''' - [state, maxmem, mem, ncpu, cputime] = dom.info() - return '%s is %s, maxmem = %s, mem = %s, ncpu = %s, cputime = %s' % (dom.name(), states.get(state, state), maxmem, mem, ncpu, cputime) +def is_running(dom): + ''' Return True if the domain is running ''' + logger.verbose('sliver_libvirt: %s is_running'%dom.name()) + try: + [state, _, _, _, _] = dom.info() + if state == libvirt.VIR_DOMAIN_RUNNING: + logger.verbose('sliver_libvirt: %s is RUNNING'%(dom.name())) + return True + else: + info = debuginfo(dom) + logger.verbose('sliver_libvirt: %s is NOT RUNNING...\n%s'%(dom.name(), info)) + return False + except: + print "Unexpected error:", sys.exc_info() + +def debuginfo(dom): + ''' Helper method to get a "nice" output of the info struct for debug''' + [state, maxmem, mem, ncpu, cputime] = dom.info() + return '%s is %s, maxmem = %s, mem = %s, ncpu = %s, cputime = %s' % (dom.name(), STATES.get(state, state), maxmem, mem, ncpu, cputime) 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) diff --git a/slivermanager.py b/slivermanager.py index d89bb22..3e4fb1f 100644 --- a/slivermanager.py +++ b/slivermanager.py @@ -17,7 +17,7 @@ import database import accounts import controller import sliver_vs -import sliver_libvirt +import sliver_lxc try: from bwlimit import bwmin, bwmax except ImportError: bwmin, bwmax = 8, 1000*1000*1000 @@ -210,7 +210,8 @@ def start(): DEFAULT_ALLOCATION[resname]=default_amount #accounts.register_class(sliver_vs.Sliver_VS) - accounts.register_class(sliver_libvirt.Sliver_LV) + #accounts.register_class(sliver_libvirt.Sliver_LV) + accounts.register_class(sliver_lxc.Sliver_LXC) accounts.register_class(controller.Controller) database.start() api_calls.deliver_ticket = deliver_ticket