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

diff --git a/code/controls.py b/code/controls.py
index 14ba689..ff3691c 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():
@@ -45,7 +46,7 @@ def remctl(*args, **kws):
     kinits if necessary, and outputs errors to stderr.
     """
     checkKinit()
-    p = subprocess.Popen(['remctl', 'black-mesa.mit.edu']
+    p = subprocess.Popen(['remctl', 'remote.mit.edu']
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
@@ -91,22 +92,12 @@ def bootMachine(machine, cdtype):
         raise CodeError('"%s" on "control %s create %s' 
                         % (err, machine.name, cdtype))
 
-def registerMachine(machine):
-    """Register a machine to be controlled by the web interface"""
-    remctl('web', 'register', machine.name)
-
-def unregisterMachine(machine):
-    """Unregister a machine to not be controlled by the web interface"""
-    remctl('web', 'unregister', machine.name)
-
-def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone_from):
+def createVm(username, state, owner, contact, name, 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, owner=owner, memory=memory, disksize=disksize/1024.)
         res = meta.engine.execute('select nextval('
                                   '\'"machines_machine_id_seq"\')')
         id = res.fetchone()[0]
@@ -121,23 +112,22 @@ 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()
     except:
         transaction.rollback()
         raise
-    registerMachine(machine)
     makeDisks(machine)
     if clone_from:
         lvcopy(clone_from, machine, 'password')
@@ -145,20 +135,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.
@@ -224,11 +205,10 @@ def deleteVM(machine):
         raise
     for mname, dname in delete_disk_pairs:
         remctl('web', 'lvremove', mname, dname)
-    unregisterMachine(machine)
 
-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):
@@ -253,7 +233,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.")
@@ -281,7 +261,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
@@ -293,5 +273,4 @@ def renameMachine(machine, old_name, new_name):
     for disk in machine.disks:
         remctl("web", "lvrename", old_name, 
                disk.guest_device_name, new_name)
-    remctl("web", "moveregister", old_name, new_name)