Autoinstalls

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

diff --git a/code/validation.py b/code/validation.py
index dc0fd8c..8f81625 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -4,7 +4,7 @@ import cache_acls
 import getafsgroups
 import re
 import string
 import getafsgroups
 import re
 import string

-from sipb_xen_database import Machine, NIC, Type, Disk, CDROM
+from sipb_xen_database import Machine, NIC, Type, Disk, CDROM, Autoinstall

 from webcommon import InvalidInput
 
 MAX_MEMORY_TOTAL = 512
 from webcommon import InvalidInput
 
 MAX_MEMORY_TOTAL = 512

@@ -19,7 +19,7 @@ MAX_VMS_ACTIVE = 4
 class Validate:
     def __init__(self, username, state, machine_id=None, name=None, description=None, owner=None,
                  admin=None, contact=None, memory=None, disksize=None,
 class Validate:
     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):
+                 vmtype=None, cdrom=None, autoinstall=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.
         # XXX Successive quota checks aren't a good idea, since you
         # can't necessarily change the locker and disk size at the
         # same time.

@@ -65,10 +65,8 @@ class Validate:
             if not CDROM.get(cdrom):
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom
             if not CDROM.get(cdrom):
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom

-        if clone_from is not None:
-            if clone_from not in ('ice3', ):
-                raise CodeError("Invalid clone image '%s'" % clone_from)
-            self.clone_from = clone_from
+        if autoinstall is not None:
+            self.autoinstall = Autoinstall.get(autoinstall)

 
 
 def getMachinesByOwner(owner, machine=None):
 
 
 def getMachinesByOwner(owner, machine=None):