Properly separate the auth.fcgi and unauth.fcgi scripts

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

diff --git a/code/controls.py b/code/controls.py
index 4576a2e..bbc9f8c 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -9,7 +9,7 @@ import yaml
 
 from invirt.config import structs as config
 from invirt.database import Machine, Disk, Type, NIC, CDROM, session, meta
 
 from invirt.config import structs as config
 from invirt.database import Machine, Disk, Type, NIC, CDROM, session, meta

-from invirt.remctl import remctl
+from invirt.remctl import remctl as gen_remctl

 
 # ... and stolen from xend/uuid.py
 def randomUUID():
 
 # ... and stolen from xend/uuid.py
 def randomUUID():

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

+def remctl(*args, **kwargs):
+    return gen_remctl(config.remote.hostname,
+                      principal='daemon/'+config.web.hostname,
+                      *args, **kwargs)
+

 def lvcreate(machine, disk):
     """Create a single disk for a machine"""
     remctl('web', 'lvcreate', machine.name,
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""
     remctl('web', 'lvcreate', machine.name,

@@ -46,6 +51,7 @@ def lvinstall(machine, autoinstall):
     remctl('control', machine.name, 'install', 
            'dist=%s' % autoinstall.distribution,
            'mirror=%s' % autoinstall.mirror,
     remctl('control', machine.name, 'install', 
            'dist=%s' % autoinstall.distribution,
            'mirror=%s' % autoinstall.mirror,

+           'arch=%s' % autoinstall.arch,

            'imagesize=%s' % imagesize)
 
 def lvcopy(machine_orig_name, machine, rootpw):
            'imagesize=%s' % imagesize)
 
 def lvcopy(machine_orig_name, machine, rootpw):

@@ -82,7 +88,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         machine.description = description
         machine.memory = memory
         machine.owner = owner
         machine.description = description
         machine.memory = memory
         machine.owner = owner

-        machine.administrator = owner
+        machine.administrator = None

         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True

@@ -90,7 +96,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(machine)
         disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)
         session.save_or_update(machine)
         disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)

-        nic = NIC.query().filter_by(machine_id=None).first()
+        nic = NIC.query().filter_by(machine_id=None).filter_by(reusable=True).first()

         if not nic: #No IPs left!
             raise CodeError("No IP addresses left!  "
                             "Contact %s." % config.web.errormail)
         if not nic: #No IPs left!
             raise CodeError("No IP addresses left!  "
                             "Contact %s." % config.web.errormail)

@@ -99,16 +105,20 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)

+        makeDisks(machine)

         session.commit()
     except:
         session.rollback()
         raise
         session.commit()
     except:
         session.rollback()
         raise

-    makeDisks(machine)
-    if autoinstall:
-        lvinstall(machine, autoinstall)
-    else:
-        # tell it to boot with cdrom
-        bootMachine(machine, cdrom)
+    try:
+        if autoinstall:
+            lvinstall(machine, autoinstall)
+        else:
+            # tell it to boot with cdrom
+            bootMachine(machine, cdrom)
+    except CodeError, e:
+        deleteVM(machine)
+        raise

     return machine
 
 def getList():
     return machine
 
 def getList():

@@ -166,6 +176,13 @@ def listHost(machine):
         return None
     return out.strip()
 
         return None
     return out.strip()
 

+def vnctoken(machine):
+    """Return a time-stamped VNC token"""
+    out, err = remctl('control', machine.name, 'vnctoken', 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)

@@ -187,17 +204,16 @@ def deleteVM(machine):
         session.rollback()
         raise
 
         session.rollback()
         raise
 

-def commandResult(username, state, fields):
+def commandResult(username, state, command_name, machine_id, fields):

     start_time = 0
     start_time = 0

-    machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
-    action = fields.getfirst('action')
-    cdrom = fields.getfirst('cdrom')
+    machine = validation.Validate(username, state, machine_id=machine_id).machine
+    action = command_name
+    cdrom = fields.get('cdrom') or None

     if cdrom is not None and not CDROM.query().filter_by(cdrom_id=cdrom).one():
         raise CodeError("Invalid cdrom type '%s'" % 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'):
+    if action not in "reboot create destroy shutdown delete".split(" "):

         raise CodeError("Invalid action '%s'" % action)
         raise CodeError("Invalid action '%s'" % action)

-    if action == 'Reboot':
+    if action == 'reboot':

         if cdrom is not None:
             out, err = remctl('control', machine.name, 'reboot', cdrom,
                               err=True)
         if cdrom is not None:
             out, err = remctl('control', machine.name, 'reboot', cdrom,
                               err=True)

@@ -213,13 +229,13 @@ def commandResult(username, state, fields):
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
                 
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
                 

-    elif action == 'Power on':
+    elif action == 'create':

         if validation.maxMemory(username, state, machine) < machine.memory:
             raise InvalidInput('action', 'Power on',
                                "You don't have enough free RAM quota "
                                "to turn on this machine.")
         bootMachine(machine, cdrom)
         if validation.maxMemory(username, state, machine) < machine.memory:
             raise InvalidInput('action', 'Power on',
                                "You don't have enough free RAM quota "
                                "to turn on this machine.")
         bootMachine(machine, cdrom)

-    elif action == 'Power off':
+    elif action == 'destroy':

         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:
             if re.match("machine '.*' is not on", err):
         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:
             if re.match("machine '.*' is not on", err):

@@ -229,7 +245,7 @@ def commandResult(username, state, fields):
                 print >> sys.stderr, 'Error on power off:'
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
                 print >> sys.stderr, 'Error on power off:'
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')

-    elif action == 'Shutdown':
+    elif action == 'shutdown':

         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:
             if re.match("machine '.*' is not on", err):
         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:
             if re.match("machine '.*' is not on", err):

@@ -239,7 +255,7 @@ def commandResult(username, state, fields):
                 print >> sys.stderr, 'Error on Shutdown:'
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
                 print >> sys.stderr, 'Error on Shutdown:'
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')

-    elif action == 'Delete VM':
+    elif action == 'delete':

         deleteVM(machine)
 
     d = dict(user=username,
         deleteVM(machine)
 
     d = dict(user=username,