X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/fd7383b857234046a5a18b7f77dfdc7476b80c08..1e922a353a14f5f231040595a93af3054ea41664:/code/controls.py diff --git a/code/controls.py b/code/controls.py index d21eb7a..bbc9f8c 100644 --- a/code/controls.py +++ b/code/controls.py @@ -1,11 +1,6 @@ -""" -Functions to perform remctls. -""" - import validation -from webcommon import CodeError, InvalidInput +from invirt.common import CodeError, InvalidInput import random -import subprocess import sys import time import re @@ -14,6 +9,7 @@ import yaml from invirt.config import structs as config from invirt.database import Machine, Disk, Type, NIC, CDROM, session, meta +from invirt.remctl import remctl as gen_remctl # ... and stolen from xend/uuid.py def randomUUID(): @@ -27,39 +23,10 @@ def uuidToString(u): "%02x" * 6]) % tuple(u) # end stolen code -def kinit(): - """Kinit with a given username and keytab""" - p = subprocess.Popen(['kinit', "-k", "-t", '/etc/invirt/keytab', - 'daemon/'+config.web.hostname], - stderr=subprocess.PIPE) - e = p.wait() - if e: - raise CodeError("Error %s in kinit: %s" % (e, p.stderr.read())) - -def checkKinit(): - """If we lack tickets, kinit.""" - p = subprocess.Popen(['klist', '-s']) - if p.wait(): - kinit() - -def remctl(*args, **kws): - """Perform a remctl and return the output. - - kinits if necessary, and outputs errors to stderr. - """ - checkKinit() - p = subprocess.Popen(['remctl', config.remote.hostname] - + list(args), - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - v = p.wait() - if kws.get('err'): - return p.stdout.read(), p.stderr.read() - if v: - print >> sys.stderr, 'Error', v, 'on remctl', args, ':' - print >> sys.stderr, p.stderr.read() - raise CodeError('ERROR on remctl') - return p.stdout.read() +def remctl(*args, **kwargs): + return gen_remctl(config.remote.hostname, + principal='daemon/'+config.web.hostname, + *args, **kwargs) def lvcreate(machine, disk): """Create a single disk for a machine""" @@ -84,6 +51,7 @@ def lvinstall(machine, autoinstall): remctl('control', machine.name, 'install', 'dist=%s' % autoinstall.distribution, 'mirror=%s' % autoinstall.mirror, + 'arch=%s' % autoinstall.arch, 'imagesize=%s' % imagesize) def lvcopy(machine_orig_name, machine, rootpw): @@ -120,7 +88,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz machine.description = description machine.memory = memory machine.owner = owner - machine.administrator = owner + machine.administrator = None machine.contact = contact machine.uuid = uuidToString(randomUUID()) machine.boot_off_cd = True @@ -128,7 +96,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz session.save_or_update(machine) disk = Disk(machine=machine, guest_device_name='hda', size=disksize) - nic = NIC.query().filter_by(machine_id=None).first() + nic = NIC.query().filter_by(machine_id=None).filter_by(reusable=True).first() if not nic: #No IPs left! raise CodeError("No IP addresses left! " "Contact %s." % config.web.errormail) @@ -137,16 +105,20 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz session.save_or_update(nic) session.save_or_update(disk) cache_acls.refreshMachine(machine) + makeDisks(machine) session.commit() except: session.rollback() raise - makeDisks(machine) - if autoinstall: - lvinstall(machine, autoinstall) - else: - # tell it to boot with cdrom - bootMachine(machine, cdrom) + try: + if autoinstall: + lvinstall(machine, autoinstall) + else: + # tell it to boot with cdrom + bootMachine(machine, cdrom) + except CodeError, e: + deleteVM(machine) + raise return machine def getList(): @@ -204,6 +176,13 @@ def listHost(machine): return None return out.strip() +def vnctoken(machine): + """Return a time-stamped VNC token""" + out, err = remctl('control', machine.name, 'vnctoken', err=True) + if err: + return None + return out.strip() + def deleteVM(machine): """Delete a VM.""" remctl('control', machine.name, 'destroy', err=True) @@ -225,17 +204,16 @@ def deleteVM(machine): session.rollback() raise -def commandResult(username, state, fields): +def commandResult(username, state, command_name, machine_id, fields): start_time = 0 - machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine - action = fields.getfirst('action') - cdrom = fields.getfirst('cdrom') + machine = validation.Validate(username, state, machine_id=machine_id).machine + action = command_name + cdrom = fields.get('cdrom') or None if cdrom is not None and not CDROM.query().filter_by(cdrom_id=cdrom).one(): raise CodeError("Invalid cdrom type '%s'" % cdrom) - if action not in ('Reboot', 'Power on', 'Power off', 'Shutdown', - 'Delete VM'): + if action not in "reboot create destroy shutdown delete".split(" "): raise CodeError("Invalid action '%s'" % action) - if action == 'Reboot': + if action == 'reboot': if cdrom is not None: out, err = remctl('control', machine.name, 'reboot', cdrom, err=True) @@ -251,13 +229,13 @@ def commandResult(username, state, fields): print >> sys.stderr, err raise CodeError('ERROR on remctl') - elif action == 'Power on': + elif action == 'create': if validation.maxMemory(username, state, machine) < machine.memory: raise InvalidInput('action', 'Power on', "You don't have enough free RAM quota " "to turn on this machine.") bootMachine(machine, cdrom) - elif action == 'Power off': + elif action == 'destroy': out, err = remctl('control', machine.name, 'destroy', err=True) if err: if re.match("machine '.*' is not on", err): @@ -267,7 +245,7 @@ def commandResult(username, state, fields): print >> sys.stderr, 'Error on power off:' print >> sys.stderr, err raise CodeError('ERROR on remctl') - elif action == 'Shutdown': + elif action == 'shutdown': out, err = remctl('control', machine.name, 'shutdown', err=True) if err: if re.match("machine '.*' is not on", err): @@ -277,7 +255,7 @@ def commandResult(username, state, fields): print >> sys.stderr, 'Error on Shutdown:' print >> sys.stderr, err raise CodeError('ERROR on remctl') - elif action == 'Delete VM': + elif action == 'delete': deleteVM(machine) d = dict(user=username,