X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/751aa520781a12c35b65b6f5f1b485f2548b7e3e..8af4d9d694c4491601cb6f9394b811fc36f13cb2:/code/controls.py?ds=inline diff --git a/code/controls.py b/code/controls.py index 57107ef..8a5f1ef 100644 --- a/code/controls.py +++ b/code/controls.py @@ -2,7 +2,6 @@ Functions to perform remctls. """ -from sipb_xen_database import Machine, Disk, Type, NIC, CDROM, ctx, meta import validation from webcommon import CodeError, InvalidInput import random @@ -13,6 +12,9 @@ import re import cache_acls import yaml +from invirt.config import structs as config +from invirt.database import Machine, Disk, Type, NIC, CDROM, ctx, meta + # ... and stolen from xend/uuid.py def randomUUID(): """Generate a random UUID.""" @@ -25,10 +27,10 @@ def uuidToString(u): "%02x" * 6]) % tuple(u) # end stolen code -def kinit(username = 'daemon/sipb-xen.mit.edu', keytab = '/etc/sipb-xen.keytab'): +def kinit(): """Kinit with a given username and keytab""" - - p = subprocess.Popen(['kinit', "-k", "-t", keytab, username], + p = subprocess.Popen(['kinit', "-k", "-t", '/etc/invirt/keytab', + 'daemon/'+config.web.hostname], stderr=subprocess.PIPE) e = p.wait() if e: @@ -46,7 +48,7 @@ def remctl(*args, **kws): kinits if necessary, and outputs errors to stderr. """ checkKinit() - p = subprocess.Popen(['remctl', 'remote.mit.edu'] + p = subprocess.Popen(['remctl', config.remote.hostname] + list(args), stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -69,6 +71,18 @@ def makeDisks(machine): for disk in machine.disks: lvcreate(machine, disk) +def getswap(disksize, memsize): + """Returns the recommended swap partition size.""" + return int(min(disksize / 4, memsize * 1.5)) + +def lvinstall(machine, autoinstall): + disksize = machine.disks[0].size + memsize = machine.memory + imagesize = disksize - getswap(disksize, memsize) + ip = machine.nics[0].ip + remctl('web', 'install', machine.name, autoinstall.distribution, + autoinstall.mirror, str(imagesize), ip) + def lvcopy(machine_orig_name, machine, rootpw): """Copy a golden image onto a machine's disk""" remctl('web', 'lvcopy', machine_orig_name, machine.name, rootpw) @@ -85,25 +99,26 @@ def bootMachine(machine, cdtype): else: out, err = remctl('control', machine.name, 'create', err=True) - if 'already exists' in out: + if 'already running' in err: raise InvalidInput('action', 'create', 'VM %s is already on' % machine.name) elif err: raise CodeError('"%s" on "control %s create %s' % (err, machine.name, cdtype)) -def createVm(username, state, owner, contact, name, memory, disksize, machine_type, cdrom, clone_from): +def createVm(username, state, owner, contact, name, description, memory, disksize, machine_type, cdrom, autoinstall): """Create a VM and put it in the database""" # put stuff in the table transaction = ctx.current.create_transaction() try: - validation.Validate(username, state, name=name, owner=owner, memory=memory, disksize=disksize/1024.) + validation.Validate(username, state, name=name, description=description, owner=owner, memory=memory, disksize=disksize/1024.) res = meta.engine.execute('select nextval(' '\'"machines_machine_id_seq"\')') id = res.fetchone()[0] machine = Machine() machine.machine_id = id machine.name = name + machine.description = description machine.memory = memory machine.owner = owner machine.administrator = owner @@ -117,7 +132,7 @@ def createVm(username, state, owner, contact, name, memory, disksize, machine_ty open_nics = NIC.select_by(machine_id=None) if not open_nics: #No IPs left! raise CodeError("No IP addresses left! " - "Contact xvm@mit.edu.") + "Contact %s." % config.web.errormail) nic = open_nics[0] nic.machine_id = machine.machine_id nic.hostname = name @@ -129,8 +144,8 @@ def createVm(username, state, owner, contact, name, memory, disksize, machine_ty transaction.rollback() raise makeDisks(machine) - if clone_from: - lvcopy(clone_from, machine, 'password') + if autoinstall: + lvinstall(machine, autoinstall) # tell it to boot with cdrom bootMachine(machine, cdrom) return machine @@ -175,7 +190,7 @@ def statusInfo(machine): if 'Unknown command' in err_string: raise CodeError("ERROR in remctl list-long %s is not registered" % (machine.name,)) - elif 'does not exist' in err_string: + elif 'is not on' in err_string: return None elif err_string: raise CodeError("ERROR in remctl list-long %s: %s" % @@ -183,6 +198,13 @@ def statusInfo(machine): status = parseStatus(value_string) return status +def listHost(machine): + """Return the host a machine is running on""" + out, err = remctl('control', machine.name, 'listhost', err=True) + if err: + return None + return out.strip() + def deleteVM(machine): """Delete a VM.""" remctl('control', machine.name, 'destroy', err=True) @@ -222,7 +244,7 @@ def commandResult(username, state, fields): out, err = remctl('control', machine.name, 'reboot', err=True) if err: - if re.match("Error: Domain '.*' does not exist.", err): + if re.match("machine '.*' is not on", err): raise InvalidInput("action", "reboot", "Machine is not on") else: @@ -239,7 +261,7 @@ def commandResult(username, state, fields): elif action == 'Power off': out, err = remctl('control', machine.name, 'destroy', err=True) if err: - if re.match("Error: Domain '.*' does not exist.", err): + if re.match("machine '.*' is not on", err): raise InvalidInput("action", "Power off", "Machine is not on.") else: @@ -249,7 +271,7 @@ def commandResult(username, state, fields): elif action == 'Shutdown': out, err = remctl('control', machine.name, 'shutdown', err=True) if err: - if re.match("Error: Domain '.*' does not exist.", err): + if re.match("machine '.*' is not on", err): raise InvalidInput("action", "Shutdown", "Machine is not on.") else: