Changeset 243 for trunk/web/controls.py

Timestamp:

Nov 12, 2007, 5:05:26 AM (16 years ago)

Author:

quentin

Message:

Remove unnecessary constructors

Rename disk to disk_size in some (but not all!) places

Added MachineAccess? to all

File:

• trunk/web/controls.py (modified) (3 diffs)

trunk/web/controls.py

@@ -88 +88 @@
     remctl('web', 'unregister', machine.name)
 
-def createVm(owner, contact, name, memory, disk, is_hvm, cdrom):
+def createVm(owner, contact, name, memory, disk_size, is_hvm, cdrom):
     """Create a VM and put it in the database"""
     # put stuff in the table
@@ -94 +94 @@
     try:
         validation.validMemory(owner, memory)
-        validation.validDisk(owner, disk  * 1. / 1024)
+        validation.validDisk(owner, disk_size  * 1. / 1024)
         validation.validAddVm(owner)
         res = meta.engine.execute('select nextval('
@@ -111 +111 @@
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
-        disk = Disk(machine.machine_id, 
-                    'hda', disk)
+        disk = Disk(machine_id=machine.machine_id, 
+                    guest_device_name='hda', size=disk_size)
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!