From e1b9196f42941a70ad972951214eec684290f9f8 Mon Sep 17 00:00:00 2001 From: Peter Iannucci Date: Tue, 17 Feb 2009 01:54:26 -0500 Subject: [PATCH] Added all the other quotas for great win. svn path=/trunk/packages/invirt-remote/; revision=2134 --- debian/changelog | 3 +-- server/usr/sbin/invirt-remote-create | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c55796..069d9a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,8 @@ invirt-remote (0.3.4) unstable; urgency=low /etc/invirt/nocreate; if it exists, they advertise zero free memory and refuse to create VMs * added memory quota validation to invirt-remote-create - * added owner table to database with ram_quota_total and ram_quota_single - -- Peter A. Iannucci Mon, 16 Feb 2009 23:49:14 -0500 + -- Peter A. Iannucci Tue, 17 Feb 2009 01:31:20 -0500 invirt-remote (0.3.3) unstable; urgency=low diff --git a/server/usr/sbin/invirt-remote-create b/server/usr/sbin/invirt-remote-create index bae10c0..3ec70a5 100755 --- a/server/usr/sbin/invirt-remote-create +++ b/server/usr/sbin/invirt-remote-create @@ -19,7 +19,7 @@ def maxMemory(owner, xmlist): Return the memory available for a new machine. """ machines = invirt.database.Machine.query().filter_by(owner=owner) - (quota_total, quota_single) = invirt.database.Owner.getQuotas(owner) + (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner) active_machines = [m for m in machines if m.name in xmlist] mem_usage = sum([x.memory for x in active_machines]) -- 1.7.9.5