For now, revert r2093-2095, which were committed by accident; I'm not

[invirt/packages/invirt-web.git] / code / validation.py

diff --git a/code/validation.py b/code/validation.py
index ecd8b9f..5f2a3ff 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -7,10 +7,10 @@ import string
 import dns.resolver
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from invirt.config import structs as config
 import dns.resolver
 from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
 from invirt.config import structs as config

-from invirt.common import InvalidInput
+from invirt.common import InvalidInput, CodeError

 
 MAX_MEMORY_TOTAL = 512
 
 MAX_MEMORY_TOTAL = 512

-MAX_MEMORY_SINGLE = 256
+MAX_MEMORY_SINGLE = 512

 MIN_MEMORY_SINGLE = 16
 MAX_DISK_TOTAL = 50
 MAX_DISK_SINGLE = 50
 MIN_MEMORY_SINGLE = 16
 MAX_DISK_TOTAL = 50
 MAX_DISK_SINGLE = 50

@@ -66,6 +66,8 @@ class Validate:
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom
         if autoinstall is not None:
                 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)
 
 
             self.autoinstall = Autoinstall.query().get(autoinstall)
 
 

@@ -239,8 +241,6 @@ def testOwner(user, owner, machine=None):
 
     If machine is None, this is the owner of a new machine.
     """
 
     If machine is None, this is the owner of a new machine.
     """

-    if owner == user:
-        return owner

     if machine is not None and owner in (machine.owner, None):
         return machine.owner
     if owner is None:
     if machine is not None and owner in (machine.owner, None):
         return machine.owner
     if owner is None: