Index: trunk/packages/sipb-xen-www/code/cache_acls.py =================================================================== --- trunk/packages/sipb-xen-www/code/cache_acls.py (revision 1011) +++ trunk/packages/sipb-xen-www/code/cache_acls.py (revision 1013) @@ -46,12 +46,12 @@ for removed in old_people - people: ma = [x for x in m.acl if x.user == removed][0] - ctx.current.delete(ma) + session.delete(ma) for p in people - old_people: ma = MachineAccess(user=p) m.acl.append(ma) - ctx.current.save(ma) + session.save_or_update(ma) def refreshCache(): - transaction = ctx.current.create_transaction() + session.begin() try: @@ -59,11 +59,11 @@ for m in machines: refreshMachine(m) - ctx.current.flush() + session.flush() # Atomically execute our changes - transaction.commit() + session.commit() except: # Failed! Rollback all the changes. - transaction.rollback() + session.rollback() raise Index: trunk/packages/sipb-xen-www/code/controls.py =================================================================== --- trunk/packages/sipb-xen-www/code/controls.py (revision 1011) +++ trunk/packages/sipb-xen-www/code/controls.py (revision 1013) @@ -110,12 +110,8 @@ """Create a VM and put it in the database""" # put stuff in the table - transaction = ctx.current.create_transaction() + session.begin() try: 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 @@ -126,21 +122,20 @@ machine.uuid = uuidToString(randomUUID()) machine.boot_off_cd = True - machine.type_id = machine_type.type_id - ctx.current.save(machine) - disk = Disk(machine_id=machine.machine_id, + machine.type = machine_type + session.save_or_update(machine) + disk = Disk(machine=machine, guest_device_name='hda', size=disksize) - open_nics = NIC.select_by(machine_id=None) - if not open_nics: #No IPs left! + nic = NIC.query().filter_by(machine_id=None).first() + if not nic: #No IPs left! raise CodeError("No IP addresses left! " "Contact %s." % config.web.errormail) - nic = open_nics[0] - nic.machine_id = machine.machine_id + nic.machine = machine nic.hostname = name - ctx.current.save(nic) - ctx.current.save(disk) + session.save_or_update(nic) + session.save_or_update(disk) cache_acls.refreshMachine(machine) - transaction.commit() + session.commit() except: - transaction.rollback() + session.rollback() raise makeDisks(machine) @@ -209,21 +204,21 @@ """Delete a VM.""" remctl('control', machine.name, 'destroy', err=True) - transaction = ctx.current.create_transaction() + session.begin() delete_disk_pairs = [(machine.name, d.guest_device_name) for d in machine.disks] try: + for mname, dname in delete_disk_pairs: + remctl('web', 'lvremove', mname, dname) for nic in machine.nics: nic.machine_id = None nic.hostname = None - ctx.current.save(nic) + session.save_or_update(nic) for disk in machine.disks: - ctx.current.delete(disk) - ctx.current.delete(machine) - transaction.commit() + session.delete(disk) + session.delete(machine) + session.commit() except: - transaction.rollback() + session.rollback() raise - for mname, dname in delete_disk_pairs: - remctl('web', 'lvremove', mname, dname) def commandResult(username, state, fields): Index: trunk/packages/sipb-xen-www/code/main.py =================================================================== --- trunk/packages/sipb-xen-www/code/main.py (revision 1011) +++ trunk/packages/sipb-xen-www/code/main.py (revision 1013) @@ -362,5 +362,5 @@ """ olddisk = {} - transaction = ctx.current.create_transaction() + session.begin() try: kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name description memory vmtype disksize'.split()]) @@ -381,5 +381,5 @@ olddisk[disk.guest_device_name] = disksize disk.size = disksize - ctx.current.save(disk) + session.save_or_update(disk) update_acl = False @@ -397,11 +397,11 @@ machine.contact = validate.contact - ctx.current.save(machine) + session.save_or_update(machine) if update_acl: print >> sys.stderr, machine, machine.administrator cache_acls.refreshMachine(machine) - transaction.commit() + session.commit() except: - transaction.rollback() + session.rollback() raise for diskname in olddisk: @@ -654,5 +654,5 @@ errorMessage=str(err), stderr=emsg, traceback=traceback) details = templates.error_raw(searchList=[d]) - if username not in config.web.errormail_exclude: + if False: #username not in config.web.errormail_exclude: send_error_mail('xvm error on %s for %s: %s' % (op, username, err), details) Index: trunk/packages/sipb-xen-www/code/validation.py =================================================================== --- trunk/packages/sipb-xen-www/code/validation.py (revision 1011) +++ trunk/packages/sipb-xen-www/code/validation.py (revision 1013) @@ -64,9 +64,9 @@ self.vmtype = validVmType(vmtype) if cdrom is not None: - if not CDROM.get(cdrom): + if not CDROM.query().get(cdrom): raise CodeError("Invalid cdrom type '%s'" % cdrom) self.cdrom = cdrom if autoinstall is not None: - self.autoinstall = Autoinstall.get(autoinstall) + self.autoinstall = Autoinstall.query().get(autoinstall) @@ -184,5 +184,5 @@ if vm_type is None: return None - t = Type.get(vm_type) + t = Type.query().get(vm_type) if t is None: raise CodeError("Invalid vm type '%s'" % vm_type) @@ -201,5 +201,5 @@ except ValueError: raise InvalidInput('machine_id', machine_id, "Must be an integer.") - machine = Machine.get(machine_id) + machine = Machine.query().get(machine_id) if exists and machine is None: raise InvalidInput('machine_id', machine_id, "Does not exist.") @@ -271,5 +271,5 @@ if machine is not None and name == machine.name: return None - if not Machine.query().filter_by(name=name): + if not Machine.query().filter_by(name=name).count(): if not validMachineName(name): raise InvalidInput('name', name, 'You must provide a machine name. Max 63 chars, alnum plus \'-\', does not begin or end with \'-\'.')