"""
if machine:
owner = machine.owner
- return Machine.select_by(owner=owner)
+ return Machine.query().filter_by(owner=owner)
def maxMemory(owner, g, machine=None, on=True):
"""Return the maximum memory for a machine or a user.
machine_id = machine.machine_id
else:
machine_id = None
- disk_usage = Disk.query().filter_by(Disk.c.machine_id != machine_id,
- owner=owner).sum(Disk.c.size) or 0
+ disk_usage = Disk.query().filter(Disk.c.machine_id != machine_id).\
+ join('machine').\
+ filter_by(owner=owner).sum(Disk.c.size) or 0
return min(MAX_DISK_SINGLE, MAX_DISK_TOTAL-disk_usage/1024.)
def cantAddVm(owner, g):
machines = getMachinesByOwner(owner)
active_machines = [m for m in machines if m.name in g.xmlist_raw]
- if len(machines) >= MAX_VMS_TOTAL:
+ if machines.count() >= MAX_VMS_TOTAL:
return 'You have too many VMs to create a new one.'
if len(active_machines) >= MAX_VMS_ACTIVE:
return ('You already have the maximum number of VMs turned on. '
name = name.lower()
if machine is not None and name == machine.name:
return None
- if not Machine.select_by(name=name):
+ if not Machine.query().filter_by(name=name):
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 \'-\'.')
return name