Standardize on the spelling of "Invirt project"...just because

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

diff --git a/code/controls.py b/code/controls.py
index d4cc13b..d21eb7a 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -13,7 +13,7 @@ import cache_acls
 import yaml
 
 from invirt.config import structs as config
-from invirt.database import Machine, Disk, Type, NIC, CDROM, ctx, meta
+from invirt.database import Machine, Disk, Type, NIC, CDROM, session, meta
 
 # ... and stolen from xend/uuid.py
 def randomUUID():
@@ -78,10 +78,13 @@ def getswap(disksize, memsize):
 def lvinstall(machine, autoinstall):
     disksize = machine.disks[0].size
     memsize = machine.memory
-    imagesize = disksize - getswap(disksize, memsize)
+    swapsize = getswap(disksize, memsize)
+    imagesize = disksize - swapsize
     ip = machine.nics[0].ip
-    remctl('web', 'install', machine.name, autoinstall.distribution,
-           autoinstall.mirror, str(imagesize), ip)
+    remctl('control', machine.name, 'install', 
+           'dist=%s' % autoinstall.distribution,
+           'mirror=%s' % autoinstall.mirror,
+           'imagesize=%s' % imagesize)
 
 def lvcopy(machine_orig_name, machine, rootpw):
     """Copy a golden image onto a machine's disk"""
@@ -109,14 +112,10 @@ def bootMachine(machine, cdtype):
 def createVm(username, state, owner, contact, name, description, memory, disksize, machine_type, cdrom, autoinstall):
     """Create a VM and put it in the database"""
     # put stuff in the table
-    transaction = ctx.current.create_transaction()
+    session.begin()
     try:
         validation.Validate(username, state, name=name, description=description, owner=owner, memory=memory, disksize=disksize/1024.)
-        res = meta.engine.execute('select nextval('
-                                  '\'"machines_machine_id_seq"\')')
-        id = res.fetchone()[0]
         machine = Machine()
-        machine.machine_id = id
         machine.name = name
         machine.description = description
         machine.memory = memory
@@ -125,29 +124,29 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
-        machine.type_id = machine_type.type_id
-        ctx.current.save(machine)
-        disk = Disk(machine_id=machine.machine_id,
+        machine.type = machine_type
+        session.save_or_update(machine)
+        disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)
-        open_nics = NIC.select_by(machine_id=None)
-        if not open_nics: #No IPs left!
+        nic = NIC.query().filter_by(machine_id=None).first()
+        if not nic: #No IPs left!
             raise CodeError("No IP addresses left!  "
-                            "Contact xvm@mit.edu.")
-        nic = open_nics[0]
-        nic.machine_id = machine.machine_id
+                            "Contact %s." % config.web.errormail)
+        nic.machine = machine
         nic.hostname = name
-        ctx.current.save(nic)
-        ctx.current.save(disk)
+        session.save_or_update(nic)
+        session.save_or_update(disk)
         cache_acls.refreshMachine(machine)
-        transaction.commit()
+        session.commit()
     except:
-        transaction.rollback()
+        session.rollback()
         raise
     makeDisks(machine)
     if autoinstall:
         lvinstall(machine, autoinstall)
-    # tell it to boot with cdrom
-    bootMachine(machine, cdrom)
+    else:
+        # tell it to boot with cdrom
+        bootMachine(machine, cdrom)
     return machine
 
 def getList():
@@ -208,30 +207,30 @@ def listHost(machine):
 def deleteVM(machine):
     """Delete a VM."""
     remctl('control', machine.name, 'destroy', err=True)
-    transaction = ctx.current.create_transaction()
+    session.begin()
     delete_disk_pairs = [(machine.name, d.guest_device_name) 
                          for d in machine.disks]
     try:
+        for mname, dname in delete_disk_pairs:
+            remctl('web', 'lvremove', mname, dname)
         for nic in machine.nics:
             nic.machine_id = None
             nic.hostname = None
-            ctx.current.save(nic)
+            session.save_or_update(nic)
         for disk in machine.disks:
-            ctx.current.delete(disk)
-        ctx.current.delete(machine)
-        transaction.commit()
+            session.delete(disk)
+        session.delete(machine)
+        session.commit()
     except:
-        transaction.rollback()
+        session.rollback()
         raise
-    for mname, dname in delete_disk_pairs:
-        remctl('web', 'lvremove', mname, dname)
 
 def commandResult(username, state, fields):
     start_time = 0
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
     action = fields.getfirst('action')
     cdrom = fields.getfirst('cdrom')
-    if cdrom is not None and not CDROM.get(cdrom):
+    if cdrom is not None and not CDROM.query().filter_by(cdrom_id=cdrom).one():
         raise CodeError("Invalid cdrom type '%s'" % cdrom)    
     if action not in ('Reboot', 'Power on', 'Power off', 'Shutdown', 
                       'Delete VM'):