Make it easy to kill fcgi processes.

[invirt/packages/invirt-web.git] / code / validation.py

diff --git a/code/validation.py b/code/validation.py
index df5bdcc..db3a365 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -19,12 +19,20 @@ MAX_VMS_ACTIVE = 4
 class Validate:
     def __init__(self, username, state, machine_id=None, name=None, owner=None,
                  admin=None, contact=None, memory=None, disksize=None,
-                 vmtype=None, cdrom=None, clone_from=None):
+                 vmtype=None, cdrom=None, clone_from=None, strict=False):
         # XXX Successive quota checks aren't a good idea, since you
         # can't necessarily change the locker and disk size at the
         # same time.
         created_new = (machine_id is None)
 
+        if strict:
+            if name is None:
+                raise InvalidInput('name', name, "You must provide a machine name.")
+            if memory is None:
+                raise InvalidInput('memory', memory, "You must provide a memory size.")
+            if disksize is None:
+                raise InvalidInput('disk', disksize, "You must provide a disk size.")
+
         if machine_id is not None:
             self.machine = testMachineId(username, machine_id)
         machine = getattr(self, 'machine', None)
@@ -84,7 +92,7 @@ def maxMemory(owner, g, machine=None, on=True):
     if not on:
         return MAX_MEMORY_SINGLE
     machines = getMachinesByOwner(owner, machine)
-    active_machines = [x for x in machines if g.xmlist.get(x)]
+    active_machines = [m for m in machines if m.name in g.xmlist_raw]
     mem_usage = sum([x.memory for x in active_machines if x != machine])
     return min(MAX_MEMORY_SINGLE, MAX_MEMORY_TOTAL-mem_usage)
 
@@ -104,7 +112,7 @@ def maxDisk(owner, machine=None):
 
 def cantAddVm(owner, g):
     machines = getMachinesByOwner(owner)
-    active_machines = [x for x in machines if g.xmlist.get(x)]
+    active_machines = [m for m in machines if m.name in g.xmlist_raw]
     if len(machines) >= MAX_VMS_TOTAL:
         return 'You have too many VMs to create a new one.'
     if len(active_machines) >= MAX_VMS_ACTIVE:
@@ -200,7 +208,9 @@ def testAdmin(user, admin, machine):
     Return the value to set the admin field to (possibly 'system:' +
     admin).  XXX is modifying this a good idea?
     """
-    if admin in (None, machine.administrator):
+    if admin is None:
+        return None
+    if machine is not None and admin == machine.administrator:
         return None
     if admin == user:
         return admin
@@ -227,7 +237,7 @@ def testOwner(user, owner, machine=None):
     if owner == user:
         return owner
     if machine is not None and owner in (machine.owner, None):
-        return None
+        return machine.owner
     if owner is None:
         raise InvalidInput('owner', owner, "Owner must be specified")
     try:
@@ -239,7 +249,7 @@ def testOwner(user, owner, machine=None):
     return owner
 
 def testContact(user, contact, machine=None):
-    if contact in (None, machine.contact):
+    if contact is None or (machine is not None and contact == machine.contact):
         return None
     if not re.match("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", contact, re.I):
         raise InvalidInput('contact', contact, "Not a valid email.")