web: fix file permissions on each make

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

diff --git a/code/controls.py b/code/controls.py
index 841d21b..bb6c590 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -11,7 +11,7 @@ import sys
 import time
 import re
 import cache_acls
-import cPickle
+import yaml
 
 # ... and stolen from xend/uuid.py
 def randomUUID():
@@ -92,20 +92,19 @@ def bootMachine(machine, cdtype):
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
-def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone_from):
+def createVm(username, state, owner, contact, name, description, memory, disksize, machine_type, cdrom, clone_from):
     """Create a VM and put it in the database"""
     # put stuff in the table
     transaction = ctx.current.create_transaction()
     try:
-        validation.validMemory(owner, memory)
-        validation.validDisk(owner, disk_size  * 1. / 1024)
-        validation.validAddVm(owner)
+        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
         machine.owner = owner
         machine.administrator = owner
@@ -115,7 +114,7 @@ def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
         machine.type_id = machine_type.type_id
         ctx.current.save(machine)
         disk = Disk(machine_id=machine.machine_id,
-                    guest_device_name='hda', size=disk_size)
+                    guest_device_name='hda', size=disksize)
         open_nics = NIC.select_by(machine_id=None)
         if not open_nics: #No IPs left!
             raise CodeError("No IP addresses left!  "
@@ -137,13 +136,11 @@ def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
     bootMachine(machine, cdrom)
     return machine
 
-def getList(machines):
-    """Return a dictionary mapping machine  to dicts."""
-    value_string = remctl('web', 'listvms', '--pickle')
-    value_dict = cPickle.loads(value_string)
-
-    d = dict((m, value_dict[m.name]) for m in machines if m.name in value_dict)
-    return d
+def getList():
+    """Return a dictionary mapping machine names to dicts."""
+    value_string = remctl('web', 'listvms')
+    value_dict = yaml.load(value_string, yaml.CSafeLoader)
+    return value_dict
 
 def parseStatus(s):
     """Parse a status string into nested tuples of strings.
@@ -179,7 +176,7 @@ def statusInfo(machine):
     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" % 
@@ -200,8 +197,6 @@ def deleteVM(machine):
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)
-        for access in machine.acl:
-            ctx.current.delete(access)
         ctx.current.delete(machine)
         transaction.commit()
     except:
@@ -210,9 +205,9 @@ def deleteVM(machine):
     for mname, dname in delete_disk_pairs:
         remctl('web', 'lvremove', mname, dname)
 
-def commandResult(user, fields):
+def commandResult(username, state, fields):
     start_time = 0
-    machine = validation.testMachineId(user, fields.getfirst('machine_id'))
+    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):
@@ -237,7 +232,7 @@ def commandResult(user, fields):
                 raise CodeError('ERROR on remctl')
                 
     elif action == 'Power on':
-        if validation.maxMemory(user, machine) < machine.memory:
+        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.")
@@ -265,7 +260,7 @@ def commandResult(user, fields):
     elif action == 'Delete VM':
         deleteVM(machine)
 
-    d = dict(user=user,
+    d = dict(user=username,
              command=action,
              machine=machine)
     return d