X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e8e6124e02bacf6a074d68b30bfa4dffe7670ead..810f5128717fa14957fce60d04d42b15c6b87fe0:/code/controls.py?ds=sidebyside diff --git a/code/controls.py b/code/controls.py index d03d4f9..bbc9f8c 100644 --- a/code/controls.py +++ b/code/controls.py @@ -64,17 +64,16 @@ def bootMachine(machine, cdtype): If cdtype is None, give no boot cd. Otherwise, it is the string id of the CD (e.g. 'gutsy_i386') """ - try: - if cdtype is not None: - out = remctl('control', machine.name, 'create', - cdtype) - else: - out = remctl('control', machine.name, 'create') - except CodeError, e: - if 'already running' in e.message: - raise InvalidInput('action', 'create', - 'VM %s is already on' % machine.name) - else: + if cdtype is not None: + out, err = remctl('control', machine.name, 'create', + cdtype, err=True) + else: + out, err = remctl('control', machine.name, 'create', + err=True) + 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)) @@ -97,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) @@ -106,11 +105,11 @@ 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) try: if autoinstall: lvinstall(machine, autoinstall) @@ -157,38 +156,36 @@ def statusInfo(machine): Gets and parses xm list --long """ - try: - value_string = remctl('control', machine.name, 'list-long') - except CodeError, e: - if 'is not on' in e.message: - return None - else: - raise + value_string, err_string = remctl('control', machine.name, 'list-long', + err=True) + if 'Unknown command' in err_string: + raise CodeError("ERROR in remctl list-long %s is not registered" % + (machine.name,)) + elif 'is not on' in err_string: + return None + elif err_string: + raise CodeError("ERROR in remctl list-long %s: %s" % + (machine.name, err_string)) status = parseStatus(value_string) return status def listHost(machine): """Return the host a machine is running on""" - try: - out = remctl('control', machine.name, 'listhost') - except CodeError, e: + out, err = remctl('control', machine.name, 'listhost', err=True) + if err: return None return out.strip() def vnctoken(machine): """Return a time-stamped VNC token""" - try: - out = remctl('control', machine.name, 'vnctoken') - except CodeError, e: + out, err = remctl('control', machine.name, 'vnctoken', err=True) + if err: return None return out.strip() def deleteVM(machine): """Delete a VM.""" - try: - remctl('control', machine.name, 'destroy') - except CodeError: - pass + remctl('control', machine.name, 'destroy', err=True) session.begin() delete_disk_pairs = [(machine.name, d.guest_device_name) for d in machine.disks] @@ -207,54 +204,58 @@ 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': - try: - if cdrom is not None: - out = remctl('control', machine.name, 'reboot', cdrom) - else: - out = remctl('control', machine.name, 'reboot') - except CodeError, e: - if re.match("machine '.*' is not on", e.message): + if action == 'reboot': + if cdrom is not None: + out, err = remctl('control', machine.name, 'reboot', cdrom, + err=True) + else: + out, err = remctl('control', machine.name, 'reboot', + err=True) + if err: + if re.match("machine '.*' is not on", err): raise InvalidInput("action", "reboot", "Machine is not on") else: - raise + print >> sys.stderr, 'Error on reboot:' + 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': - try: - out = remctl('control', machine.name, 'destroy') - except CodeError, e: - if re.match("machine '.*' is not on", e.message): + elif action == 'destroy': + out, err = remctl('control', machine.name, 'destroy', err=True) + if err: + if re.match("machine '.*' is not on", err): raise InvalidInput("action", "Power off", "Machine is not on.") else: - raise - elif action == 'Shutdown': - try: - out = remctl('control', machine.name, 'shutdown') - except CodeError, e: - if re.match("machine '.*' is not on", e.message): + print >> sys.stderr, 'Error on power off:' + print >> sys.stderr, err + raise CodeError('ERROR on remctl') + elif action == 'shutdown': + out, err = remctl('control', machine.name, 'shutdown', err=True) + if err: + if re.match("machine '.*' is not on", err): raise InvalidInput("action", "Shutdown", "Machine is not on.") else: - raise - elif action == 'Delete VM': + print >> sys.stderr, 'Error on Shutdown:' + print >> sys.stderr, err + raise CodeError('ERROR on remctl') + elif action == 'delete': deleteVM(machine) d = dict(user=username,