Fix a SQLAlchemyism in the web code

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

diff --git a/code/controls.py b/code/controls.py
index 622dd50..86c23c2 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -2,7 +2,6 @@
 Functions to perform remctls.
 """
 
 Functions to perform remctls.
 """
 

-from sipb_xen_database import Machine, Disk, Type, NIC, CDROM, ctx, meta

 import validation
 from webcommon import CodeError, InvalidInput
 import random
 import validation
 from webcommon import CodeError, InvalidInput
 import random

@@ -13,6 +12,9 @@ import re
 import cache_acls
 import yaml
 
 import cache_acls
 import yaml
 

+from invirt.config import structs as config
+from invirt.database import Machine, Disk, Type, NIC, CDROM, session, meta
+

 # ... and stolen from xend/uuid.py
 def randomUUID():
     """Generate a random UUID."""
 # ... and stolen from xend/uuid.py
 def randomUUID():
     """Generate a random UUID."""

@@ -25,10 +27,10 @@ def uuidToString(u):
                      "%02x" * 6]) % tuple(u)
 # end stolen code
 
                      "%02x" * 6]) % tuple(u)
 # end stolen code
 

-def kinit(username = 'daemon/sipb-xen.mit.edu', keytab = '/etc/sipb-xen.keytab'):
+def kinit():

     """Kinit with a given username and keytab"""
     """Kinit with a given username and keytab"""

-
-    p = subprocess.Popen(['kinit', "-k", "-t", keytab, username],
+    p = subprocess.Popen(['kinit', "-k", "-t", '/etc/invirt/keytab',
+                          'daemon/'+config.web.hostname],

                          stderr=subprocess.PIPE)
     e = p.wait()
     if e:
                          stderr=subprocess.PIPE)
     e = p.wait()
     if e:

@@ -46,7 +48,7 @@ def remctl(*args, **kws):
     kinits if necessary, and outputs errors to stderr.
     """
     checkKinit()
     kinits if necessary, and outputs errors to stderr.
     """
     checkKinit()

-    p = subprocess.Popen(['remctl', 'remote.mit.edu']
+    p = subprocess.Popen(['remctl', config.remote.hostname]

                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)

@@ -69,6 +71,18 @@ def makeDisks(machine):
     for disk in machine.disks:
         lvcreate(machine, disk)
 
     for disk in machine.disks:
         lvcreate(machine, disk)
 

+def getswap(disksize, memsize):
+    """Returns the recommended swap partition size."""
+    return int(min(disksize / 4, memsize * 1.5))
+
+def lvinstall(machine, autoinstall):
+    disksize = machine.disks[0].size
+    memsize = machine.memory
+    imagesize = disksize - getswap(disksize, memsize)
+    ip = machine.nics[0].ip
+    remctl('web', 'install', machine.name, autoinstall.distribution,
+           autoinstall.mirror, str(imagesize), ip)
+

 def lvcopy(machine_orig_name, machine, rootpw):
     """Copy a golden image onto a machine's disk"""
     remctl('web', 'lvcopy', machine_orig_name, machine.name, rootpw)
 def lvcopy(machine_orig_name, machine, rootpw):
     """Copy a golden image onto a machine's disk"""
     remctl('web', 'lvcopy', machine_orig_name, machine.name, rootpw)

@@ -85,24 +99,20 @@ def bootMachine(machine, cdtype):
     else:
         out, err = remctl('control', machine.name, 'create',
                           err=True)
     else:
         out, err = remctl('control', machine.name, 'create',
                           err=True)

-    if 'already exists' in out:
+    if 'already running' in err:

         raise InvalidInput('action', 'create',
                            'VM %s is already on' % machine.name)
     elif err:
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
         raise InvalidInput('action', 'create',
                            'VM %s is already on' % machine.name)
     elif err:
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 

-def createVm(username, state, owner, contact, name, description, memory, disksize, machine_type, cdrom, clone_from):
+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
     """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.)
     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()

-        machine.machine_id = id

         machine.name = name
         machine.description = description
         machine.memory = memory
         machine.name = name
         machine.description = description
         machine.memory = memory

@@ -111,27 +121,26 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
         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)
                     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!  "
             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
         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)
         cache_acls.refreshMachine(machine)

-        transaction.commit()
+        session.commit()

     except:
     except:

-        transaction.rollback()
+        session.rollback()

         raise
     makeDisks(machine)
         raise
     makeDisks(machine)

-    if clone_from:
-        lvcopy(clone_from, machine, 'password')
+    if autoinstall:
+        lvinstall(machine, autoinstall)

     # tell it to boot with cdrom
     bootMachine(machine, cdrom)
     return machine
     # tell it to boot with cdrom
     bootMachine(machine, cdrom)
     return machine

@@ -176,7 +185,7 @@ def statusInfo(machine):
     if 'Unknown command' in err_string:
         raise CodeError("ERROR in remctl list-long %s is not registered" % 
                         (machine.name,))
     if 'Unknown command' in err_string:
         raise CodeError("ERROR in remctl list-long %s is not registered" % 
                         (machine.name,))

-    elif 'does not exist' in err_string:
+    elif 'is not on' in err_string:

         return None
     elif err_string:
         raise CodeError("ERROR in remctl list-long %s:  %s" % 
         return None
     elif err_string:
         raise CodeError("ERROR in remctl list-long %s:  %s" % 

@@ -184,33 +193,40 @@ def statusInfo(machine):
     status = parseStatus(value_string)
     return status
 
     status = parseStatus(value_string)
     return status
 

+def listHost(machine):
+    """Return the host a machine is running on"""
+    out, err = remctl('control', machine.name, 'listhost', err=True)
+    if err:
+        return None
+    return out.strip()
+

 def deleteVM(machine):
     """Delete a VM."""
     remctl('control', machine.name, 'destroy', err=True)
 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:
     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
         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:
         for disk in machine.disks:

-            ctx.current.delete(disk)
-        ctx.current.delete(machine)
-        transaction.commit()
+            session.delete(disk)
+        session.delete(machine)
+        session.commit()

     except:
     except:

-        transaction.rollback()
+        session.rollback()

         raise
         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')
 
 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'):
         raise CodeError("Invalid cdrom type '%s'" % cdrom)    
     if action not in ('Reboot', 'Power on', 'Power off', 'Shutdown', 
                       'Delete VM'):

@@ -223,7 +239,7 @@ def commandResult(username, state, fields):
             out, err = remctl('control', machine.name, 'reboot',
                               err=True)
         if err:
             out, err = remctl('control', machine.name, 'reboot',
                               err=True)
         if err:

-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:
                 raise InvalidInput("action", "reboot", 
                                    "Machine is not on")
             else:

@@ -240,7 +256,7 @@ def commandResult(username, state, fields):
     elif action == 'Power off':
         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:
     elif action == 'Power off':
         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:

-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:
                 raise InvalidInput("action", "Power off", 
                                    "Machine is not on.")
             else:

@@ -250,7 +266,7 @@ def commandResult(username, state, fields):
     elif action == 'Shutdown':
         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:
     elif action == 'Shutdown':
         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:

-            if re.match("Error: Domain '.*' does not exist.", err):
+            if re.match("machine '.*' is not on", err):

                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else:
                 raise InvalidInput("action", "Shutdown", 
                                    "Machine is not on.")
             else: