projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support autoinstalls table for creation list.
[invirt/packages/invirt-web.git]
/
code
/
main.py
diff --git
a/code/main.py
b/code/main.py
index
f1ff5ac
..
3fe04d5
100755
(executable)
--- a/
code/main.py
+++ b/
code/main.py
@@
-37,7
+37,7
@@
sys.path.append('/home/ecprice/.local/lib/python2.5/site-packages')
import templates
from Cheetah.Template import Template
import sipb_xen_database
import templates
from Cheetah.Template import Template
import sipb_xen_database
-from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type
+from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
import validation
from webcommon import InvalidInput, CodeError, g
import controls
import validation
from webcommon import InvalidInput, CodeError, g
import controls
@@
-98,6
+98,7
@@
class Defaults:
memory = 256
disk = 4.0
cdrom = ''
memory = 256
disk = 4.0
cdrom = ''
+ autoinstall = ''
name = ''
def __init__(self, max_memory=None, max_disk=None, **kws):
self.type = Type.get('linux-hvm')
name = ''
def __init__(self, max_memory=None, max_disk=None, **kws):
self.type = Type.get('linux-hvm')
@@
-221,8
+222,7
@@
def getListDict(user):
defaults=defaults,
machines=machines,
has_vnc=has_vnc,
defaults=defaults,
machines=machines,
has_vnc=has_vnc,
- uptimes=g.uptimes,
- cdroms=CDROM.select())
+ uptimes=g.uptimes)
return d
def listVms(user, fields):
return d
def listVms(user, fields):
@@
-571,7
+571,6
@@
def infoDict(user, machine):
defaults.disk = "%0.2f" % (machine.disks[0].size/1024.)
checkpoint.checkpoint('Got defaults')
d = dict(user=user,
defaults.disk = "%0.2f" % (machine.disks[0].size/1024.)
checkpoint.checkpoint('Got defaults')
d = dict(user=user,
- cdroms=CDROM.select(),
on=status is not None,
machine=machine,
defaults=defaults,
on=status is not None,
machine=machine,
defaults=defaults,