X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e85742797d25cb0711381d3f2a00e948285e6e71..48ee742135ea5c591b7636e0be9ae5c902fe05b0:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index 4b9c6a4..bbc9f8c 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -43,8 +43,6 @@ def getswap(disksize, memsize):
     return int(min(disksize / 4, memsize * 1.5))
 
 def lvinstall(machine, autoinstall):
-    #raise InvalidInput('autoinstall', 'install',
-    #                   "The autoinstaller has been temporarily disabled")
     disksize = machine.disks[0].size
     memsize = machine.memory
     swapsize = getswap(disksize, memsize)
@@ -53,6 +51,7 @@ def lvinstall(machine, autoinstall):
     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):
@@ -89,7 +88,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         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
@@ -97,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)
-        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)
@@ -106,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)
+        makeDisks(machine)
         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():
@@ -201,17 +204,16 @@ def deleteVM(machine):
         session.rollback()
         raise
 
-def commandResult(username, state, fields):
+def commandResult(username, state, command_name, machine_id, fields):
     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 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)
-    if action == 'Reboot':
+    if action == 'reboot':
         if cdrom is not None:
             out, err = remctl('control', machine.name, 'reboot', cdrom,
                               err=True)
@@ -227,13 +229,13 @@ def commandResult(username, state, fields):
                 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)
-    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):
@@ -243,7 +245,7 @@ def commandResult(username, state, fields):
                 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):
@@ -253,7 +255,7 @@ def commandResult(username, state, fields):
                 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,