Changeset 577 for trunk/packages/sipb-xen-www/code/validation.py

Timestamp:

Jun 2, 2008, 11:58:25 PM (16 years ago)

Author:

ecprice

Message:

Fix more bugs

File:

• trunk/packages/sipb-xen-www/code/validation.py (modified) (1 diff)

trunk/packages/sipb-xen-www/code/validation.py

@@ -20 +20 @@
     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: