Changeset 440 for trunk/packages/sipb-xen-www/code/main.py
- Timestamp:
- Apr 21, 2008, 9:13:53 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/sipb-xen-www/code/main.py
r438 r440 37 37 import templates 38 38 from Cheetah.Template import Template 39 from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess 39 import sipb_xen_database 40 from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type 40 41 import validation 41 42 from webcommon import InvalidInput, CodeError, g … … 72 73 return '<p>STDERR:</p><pre>' + str(addition) + '</pre>' 73 74 75 Template.sipb_xen_database = sipb_xen_database 74 76 Template.helppopup = staticmethod(helppopup) 75 77 Template.err = None … … 98 100 cdrom = '' 99 101 name = '' 100 vmtype = 'hvm'101 102 def __init__(self, max_memory=None, max_disk=None, **kws): 103 self.type = Type.get('linux-hvm') 102 104 if max_memory is not None: 103 105 self.memory = min(self.memory, max_memory) … … 380 382 machine.memory = memory 381 383 384 vm_type = validation.validVmType(fields.getfirst('vmtype')) 385 if vm_type is not None: 386 machine.type = vm_type 387 382 388 disksize = validation.testDisk(user, fields.getfirst('disk')) 383 389 if disksize is not None: … … 561 567 max_disk = validation.maxDisk(user, machine) 562 568 defaults = Defaults() 563 for name in 'machine_id name administrator owner memory contact '.split():569 for name in 'machine_id name administrator owner memory contact type'.split(): 564 570 setattr(defaults, name, getattr(machine, name)) 565 571 defaults.disk = "%0.2f" % (machine.disks[0].size/1024.)
Note: See TracChangeset
for help on using the changeset viewer.