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

diff --git a/code/validation.py b/code/validation.py
index fe6d7c8..dd3278b 100644
--- a/code/validation.py
+++ b/code/validation.py
@@ -10,7 +10,7 @@ from invirt.config import structs as config
 from invirt.common import InvalidInput
 
 MAX_MEMORY_TOTAL = 512
-MAX_MEMORY_SINGLE = 256
+MAX_MEMORY_SINGLE = 512
 MIN_MEMORY_SINGLE = 16
 MAX_DISK_TOTAL = 50
 MAX_DISK_SINGLE = 50
@@ -44,9 +44,7 @@ class Validate:
         owner = testOwner(username, owner, machine)
         if owner is not None:
             self.owner = owner
-        admin = testAdmin(username, admin, machine)
-        if admin is not None:
-            self.admin = admin
+        self.admin = testAdmin(username, admin, machine)
         contact = testContact(username, contact, machine)
         if contact is not None:
             self.contact = contact
@@ -68,6 +66,8 @@ class Validate:
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom
         if autoinstall is not None:
+            #raise InvalidInput('autoinstall', 'install',
+            #                   "The autoinstaller has been temporarily disabled")
             self.autoinstall = Autoinstall.query().get(autoinstall)
 
 
@@ -218,7 +218,7 @@ def testAdmin(user, admin, machine):
     if admin is None:
         return None
     if machine is not None and admin == machine.administrator:
-        return None
+        return admin
     if admin == user:
         return admin
     if ':' not in admin: