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

Timestamp:

Jun 18, 2008, 3:50:31 AM (16 years ago)

Author:

andersk

Message:

Add a description field.

File:

• trunk/packages/sipb-xen-www/code/validation.py (modified) (4 diffs)

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

@@ -18 +18 @@
 
 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, strict=False):
@@ -29 +29 @@
             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.")
@@ -50 +52 @@
         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,
@@ -270 +275 @@
     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: