X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/05e5f586ef5b9cd9374fa30d89fb107cd949d19d..c6003dd7f5cab27e9782b94617ffde59f2db331a:/code/validation.py

diff --git a/code/validation.py b/code/validation.py
index caa8ce2..dc0fd8c 100644
--- a/code/validation.py
+++ b/code/validation.py
@@ -4,7 +4,7 @@ import cache_acls
 import getafsgroups
 import re
 import string
-from sipb_xen_database import Machine, NIC, Type, Disk
+from sipb_xen_database import Machine, NIC, Type, Disk, CDROM
 from webcommon import InvalidInput
 
 MAX_MEMORY_TOTAL = 512
@@ -17,14 +17,24 @@ MAX_VMS_TOTAL = 10
 MAX_VMS_ACTIVE = 4
 
 class Validate:
-    def __init__(self, username, state, machine_id=None, name=None, owner=None,
+    def __init__(self, username, state, machine_id=None, name=None, description=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 description is None:
+                raise InvalidInput('description', description, "You must provide a description.")
+            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)
@@ -41,6 +51,9 @@ class Validate:
         name = testName(username, name, machine)
         if name is not None:
             self.name = name
+        description = testDescription(username, description, machine)
+        if description is not None:
+            self.description = description
         if memory is not None:
             self.memory = validMemory(self.owner, state, memory, machine,
                                       on=not created_new)
@@ -241,7 +254,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.")
@@ -261,6 +274,11 @@ def testName(user, name, machine=None):
         return name
     raise InvalidInput('name', name, "Name is already taken.")
 
+def testDescription(user, description, machine=None):
+    if description is None or description.strip() == '':
+        return None
+    return description.strip()
+
 def testHostname(user, hostname, machine):
     for nic in machine.nics:
         if hostname == nic.hostname: