X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/7dea7333e116b9df09a99effd449c268529ba1a9..907f34a95f096535be1b47e99f37b063a2a8245c:/code/controls.py?ds=sidebyside

diff --git a/code/controls.py b/code/controls.py
index 3cf6b1d..622dd50 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -11,6 +11,7 @@ import sys
 import time
 import re
 import cache_acls
+import yaml
 
 # ... and stolen from xend/uuid.py
 def randomUUID():
@@ -91,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
@@ -113,16 +113,16 @@ def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
         machine.boot_off_cd = True
         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)
+        disk = Disk(machine_id=machine.machine_id,
+                    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!  "
-                            "Contact sipb-xen@mit.edu.")
+                            "Contact xvm@mit.edu.")
         nic = open_nics[0]
         nic.machine_id = machine.machine_id
         nic.hostname = name
-        ctx.current.save(nic)    
+        ctx.current.save(nic)
         ctx.current.save(disk)
         cache_acls.refreshMachine(machine)
         transaction.commit()
@@ -136,20 +136,11 @@ def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
     bootMachine(machine, cdrom)
     return machine
 
-def getUptimes(machines=None):
-    """Return a dictionary mapping machine names to uptime strings"""
+def getList():
+    """Return a dictionary mapping machine names to dicts."""
     value_string = remctl('web', 'listvms')
-    lines = value_string.splitlines()
-    d = {}
-    for line in lines:
-        lst = line.split()
-        name, id = lst[:2]
-        uptime = ' '.join(lst[2:])
-        d[name] = uptime
-    ans = {}
-    for m in machines:
-        ans[m] = d.get(m.name)
-    return ans
+    value_dict = yaml.load(value_string, yaml.CSafeLoader)
+    return value_dict
 
 def parseStatus(s):
     """Parse a status string into nested tuples of strings.
@@ -206,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:
@@ -216,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):
@@ -243,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.")
@@ -271,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