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 7eb1b4f..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)