Changeset 134 for trunk

Timestamp:

Oct 8, 2007, 2:17:26 AM (17 years ago)

Author:

ecprice

Message:

Moo!

Location:

trunk/web/templates

Files:

• command.tmpl (added)
• create.tmpl (modified) (1 diff)
• main.py (modified) (3 diffs)

trunk/web/templates/create.tmpl

@@ -13 +13 @@
 <p>Odd... no error, but no machine.</p>
 #end if
+<p><a href="list">Return</a></p>
 #end def

trunk/web/templates/main.py

@@ -213 +213 @@
     return machine
 
-def create(user, fields):
-    name = fields.getfirst('name')
-    if not validMachineName(name):
-        raise MyException("Invalid name '%s'" % name)
-    name = user.username + '_' + name.lower()
-
-    if Machine.get_by(name=name):
-        raise MyException("A machine named '%s' already exists" % name)
-    
-    memory = fields.getfirst('memory')
+def validMemory(user, memory, machine=None):
     try:
         memory = int(memory)
@@ -229 +220 @@
     except ValueError:
         raise MyException("Invalid memory amount")
-    if memory > maxMemory(user):
+    if memory > maxMemory(user, machine):
         raise MyException("Too much memory requested")
-    
-    disk = fields.getfirst('disk')
+    return memory
+
+def validDisk(user, disk, machine=None):
     try:
         disk = float(disk)
-        if disk > maxDisk(user):
+        if disk > maxDisk(user, machine):
             raise MyException("Too much disk requested")
         disk = int(disk * 1024)
@@ -242 +234 @@
     except ValueError:
         raise MyException("Invalid disk amount")
-    
+    return disk
+
+def create(user, fields):
+    name = fields.getfirst('name')
+    if not validMachineName(name):
+        raise MyException("Invalid name '%s'" % name)
+    name = user.username + '_' + name.lower()
+
+    if Machine.get_by(name=name):
+        raise MyException("A machine named '%s' already exists" % name)
+    
+    memory = fields.getfirst('memory')
+    memory = validMemory(user, memory)
+    
+    disk = fields.getfirst('disk')
+    disk = validDisk(user, disk)
+
     vm_type = fields.getfirst('vmtype')
     if vm_type not in ('hvm', 'paravm'):